proto fixes

Author: wllmshao

docs/internal/migrations/cosmos-sdk-v0.50-migration.md

@@ -44,20 +44,20 @@ make proto-gen
 ### Steps for upgrading cosmos-sdk and ibc-go
 Key dependencies:
 * `[email protected]`
-* `ibc-go/v9@v8.1.0`
+* `ibc-go/v8@v8.1.0`
 * `ibc-go/modules/[email protected]`
 
 ```shell
 go get github.com/cosmos/[email protected]
-go get github.com/cosmos/ibc-go/v9@v8.1.0
+go get github.com/cosmos/ibc-go/v8@v8.1.0
 go get github.com/cosmos/ibc-go/modules/[email protected]
 ```
 
-`ibc-go/v9` is using the `x/capability` module that lives in `github.com/cosmos/ibc-go/modules/capability`.
+`ibc-go/v8` is using the `x/capability` module that lives in `github.com/cosmos/ibc-go/modules/capability`.
 * this module was added after all the file imports were changed for ibc-go (from v7 -> v8) to avoid weird import behaviour
 
 ### Search & replace
-* github.com/cosmos/ibc-go/v7 -> github.com/cosmos/ibc-go/v9
+* github.com/cosmos/ibc-go/v7 -> github.com/cosmos/ibc-go/v8
 * github.com/cosmos/cosmos-sdk/store -> cosmossdk.io/store
 * github.com/cosmos/cosmos-sdk/x/feegrant -> cosmossdk.io/x/feegrant
 * github.com/cosmos/cosmos-sdk/x/evidence -> cosmossdk.io/x/evidence

go.mod

@@ -17,7 +17,6 @@ require (
 	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/kylelemons/godebug v1.1.0
-	github.com/oxyno-zeta/gomock-extra-matcher v1.2.0
 	github.com/spf13/cast v1.7.1
 	github.com/spf13/cobra v1.8.1
 	github.com/stretchr/testify v1.10.0
@@ -214,12 +213,10 @@ require (
 	go.opentelemetry.io/otel v1.31.0 // indirect
 	go.opentelemetry.io/otel/metric v1.31.0 // indirect
 	go.opentelemetry.io/otel/trace v1.31.0 // indirect
-	go.uber.org/mock v0.2.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.22.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
 	gotest.tools/v3 v3.5.1 // indirect
 )

go.sum

@@ -852,8 +852,6 @@ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh
 github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA=
 github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs=
-github.com/oxyno-zeta/gomock-extra-matcher v1.2.0 h1:WPEclU0y0PMwUzdDcaKZvld4aXpa3fkzjiUMQdcBEHg=
-github.com/oxyno-zeta/gomock-extra-matcher v1.2.0/go.mod h1:S0r7HmKeCGsHmvIVFMjKWwswb4+30nCNWbXRMBVPkaU=
 github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
@@ -1016,7 +1014,6 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/zondax/hid v0.9.2 h1:WCJFnEDMiqGF64nlZz28E9qLVZ0KSJ7xpc5DLEyma2U=
 github.com/zondax/hid v0.9.2/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM=
@@ -1057,8 +1054,6 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
-go.uber.org/mock v0.2.0 h1:TaP3xedm7JaAgScZO7tlvlKrqT0p7I6OsdGB5YNSMDU=
-go.uber.org/mock v0.2.0/go.mod h1:J0y0rp9L3xiff1+ZBfKxlC1fz2+aO16tw0tsDOixfuM=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
@@ -1120,7 +1115,6 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
 golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
@@ -1171,7 +1165,6 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
@@ -1298,7 +1291,6 @@ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1410,10 +1402,7 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
-golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

proto/buf.lock

@@ -1,6 +1,11 @@
 # Generated by buf. DO NOT EDIT.
 version: v1
 deps:
+  - remote: buf.build
+    owner: cometbft
+    repository: cometbft
+    commit: c0d3497e35d649538679874acdd86660
+    digest: shake256:05d2fb9e6b6bf82385ac26b250afbba281a2ca79f51729291373d24ca676d743183bf70a921daae6feafd5f9917120e2548a7c477d9743f668bca27cc1e12fdf
   - remote: buf.build
     owner: cosmos
     repository: cosmos-proto
@@ -19,8 +24,8 @@ deps:
   - remote: buf.build
     owner: cosmos
     repository: ibc
-    commit: 7ab44ae956a0488ea04e04511efa5f70
-    digest: shake256:95cc5472ddf692d23654b7e5adfd79149469dcc90657f9a1f80ee3fea8af639cff59cd849efca0567d270118eea7c7ff2f7e60c562545bace410b8eece27577e
+    commit: baf134b1c13a45e9903beeba3b2a92ec
+    digest: shake256:0069c2b35e359966bfe3f30ec98bc76180f277eb6fe722cdc6d20e68257d9b888db3b801c9fdc8ae1014439d786420f21ba2147d8fee7b1dc1dc748ff84e1fe4
   - remote: buf.build
     owner: cosmos
     repository: ics23

proto/buf.yaml

@@ -10,7 +10,7 @@ deps:
   - buf.build/cosmos/cosmos-proto:1935555c206d4afb9e94615dfd0fad31
   - buf.build/cosmos/gogo-proto:a14993478f40695898ed8a86931094b6656e8a5d
   - buf.build/cosmos/ics23:b1abd8678aab07165efd453c96796a179eb3131f
-  - buf.build/cosmos/ibc:26f7fe338f6d5d1d587887e94aa473302bb26a1a
+  - buf.build/cosmos/ibc:44af86ebb61ee4bd4e69e3a3e85ad145ccf2f53b
   - buf.build/googleapis/googleapis:8d7204855ec14631a499bd7393ce1970
 
 breaking:

proto/interchain_security/ccv/consumer/v1/consumer.proto

@@ -28,9 +28,9 @@ message CrossChainValidator {
     (gogoproto.moretags) = "yaml:\"consensus_pubkey\""
   ];
 
-  // !!! DEPRECATED !!! opted_out is deprecated because after the introduction of Partial Set Security (PSS)
-  // we removed the soft opt-out feature.
-  bool opted_out = 4 [deprecated = true];
+  // !!! DEPRECATED !!! opted_out is deprecated because after the introduction
+  // of Partial Set Security (PSS) we removed the soft opt-out feature.
+  bool opted_out = 4 [ deprecated = true ];
 }
 
 // A record storing the state of a slash packet sent to the provider chain

