Merge branch 'main' into faddat/pre-blocker

cosmos · Sep 19, 2023 · 201c33c · 201c33c
2 parents c54a322 + a4a5061
commit 201c33c
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 13 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -34,6 +34,14 @@ pull_request_rules:
       backport:
         branches:
           - callbacks/release/v0.1.x+ibc-go-v7.3.x
+  - name: backport patches to v0.2.x callbacks ibc-go v7.3.x branch
+    conditions:
+      - base=main
+      - label=backport-callbacks-to-v0.2.x+ibc-go-v7.3.x
+    actions:
+      backport:
+        branches:
+          - callbacks/release/v0.2.x+ibc-go-v7.3.x
   - name: backport patches to v4.4.x branch
     conditions:
       - base=main

diff --git a/modules/apps/27-interchain-accounts/controller/types/tx.pb.go b/modules/apps/27-interchain-accounts/controller/types/tx.pb.go
diff --git a/modules/apps/27-interchain-accounts/host/types/tx.pb.go b/modules/apps/27-interchain-accounts/host/types/tx.pb.go
diff --git a/modules/apps/transfer/types/tx.pb.go b/modules/apps/transfer/types/tx.pb.go
diff --git a/modules/core/02-client/types/tx.pb.go b/modules/core/02-client/types/tx.pb.go
diff --git a/modules/core/03-connection/types/tx.pb.go b/modules/core/03-connection/types/tx.pb.go
diff --git a/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto b/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto
@@ -67,7 +67,7 @@ message MsgUpdateParams {
 
   option (gogoproto.goproto_getters) = false;
 
-  // signer address (it may be the the address that controls the module, which defaults to x/gov unless overwritten).
+  // signer address 
   string signer = 1;
 
   // params defines the 27-interchain-accounts/controller parameters to update.

diff --git a/proto/ibc/applications/interchain_accounts/host/v1/tx.proto b/proto/ibc/applications/interchain_accounts/host/v1/tx.proto
@@ -22,7 +22,7 @@ message MsgUpdateParams {
 
   option (gogoproto.goproto_getters) = false;
 
-  // signer address (it may be the the address that controls the module, which defaults to x/gov unless overwritten).
+  // signer address 
   string signer = 1;
 
   // params defines the 27-interchain-accounts/host parameters to update.

diff --git a/proto/ibc/applications/transfer/v1/tx.proto b/proto/ibc/applications/transfer/v1/tx.proto
@@ -65,7 +65,7 @@ message MsgUpdateParams {
 
   option (gogoproto.goproto_getters) = false;
 
-  // signer address (it may be the the address that controls the module, which defaults to x/gov unless overwritten).
+  // signer address 
   string signer = 1;
 
   // params defines the transfer parameters to update.

diff --git a/proto/ibc/core/client/v1/tx.proto b/proto/ibc/core/client/v1/tx.proto
@@ -129,7 +129,7 @@ message MsgRecoverClient {
   // client
   string substitute_client_id = 2;
 
-  // signer address (it may be the the address that controls the module, which defaults to x/gov unless overwritten).
+  // signer address 
   string signer = 3;
 }
 
@@ -149,7 +149,7 @@ message MsgIBCSoftwareUpgrade {
   // deprecated in the Cosmos SDK to allow for this logic to exist solely in
   // the 02-client module.
   google.protobuf.Any upgraded_client_state = 2;
-  // signer defaults to the governance account address unless otherwise specified.
+  // signer address
   string signer = 3;
 }
 
@@ -162,7 +162,7 @@ message MsgUpdateParams {
 
   option (gogoproto.goproto_getters) = false;
 
-  // signer address (it may be the the address that controls the module, which defaults to x/gov unless overwritten).
+  // signer address 
   string signer = 1;
 
   // params defines the client parameters to update.

diff --git a/proto/ibc/core/connection/v1/tx.proto b/proto/ibc/core/connection/v1/tx.proto
@@ -133,7 +133,7 @@ message MsgUpdateParams {
 
   option (gogoproto.goproto_getters) = false;
 
-  // signer address (it may be the the address that controls the module, which defaults to x/gov unless overwritten).
+  // signer address 
   string signer = 1;
 
   // params defines the connection parameters to update.