Merge branch 'release/v0.53.x' into technicallyty/23846/add-tx-compat

cosmos · Mar 3, 2025 · 9cd0fad · 9cd0fad
2 parents bc3478b + f56b1bf
commit 9cd0fad
Show file tree

Hide file tree

Showing 11 changed files with 345 additions and 326 deletions.
diff --git a/.github/workflows/dependabot-update-all.yml b/.github/workflows/dependabot-update-all.yml
@@ -14,7 +14,7 @@ jobs:
     if: ${{ github.actor == 'dependabot[bot]' }}
     steps:
       - name: Generate Token
-        uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1
+        uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1
         id: app-token
         with:
           app-id: "${{ secrets.APP_ID }}"

diff --git a/.mergify.yml b/.mergify.yml
@@ -1,21 +1,25 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
+      - "#approved-reviews-by>1"
+      - base=main
+      - label=A:automerge
+    merge_conditions:
       - "#approved-reviews-by>1"
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+      {{ body }}
+    merge_method: squash
 
 pull_request_rules:
-  - name: automerge to main with label automerge and branch protection passing
+  - name: backport patches to v0.53.x branch
     conditions:
-      - "#approved-reviews-by>1"
       - base=main
-      - label=A:automerge
+      - label=backport/v0.53.x
     actions:
-      queue:
-        name: default
-        method: squash
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-          {{ body }}
+      backport:
+        branches:
+          - release/v0.53.x
   - name: backport patches to v0.50.x branch
     conditions:
       - base=main
@@ -48,3 +52,7 @@ pull_request_rules:
       backport:
         branches:
           - release/v0.45.x
