Skip to content

Commit 16a12be

Browse files
committed
proto fixes
1 parent eff3efa commit 16a12be

File tree

20 files changed

+911
-4042
lines changed

20 files changed

+911
-4042
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,20 @@ make proto-gen
4444
### Steps for upgrading cosmos-sdk and ibc-go
4545
Key dependencies:
4646
47-
* `ibc-go/v9@v8.1.0`
47+
* `ibc-go/v8@v8.1.0`
4848
* `ibc-go/modules/[email protected]`
4949

5050
```shell
5151
go get github.com/cosmos/[email protected]
52-
go get github.com/cosmos/ibc-go/v9@v8.1.0
52+
go get github.com/cosmos/ibc-go/v8@v8.1.0
5353
go get github.com/cosmos/ibc-go/modules/[email protected]
5454
```
5555

56-
`ibc-go/v9` is using the `x/capability` module that lives in `github.com/cosmos/ibc-go/modules/capability`.
56+
`ibc-go/v8` is using the `x/capability` module that lives in `github.com/cosmos/ibc-go/modules/capability`.
5757
* this module was added after all the file imports were changed for ibc-go (from v7 -> v8) to avoid weird import behaviour
5858

5959
### Search & replace
60-
* github.com/cosmos/ibc-go/v7 -> github.com/cosmos/ibc-go/v9
60+
* github.com/cosmos/ibc-go/v7 -> github.com/cosmos/ibc-go/v8
6161
* github.com/cosmos/cosmos-sdk/store -> cosmossdk.io/store
6262
* github.com/cosmos/cosmos-sdk/x/feegrant -> cosmossdk.io/x/feegrant
6363
* github.com/cosmos/cosmos-sdk/x/evidence -> cosmossdk.io/x/evidence

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ message CrossChainValidator {
2828
(gogoproto.moretags) = "yaml:\"consensus_pubkey\""
2929
];
3030

31-
// !!! DEPRECATED !!! opted_out is deprecated because after the introduction of Partial Set Security (PSS)
32-
// we removed the soft opt-out feature.
33-
bool opted_out = 4 [deprecated = true];
31+
// !!! DEPRECATED !!! opted_out is deprecated because after the introduction
32+
// of Partial Set Security (PSS) we removed the soft opt-out feature.
33+
bool opted_out = 4 [ deprecated = true ];
3434
}
3535

3636
// A record storing the state of a slash packet sent to the provider chain

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,14 @@ import "interchain_security/ccv/v1/wire.proto";
1212
import "google/protobuf/timestamp.proto";
1313
import "tendermint/abci/types.proto";
1414