proto/interchain_security/ccv/consumer/v1/genesis.proto

@@ -12,17 +12,14 @@ import "interchain_security/ccv/v1/wire.proto";
 import "google/protobuf/timestamp.proto";
 import "tendermint/abci/types.proto";
 
-
-
-
 // GenesisState defines the CCV consumer genesis state
 //
-// Note: this type is only used on consumer side and references shared types with
-// provider
+// Note: this type is only used on consumer side and references shared types
+// with provider
 message GenesisState {
   // Reserve 5th slot for removed provider_client_state field
   reserved 5;
- 
+
   // Reserve 6th slot for removed provider_consensus_state field
   reserved 6;
 
@@ -57,10 +54,11 @@ message GenesisState {
   bool preCCV = 13;
   interchain_security.ccv.v1.ProviderInfo provider = 14
       [ (gogoproto.nullable) = false ];
-  // The ID of the connection end on the consumer chain on top of which the 
-  // CCV channel will be established. If connection_id == "", a new client of 
+  // The ID of the connection end on the consumer chain on top of which the
+  // CCV channel will be established. If connection_id == "", a new client of
   // the provider chain and a new connection on top of this client are created.
-  // The new client is initialized using provider.client_state and provider.consensus_state.
+  // The new client is initialized using provider.client_state and
+  // provider.consensus_state.
   string connection_id = 15;
 }
 

proto/interchain_security/ccv/consumer/v1/query.proto

@@ -22,13 +22,18 @@ service Query {
     option (google.api.http).get = "/interchain_security/ccv/consumer/params";
   }
 
-  rpc QueryProviderInfo(QueryProviderInfoRequest) returns (QueryProviderInfoResponse) {
-    option (google.api.http).get = "/interchain_security/ccv/consumer/provider-info";
+  rpc QueryProviderInfo(QueryProviderInfoRequest)
+      returns (QueryProviderInfoResponse) {
+    option (google.api.http).get =
+        "/interchain_security/ccv/consumer/provider-info";
   }
 
-  // QueryThrottleState returns on-chain state relevant to throttled consumer packets
-  rpc QueryThrottleState(QueryThrottleStateRequest) returns (QueryThrottleStateResponse) {
-    option (google.api.http).get = "/interchain_security/ccv/consumer/throttle_state";
+  // QueryThrottleState returns on-chain state relevant to throttled consumer
+  // packets
+  rpc QueryThrottleState(QueryThrottleStateRequest)
+      returns (QueryThrottleStateResponse) {
+    option (google.api.http).get =
+        "/interchain_security/ccv/consumer/throttle_state";
   }
 }
 
@@ -61,7 +66,8 @@ message QueryParamsRequest {}
 // QueryParamsResponse is response type for the Query/Params RPC method.
 message QueryParamsResponse {
   // params holds all the parameters of this module.
-  interchain_security.ccv.v1.ConsumerParams params = 1 [ (gogoproto.nullable) = false ];
+  interchain_security.ccv.v1.ConsumerParams params = 1
+      [ (gogoproto.nullable) = false ];
 }
 
 message QueryProviderInfoRequest {}
@@ -75,10 +81,10 @@ message QueryThrottleStateRequest {}
 
 message QueryThrottleStateResponse {
   SlashRecord slash_record = 1 [ (gogoproto.nullable) = true ];
-  repeated interchain_security.ccv.v1.ConsumerPacketData packet_data_queue = 2 [ (gogoproto.nullable) = false ];
+  repeated interchain_security.ccv.v1.ConsumerPacketData packet_data_queue = 2
+      [ (gogoproto.nullable) = false ];
 }
 
-
 message ChainInfo {
   string chainID = 1;
   string clientID = 2;

proto/interchain_security/ccv/consumer/v1/tx.proto

@@ -20,10 +20,11 @@ message MsgUpdateParams {
   option (cosmos.msg.v1.signer) = "authority";
 
   // signer is the address of the governance account.
-  string authority = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
+  string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
 
   // params defines the x/provider parameters to update.
-  interchain_security.ccv.v1.ConsumerParams params = 2 [(gogoproto.nullable) = false];
+  interchain_security.ccv.v1.ConsumerParams params = 2
+      [ (gogoproto.nullable) = false ];
 }
 
 message MsgUpdateParamsResponse {}

proto/interchain_security/ccv/provider/v1/genesis.proto

@@ -11,26 +11,26 @@ import "interchain_security/ccv/provider/v1/provider.proto";
 
 // GenesisState defines the CCV provider chain genesis state
 message GenesisState {
-    // Reserve 3rd slot for removed unbonding_ops field
-    reserved 3;
+  // Reserve 3rd slot for removed unbonding_ops field
+  reserved 3;
 
-    // Reserve 4th slot for removed mature_unbonding_ops field
-    reserved 4;
+  // Reserve 4th slot for removed mature_unbonding_ops field
+  reserved 4;
 
-    // Reserve 6th slot for removed consumer_addition_proposals field
-    reserved 6;
+  // Reserve 6th slot for removed consumer_addition_proposals field
+  reserved 6;
 
-    // Reserve 7th slot for removed consumer_removal_proposals field
-    reserved 7;
+  // Reserve 7th slot for removed consumer_removal_proposals field
+  reserved 7;
 
-    // Reserve 11th slot for consumer_addrs_to_prune field
-    reserved 11;
+  // Reserve 11th slot for consumer_addrs_to_prune field
+  reserved 11;
 
-    // Reserve 12th slot for removed init_timeout_timestamps field
-    reserved 12;
+  // Reserve 12th slot for removed init_timeout_timestamps field
+  reserved 12;
 
-    // Reserve 13th slot for removed exported_vsc_send_timestamps field
-    reserved 13;
+  // Reserve 13th slot for removed exported_vsc_send_timestamps field
+  reserved 13;
 
   // strictly positive and set to 1 (DefaultValsetUpdateID) for a new chain
   uint64 valset_update_id = 1;
@@ -55,12 +55,12 @@ message GenesisState {
       [ (gogoproto.nullable) = false ];
 }
 
-// The provider CCV module's knowledge of consumer state. 
+// The provider CCV module's knowledge of consumer state.
 //
 // Note this type is only used internally to the provider CCV module.
 message ConsumerState {
-    // Reserve 8th slot for removed unbonding_ops_index field
-    reserved 8;
+  // Reserve 8th slot for removed unbonding_ops_index field
+  reserved 8;
 
   // ChainID defines the chain ID for the consumer chain
   string chain_id = 1;