+  - name: automerge to main with label automerge and branch protection passing
+    conditions: []
+    actions:
+      queue:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -43,17 +43,23 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (all) [23708](https://github.com/cosmos/cosmos-sdk/pull/23708) Add unordered transaction support.
   * Adds a `--timeout-timestamp` flag that allows users to specify a block time at which the unordered transactions should expire from the mempool.
 * (x/epochs) [#23815](https://github.com/cosmos/cosmos-sdk/pull/23815) Upstream `x/epochs` from Osmosis
-* (client) [#21074](https://github.com/cosmos/cosmos-sdk/pull/21074) Add auto cli for node service
+* (client) [#23811](https://github.com/cosmos/cosmos-sdk/pull/23811) Add auto cli for node service.
+
+### Improvements
+
+* (gRPC) [#23844](https://github.com/cosmos/cosmos-sdk/pull/23844) Add debug log prints for each gRPC request.
 
 ### Bug Fixes
 
+* (client) [#23860](https://github.com/cosmos/cosmos-sdk/pull/23860) Add missing `unordered` field for legacy amino signing of tx body.
+* (x/bank) [#23836](https://github.com/cosmos/cosmos-sdk/pull/23836) Fix `DenomMetadata` rpc allow value with slashes.
 * (query) [87d3a43](https://github.com/cosmos/cosmos-sdk/commit/87d3a432af95f4cf96aa02351ed5fcc51cca6e7b) Fix collection filtered pagination.
 
 ## [v0.50.12](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.12) - 2025-02-20
 
 ### Bug Fixes
 
-* [GHSA-x5vx-95h7-rv4p](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-x5vx-95h7-rv4p) Fix Group module can halt chain when handling a malicious proposal
+* [GHSA-x5vx-95h7-rv4p](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-x5vx-95h7-rv4p) Fix Group module can halt chain when handling a malicious proposal.
 
 ## [v0.50.11](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.11) - 2024-12-16
 

diff --git a/api/cosmos/bank/v1beta1/query.pulsar.go b/api/cosmos/bank/v1beta1/query.pulsar.go
diff --git a/api/cosmos/bank/v1beta1/query_grpc.pb.go b/api/cosmos/bank/v1beta1/query_grpc.pb.go
diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
@@ -203,7 +203,7 @@ func NewBaseApp(
 	name string, logger log.Logger, db dbm.DB, txDecoder sdk.TxDecoder, options ...func(*BaseApp),
 ) *BaseApp {
 	app := &BaseApp{
-		logger:           logger,
+		logger:           logger.With(log.ModuleKey, "baseapp"),
 		name:             name,
 		db:               db,
 		cms:              store.NewCommitMultiStore(db, logger, storemetrics.NewNoOpMetrics()), // by default we use a no-op metric gather in store

diff --git a/baseapp/grpcserver.go b/baseapp/grpcserver.go
@@ -2,6 +2,7 @@ package baseapp
 
 import (
 	"context"
+	"fmt"
 	"strconv"
 
 	gogogrpc "github.com/cosmos/gogoproto/grpc"
@@ -64,6 +65,8 @@ func (app *BaseApp) RegisterGRPCServer(server gogogrpc.Server) {
 			app.logger.Error("failed to set gRPC header", "err", err)
 		}
 
+		app.logger.Debug("gRPC query received", "type", fmt.Sprintf("%#v", req))
+
 		return handler(grpcCtx, req)
 	}
 

diff --git a/client/tx/aux_builder.go b/client/tx/aux_builder.go
@@ -223,6 +223,7 @@ func (b *AuxTxBuilder) GetSignBytes() ([]byte, error) {
 				Memo:             body.Memo,
 				TimeoutHeight:    body.TimeoutHeight,
 				TimeoutTimestamp: body.TimeoutTimestamp,
+				Unordered:        body.Unordered,
 				// AuxTxBuilder has no concern with extension options, so we set them to nil.
 				// This preserves pre-PR#16025 behavior where extension options were ignored, this code path:
 				// https://github.com/cosmos/cosmos-sdk/blob/ac3c209326a26b46f65a6cc6f5b5ebf6beb79b38/client/tx/aux_builder.go#L193

diff --git a/proto/cosmos/bank/v1beta1/query.proto b/proto/cosmos/bank/v1beta1/query.proto
@@ -77,10 +77,17 @@ service Query {
     option (google.api.http).get               = "/cosmos/bank/v1beta1/params";
   }
 
+  // DenomsMetadata queries the client metadata for all registered coin
+  // denominations.
+  rpc DenomsMetadata(QueryDenomsMetadataRequest) returns (QueryDenomsMetadataResponse) {
+    option (cosmos.query.v1.module_query_safe) = true;
+    option (google.api.http).get               = "/cosmos/bank/v1beta1/denoms_metadata";
+  }
+
   // DenomMetadata queries the client metadata of a given coin denomination.
   rpc DenomMetadata(QueryDenomMetadataRequest) returns (QueryDenomMetadataResponse) {
     option (cosmos.query.v1.module_query_safe) = true;
-    option (google.api.http).get               = "/cosmos/bank/v1beta1/denoms_metadata/{denom}";
+    option (google.api.http).get               = "/cosmos/bank/v1beta1/denoms_metadata/{denom=**}";
   }
 
   // DenomMetadataByQueryString queries the client metadata of a given coin denomination.
@@ -89,12 +96,6 @@ service Query {
     option (cosmos.query.v1.module_query_safe) = true;
     option (google.api.http).get               = "/cosmos/bank/v1beta1/denoms_metadata_by_query_string";
   }
-  // DenomsMetadata queries the client metadata for all registered coin
-  // denominations.
-  rpc DenomsMetadata(QueryDenomsMetadataRequest) returns (QueryDenomsMetadataResponse) {
-    option (cosmos.query.v1.module_query_safe) = true;
-    option (google.api.http).get               = "/cosmos/bank/v1beta1/denoms_metadata";
-  }
 
   // DenomOwners queries for all account addresses that own a particular token
   // denomination.
@@ -105,7 +106,7 @@ service Query {
   // Since: cosmos-sdk 0.46
   rpc DenomOwners(QueryDenomOwnersRequest) returns (QueryDenomOwnersResponse) {
     option (cosmos.query.v1.module_query_safe) = true;
-    option (google.api.http).get               = "/cosmos/bank/v1beta1/denom_owners/{denom}";
+    option (google.api.http).get               = "/cosmos/bank/v1beta1/denom_owners/{denom=**}";
   }
 
   // DenomOwnersByQuery queries for all account addresses that own a particular token