Update documents (#2619)

* update mainnet get start docs (#2610) * Bump sdk version to v0.42.4 (#2611) * bump sdk version to v0.42.4 * update changelog * update api docs * update changelog * fix typo (#2613) * update fee.md (#2616) * update fee.md (#2615) Co-authored-by: vincent <[email protected]> * Bump markdown-it from 12.0.4 to 12.0.6 in /docs (#2614) Bumps [markdown-it](https://github.com/markdown-it/markdown-it) from 12.0.4 to 12.0.6. - [Release notes](https://github.com/markdown-it/markdown-it/releases) - [Changelog](https://github.com/markdown-it/markdown-it/blob/master/CHANGELOG.md) - [Commits](markdown-it/markdown-it@12.0.4...12.0.6) 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 date (#2617) Co-authored-by: Jinbiao Zhang <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
irisnet · Apr 22, 2021 · 9687341 · 9687341
1 parent 50c4631
commit 9687341
Show file tree

Hide file tree

Showing 17 changed files with 69 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,26 @@
 
 ## Unreleased
 
+## 1.1.1
+
+*April 21th, 2021*
+
+### Application
+
+* [\#2611](https://github.com/irisnet/irishub/pull/2611) Bump cosmos-sdk version to [v0.42.4](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.42.4)
+* [\#2611](https://github.com/irisnet/irishub/pull/2611) Bump tendermint version to [v0.34.9](https://github.com/tendermint/tendermint/releases/tag/v0.34.9)
+
 ## 1.1.0
 
 *March 26th, 2021*
 
-* [\#2592](https://github.com/irisnet/irishub/pull/2592) Bump cosmos-sdk version to [v0.42.2](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.42.2)
+### CLI
+
+* [\#2592](https://github.com/irisnet/irishub/pull/2592) Bump irismod version to [v1.4.0](https://github.com/irisnet/irismod/releases/tag/v1.4.0)
+
+### Application
+
+* [\#2602](https://github.com/irisnet/irishub/pull/2602) Bump cosmos-sdk version to [v0.42.2](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.42.3)
 * [\#2588](https://github.com/irisnet/irishub/pull/2588) Bump tendermint verion to [v0.34.8](https://github.com/tendermint/tendermint/releases/tag/v0.34.8)
 * [\#2592](https://github.com/irisnet/irishub/pull/2592) Bump irismod version to [v1.4.0](https://github.com/irisnet/irismod/releases/tag/v1.4.0)
 * [\#2589](https://github.com/irisnet/irishub/issues/2589) Migrate irishub from v1.0 to v1.1
@@ -15,6 +30,8 @@
 
 *February 18th, 2021*
 
+### Application
+
 This release fixes a downstream security issue which impacts Cosmos SDK users.
 See the [Tendermint v0.34.7 SDK changelog](https://github.com/tendermint/tendermint/blob/v0.34.x/CHANGELOG.md#v0347) for details.
 

diff --git a/app/ante.go b/app/ante.go
@@ -7,9 +7,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth/signing"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 
-	guardiankeeper "github.com/irisnet/irishub/modules/guardian/keeper"
 	oraclekeeper "github.com/irisnet/irismod/modules/oracle/keeper"
 	tokenkeeper "github.com/irisnet/irismod/modules/token/keeper"
+
+	guardiankeeper "github.com/irisnet/irishub/modules/guardian/keeper"
 )
 
 // NewAnteHandler returns an AnteHandler that checks and increments sequence

diff --git a/docs/concepts/fee.md b/docs/concepts/fee.md
@@ -29,4 +29,4 @@ Example
 iris tx bank send <from-address> <to-address>  1iris --fees=0.3iris --gas=50000 --chain-id=irishub --from=<key-name>
 ```
 
-This example is a transfer transaction. The maximum fee `--fee` is set to be 0.3iris and the maximum gas `--gas` is set to be 50000. Therefore, the gas price here is 6000iris-nano/Gas. Suppose that 10000 gas is used to execute the transaction, then 0.06iris will be paid to validators and left 0.24iris will be refunded to user.
+This example is a transfer transaction. The maximum fee `--fee` is set to be 0.3iris and the maximum gas `--gas` is set to be 50000. Therefore, the gas price here is 0.000006iris/Gas. Suppose that 10000 gas is used to execute the transaction, then 0.06iris will be paid to validators and left 0.24iris will be refunded to user.
diff --git a/docs/get-started/install.md b/docs/get-started/install.md
@@ -3,11 +3,6 @@ order: 2
 ---
 
 # Install
-
-## Latest Version
-
-The Latest IRIShub version for Mainnet is [v1.1.0](https://github.com/irisnet/irishub/releases/v1.1.0)
-
 ## Install `go`
 
 ::: tip
@@ -41,8 +36,9 @@ After setting up `go` correctly, you should be able to compile and run `iris`.
 Make sure that your server can access to google.com because our project depends on some libraries provided by google. (If you are not able to access google.com, you can also try to add a proxy: `export GOPROXY=https://goproxy.io`)
 
 ```bash
-git clone --branch v1.1.0 https://github.com/irisnet/irishub
+git clone https://github.com/irisnet/irishub
 cd irishub
+git checkout <version>
 make install
 ```
 

diff --git a/docs/get-started/mainnet.md b/docs/get-started/mainnet.md
@@ -10,6 +10,12 @@ order: 3
 
 ## Run a Full Node
 
+### Start node from genesis
+
+:::tip
+You must use irishub [v1.0.1](https://github.com/irisnet/irishub/releases/tag/v1.0.1) to initialize your node.
+:::
+
 ```bash
 # initialize node configurations
 iris init <moniker> --chain-id=irishub-1
@@ -22,6 +28,13 @@ curl -o ~/.iris/config/genesis.json https://raw.githubusercontent.com/irisnet/ma
 iris start
 ```
 
+Next, your node will process all chain upgrades. Between each upgrade, you must use the specified version to catch up with the block. Don't worry about using the old version at the upgrade height, the node will be halted automatically.
+
+| Proposal | Start height | Upgrade height | irishub version |
+| -------- | ------------ | -------------- | ----- |
+| genesis  |  9146456     |  9593205  | [v1.0.1](https://github.com/irisnet/irishub/releases/tag/v1.0.1) |
+| [#1](https://irishub.iobscan.io/#/ProposalsDetail/1)  |  9593205     |    | [v1.1.0](https://github.com/irisnet/irishub/releases/tag/v1.1.0) |
+
 :::tip
 You may see some connection errors, it does not matter, the P2P network is trying to find available connections
 

diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -12,7 +12,7 @@
   "devDependencies": {
     "@vuepress/plugin-search": "^1.0.0-rc.1",
     "lodash": "^4.17.19",
-    "markdown-it": "^12.0.4",
+    "markdown-it": "^12.0.6",
     "markdown-it-meta": "0.0.1",
     "vuepress": "^1.8.2",
     "ssri": ">=8.0.1",

diff --git a/docs/zh/concepts/fee.md b/docs/zh/concepts/fee.md
@@ -37,4 +37,4 @@ Gas价格 = 交易费 / Gas上限，代表用户为每个单位的资源消耗
 iris tx bank send <from_address>  <to_address> 1iris --fees=0.3iris --gas=50000 --chain-id=irishub --from=<key-name>
 ```
 
-在这个示例中执行的是转账操作，这里设定的交易费上限`--fee`为0.3iris，Gas上限`--gas`为50000，Gas价格就是 6000iris-nano/Gas。假设执行交易总共需要10000个Gas，那么会有 0.06iris 的交易费被支付给验证人节点；剩余的 0.24iris 会被退还给用户。
+在这个示例中执行的是转账操作，这里设定的交易费上限`--fee`为0.3iris，Gas上限`--gas`为50000，Gas价格就是 0.000006iris/Gas。假设执行交易总共需要10000个Gas，那么会有 0.06iris 的交易费被支付给验证人节点；剩余的 0.24iris 会被退还给用户。
diff --git a/docs/zh/get-started/install.md b/docs/zh/get-started/install.md
@@ -3,11 +3,6 @@ order: 2
 ---
 
 # 安装
-
-## 最新版本
-
-IRIShub 主网的最新版本是[v1.1.0](https://github.com/irisnet/irishub/releases/v1.1.0)
-
 ## 安装`go`
 
 :::tip
@@ -41,8 +36,9 @@ go version
 请确保您的服务器可以访问 google.com，因为我们的项目依赖于google提供的某些库（如果您无法访问`google.com`，也可以尝试添加代理：`export GOPROXY=https://goproxy.io`）
 
 ```bash
-git clone --branch v1.1.0 https://github.com/irisnet/irishub
+git clone https://github.com/irisnet/irishub
 cd irishub
+git checkout <version>
 make install
 ```
 

diff --git a/docs/zh/get-started/mainnet.md b/docs/zh/get-started/mainnet.md
@@ -10,6 +10,12 @@ order: 3
 
 ## 运行全节点
 
+### Start node from genesis
+
+:::tip
+必须使用 irishub [v1.0.1](https://github.com/irisnet/irishub/releases/tag/v1.0.1) 初始化你的节点
+:::
+
 ```bash
 # 初始化节点
 iris init <moniker> --chain-id=irishub-1
@@ -22,6 +28,13 @@ curl -o ~/.iris/config/genesis.json https://raw.githubusercontent.com/irisnet/ma
 iris start
 ```
 
+接下来，你的节点将执行所有链升级过程。在每次升级之间，你必须使用特定的版本同步区块。不用担心在升级高度使用旧版本，节点会自动停止。
+
+| 提案 | 起始高度 | 升级高度 | irishub 版本 |
+| -------- | ------------ | -------------- | ----- |
+| genesis  |  9146456     |  9593205  | [v1.0.1](https://github.com/irisnet/irishub/releases/tag/v1.0.1) |
+| [#1](https://irishub.iobscan.io/#/ProposalsDetail/1)  |  9593205     |    | [v1.1.0](https://github.com/irisnet/irishub/releases/tag/v1.1.0) |
+
 :::tip
 您可能会看到一些连接错误，这没关系，P2P网络正在尝试查找可用的连接
 

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/irisnet/irishub
 go 1.15
 
 require (
-	github.com/cosmos/cosmos-sdk v0.42.3
+	github.com/cosmos/cosmos-sdk v0.42.4
 	github.com/gogo/protobuf v1.3.3
 	github.com/golang/protobuf v1.4.3
 	github.com/gorilla/mux v1.8.0
@@ -18,7 +18,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.7.1
 	github.com/stretchr/testify v1.7.0
-	github.com/tendermint/tendermint v0.34.8
+	github.com/tendermint/tendermint v0.34.9
 	github.com/tendermint/tm-db v0.6.4
 	github.com/tidwall/gjson v1.6.1 // indirect
 	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad

diff --git a/go.sum b/go.sum
@@ -102,8 +102,9 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/cosmos/cosmos-sdk v0.42.3 h1:VFYq7spDBBIlygAxwcI79Xh2JuIrG1ZCPKpvqKghIZs=
 github.com/cosmos/cosmos-sdk v0.42.3/go.mod h1:xiLp1G8mumj82S5KLJGCAyeAlD+7VNomg/aRSJV12yk=
+github.com/cosmos/cosmos-sdk v0.42.4 h1:yaD4PyOx0LnyfiWasC5egg1U76lT83GRxjJjupPo7Gk=
+github.com/cosmos/cosmos-sdk v0.42.4/go.mod h1:I1Zw1zmU4rA/NITaakTb71pXQnQrWyFBhqo3WSeg0vA=
 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
 github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
 github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
@@ -230,6 +231,8 @@ github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSN
 github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/orderedcode v0.0.1 h1:UzfcAexk9Vhv8+9pNOgRu41f16lHq725vPwnSeiG/Us=
+github.com/google/orderedcode v0.0.1/go.mod h1:iVyU4/qPKHY5h/wSd6rZZCDcLJNxiWO6dvsYES2Sb20=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
@@ -571,8 +574,9 @@ github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoM
 github.com/tendermint/tendermint v0.34.0-rc4/go.mod h1:yotsojf2C1QBOw4dZrTcxbyxmPUrT4hNuOQWX9XUwB4=
 github.com/tendermint/tendermint v0.34.0-rc6/go.mod h1:ugzyZO5foutZImv0Iyx/gOFCX6mjJTgbLHTwi17VDVg=
 github.com/tendermint/tendermint v0.34.0/go.mod h1:Aj3PIipBFSNO21r+Lq3TtzQ+uKESxkbA3yo/INM4QwQ=
-github.com/tendermint/tendermint v0.34.8 h1:PMWgUx47FrNTsfhxCWzoiIlVAC1SE9+WBlnsF9oQW0I=
 github.com/tendermint/tendermint v0.34.8/go.mod h1:JVuu3V1ZexOaZG8VJMRl8lnfrGw6hEB2TVnoUwKRbss=
+github.com/tendermint/tendermint v0.34.9 h1:9P2MXDEPOcPW0NBcHQ/HDSfvczZm+q5nUUw7AZ6f1Vc=
+github.com/tendermint/tendermint v0.34.9/go.mod h1:kl4Z1JwGx1I+u1SXIzMDy7Z3T8LiMeCAOnzNn6AIMT4=
 github.com/tendermint/tm-db v0.6.2/go.mod h1:GYtQ67SUvATOcoY8/+x6ylk8Qo02BQyLrAs+yAcLvGI=
 github.com/tendermint/tm-db v0.6.3/go.mod h1:lfA1dL9/Y/Y8wwyPp2NMLyn5P5Ptr/gvDFNWtrCWSf8=
 github.com/tendermint/tm-db v0.6.4 h1:3N2jlnYQkXNQclQwd/eKV/NzlqPlfK21cpRRIx80XXQ=

diff --git a/lite/config.json b/lite/config.json
@@ -3,7 +3,7 @@
     "info": {
         "title": "IRIShub - Legacy REST and gRPC Gateway docs",
         "description": "A REST interface for state queries, legacy transactions",
-        "version": "1.1.0"
+        "version": "1.1.1"
     },
     "apis": [
         {

diff --git a/lite/statik/statik.go b/lite/statik/statik.go
diff --git a/lite/swagger-ui/swagger.yaml b/lite/swagger-ui/swagger.yaml
@@ -2,7 +2,7 @@ swagger: '2.0'
 info:
   title: IRIShub - Legacy REST and gRPC Gateway docs
   description: 'A REST interface for state queries, legacy transactions'
-  version: 1.1.0
+  version: 1.1.1
 paths:
   /node_info:
     get:

diff --git a/modules/mint/client/rest/grpc_query_test.go b/modules/mint/client/rest/grpc_query_test.go
@@ -43,7 +43,7 @@ func TestIntegrationTestSuite(t *testing.T) {
 	suite.Run(t, new(IntegrationTestSuite))
 }
 
-func (s *IntegrationTestSuite) TestHtlc() {
+func (s *IntegrationTestSuite) TestParams() {
 	val := s.network.Validators[0]
 	baseURL := val.APIAddress
 	//------test GetCmdQueryParams()-------------

diff --git a/scripts/protoc-swagger-gen.sh b/scripts/protoc-swagger-gen.sh
@@ -2,7 +2,7 @@
 
 set -eo pipefail
 
-SDK_VERSION=v0.42.3
+SDK_VERSION=v0.42.4
 IRISMOD_VERSION=v1.4.0
 
 chmod -R 755 ${GOPATH}/pkg/mod/github.com/cosmos/cosmos-sdk@${SDK_VERSION}/proto