Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge with master #2671

Merged
merged 67 commits into from
Nov 30, 2021
Merged

Merge with master #2671

merged 67 commits into from
Nov 30, 2021

Conversation

chengwenxi
Copy link
Contributor

No description provided.

chengwenxi and others added 30 commits April 23, 2021 09:55
* update mainnet version

* update height
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.16.3 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](browserslist/browserslist@4.16.3...4.16.6)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](mafintosh/dns-packet@v1.3.1...v1.3.4)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yelong Zhang <[email protected]>
Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/commits)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yelong Zhang <[email protected]>
Bumps [postcss](https://github.com/postcss/postcss) from 7.0.35 to 7.0.36.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](postcss/postcss@7.0.35...7.0.36)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* add query params api

* Revert "Update mainnet version (#2618)"

This reverts commit 7cf7584.

* revert

* upgrade irismod version

* fix some bugs

* revert

* refund shoule be in endblocker not begin blocker

* revert version

* revert version

* upgrade irismod version

* update irismod version

* fix compling

* upgrade irismod

* upgrade irismod

* merge from master

* upgrade irismod

* add farm api and swagger doc

Co-authored-by: chengwenxi <[email protected]>
* add query params api

* Revert "Update mainnet version (#2618)"

This reverts commit 7cf7584.

* merge from master

* update farm version

* revert code

* revert docs

* revert docs

* update irismod version

* update irismod version

* add farm proto docs

Co-authored-by: chengwenxi <[email protected]>
Bumps [prismjs](https://github.com/PrismJS/prism) from 1.23.0 to 1.24.0.
- [Release notes](https://github.com/PrismJS/prism/releases)
- [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md)
- [Commits](PrismJS/prism@v1.23.0...v1.24.0)

---
updated-dependencies:
- dependency-name: prismjs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: vincent <[email protected]>
Bumps [color-string](https://github.com/Qix-/color-string) from 1.5.4 to 1.5.5.
- [Release notes](https://github.com/Qix-/color-string/releases)
- [Changelog](https://github.com/Qix-/color-string/blob/master/CHANGELOG.md)
- [Commits](Qix-/color-string@1.5.4...1.5.5)

---
updated-dependencies:
- dependency-name: color-string
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: vincent <[email protected]>
* fix the staking.md

* transaction
* fix governance

* fix governance
* fix NFT.md

* fix ch

Co-authored-by: vincent <[email protected]>
Co-authored-by: Yelong Zhang <[email protected]>
* upgrade coinswap

* init farm moudle params

* apply comment from github
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.1 to 1.5.3.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](unshiftio/url-parse@1.5.1...1.5.3)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: vincent <[email protected]>
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: vincent <[email protected]>
* update irismod version

* update irismod version
* fix testnet

* fix testnet detail

Co-authored-by: vincent <[email protected]>
Zhiqiang Zhang and others added 24 commits October 13, 2021 21:39
* add RunMigrations

* update RunMigrations

* fix upgrade failed
* fix docs link error

* update irismod version
Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](axios/axios@v0.21.1...v0.21.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yelong Zhang <[email protected]>
Bumps [prismjs](https://github.com/PrismJS/prism) from 1.24.0 to 1.25.0.
- [Release notes](https://github.com/PrismJS/prism/releases)
- [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md)
- [Commits](PrismJS/prism@v1.24.0...v1.25.0)

---
updated-dependencies:
- dependency-name: prismjs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yelong Zhang <[email protected]>
* fix docs link error

* update defalt chain name
* fix docs link error

* replace tendermint

* replace tendermint
* update irismod require

* update tibc-go require
* bump irismod version to v1.5.0-alpha

* bump tibc version to v0.2.0-alpha
* the light client is initialized by default When upgrading (#2689)

* fix docs link error

* replace tendermint

* replace tendermint

* init clients when upgrade

* register relayers

* fix test error

* Add eth client (#2690)

* fix docs link error

* replace tendermint

* replace tendermint

* init clients when upgrade

* register relayers

* fix test error

* add eth light client
* fix docs link error

* fix ibc upgrade error
* fix docs link error

* add change log

* add nft change log

* add api breaking changes
* update user documentation

* update user documentation

* format && update filed

Co-authored-by: Yelong Zhang <[email protected]>
* Add files for initializing the client and relayer

* fix: register data

Co-authored-by: sheldon <[email protected]>
* bump cosmos-sdk to v0.44.3

* bump cosmos-sdk to v0.44.3

* bump cosmos-sdk to v0.44.3
@chengwenxi
Copy link
Contributor Author

chengwenxi commented Nov 29, 2021

@zhangyelong @dreamer-zq Has anyone merge this PR to update the irishub documentation?

@chengwenxi chengwenxi changed the title WIP: Merge with master Merge with master Nov 29, 2021
@haifengxi
Copy link
Contributor

@zhangyelong @dreamer-zq Has anyone merge this PR to update the irishub documentation?

Thanks, will take a look asap. :-)

@zhangyelong zhangyelong merged commit 0f9b92e into documents Nov 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.