Merge branch 'main' into julien/support-consensus-address

cosmos · Jul 14, 2023 · fa8d0a0 · fa8d0a0
2 parents 156c8cd + 6a0ab4f
commit fa8d0a0
Show file tree

Hide file tree

Showing 57 changed files with 936 additions and 1,312 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,6 +41,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Features
 
 * (cli) [#16887](https://github.com/cosmos/cosmos-sdk/pull/16887) Add two new CLI commands: `tx simulate` for simulating a transaction; `query block-results` for querying CometBFT RPC for block results.
+* (x/gov) [#16976](https://github.com/cosmos/cosmos-sdk/pull/16976) Add `failed_reason` field to `Proposal` under `x/gov` to indicate the reason for a failed proposal. Referenced from [#238](https://github.com/bnb-chain/greenfield-cosmos-sdk/pull/238) under `bnb-chain/greenfield-cosmos-sdk`.
 
 ### Improvements
 
@@ -53,6 +54,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 * (server) [#16827](https://github.com/cosmos/cosmos-sdk/pull/16827) Properly use `--trace` flag (before it was setting the trace level instead of displaying the stacktraces).
 * (x/bank) [#16841](https://github.com/cosmos/cosmos-sdk/pull/16841) correctly process legacy `DenomAddressIndex` values.
+* (types/query) [#16905](https://github.com/cosmos/cosmos-sdk/pull/16905) – Collections Pagination now applies proper count when filtering results.
 
 ### API Breaking Changes
 

diff --git a/api/cosmos/gov/v1/gov.pulsar.go b/api/cosmos/gov/v1/gov.pulsar.go
diff --git a/client/v2/go.mod b/client/v2/go.mod
@@ -25,7 +25,7 @@ require (
  cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca // indirect
  cosmossdk.io/math v1.0.1 // indirect
  cosmossdk.io/store v1.0.0-alpha.1 // indirect
- cosmossdk.io/x/tx v0.8.0 // indirect
+ cosmossdk.io/x/tx v0.9.1 // indirect
  filippo.io/edwards25519 v1.0.0 // indirect
  github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
  github.com/99designs/keyring v1.2.1 // indirect

diff --git a/client/v2/go.sum b/client/v2/go.sum
@@ -51,8 +51,8 @@ cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg=
 cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k=
 cosmossdk.io/store v1.0.0-alpha.1 h1:/151XxAgm0tiKuYrtJzMG61lf6enpPuP+D/hIN8cRjQ=
 cosmossdk.io/store v1.0.0-alpha.1/go.mod h1:ejgU9GhRGMNBduVnDwC3RyhOmu4uKlNQlTiJgPmbDkI=
-cosmossdk.io/x/tx v0.8.0 h1:gLiGRL/Fy7fs6dd0IX8jOf0PrVr56/SG6XVMGQjyvJU=
-cosmossdk.io/x/tx v0.8.0/go.mod h1:T9uEumGNgKU61gJYRv1t3uzQwLnASpJGmSE229HM3xA=
+cosmossdk.io/x/tx v0.9.1 h1:9pmmXA9Vs4qdouOFnzhsdsff2mif0f0kylMq5xTGhRI=
+cosmossdk.io/x/tx v0.9.1/go.mod h1:/YFGTXG6+kyihd8YbfuJiXHV4R/mIMm2uvVzo80CIhA=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
 filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=

diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
  cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca
  cosmossdk.io/math v1.0.1
  cosmossdk.io/store v1.0.0-alpha.1
- cosmossdk.io/x/tx v0.8.0
+ cosmossdk.io/x/tx v0.9.1
  github.com/99designs/keyring v1.2.1
  github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816
  github.com/bits-and-blooms/bitset v1.8.0

diff --git a/go.sum b/go.sum
@@ -51,8 +51,8 @@ cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg=
 cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k=
 cosmossdk.io/store v1.0.0-alpha.1 h1:/151XxAgm0tiKuYrtJzMG61lf6enpPuP+D/hIN8cRjQ=
 cosmossdk.io/store v1.0.0-alpha.1/go.mod h1:ejgU9GhRGMNBduVnDwC3RyhOmu4uKlNQlTiJgPmbDkI=
-cosmossdk.io/x/tx v0.8.0 h1:gLiGRL/Fy7fs6dd0IX8jOf0PrVr56/SG6XVMGQjyvJU=
-cosmossdk.io/x/tx v0.8.0/go.mod h1:T9uEumGNgKU61gJYRv1t3uzQwLnASpJGmSE229HM3xA=
+cosmossdk.io/x/tx v0.9.1 h1:9pmmXA9Vs4qdouOFnzhsdsff2mif0f0kylMq5xTGhRI=
+cosmossdk.io/x/tx v0.9.1/go.mod h1:/YFGTXG6+kyihd8YbfuJiXHV4R/mIMm2uvVzo80CIhA=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
 filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=

diff --git a/proto/cosmos/gov/v1/gov.proto b/proto/cosmos/gov/v1/gov.proto
@@ -102,6 +102,11 @@ message Proposal {
  //
  // Since: cosmos-sdk 0.50
  bool expedited = 14;
+
+ // failed_reason defines the reason why the proposal failed
+ //
+ // Since: cosmos-sdk 0.50
+ string failed_reason = 15;
 }
 
 // ProposalStatus enumerates the valid statuses of a proposal.

diff --git a/simapp/go.mod b/simapp/go.mod
@@ -16,7 +16,7 @@ require (
  cosmossdk.io/x/evidence v0.0.0-20230613133644-0a778132a60f
  cosmossdk.io/x/feegrant v0.0.0-20230613133644-0a778132a60f
  cosmossdk.io/x/nft v0.0.0-20230613133644-0a778132a60f
- cosmossdk.io/x/tx v0.8.0
+ cosmossdk.io/x/tx v0.9.1
  cosmossdk.io/x/upgrade v0.0.0-20230613133644-0a778132a60f
  github.com/cometbft/cometbft v0.38.0-rc2
  github.com/cosmos/cosmos-db v1.0.0

diff --git a/simapp/go.sum b/simapp/go.sum
@@ -203,8 +203,8 @@ cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg=
 cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k=
 cosmossdk.io/store v1.0.0-alpha.1 h1:/151XxAgm0tiKuYrtJzMG61lf6enpPuP+D/hIN8cRjQ=
 cosmossdk.io/store v1.0.0-alpha.1/go.mod h1:ejgU9GhRGMNBduVnDwC3RyhOmu4uKlNQlTiJgPmbDkI=
-cosmossdk.io/x/tx v0.8.0 h1:gLiGRL/Fy7fs6dd0IX8jOf0PrVr56/SG6XVMGQjyvJU=
-cosmossdk.io/x/tx v0.8.0/go.mod h1:T9uEumGNgKU61gJYRv1t3uzQwLnASpJGmSE229HM3xA=
+cosmossdk.io/x/tx v0.9.1 h1:9pmmXA9Vs4qdouOFnzhsdsff2mif0f0kylMq5xTGhRI=
+cosmossdk.io/x/tx v0.9.1/go.mod h1:/YFGTXG6+kyihd8YbfuJiXHV4R/mIMm2uvVzo80CIhA=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
 filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=

diff --git a/tests/e2e/authz/grpc.go b/tests/e2e/authz/grpc.go
@@ -200,7 +200,7 @@ func (s *E2ETestSuite) TestQueryGranterGrantsGRPC() {
  fmt.Sprintf("%s/cosmos/authz/v1beta1/grants/granter/%s", val.APIAddress, val.Address.String()),
  false,
  "",
- 7,
+ 6,
  },
  }
  for _, tc := range testCases {

diff --git a/tests/e2e/authz/query.go b/tests/e2e/authz/query.go
diff --git a/tests/go.mod b/tests/go.mod
@@ -15,7 +15,7 @@ require (
  cosmossdk.io/x/evidence v0.0.0-20230613133644-0a778132a60f
  cosmossdk.io/x/feegrant v0.0.0-20230613133644-0a778132a60f
  cosmossdk.io/x/nft v0.0.0-20230613133644-0a778132a60f // indirect
- cosmossdk.io/x/tx v0.8.0
+ cosmossdk.io/x/tx v0.9.1
  cosmossdk.io/x/upgrade v0.0.0-20230613133644-0a778132a60f
  github.com/cometbft/cometbft v0.38.0-rc2
  github.com/cosmos/cosmos-db v1.0.0

diff --git a/tests/go.sum b/tests/go.sum
@@ -203,8 +203,8 @@ cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg=
 cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k=
 cosmossdk.io/store v1.0.0-alpha.1 h1:/151XxAgm0tiKuYrtJzMG61lf6enpPuP+D/hIN8cRjQ=
 cosmossdk.io/store v1.0.0-alpha.1/go.mod h1:ejgU9GhRGMNBduVnDwC3RyhOmu4uKlNQlTiJgPmbDkI=
-cosmossdk.io/x/tx v0.8.0 h1:gLiGRL/Fy7fs6dd0IX8jOf0PrVr56/SG6XVMGQjyvJU=
-cosmossdk.io/x/tx v0.8.0/go.mod h1:T9uEumGNgKU61gJYRv1t3uzQwLnASpJGmSE229HM3xA=
+cosmossdk.io/x/tx v0.9.1 h1:9pmmXA9Vs4qdouOFnzhsdsff2mif0f0kylMq5xTGhRI=
+cosmossdk.io/x/tx v0.9.1/go.mod h1:/YFGTXG6+kyihd8YbfuJiXHV4R/mIMm2uvVzo80CIhA=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
 filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=

diff --git a/tools/confix/go.mod b/tools/confix/go.mod
@@ -21,7 +21,7 @@ require (
  cosmossdk.io/log v1.1.0 // indirect
  cosmossdk.io/math v1.0.1 // indirect
  cosmossdk.io/store v1.0.0-alpha.1 // indirect
- cosmossdk.io/x/tx v0.8.0 // indirect
+ cosmossdk.io/x/tx v0.9.1 // indirect
  filippo.io/edwards25519 v1.0.0 // indirect
  github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
  github.com/99designs/keyring v1.2.1 // indirect