Bump cosmos-sdk version to 0.42.1 (#2590)

* bump up to 0.42.1 * update irismod version
irisnet · Mar 12, 2021 · e509299 · e509299
1 parent 8eb8cfc
commit e509299
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 117 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,13 +6,12 @@
 
 *February 18th, 2021*
 
-This release fixes a downstream security issue which impacts Cosmos SDK users. 
+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.
 
 * [\#2573](https://github.com/irisnet/irishub/pull/2573) Bump cosmos-sdk version to [v0.41.3](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.41.3)
 * [\#2571](https://github.com/irisnet/irishub/pull/2571) Bump tendermint verion to [v0.34.7](https://github.com/tendermint/tendermint/releases/tag/v0.34.7)
 
-
 ## 1.0.0
 
 *February 9th, 2021*

diff --git a/docs/endpoints/proto-docs.md b/docs/endpoints/proto-docs.md
@@ -11590,6 +11590,7 @@ Params defines service module's parameters
 | `arbitration_time_limit` | [google.protobuf.Duration](#google.protobuf.Duration) |  |  |
 | `tx_size_limit` | [uint64](#uint64) |  |  |
 | `base_denom` | [string](#string) |  |  |
+| `restricted_service_fee_denom` | [bool](#bool) |  |  |
 
 
 

diff --git a/docs/zh/endpoints/proto-docs.md b/docs/zh/endpoints/proto-docs.md
@@ -11590,6 +11590,7 @@ Params defines service module's parameters
 | `arbitration_time_limit` | [google.protobuf.Duration](#google.protobuf.Duration) |  |  |
 | `tx_size_limit` | [uint64](#uint64) |  |  |
 | `base_denom` | [string](#string) |  |  |
+| `restricted_service_fee_denom` | [bool](#bool) |  |  |
 
 
 

diff --git a/go.mod b/go.mod
@@ -3,12 +3,12 @@ module github.com/irisnet/irishub
 go 1.15
 
 require (
-	github.com/cosmos/cosmos-sdk v0.41.4
+	github.com/cosmos/cosmos-sdk v0.42.1
 	github.com/gogo/protobuf v1.3.3
 	github.com/golang/protobuf v1.4.3
 	github.com/gorilla/mux v1.8.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
-	github.com/irisnet/irismod v1.3.2-0.20210308021302-c22d58f6e250
+	github.com/irisnet/irismod v1.3.2-0.20210311063851-129a65bf1185
 	github.com/olebedev/config v0.0.0-20190528211619-364964f3a8e4
 	github.com/pkg/errors v0.9.1
 	github.com/rakyll/statik v0.1.7
@@ -27,7 +27,4 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 )
 
-replace (
-	github.com/cosmos/cosmos-sdk => github.com/irisnet/cosmos-sdk v0.34.4-0.20210304082514-9a60267940b8
-	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
-)
+replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
diff --git a/go.sum b/go.sum
@@ -102,6 +102,8 @@ 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.1 h1:/0SqvXdxbHBRUFRTLdiL4VYE18DMNXd2ONhC5d90EBQ=
+github.com/cosmos/cosmos-sdk v0.42.1/go.mod h1:xiLp1G8mumj82S5KLJGCAyeAlD+7VNomg/aRSJV12yk=
 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=
@@ -302,10 +304,8 @@ github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmK
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
-github.com/irisnet/cosmos-sdk v0.34.4-0.20210304082514-9a60267940b8 h1:KTCFlQ3/T4xgtWjc5R3/6htVYQzVIK15cGFrEIcCJWU=
-github.com/irisnet/cosmos-sdk v0.34.4-0.20210304082514-9a60267940b8/go.mod h1:xiLp1G8mumj82S5KLJGCAyeAlD+7VNomg/aRSJV12yk=
-github.com/irisnet/irismod v1.3.2-0.20210308021302-c22d58f6e250 h1:SDYSZtSveO0JY6bWjlHb6f9Iw4AOt7UirgsdG4Btm2Q=
-github.com/irisnet/irismod v1.3.2-0.20210308021302-c22d58f6e250/go.mod h1:JfAAdwp0kXzwU8VBPJ4gdZgbWImpaqp2DWpQDiLXIso=
+github.com/irisnet/irismod v1.3.2-0.20210311063851-129a65bf1185 h1:7VvGKcwr5BkBqXQwqgbVKEdkCeTw2leiHB3ao4hMa80=
+github.com/irisnet/irismod v1.3.2-0.20210311063851-129a65bf1185/go.mod h1:IHGz1prU5tZMo8Hwm3xiRNtKQGMCgzDo9BUFxU6R3hg=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=

diff --git a/lite/cosmos_swagger_legacy.yaml b/lite/cosmos_swagger_legacy.yaml
@@ -446,45 +446,6 @@ paths:
           description: Invalid request
         500:
           description: Server internal error
-  /bank/total:
-    get:
-      deprecated: true
-      summary: Total supply of coins in the chain
-      tags:
-        - Bank
-      produces:
-        - application/json
-      responses:
-        200:
-          description: OK
-          schema:
-            $ref: "#/definitions/Supply"
-        500:
-          description: Internal Server Error
-  /bank/total/{denomination}:
-    parameters:
-      - in: path
-        name: denomination
-        description: Coin denomination
-        required: true
-        type: string
-        x-example: uatom
-    get:
-      deprecated: true
-      summary: Total supply of a single coin denomination
-      tags:
-        - Bank
-      produces:
-        - application/json
-      responses:
-        200:
-          description: OK
-          schema:
-            type: string
-        400:
-          description: Invalid coin denomination
-        500:
-          description: Internal Server Error
   /auth/accounts/{address}:
     get:
       deprecated: true
@@ -1979,6 +1940,45 @@ paths:
             type: string
         500:
           description: Internal Server Error
+  /supply/total:
+    get:
+      deprecated: true
+      summary: Total supply of coins in the chain
+      tags:
+        - Supply
+      produces:
+        - application/json
+      responses:
+        200:
+          description: OK
+          schema:
+            $ref: "#/definitions/Supply"
+        500:
+          description: Internal Server Error
+  /supply/total/{denomination}:
+    parameters:
+      - in: path
+        name: denomination
+        description: Coin denomination
+        required: true
+        type: string
+        x-example: uatom
+    get:
+      deprecated: true
+      summary: Total supply of a single coin denomination
+      tags:
+        - Supply
+      produces:
+        - application/json
+      responses:
+        200:
+          description: OK
+          schema:
+            type: string
+        400:
+          description: Invalid coin denomination
+        500:
+          description: Internal Server Error
 definitions:
   CheckTxResult:
     type: object

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
@@ -1395,57 +1395,6 @@ paths:
           description: Invalid request
         '500':
           description: Server internal error
-  /bank/total:
-    get:
-      deprecated: true
-      summary: Total supply of coins in the chain
-      tags:
-        - Bank
-      produces:
-        - application/json
-      responses:
-        '200':
-          description: OK
-          schema:
-            type: object
-            properties:
-              total:
-                type: array
-                items:
-                  type: object
-                  properties:
-                    denom:
-                      type: string
-                      example: stake
-                    amount:
-                      type: string
-                      example: '50'
-        '500':
-          description: Internal Server Error
-  '/bank/total/{denomination}':
-    parameters:
-      - in: path
-        name: denomination
-        description: Coin denomination
-        required: true
-        type: string
-        x-example: uatom
-    get:
-      deprecated: true
-      summary: Total supply of a single coin denomination
-      tags:
-        - Bank
-      produces:
-        - application/json
-      responses:
-        '200':
-          description: OK
-          schema:
-            type: string
-        '400':
-          description: Invalid coin denomination
-        '500':
-          description: Internal Server Error
   '/auth/accounts/{address}':
     get:
       deprecated: true
@@ -32148,6 +32097,8 @@ paths:
                     format: uint64
                   base_denom:
                     type: string
+                  restricted_service_fee_denom:
+                    type: boolean
                 title: Params defines service module's parameters
               res:
                 type: object
@@ -53614,6 +53565,8 @@ definitions:
         format: uint64
       base_denom:
         type: string
+      restricted_service_fee_denom:
+        type: boolean
     title: Params defines service module's parameters
   irismod.service.QueryBindingResponse:
     type: object
@@ -53816,6 +53769,8 @@ definitions:
             format: uint64
           base_denom:
             type: string
+          restricted_service_fee_denom:
+            type: boolean
         title: Params defines service module's parameters
       res:
         type: object

diff --git a/scripts/protoc-swagger-gen.sh b/scripts/protoc-swagger-gen.sh
@@ -2,21 +2,17 @@
 
 set -eo pipefail
 
-SDK_VERSION=v0.34.4-0.20210304082514-9a60267940b8
-IRISMOD_VERSION=v1.3.1
+SDK_VERSION=v0.42.1
+IRISMOD_VERSION=v1.3.2-0.20210311063851-129a65bf1185
 
-chmod -R 755 ${GOPATH}/pkg/mod/github.com/irisnet/cosmos-sdk@${SDK_VERSION}/proto
-# chmod -R 755 ${GOPATH}/pkg/mod/github.com/cosmos/cosmos-sdk@${SDK_VERSION}/proto
-chmod -R 755 ${GOPATH}/pkg/mod/github.com/irisnet/cosmos-sdk@${SDK_VERSION}/third_party/proto
-# chmod -R 755 ${GOPATH}/pkg/mod/github.com/cosmos/cosmos-sdk@${SDK_VERSION}/third_party/proto
+chmod -R 755 ${GOPATH}/pkg/mod/github.com/cosmos/cosmos-sdk@${SDK_VERSION}/proto
+chmod -R 755 ${GOPATH}/pkg/mod/github.com/cosmos/cosmos-sdk@${SDK_VERSION}/third_party/proto
 chmod -R 755 ${GOPATH}/pkg/mod/github.com/irisnet/irismod@${IRISMOD_VERSION}/proto
 
 rm -rf ./tmp-swagger-gen ./tmp && mkdir -p ./tmp-swagger-gen ./tmp/proto ./tmp/third_party
 
-cp -r ${GOPATH}/pkg/mod/github.com/irisnet/cosmos-sdk@${SDK_VERSION}/proto ./tmp && rm -rf ./tmp/proto/cosmos/mint
-# cp -r ${GOPATH}/pkg/mod/github.com/cosmos/cosmos-sdk@${SDK_VERSION}/proto ./tmp && rm -rf ./tmp/proto/cosmos/mint
-cp -r ${GOPATH}/pkg/mod/github.com/irisnet/cosmos-sdk@${SDK_VERSION}/third_party/proto ./tmp/third_party
-# cp -r ${GOPATH}/pkg/mod/github.com/cosmos/cosmos-sdk@${SDK_VERSION}/third_party/proto ./tmp/third_party
+cp -r ${GOPATH}/pkg/mod/github.com/cosmos/cosmos-sdk@${SDK_VERSION}/proto ./tmp && rm -rf ./tmp/proto/cosmos/mint
+cp -r ${GOPATH}/pkg/mod/github.com/cosmos/cosmos-sdk@${SDK_VERSION}/third_party/proto ./tmp/third_party
 cp -r ${GOPATH}/pkg/mod/github.com/irisnet/irismod@${IRISMOD_VERSION}/proto ./tmp
 cp -r ./proto ./tmp
 
@@ -39,10 +35,8 @@ for dir in $proto_dirs; do
 done
 
 # copy cosmos swagger_legacy.yaml
-chmod -R 755 ${GOPATH}/pkg/mod/github.com/irisnet/cosmos-sdk@${SDK_VERSION}/client/docs/swagger_legacy.yaml
-cp -r ${GOPATH}/pkg/mod/github.com/irisnet/cosmos-sdk@${SDK_VERSION}/client/docs/swagger_legacy.yaml ./lite/cosmos_swagger_legacy.yaml
-# chmod -R 755 ${GOPATH}/pkg/mod/github.com/cosmos/cosmos-sdk@${SDK_VERSION}/client/docs/swagger_legacy.yaml
-# cp -r ${GOPATH}/pkg/mod/github.com/cosmos/cosmos-sdk@${SDK_VERSION}/client/docs/swagger_legacy.yaml ./lite/cosmos_swagger_legacy.yaml
+chmod -R 755 ${GOPATH}/pkg/mod/github.com/cosmos/cosmos-sdk@${SDK_VERSION}/client/docs/swagger_legacy.yaml
+cp -r ${GOPATH}/pkg/mod/github.com/cosmos/cosmos-sdk@${SDK_VERSION}/client/docs/swagger_legacy.yaml ./lite/cosmos_swagger_legacy.yaml
 
 # combine swagger files
 # uses nodejs package `swagger-combine`.