15-
16-
17-
1815
// GenesisState defines the CCV consumer genesis state
1916
//
20-
// Note: this type is only used on consumer side and references shared types with
21-
// provider
17+
// Note: this type is only used on consumer side and references shared types
18+
// with provider
2219
message GenesisState {
2320
// Reserve 5th slot for removed provider_client_state field
2421
reserved 5;
25-
22+
2623
// Reserve 6th slot for removed provider_consensus_state field
2724
reserved 6;
2825

@@ -57,10 +54,11 @@ message GenesisState {
5754
bool preCCV = 13;
5855
interchain_security.ccv.v1.ProviderInfo provider = 14
5956
[ (gogoproto.nullable) = false ];
60-
// The ID of the connection end on the consumer chain on top of which the
61-
// CCV channel will be established. If connection_id == "", a new client of
57+
// The ID of the connection end on the consumer chain on top of which the
58+
// CCV channel will be established. If connection_id == "", a new client of
6259
// the provider chain and a new connection on top of this client are created.
63-
// The new client is initialized using provider.client_state and provider.consensus_state.
60+
// The new client is initialized using provider.client_state and
61+
// provider.consensus_state.
6462
string connection_id = 15;
6563
}
6664

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,18 @@ service Query {
2222
option (google.api.http).get = "/interchain_security/ccv/consumer/params";
2323
}
2424

25-
rpc QueryProviderInfo(QueryProviderInfoRequest) returns (QueryProviderInfoResponse) {
26-
option (google.api.http).get = "/interchain_security/ccv/consumer/provider-info";
25+
rpc QueryProviderInfo(QueryProviderInfoRequest)
26+
returns (QueryProviderInfoResponse) {
27+
option (google.api.http).get =
28+
"/interchain_security/ccv/consumer/provider-info";
2729
}
2830

29-
// QueryThrottleState returns on-chain state relevant to throttled consumer packets
30-
rpc QueryThrottleState(QueryThrottleStateRequest) returns (QueryThrottleStateResponse) {
31-
option (google.api.http).get = "/interchain_security/ccv/consumer/throttle_state";
31+
// QueryThrottleState returns on-chain state relevant to throttled consumer
32+
// packets
33+
rpc QueryThrottleState(QueryThrottleStateRequest)
34+
returns (QueryThrottleStateResponse) {
35+
option (google.api.http).get =
36+
"/interchain_security/ccv/consumer/throttle_state";
3237
}
3338
}
3439

@@ -61,7 +66,8 @@ message QueryParamsRequest {}
6166
// QueryParamsResponse is response type for the Query/Params RPC method.
6267
message QueryParamsResponse {
6368
// params holds all the parameters of this module.
64-
interchain_security.ccv.v1.ConsumerParams params = 1 [ (gogoproto.nullable) = false ];
69+
interchain_security.ccv.v1.ConsumerParams params = 1
70+
[ (gogoproto.nullable) = false ];
6571
}
6672

6773
message QueryProviderInfoRequest {}
@@ -75,10 +81,10 @@ message QueryThrottleStateRequest {}
7581

7682
message QueryThrottleStateResponse {
7783
SlashRecord slash_record = 1 [ (gogoproto.nullable) = true ];
78-
repeated interchain_security.ccv.v1.ConsumerPacketData packet_data_queue = 2 [ (gogoproto.nullable) = false ];
84+
repeated interchain_security.ccv.v1.ConsumerPacketData packet_data_queue = 2
85+
[ (gogoproto.nullable) = false ];
7986
}
8087

81-
8288
message ChainInfo {
8389
string chainID = 1;
8490
string clientID = 2;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ message MsgUpdateParams {
2020
option (cosmos.msg.v1.signer) = "authority";
2121

2222
// signer is the address of the governance account.
23-
string authority = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
23+
string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
2424

2525
// params defines the x/provider parameters to update.
26-
interchain_security.ccv.v1.ConsumerParams params = 2 [(gogoproto.nullable) = false];
26+
interchain_security.ccv.v1.ConsumerParams params = 2
27+
[ (gogoproto.nullable) = false ];
2728
}
2829

2930
message MsgUpdateParamsResponse {}

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,26 @@ import "interchain_security/ccv/provider/v1/provider.proto";
1111

1212
// GenesisState defines the CCV provider chain genesis state
1313
message GenesisState {
14-
// Reserve 3rd slot for removed unbonding_ops field
15-
reserved 3;
14+
// Reserve 3rd slot for removed unbonding_ops field
15+
reserved 3;
1616

17-
// Reserve 4th slot for removed mature_unbonding_ops field
18-
reserved 4;
17+
// Reserve 4th slot for removed mature_unbonding_ops field
18+
reserved 4;
1919

20-
// Reserve 6th slot for removed consumer_addition_proposals field
21-
reserved 6;
20+
// Reserve 6th slot for removed consumer_addition_proposals field
21+
reserved 6;
2222

23-
// Reserve 7th slot for removed consumer_removal_proposals field
24-
reserved 7;
23+
// Reserve 7th slot for removed consumer_removal_proposals field
24+
reserved 7;
2525

26-
// Reserve 11th slot for consumer_addrs_to_prune field
27-
reserved 11;
26+
// Reserve 11th slot for consumer_addrs_to_prune field
27+
reserved 11;
2828

29-
// Reserve 12th slot for removed init_timeout_timestamps field
30-
reserved 12;
29+
// Reserve 12th slot for removed init_timeout_timestamps field
30+
reserved 12;
3131

32-
// Reserve 13th slot for removed exported_vsc_send_timestamps field
33-
reserved 13;
32+
// Reserve 13th slot for removed exported_vsc_send_timestamps field
33+
reserved 13;
3434

3535
// strictly positive and set to 1 (DefaultValsetUpdateID) for a new chain
3636
uint64 valset_update_id = 1;
@@ -55,12 +55,12 @@ message GenesisState {
5555
[ (gogoproto.nullable) = false ];
5656
}
5757

58-
// The provider CCV module's knowledge of consumer state.
58+
// The provider CCV module's knowledge of consumer state.
5959
//
6060
// Note this type is only used internally to the provider CCV module.
6161
message ConsumerState {
62-
// Reserve 8th slot for removed unbonding_ops_index field
63-
reserved 8;
62+
// Reserve 8th slot for removed unbonding_ops_index field
63+
reserved 8;
6464

6565
// ChainID defines the chain ID for the consumer chain
6666
string chain_id = 1;

0 commit comments

Comments
 (0)