diff --git a/proto/logic/v1beta/genesis.proto b/proto/logic/v1beta/genesis.proto index 6b69b725..c8ba1981 100644 --- a/proto/logic/v1beta/genesis.proto +++ b/proto/logic/v1beta/genesis.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package logic.v1beta; import "gogoproto/gogo.proto"; diff --git a/proto/logic/v1beta/params.proto b/proto/logic/v1beta/params.proto index f81d1e18..2ff3b514 100644 --- a/proto/logic/v1beta/params.proto +++ b/proto/logic/v1beta/params.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package logic.v1beta; import "gogoproto/gogo.proto"; @@ -9,6 +10,6 @@ option go_package = "github.com/okp4/okp4d/x/logic/types"; message Params { option (gogoproto.goproto_stringer) = false; - // foo represents a metasyntactic variable for testing purposes. + // foo represents a metasyntactic variable for testing purposes. string foo = 1 [(gogoproto.moretags) = "yaml:\"foo\""]; } diff --git a/proto/logic/v1beta/query.proto b/proto/logic/v1beta/query.proto index d6435d1f..edd46fe8 100644 --- a/proto/logic/v1beta/query.proto +++ b/proto/logic/v1beta/query.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package logic.v1beta; import "gogoproto/gogo.proto"; @@ -23,4 +24,3 @@ message QueryServiceParamsResponse { // params holds all the parameters of this module. Params params = 1 [(gogoproto.nullable) = false]; } - diff --git a/proto/logic/v1beta/tx.proto b/proto/logic/v1beta/tx.proto index ad36675f..2819f6d1 100644 --- a/proto/logic/v1beta/tx.proto +++ b/proto/logic/v1beta/tx.proto @@ -1,8 +1,8 @@ syntax = "proto3"; + package logic.v1beta; option go_package = "github.com/okp4/okp4d/x/logic/types"; // Msg defines the Msg service. -service MsgService { -} +service MsgService {} diff --git a/proto/vesting/v1beta1/tx.proto b/proto/vesting/v1beta1/tx.proto index 5761e637..021fe0f1 100644 --- a/proto/vesting/v1beta1/tx.proto +++ b/proto/vesting/v1beta1/tx.proto @@ -1,12 +1,11 @@ syntax = "proto3"; + package vesting.v1beta1; -import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -import "cosmos_proto/cosmos.proto"; -import "vesting/v1beta1/vesting.proto"; - import "cosmos/msg/v1/msg.proto"; +import "gogoproto/gogo.proto"; +import "vesting/v1beta1/vesting.proto"; option go_package = "github.com/okp4/okp4d/x/vesting/types"; @@ -37,13 +36,15 @@ message MsgCreateVestingAccount { option (gogoproto.equal) = true; - string from_address = 1; - string to_address = 2; - repeated cosmos.base.v1beta1.Coin amount = 3 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + string from_address = 1; + string to_address = 2; + repeated cosmos.base.v1beta1.Coin amount = 3 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; int64 end_time = 4; - bool delayed = 6; + bool delayed = 6; } // MsgCreateVestingAccountResponse defines the Msg/CreateVestingAccount response type. @@ -56,10 +57,12 @@ message MsgCreateVestingAccountResponse {} message MsgCreatePermanentLockedAccount { option (gogoproto.equal) = true; - string from_address = 1 [(gogoproto.moretags) = "yaml:\"from_address\""]; - string to_address = 2 [(gogoproto.moretags) = "yaml:\"to_address\""]; - repeated cosmos.base.v1beta1.Coin amount = 3 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + string from_address = 1 [(gogoproto.moretags) = "yaml:\"from_address\""]; + string to_address = 2 [(gogoproto.moretags) = "yaml:\"to_address\""]; + repeated cosmos.base.v1beta1.Coin amount = 3 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; } // MsgCreatePermanentLockedAccountResponse defines the Msg/CreatePermanentLockedAccount response type. @@ -76,9 +79,9 @@ message MsgCreatePeriodicVestingAccount { option (gogoproto.equal) = false; - string from_address = 1; - string to_address = 2; - int64 start_time = 3; + string from_address = 1; + string to_address = 2; + int64 start_time = 3; repeated Period vesting_periods = 4 [(gogoproto.nullable) = false]; } @@ -95,10 +98,12 @@ message MsgCreateCliffVestingAccount { option (gogoproto.equal) = true; - string from_address = 1; - string to_address = 2; - repeated cosmos.base.v1beta1.Coin amount = 3 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + string from_address = 1; + string to_address = 2; + repeated cosmos.base.v1beta1.Coin amount = 3 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; int64 end_time = 4; int64 cliff_time = 5; diff --git a/proto/vesting/v1beta1/vesting.proto b/proto/vesting/v1beta1/vesting.proto index e806e126..a7ba2737 100644 --- a/proto/vesting/v1beta1/vesting.proto +++ b/proto/vesting/v1beta1/vesting.proto @@ -1,43 +1,50 @@ syntax = "proto3"; + package vesting.v1beta1; -import "gogoproto/gogo.proto"; -import "cosmos/base/v1beta1/coin.proto"; import "cosmos/auth/v1beta1/auth.proto"; +import "cosmos/base/v1beta1/coin.proto"; +import "gogoproto/gogo.proto"; option go_package = "github.com/okp4/okp4d/x/vesting/types"; // BaseVestingAccount implements the VestingAccount interface. It contains all // the necessary fields needed for any vesting account implementation. message BaseVestingAccount { - option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; - cosmos.auth.v1beta1.BaseAccount base_account = 1 [(gogoproto.embed) = true]; - repeated cosmos.base.v1beta1.Coin original_vesting = 2 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; - repeated cosmos.base.v1beta1.Coin delegated_free = 3 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; - repeated cosmos.base.v1beta1.Coin delegated_vesting = 4 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + cosmos.auth.v1beta1.BaseAccount base_account = 1 [(gogoproto.embed) = true]; + repeated cosmos.base.v1beta1.Coin original_vesting = 2 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; + repeated cosmos.base.v1beta1.Coin delegated_free = 3 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; + repeated cosmos.base.v1beta1.Coin delegated_vesting = 4 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; int64 end_time = 5; } // ContinuousVestingAccount implements the VestingAccount interface. It // continuously vests by unlocking coins linearly with respect to time. message ContinuousVestingAccount { - option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; BaseVestingAccount base_vesting_account = 1 [(gogoproto.embed) = true]; - int64 start_time = 2; + int64 start_time = 2; } // DelayedVestingAccount implements the VestingAccount interface. It vests all // coins after a specific time, but non prior. In other words, it keeps them // locked until a specified time. message DelayedVestingAccount { - option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; BaseVestingAccount base_vesting_account = 1 [(gogoproto.embed) = true]; @@ -47,20 +54,22 @@ message DelayedVestingAccount { message Period { option (gogoproto.goproto_stringer) = false; - int64 length = 1; - repeated cosmos.base.v1beta1.Coin amount = 2 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + int64 length = 1; + repeated cosmos.base.v1beta1.Coin amount = 2 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; } // PeriodicVestingAccount implements the VestingAccount interface. It // periodically vests by unlocking coins during each specified period. message PeriodicVestingAccount { - option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; BaseVestingAccount base_vesting_account = 1 [(gogoproto.embed) = true]; - int64 start_time = 2; - repeated Period vesting_periods = 3 [(gogoproto.nullable) = false]; + int64 start_time = 2; + repeated Period vesting_periods = 3 [(gogoproto.nullable) = false]; } // PermanentLockedAccount implements the VestingAccount interface. It does @@ -69,7 +78,7 @@ message PeriodicVestingAccount { // // Since: cosmos-sdk 0.43 message PermanentLockedAccount { - option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; BaseVestingAccount base_vesting_account = 1 [(gogoproto.embed) = true]; @@ -83,8 +92,7 @@ message CliffVestingAccount { // base_vesting_account implements the VestingAccount interface. It contains // all the necessary fields needed for any vesting account implementation - BaseVestingAccount base_vesting_account = 1 - [ (gogoproto.embed) = true ]; + BaseVestingAccount base_vesting_account = 1 [(gogoproto.embed) = true]; // start_time defines the time at which the vesting period begins int64 start_time = 2; int64 cliff_time = 3; diff --git a/third_party/proto/buf.yaml b/third_party/proto/buf.yaml index 89442efb..a7f5b8d4 100644 --- a/third_party/proto/buf.yaml +++ b/third_party/proto/buf.yaml @@ -34,4 +34,4 @@ breaking: - tendermint - gogoproto - cosmos_proto - - google \ No newline at end of file + - google diff --git a/third_party/proto/cosmos/auth/v1beta1/auth.proto b/third_party/proto/cosmos/auth/v1beta1/auth.proto index 72e1d9ec..0e8678e0 100644 --- a/third_party/proto/cosmos/auth/v1beta1/auth.proto +++ b/third_party/proto/cosmos/auth/v1beta1/auth.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package cosmos.auth.v1beta1; import "cosmos_proto/cosmos.proto"; @@ -11,40 +12,49 @@ option go_package = "github.com/cosmos/cosmos-sdk/x/auth/types"; // for basic account functionality. Any custom account type should extend this // type for additional functionality (e.g. vesting). message BaseAccount { - option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (cosmos_proto.implements_interface) = "AccountI"; - string address = 1; - google.protobuf.Any pub_key = 2 - [(gogoproto.jsontag) = "public_key,omitempty", (gogoproto.moretags) = "yaml:\"public_key\""]; + string address = 1; + google.protobuf.Any pub_key = 2 [ + (gogoproto.jsontag) = "public_key,omitempty", + (gogoproto.moretags) = "yaml:\"public_key\"" + ]; uint64 account_number = 3 [(gogoproto.moretags) = "yaml:\"account_number\""]; - uint64 sequence = 4; + uint64 sequence = 4; } // ModuleAccount defines an account for modules that holds coins on a pool. message ModuleAccount { - option (gogoproto.goproto_getters) = false; - option (gogoproto.goproto_stringer) = false; + option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_stringer) = false; option (cosmos_proto.implements_interface) = "ModuleAccountI"; - BaseAccount base_account = 1 [(gogoproto.embed) = true, (gogoproto.moretags) = "yaml:\"base_account\""]; - string name = 2; - repeated string permissions = 3; + BaseAccount base_account = 1 [ + (gogoproto.embed) = true, + (gogoproto.moretags) = "yaml:\"base_account\"" + ]; + string name = 2; + repeated string permissions = 3; } // Params defines the parameters for the auth module. message Params { - option (gogoproto.equal) = true; + option (gogoproto.equal) = true; option (gogoproto.goproto_stringer) = false; - uint64 max_memo_characters = 1 [(gogoproto.moretags) = "yaml:\"max_memo_characters\""]; - uint64 tx_sig_limit = 2 [(gogoproto.moretags) = "yaml:\"tx_sig_limit\""]; - uint64 tx_size_cost_per_byte = 3 [(gogoproto.moretags) = "yaml:\"tx_size_cost_per_byte\""]; - uint64 sig_verify_cost_ed25519 = 4 - [(gogoproto.customname) = "SigVerifyCostED25519", (gogoproto.moretags) = "yaml:\"sig_verify_cost_ed25519\""]; - uint64 sig_verify_cost_secp256k1 = 5 - [(gogoproto.customname) = "SigVerifyCostSecp256k1", (gogoproto.moretags) = "yaml:\"sig_verify_cost_secp256k1\""]; + uint64 max_memo_characters = 1 [(gogoproto.moretags) = "yaml:\"max_memo_characters\""]; + uint64 tx_sig_limit = 2 [(gogoproto.moretags) = "yaml:\"tx_sig_limit\""]; + uint64 tx_size_cost_per_byte = 3 [(gogoproto.moretags) = "yaml:\"tx_size_cost_per_byte\""]; + uint64 sig_verify_cost_ed25519 = 4 [ + (gogoproto.customname) = "SigVerifyCostED25519", + (gogoproto.moretags) = "yaml:\"sig_verify_cost_ed25519\"" + ]; + uint64 sig_verify_cost_secp256k1 = 5 [ + (gogoproto.customname) = "SigVerifyCostSecp256k1", + (gogoproto.moretags) = "yaml:\"sig_verify_cost_secp256k1\"" + ]; } diff --git a/third_party/proto/cosmos/auth/v1beta1/genesis.proto b/third_party/proto/cosmos/auth/v1beta1/genesis.proto index c88b94ee..77dba77e 100644 --- a/third_party/proto/cosmos/auth/v1beta1/genesis.proto +++ b/third_party/proto/cosmos/auth/v1beta1/genesis.proto @@ -1,9 +1,10 @@ syntax = "proto3"; + package cosmos.auth.v1beta1; -import "google/protobuf/any.proto"; -import "gogoproto/gogo.proto"; import "cosmos/auth/v1beta1/auth.proto"; +import "gogoproto/gogo.proto"; +import "google/protobuf/any.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/auth/types"; diff --git a/third_party/proto/cosmos/auth/v1beta1/query.proto b/third_party/proto/cosmos/auth/v1beta1/query.proto index 4d9759ca..83bb341e 100644 --- a/third_party/proto/cosmos/auth/v1beta1/query.proto +++ b/third_party/proto/cosmos/auth/v1beta1/query.proto @@ -1,12 +1,13 @@ syntax = "proto3"; + package cosmos.auth.v1beta1; +import "cosmos/auth/v1beta1/auth.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; +import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -import "google/protobuf/any.proto"; import "google/api/annotations.proto"; -import "cosmos/auth/v1beta1/auth.proto"; -import "cosmos_proto/cosmos.proto"; +import "google/protobuf/any.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/auth/types"; @@ -51,7 +52,7 @@ message QueryAccountsResponse { // QueryAccountRequest is the request type for the Query/Account RPC method. message QueryAccountRequest { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // address defines the address to query for. diff --git a/third_party/proto/cosmos/authz/v1beta1/authz.proto b/third_party/proto/cosmos/authz/v1beta1/authz.proto index 05b1feef..a911fcf9 100644 --- a/third_party/proto/cosmos/authz/v1beta1/authz.proto +++ b/third_party/proto/cosmos/authz/v1beta1/authz.proto @@ -1,13 +1,14 @@ // Since: cosmos-sdk 0.43 syntax = "proto3"; + package cosmos.authz.v1beta1; import "cosmos_proto/cosmos.proto"; -import "google/protobuf/timestamp.proto"; import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; +import "google/protobuf/timestamp.proto"; -option go_package = "github.com/cosmos/cosmos-sdk/x/authz"; +option go_package = "github.com/cosmos/cosmos-sdk/x/authz"; option (gogoproto.goproto_getters_all) = false; // GenericAuthorization gives the grantee unrestricted permissions to execute @@ -22,8 +23,11 @@ message GenericAuthorization { // Grant gives permissions to execute // the provide method with expiration time. message Grant { - google.protobuf.Any authorization = 1 [(cosmos_proto.accepts_interface) = "Authorization"]; - google.protobuf.Timestamp expiration = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; + google.protobuf.Any authorization = 1 [(cosmos_proto.accepts_interface) = "Authorization"]; + google.protobuf.Timestamp expiration = 2 [ + (gogoproto.stdtime) = true, + (gogoproto.nullable) = false + ]; } // GrantAuthorization extends a grant with both the addresses of the grantee and granter. @@ -34,6 +38,9 @@ message GrantAuthorization { string granter = 1; string grantee = 2; - google.protobuf.Any authorization = 3 [(cosmos_proto.accepts_interface) = "Authorization"]; - google.protobuf.Timestamp expiration = 4 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; + google.protobuf.Any authorization = 3 [(cosmos_proto.accepts_interface) = "Authorization"]; + google.protobuf.Timestamp expiration = 4 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true + ]; } diff --git a/third_party/proto/cosmos/authz/v1beta1/event.proto b/third_party/proto/cosmos/authz/v1beta1/event.proto index 7a3cf7c8..eab480ee 100644 --- a/third_party/proto/cosmos/authz/v1beta1/event.proto +++ b/third_party/proto/cosmos/authz/v1beta1/event.proto @@ -1,5 +1,6 @@ // Since: cosmos-sdk 0.43 syntax = "proto3"; + package cosmos.authz.v1beta1; option go_package = "github.com/cosmos/cosmos-sdk/x/authz"; diff --git a/third_party/proto/cosmos/authz/v1beta1/genesis.proto b/third_party/proto/cosmos/authz/v1beta1/genesis.proto index 310f6265..6792cb47 100644 --- a/third_party/proto/cosmos/authz/v1beta1/genesis.proto +++ b/third_party/proto/cosmos/authz/v1beta1/genesis.proto @@ -1,9 +1,10 @@ // Since: cosmos-sdk 0.43 syntax = "proto3"; + package cosmos.authz.v1beta1; -import "gogoproto/gogo.proto"; import "cosmos/authz/v1beta1/authz.proto"; +import "gogoproto/gogo.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/authz"; diff --git a/third_party/proto/cosmos/authz/v1beta1/query.proto b/third_party/proto/cosmos/authz/v1beta1/query.proto index f668309b..d6b1e601 100644 --- a/third_party/proto/cosmos/authz/v1beta1/query.proto +++ b/third_party/proto/cosmos/authz/v1beta1/query.proto @@ -1,10 +1,11 @@ // Since: cosmos-sdk 0.43 syntax = "proto3"; + package cosmos.authz.v1beta1; -import "google/api/annotations.proto"; -import "cosmos/base/query/v1beta1/pagination.proto"; import "cosmos/authz/v1beta1/authz.proto"; +import "cosmos/base/query/v1beta1/pagination.proto"; +import "google/api/annotations.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/authz"; diff --git a/third_party/proto/cosmos/authz/v1beta1/tx.proto b/third_party/proto/cosmos/authz/v1beta1/tx.proto index 457f0d66..d5032eec 100644 --- a/third_party/proto/cosmos/authz/v1beta1/tx.proto +++ b/third_party/proto/cosmos/authz/v1beta1/tx.proto @@ -1,15 +1,16 @@ // Since: cosmos-sdk 0.43 syntax = "proto3"; + package cosmos.authz.v1beta1; +import "cosmos/authz/v1beta1/authz.proto"; +import "cosmos/base/abci/v1beta1/abci.proto"; import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -import "google/protobuf/timestamp.proto"; import "google/protobuf/any.proto"; -import "cosmos/base/abci/v1beta1/abci.proto"; -import "cosmos/authz/v1beta1/authz.proto"; +import "google/protobuf/timestamp.proto"; -option go_package = "github.com/cosmos/cosmos-sdk/x/authz"; +option go_package = "github.com/cosmos/cosmos-sdk/x/authz"; option (gogoproto.goproto_getters_all) = false; // Msg defines the authz Msg service. @@ -61,8 +62,8 @@ message MsgGrantResponse {} // MsgRevoke revokes any authorization with the provided sdk.Msg type on the // granter's account with that has been granted to the grantee. message MsgRevoke { - string granter = 1; - string grantee = 2; + string granter = 1; + string grantee = 2; string msg_type_url = 3; } diff --git a/third_party/proto/cosmos/bank/v1beta1/authz.proto b/third_party/proto/cosmos/bank/v1beta1/authz.proto index 4f58b15e..8ddc0ff2 100644 --- a/third_party/proto/cosmos/bank/v1beta1/authz.proto +++ b/third_party/proto/cosmos/bank/v1beta1/authz.proto @@ -1,9 +1,10 @@ syntax = "proto3"; + package cosmos.bank.v1beta1; -import "gogoproto/gogo.proto"; -import "cosmos_proto/cosmos.proto"; import "cosmos/base/v1beta1/coin.proto"; +import "cosmos_proto/cosmos.proto"; +import "gogoproto/gogo.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/bank/types"; @@ -14,6 +15,8 @@ option go_package = "github.com/cosmos/cosmos-sdk/x/bank/types"; message SendAuthorization { option (cosmos_proto.implements_interface) = "Authorization"; - repeated cosmos.base.v1beta1.Coin spend_limit = 1 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + repeated cosmos.base.v1beta1.Coin spend_limit = 1 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; } diff --git a/third_party/proto/cosmos/bank/v1beta1/bank.proto b/third_party/proto/cosmos/bank/v1beta1/bank.proto index df91008d..0fdb99b2 100644 --- a/third_party/proto/cosmos/bank/v1beta1/bank.proto +++ b/third_party/proto/cosmos/bank/v1beta1/bank.proto @@ -1,46 +1,51 @@ syntax = "proto3"; + package cosmos.bank.v1beta1; -import "gogoproto/gogo.proto"; -import "cosmos_proto/cosmos.proto"; import "cosmos/base/v1beta1/coin.proto"; +import "cosmos_proto/cosmos.proto"; +import "gogoproto/gogo.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/bank/types"; // Params defines the parameters for the bank module. message Params { - option (gogoproto.goproto_stringer) = false; - repeated SendEnabled send_enabled = 1 [(gogoproto.moretags) = "yaml:\"send_enabled,omitempty\""]; - bool default_send_enabled = 2 [(gogoproto.moretags) = "yaml:\"default_send_enabled,omitempty\""]; + option (gogoproto.goproto_stringer) = false; + repeated SendEnabled send_enabled = 1 [(gogoproto.moretags) = "yaml:\"send_enabled,omitempty\""]; + bool default_send_enabled = 2 [(gogoproto.moretags) = "yaml:\"default_send_enabled,omitempty\""]; } // SendEnabled maps coin denom to a send_enabled status (whether a denom is // sendable). message SendEnabled { - option (gogoproto.equal) = true; + option (gogoproto.equal) = true; option (gogoproto.goproto_stringer) = false; - string denom = 1; - bool enabled = 2; + string denom = 1; + bool enabled = 2; } // Input models transaction input. message Input { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string address = 1; - repeated cosmos.base.v1beta1.Coin coins = 2 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + string address = 1; + repeated cosmos.base.v1beta1.Coin coins = 2 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; } // Output models transaction outputs. message Output { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string address = 1; - repeated cosmos.base.v1beta1.Coin coins = 2 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + string address = 1; + repeated cosmos.base.v1beta1.Coin coins = 2 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; } // Supply represents a struct that passively keeps track of the total supply @@ -49,13 +54,15 @@ message Output { message Supply { option deprecated = true; - option (gogoproto.equal) = true; + option (gogoproto.equal) = true; option (gogoproto.goproto_getters) = false; option (cosmos_proto.implements_interface) = "*github.com/cosmos/cosmos-sdk/x/bank/legacy/v040.SupplyI"; - repeated cosmos.base.v1beta1.Coin total = 1 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + repeated cosmos.base.v1beta1.Coin total = 1 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; } // DenomUnit represents a struct that describes a given diff --git a/third_party/proto/cosmos/bank/v1beta1/genesis.proto b/third_party/proto/cosmos/bank/v1beta1/genesis.proto index 8fd7329a..24412435 100644 --- a/third_party/proto/cosmos/bank/v1beta1/genesis.proto +++ b/third_party/proto/cosmos/bank/v1beta1/genesis.proto @@ -1,9 +1,10 @@ syntax = "proto3"; + package cosmos.bank.v1beta1; -import "gogoproto/gogo.proto"; -import "cosmos/base/v1beta1/coin.proto"; import "cosmos/bank/v1beta1/bank.proto"; +import "cosmos/base/v1beta1/coin.proto"; +import "gogoproto/gogo.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/bank/types"; @@ -17,23 +18,30 @@ message GenesisState { // supply represents the total supply. If it is left empty, then supply will be calculated based on the provided // balances. Otherwise, it will be used to validate that the sum of the balances equals this amount. - repeated cosmos.base.v1beta1.Coin supply = 3 - [(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", (gogoproto.nullable) = false]; + repeated cosmos.base.v1beta1.Coin supply = 3 [ + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", + (gogoproto.nullable) = false + ]; // denom_metadata defines the metadata of the differents coins. - repeated Metadata denom_metadata = 4 [(gogoproto.moretags) = "yaml:\"denom_metadata\"", (gogoproto.nullable) = false]; + repeated Metadata denom_metadata = 4 [ + (gogoproto.moretags) = "yaml:\"denom_metadata\"", + (gogoproto.nullable) = false + ]; } // Balance defines an account address and balance pair used in the bank module's // genesis state. message Balance { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // address is the address of the balance holder. string address = 1; // coins defines the different coins this balance holds. - repeated cosmos.base.v1beta1.Coin coins = 2 - [(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", (gogoproto.nullable) = false]; + repeated cosmos.base.v1beta1.Coin coins = 2 [ + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", + (gogoproto.nullable) = false + ]; } diff --git a/third_party/proto/cosmos/bank/v1beta1/query.proto b/third_party/proto/cosmos/bank/v1beta1/query.proto index 67cebd5f..1cbe7295 100644 --- a/third_party/proto/cosmos/bank/v1beta1/query.proto +++ b/third_party/proto/cosmos/bank/v1beta1/query.proto @@ -1,11 +1,12 @@ syntax = "proto3"; + package cosmos.bank.v1beta1; +import "cosmos/bank/v1beta1/bank.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; +import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -import "cosmos/base/v1beta1/coin.proto"; -import "cosmos/bank/v1beta1/bank.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/bank/types"; @@ -87,8 +88,10 @@ message QueryAllBalancesRequest { // method. message QueryAllBalancesResponse { // balances is the balances of all the coins. - repeated cosmos.base.v1beta1.Coin balances = 1 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + repeated cosmos.base.v1beta1.Coin balances = 1 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; // pagination defines the pagination in the response. cosmos.base.query.v1beta1.PageResponse pagination = 2; @@ -97,7 +100,7 @@ message QueryAllBalancesResponse { // QuerySpendableBalancesRequest defines the gRPC request structure for querying // an account's spendable balances. message QuerySpendableBalancesRequest { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // address is the address to query spendable balances for. @@ -111,8 +114,10 @@ message QuerySpendableBalancesRequest { // an account's spendable balances. message QuerySpendableBalancesResponse { // balances is the spendable balances of all the coins. - repeated cosmos.base.v1beta1.Coin balances = 1 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + repeated cosmos.base.v1beta1.Coin balances = 1 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; // pagination defines the pagination in the response. cosmos.base.query.v1beta1.PageResponse pagination = 2; @@ -134,8 +139,10 @@ message QueryTotalSupplyRequest { // method message QueryTotalSupplyResponse { // supply is the supply of the coins - repeated cosmos.base.v1beta1.Coin supply = 1 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + repeated cosmos.base.v1beta1.Coin supply = 1 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; // pagination defines the pagination in the response. // diff --git a/third_party/proto/cosmos/bank/v1beta1/tx.proto b/third_party/proto/cosmos/bank/v1beta1/tx.proto index 26b2ab41..ede3a1b6 100644 --- a/third_party/proto/cosmos/bank/v1beta1/tx.proto +++ b/third_party/proto/cosmos/bank/v1beta1/tx.proto @@ -1,9 +1,10 @@ syntax = "proto3"; + package cosmos.bank.v1beta1; -import "gogoproto/gogo.proto"; -import "cosmos/base/v1beta1/coin.proto"; import "cosmos/bank/v1beta1/bank.proto"; +import "cosmos/base/v1beta1/coin.proto"; +import "gogoproto/gogo.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/bank/types"; @@ -18,13 +19,15 @@ service Msg { // MsgSend represents a message to send coins from one account to another. message MsgSend { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string from_address = 1 [(gogoproto.moretags) = "yaml:\"from_address\""]; - string to_address = 2 [(gogoproto.moretags) = "yaml:\"to_address\""]; - repeated cosmos.base.v1beta1.Coin amount = 3 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + string from_address = 1 [(gogoproto.moretags) = "yaml:\"from_address\""]; + string to_address = 2 [(gogoproto.moretags) = "yaml:\"to_address\""]; + repeated cosmos.base.v1beta1.Coin amount = 3 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; } // MsgSendResponse defines the Msg/Send response type. @@ -34,7 +37,7 @@ message MsgSendResponse {} message MsgMultiSend { option (gogoproto.equal) = false; - repeated Input inputs = 1 [(gogoproto.nullable) = false]; + repeated Input inputs = 1 [(gogoproto.nullable) = false]; repeated Output outputs = 2 [(gogoproto.nullable) = false]; } diff --git a/third_party/proto/cosmos/base/abci/v1beta1/abci.proto b/third_party/proto/cosmos/base/abci/v1beta1/abci.proto index e24ae7bd..534dffc6 100644 --- a/third_party/proto/cosmos/base/abci/v1beta1/abci.proto +++ b/third_party/proto/cosmos/base/abci/v1beta1/abci.proto @@ -1,11 +1,12 @@ syntax = "proto3"; + package cosmos.base.abci.v1beta1; import "gogoproto/gogo.proto"; -import "tendermint/abci/types.proto"; import "google/protobuf/any.proto"; +import "tendermint/abci/types.proto"; -option go_package = "github.com/cosmos/cosmos-sdk/types"; +option go_package = "github.com/cosmos/cosmos-sdk/types"; option (gogoproto.goproto_stringer_all) = false; // TxResponse defines a structure containing relevant tx data and metadata. The @@ -26,7 +27,10 @@ message TxResponse { // non-deterministic. string raw_log = 6; // The output of the application's logger (typed). May be non-deterministic. - repeated ABCIMessageLog logs = 7 [(gogoproto.castrepeated) = "ABCIMessageLogs", (gogoproto.nullable) = false]; + repeated ABCIMessageLog logs = 7 [ + (gogoproto.castrepeated) = "ABCIMessageLogs", + (gogoproto.nullable) = false + ]; // Additional information. May be non-deterministic. string info = 8; // Amount of gas requested for transaction. @@ -53,11 +57,14 @@ message ABCIMessageLog { option (gogoproto.stringer) = true; uint32 msg_index = 1; - string log = 2; + string log = 2; // Events contains a slice of Event objects that were emitted during some // execution. - repeated StringEvent events = 3 [(gogoproto.castrepeated) = "StringEvents", (gogoproto.nullable) = false]; + repeated StringEvent events = 3 [ + (gogoproto.castrepeated) = "StringEvents", + (gogoproto.nullable) = false + ]; } // StringEvent defines en Event object wrapper where all the attributes @@ -65,14 +72,14 @@ message ABCIMessageLog { message StringEvent { option (gogoproto.stringer) = true; - string type = 1; + string type = 1; repeated Attribute attributes = 2 [(gogoproto.nullable) = false]; } // Attribute defines an attribute wrapper where the key and value are // strings instead of raw bytes. message Attribute { - string key = 1; + string key = 1; string value = 2; } @@ -104,8 +111,11 @@ message Result { // SimulationResponse defines the response generated when a transaction is // successfully simulated. message SimulationResponse { - GasInfo gas_info = 1 [(gogoproto.embed) = true, (gogoproto.nullable) = false]; - Result result = 2; + GasInfo gas_info = 1 [ + (gogoproto.embed) = true, + (gogoproto.nullable) = false + ]; + Result result = 2; } // MsgData defines the data returned in a Result object during message @@ -114,7 +124,7 @@ message MsgData { option (gogoproto.stringer) = true; string msg_type = 1; - bytes data = 2; + bytes data = 2; } // TxMsgData defines a list of MsgData. A transaction will have a MsgData object @@ -130,13 +140,22 @@ message SearchTxsResult { option (gogoproto.stringer) = true; // Count of all txs - uint64 total_count = 1 [(gogoproto.moretags) = "yaml:\"total_count\"", (gogoproto.jsontag) = "total_count"]; + uint64 total_count = 1 [ + (gogoproto.moretags) = "yaml:\"total_count\"", + (gogoproto.jsontag) = "total_count" + ]; // Count of txs in current page uint64 count = 2; // Index of current page, start from 1 - uint64 page_number = 3 [(gogoproto.moretags) = "yaml:\"page_number\"", (gogoproto.jsontag) = "page_number"]; + uint64 page_number = 3 [ + (gogoproto.moretags) = "yaml:\"page_number\"", + (gogoproto.jsontag) = "page_number" + ]; // Count of total pages - uint64 page_total = 4 [(gogoproto.moretags) = "yaml:\"page_total\"", (gogoproto.jsontag) = "page_total"]; + uint64 page_total = 4 [ + (gogoproto.moretags) = "yaml:\"page_total\"", + (gogoproto.jsontag) = "page_total" + ]; // Max count txs per page uint64 limit = 5; // List of txs in current page diff --git a/third_party/proto/cosmos/base/kv/v1beta1/kv.proto b/third_party/proto/cosmos/base/kv/v1beta1/kv.proto index 4e9b8d28..03f48604 100644 --- a/third_party/proto/cosmos/base/kv/v1beta1/kv.proto +++ b/third_party/proto/cosmos/base/kv/v1beta1/kv.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package cosmos.base.kv.v1beta1; import "gogoproto/gogo.proto"; @@ -12,6 +13,6 @@ message Pairs { // Pair defines a key/value bytes tuple. message Pair { - bytes key = 1; + bytes key = 1; bytes value = 2; } diff --git a/third_party/proto/cosmos/base/query/v1beta1/pagination.proto b/third_party/proto/cosmos/base/query/v1beta1/pagination.proto index cd5eb066..635bbb28 100644 --- a/third_party/proto/cosmos/base/query/v1beta1/pagination.proto +++ b/third_party/proto/cosmos/base/query/v1beta1/pagination.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package cosmos.base.query.v1beta1; option go_package = "github.com/cosmos/cosmos-sdk/types/query"; diff --git a/third_party/proto/cosmos/base/reflection/v1beta1/reflection.proto b/third_party/proto/cosmos/base/reflection/v1beta1/reflection.proto index 22670e72..a2cbddbc 100644 --- a/third_party/proto/cosmos/base/reflection/v1beta1/reflection.proto +++ b/third_party/proto/cosmos/base/reflection/v1beta1/reflection.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package cosmos.base.reflection.v1beta1; import "google/api/annotations.proto"; @@ -11,14 +12,17 @@ service ReflectionService { // registry. rpc ListAllInterfaces(ListAllInterfacesRequest) returns (ListAllInterfacesResponse) { option (google.api.http).get = "/cosmos/base/reflection/v1beta1/interfaces"; - }; + } + // ListImplementations list all the concrete types that implement a given // interface. rpc ListImplementations(ListImplementationsRequest) returns (ListImplementationsResponse) { - option (google.api.http).get = "/cosmos/base/reflection/v1beta1/interfaces/" - "{interface_name}/implementations"; - }; + option (google.api.http).get = + "/cosmos/base/reflection/v1beta1/interfaces/" + "{interface_name}/implementations"; + } + } // ListAllInterfacesRequest is the request type of the ListAllInterfaces RPC. diff --git a/third_party/proto/cosmos/base/reflection/v2alpha1/reflection.proto b/third_party/proto/cosmos/base/reflection/v2alpha1/reflection.proto index d5b04855..59614213 100644 --- a/third_party/proto/cosmos/base/reflection/v2alpha1/reflection.proto +++ b/third_party/proto/cosmos/base/reflection/v2alpha1/reflection.proto @@ -1,5 +1,6 @@ // Since: cosmos-sdk 0.43 syntax = "proto3"; + package cosmos.base.reflection.v2alpha1; import "google/api/annotations.proto"; @@ -122,7 +123,8 @@ service ReflectionService { // GetChainDescriptor returns the description of the chain rpc GetChainDescriptor(GetChainDescriptorRequest) returns (GetChainDescriptorResponse) { option (google.api.http).get = "/cosmos/base/reflection/v1beta1/app_descriptor/chain"; - }; + } + // GetCodecDescriptor returns the descriptor of the codec of the application rpc GetCodecDescriptor(GetCodecDescriptorRequest) returns (GetCodecDescriptorResponse) { option (google.api.http).get = "/cosmos/base/reflection/v1beta1/app_descriptor/codec"; diff --git a/third_party/proto/cosmos/base/snapshots/v1beta1/snapshot.proto b/third_party/proto/cosmos/base/snapshots/v1beta1/snapshot.proto index 1d2365be..f3ab8608 100644 --- a/third_party/proto/cosmos/base/snapshots/v1beta1/snapshot.proto +++ b/third_party/proto/cosmos/base/snapshots/v1beta1/snapshot.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package cosmos.base.snapshots.v1beta1; import "gogoproto/gogo.proto"; @@ -7,10 +8,10 @@ option go_package = "github.com/cosmos/cosmos-sdk/snapshots/types"; // Snapshot contains Tendermint state sync snapshot info. message Snapshot { - uint64 height = 1; - uint32 format = 2; - uint32 chunks = 3; - bytes hash = 4; + uint64 height = 1; + uint32 format = 2; + uint32 chunks = 3; + bytes hash = 4; Metadata metadata = 5 [(gogoproto.nullable) = false]; } @@ -23,9 +24,9 @@ message Metadata { message SnapshotItem { // item is the specific type of snapshot item. oneof item { - SnapshotStoreItem store = 1; - SnapshotIAVLItem iavl = 2 [(gogoproto.customname) = "IAVL"]; - SnapshotExtensionMeta extension = 3; + SnapshotStoreItem store = 1; + SnapshotIAVLItem iavl = 2 [(gogoproto.customname) = "IAVL"]; + SnapshotExtensionMeta extension = 3; SnapshotExtensionPayload extension_payload = 4; } } @@ -37,17 +38,17 @@ message SnapshotStoreItem { // SnapshotIAVLItem is an exported IAVL node. message SnapshotIAVLItem { - bytes key = 1; - bytes value = 2; + bytes key = 1; + bytes value = 2; // version is block height int64 version = 3; // height is depth of the tree. - int32 height = 4; + int32 height = 4; } // SnapshotExtensionMeta contains metadata about an external snapshotter. message SnapshotExtensionMeta { - string name = 1; + string name = 1; uint32 format = 2; } diff --git a/third_party/proto/cosmos/base/store/v1beta1/commit_info.proto b/third_party/proto/cosmos/base/store/v1beta1/commit_info.proto index 98a33d30..7c02ffee 100644 --- a/third_party/proto/cosmos/base/store/v1beta1/commit_info.proto +++ b/third_party/proto/cosmos/base/store/v1beta1/commit_info.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package cosmos.base.store.v1beta1; import "gogoproto/gogo.proto"; @@ -8,14 +9,14 @@ option go_package = "github.com/cosmos/cosmos-sdk/store/types"; // CommitInfo defines commit information used by the multi-store when committing // a version/height. message CommitInfo { - int64 version = 1; + int64 version = 1; repeated StoreInfo store_infos = 2 [(gogoproto.nullable) = false]; } // StoreInfo defines store-specific commit information. It contains a reference // between a store name and the commit ID. message StoreInfo { - string name = 1; + string name = 1; CommitID commit_id = 2 [(gogoproto.nullable) = false]; } @@ -25,5 +26,5 @@ message CommitID { option (gogoproto.goproto_stringer) = false; int64 version = 1; - bytes hash = 2; + bytes hash = 2; } diff --git a/third_party/proto/cosmos/base/store/v1beta1/listening.proto b/third_party/proto/cosmos/base/store/v1beta1/listening.proto index 35999710..2507f274 100644 --- a/third_party/proto/cosmos/base/store/v1beta1/listening.proto +++ b/third_party/proto/cosmos/base/store/v1beta1/listening.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package cosmos.base.store.v1beta1; option go_package = "github.com/cosmos/cosmos-sdk/store/types"; @@ -10,7 +11,7 @@ option go_package = "github.com/cosmos/cosmos-sdk/store/types"; // Since: cosmos-sdk 0.43 message StoreKVPair { string store_key = 1; // the store key for the KVStore this pair originates from - bool delete = 2; // true indicates a delete operation, false indicates a set operation - bytes key = 3; - bytes value = 4; + bool delete = 2; // true indicates a delete operation, false indicates a set operation + bytes key = 3; + bytes value = 4; } diff --git a/third_party/proto/cosmos/base/tendermint/v1beta1/query.proto b/third_party/proto/cosmos/base/tendermint/v1beta1/query.proto index 3c31877a..88e693e6 100644 --- a/third_party/proto/cosmos/base/tendermint/v1beta1/query.proto +++ b/third_party/proto/cosmos/base/tendermint/v1beta1/query.proto @@ -1,13 +1,14 @@ syntax = "proto3"; + package cosmos.base.tendermint.v1beta1; +import "cosmos/base/query/v1beta1/pagination.proto"; import "gogoproto/gogo.proto"; -import "google/protobuf/any.proto"; import "google/api/annotations.proto"; +import "google/protobuf/any.proto"; import "tendermint/p2p/types.proto"; import "tendermint/types/block.proto"; import "tendermint/types/types.proto"; -import "cosmos/base/query/v1beta1/pagination.proto"; option go_package = "github.com/cosmos/cosmos-sdk/client/grpc/tmservice"; @@ -49,8 +50,8 @@ message GetValidatorSetByHeightRequest { // GetValidatorSetByHeightResponse is the response type for the Query/GetValidatorSetByHeight RPC method. message GetValidatorSetByHeightResponse { - int64 block_height = 1; - repeated Validator validators = 2; + int64 block_height = 1; + repeated Validator validators = 2; // pagination defines an pagination for the response. cosmos.base.query.v1beta1.PageResponse pagination = 3; } @@ -63,18 +64,18 @@ message GetLatestValidatorSetRequest { // GetLatestValidatorSetResponse is the response type for the Query/GetValidatorSetByHeight RPC method. message GetLatestValidatorSetResponse { - int64 block_height = 1; - repeated Validator validators = 2; + int64 block_height = 1; + repeated Validator validators = 2; // pagination defines an pagination for the response. cosmos.base.query.v1beta1.PageResponse pagination = 3; } // Validator is the type for the validator-set. message Validator { - string address = 1; - google.protobuf.Any pub_key = 2; - int64 voting_power = 3; - int64 proposer_priority = 4; + string address = 1; + google.protobuf.Any pub_key = 2; + int64 voting_power = 3; + int64 proposer_priority = 4; } // GetBlockByHeightRequest is the request type for the Query/GetBlockByHeight RPC method. @@ -85,7 +86,7 @@ message GetBlockByHeightRequest { // GetBlockByHeightResponse is the response type for the Query/GetBlockByHeight RPC method. message GetBlockByHeightResponse { .tendermint.types.BlockID block_id = 1; - .tendermint.types.Block block = 2; + .tendermint.types.Block block = 2; } // GetLatestBlockRequest is the request type for the Query/GetLatestBlock RPC method. @@ -94,7 +95,7 @@ message GetLatestBlockRequest {} // GetLatestBlockResponse is the response type for the Query/GetLatestBlock RPC method. message GetLatestBlockResponse { .tendermint.types.BlockID block_id = 1; - .tendermint.types.Block block = 2; + .tendermint.types.Block block = 2; } // GetSyncingRequest is the request type for the Query/GetSyncing RPC method. @@ -110,21 +111,21 @@ message GetNodeInfoRequest {} // GetNodeInfoResponse is the request type for the Query/GetNodeInfo RPC method. message GetNodeInfoResponse { - .tendermint.p2p.DefaultNodeInfo default_node_info = 1; - VersionInfo application_version = 2; + .tendermint.p2p.DefaultNodeInfo default_node_info = 1; + VersionInfo application_version = 2; } // VersionInfo is the type for the GetNodeInfoResponse message. message VersionInfo { - string name = 1; - string app_name = 2; - string version = 3; - string git_commit = 4; - string build_tags = 5; - string go_version = 6; - repeated Module build_deps = 7; + string name = 1; + string app_name = 2; + string version = 3; + string git_commit = 4; + string build_tags = 5; + string go_version = 6; + repeated Module build_deps = 7; // Since: cosmos-sdk 0.43 - string cosmos_sdk_version = 8; + string cosmos_sdk_version = 8; } // Module is the type for VersionInfo diff --git a/third_party/proto/cosmos/base/v1beta1/coin.proto b/third_party/proto/cosmos/base/v1beta1/coin.proto index fab75284..82d0e75c 100644 --- a/third_party/proto/cosmos/base/v1beta1/coin.proto +++ b/third_party/proto/cosmos/base/v1beta1/coin.proto @@ -1,11 +1,12 @@ syntax = "proto3"; + package cosmos.base.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/cosmos/cosmos-sdk/types"; +option go_package = "github.com/cosmos/cosmos-sdk/types"; option (gogoproto.goproto_stringer_all) = false; -option (gogoproto.stringer_all) = false; +option (gogoproto.stringer_all) = false; // Coin defines a token with a denomination and an amount. // @@ -14,8 +15,11 @@ option (gogoproto.stringer_all) = false; message Coin { option (gogoproto.equal) = true; - string denom = 1; - string amount = 2 [(gogoproto.customtype) = "Int", (gogoproto.nullable) = false]; + string denom = 1; + string amount = 2 [ + (gogoproto.customtype) = "Int", + (gogoproto.nullable) = false + ]; } // DecCoin defines a token with a denomination and a decimal amount. @@ -25,16 +29,25 @@ message Coin { message DecCoin { option (gogoproto.equal) = true; - string denom = 1; - string amount = 2 [(gogoproto.customtype) = "Dec", (gogoproto.nullable) = false]; + string denom = 1; + string amount = 2 [ + (gogoproto.customtype) = "Dec", + (gogoproto.nullable) = false + ]; } // IntProto defines a Protobuf wrapper around an Int object. message IntProto { - string int = 1 [(gogoproto.customtype) = "Int", (gogoproto.nullable) = false]; + string int = 1 [ + (gogoproto.customtype) = "Int", + (gogoproto.nullable) = false + ]; } // DecProto defines a Protobuf wrapper around a Dec object. message DecProto { - string dec = 1 [(gogoproto.customtype) = "Dec", (gogoproto.nullable) = false]; + string dec = 1 [ + (gogoproto.customtype) = "Dec", + (gogoproto.nullable) = false + ]; } diff --git a/third_party/proto/cosmos/capability/v1beta1/capability.proto b/third_party/proto/cosmos/capability/v1beta1/capability.proto index 1c8332f3..8f1ef86a 100644 --- a/third_party/proto/cosmos/capability/v1beta1/capability.proto +++ b/third_party/proto/cosmos/capability/v1beta1/capability.proto @@ -1,10 +1,11 @@ syntax = "proto3"; -package cosmos.capability.v1beta1; -option go_package = "github.com/cosmos/cosmos-sdk/x/capability/types"; +package cosmos.capability.v1beta1; import "gogoproto/gogo.proto"; +option go_package = "github.com/cosmos/cosmos-sdk/x/capability/types"; + // Capability defines an implementation of an object capability. The index // provided to a Capability must be globally unique. message Capability { @@ -17,10 +18,10 @@ message Capability { // capability and the module name. message Owner { option (gogoproto.goproto_stringer) = false; - option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_getters) = false; string module = 1 [(gogoproto.moretags) = "yaml:\"module\""]; - string name = 2 [(gogoproto.moretags) = "yaml:\"name\""]; + string name = 2 [(gogoproto.moretags) = "yaml:\"name\""]; } // CapabilityOwners defines a set of owners of a single Capability. The set of diff --git a/third_party/proto/cosmos/capability/v1beta1/genesis.proto b/third_party/proto/cosmos/capability/v1beta1/genesis.proto index 05bb0afc..efa8ebd7 100644 --- a/third_party/proto/cosmos/capability/v1beta1/genesis.proto +++ b/third_party/proto/cosmos/capability/v1beta1/genesis.proto @@ -1,8 +1,9 @@ syntax = "proto3"; + package cosmos.capability.v1beta1; -import "gogoproto/gogo.proto"; import "cosmos/capability/v1beta1/capability.proto"; +import "gogoproto/gogo.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/capability/types"; @@ -12,7 +13,10 @@ message GenesisOwners { uint64 index = 1; // index_owners are the owners at the given index. - CapabilityOwners index_owners = 2 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"index_owners\""]; + CapabilityOwners index_owners = 2 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"index_owners\"" + ]; } // GenesisState defines the capability module's genesis state. diff --git a/third_party/proto/cosmos/crisis/v1beta1/genesis.proto b/third_party/proto/cosmos/crisis/v1beta1/genesis.proto index 5b0ff7ec..a59e1813 100644 --- a/third_party/proto/cosmos/crisis/v1beta1/genesis.proto +++ b/third_party/proto/cosmos/crisis/v1beta1/genesis.proto @@ -1,15 +1,18 @@ syntax = "proto3"; -package cosmos.crisis.v1beta1; -option go_package = "github.com/cosmos/cosmos-sdk/x/crisis/types"; +package cosmos.crisis.v1beta1; -import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; +import "gogoproto/gogo.proto"; + +option go_package = "github.com/cosmos/cosmos-sdk/x/crisis/types"; // GenesisState defines the crisis module's genesis state. message GenesisState { // constant_fee is the fee used to verify the invariant in the crisis // module. - cosmos.base.v1beta1.Coin constant_fee = 3 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"constant_fee\""]; + cosmos.base.v1beta1.Coin constant_fee = 3 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"constant_fee\"" + ]; } diff --git a/third_party/proto/cosmos/crisis/v1beta1/tx.proto b/third_party/proto/cosmos/crisis/v1beta1/tx.proto index 26457ad6..8be06a68 100644 --- a/third_party/proto/cosmos/crisis/v1beta1/tx.proto +++ b/third_party/proto/cosmos/crisis/v1beta1/tx.proto @@ -1,10 +1,11 @@ syntax = "proto3"; -package cosmos.crisis.v1beta1; -option go_package = "github.com/cosmos/cosmos-sdk/x/crisis/types"; +package cosmos.crisis.v1beta1; import "gogoproto/gogo.proto"; +option go_package = "github.com/cosmos/cosmos-sdk/x/crisis/types"; + // Msg defines the bank Msg service. service Msg { // VerifyInvariant defines a method to verify a particular invariance. @@ -13,12 +14,12 @@ service Msg { // MsgVerifyInvariant represents a message to verify a particular invariance. message MsgVerifyInvariant { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string sender = 1; + string sender = 1; string invariant_module_name = 2 [(gogoproto.moretags) = "yaml:\"invariant_module_name\""]; - string invariant_route = 3 [(gogoproto.moretags) = "yaml:\"invariant_route\""]; + string invariant_route = 3 [(gogoproto.moretags) = "yaml:\"invariant_route\""]; } // MsgVerifyInvariantResponse defines the Msg/VerifyInvariant response type. diff --git a/third_party/proto/cosmos/crypto/ed25519/keys.proto b/third_party/proto/cosmos/crypto/ed25519/keys.proto index 6ffec344..02fbfed9 100644 --- a/third_party/proto/cosmos/crypto/ed25519/keys.proto +++ b/third_party/proto/cosmos/crypto/ed25519/keys.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package cosmos.crypto.ed25519; import "gogoproto/gogo.proto"; diff --git a/third_party/proto/cosmos/crypto/multisig/keys.proto b/third_party/proto/cosmos/crypto/multisig/keys.proto index f8398e80..19cae9a5 100644 --- a/third_party/proto/cosmos/crypto/multisig/keys.proto +++ b/third_party/proto/cosmos/crypto/multisig/keys.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package cosmos.crypto.multisig; import "gogoproto/gogo.proto"; @@ -12,7 +13,9 @@ option go_package = "github.com/cosmos/cosmos-sdk/crypto/keys/multisig"; message LegacyAminoPubKey { option (gogoproto.goproto_getters) = false; - uint32 threshold = 1 [(gogoproto.moretags) = "yaml:\"threshold\""]; - repeated google.protobuf.Any public_keys = 2 - [(gogoproto.customname) = "PubKeys", (gogoproto.moretags) = "yaml:\"pubkeys\""]; + uint32 threshold = 1 [(gogoproto.moretags) = "yaml:\"threshold\""]; + repeated google.protobuf.Any public_keys = 2 [ + (gogoproto.customname) = "PubKeys", + (gogoproto.moretags) = "yaml:\"pubkeys\"" + ]; } diff --git a/third_party/proto/cosmos/crypto/multisig/v1beta1/multisig.proto b/third_party/proto/cosmos/crypto/multisig/v1beta1/multisig.proto index bf671f17..5226734e 100644 --- a/third_party/proto/cosmos/crypto/multisig/v1beta1/multisig.proto +++ b/third_party/proto/cosmos/crypto/multisig/v1beta1/multisig.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package cosmos.crypto.multisig.v1beta1; import "gogoproto/gogo.proto"; @@ -10,7 +11,7 @@ option go_package = "github.com/cosmos/cosmos-sdk/crypto/types"; // signed and with which modes. message MultiSignature { option (gogoproto.goproto_unrecognized) = true; - repeated bytes signatures = 1; + repeated bytes signatures = 1; } // CompactBitArray is an implementation of a space efficient bit array. @@ -21,5 +22,5 @@ message CompactBitArray { option (gogoproto.goproto_stringer) = false; uint32 extra_bits_stored = 1; - bytes elems = 2; + bytes elems = 2; } diff --git a/third_party/proto/cosmos/crypto/secp256k1/keys.proto b/third_party/proto/cosmos/crypto/secp256k1/keys.proto index a2272571..b37f4072 100644 --- a/third_party/proto/cosmos/crypto/secp256k1/keys.proto +++ b/third_party/proto/cosmos/crypto/secp256k1/keys.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package cosmos.crypto.secp256k1; import "gogoproto/gogo.proto"; diff --git a/third_party/proto/cosmos/crypto/secp256r1/keys.proto b/third_party/proto/cosmos/crypto/secp256r1/keys.proto index 2e96c6e3..a6c59d4d 100644 --- a/third_party/proto/cosmos/crypto/secp256r1/keys.proto +++ b/third_party/proto/cosmos/crypto/secp256r1/keys.proto @@ -1,13 +1,14 @@ // Since: cosmos-sdk 0.43 syntax = "proto3"; + package cosmos.crypto.secp256r1; import "gogoproto/gogo.proto"; -option go_package = "github.com/cosmos/cosmos-sdk/crypto/keys/secp256r1"; -option (gogoproto.messagename_all) = true; +option go_package = "github.com/cosmos/cosmos-sdk/crypto/keys/secp256r1"; +option (gogoproto.goproto_getters_all) = false; option (gogoproto.goproto_stringer_all) = false; -option (gogoproto.goproto_getters_all) = false; +option (gogoproto.messagename_all) = true; // PubKey defines a secp256r1 ECDSA public key. message PubKey { diff --git a/third_party/proto/cosmos/distribution/v1beta1/distribution.proto b/third_party/proto/cosmos/distribution/v1beta1/distribution.proto index ae98ec0b..2e61cd72 100644 --- a/third_party/proto/cosmos/distribution/v1beta1/distribution.proto +++ b/third_party/proto/cosmos/distribution/v1beta1/distribution.proto @@ -1,29 +1,30 @@ syntax = "proto3"; -package cosmos.distribution.v1beta1; -option go_package = "github.com/cosmos/cosmos-sdk/x/distribution/types"; -option (gogoproto.equal_all) = true; +package cosmos.distribution.v1beta1; -import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; +import "gogoproto/gogo.proto"; + +option go_package = "github.com/cosmos/cosmos-sdk/x/distribution/types"; +option (gogoproto.equal_all) = true; // Params defines the set of params for the distribution module. message Params { option (gogoproto.goproto_stringer) = false; - string community_tax = 1 [ - (gogoproto.moretags) = "yaml:\"community_tax\"", + string community_tax = 1 [ + (gogoproto.moretags) = "yaml:\"community_tax\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false + (gogoproto.nullable) = false ]; string base_proposer_reward = 2 [ - (gogoproto.moretags) = "yaml:\"base_proposer_reward\"", + (gogoproto.moretags) = "yaml:\"base_proposer_reward\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false + (gogoproto.nullable) = false ]; string bonus_proposer_reward = 3 [ - (gogoproto.moretags) = "yaml:\"bonus_proposer_reward\"", + (gogoproto.moretags) = "yaml:\"bonus_proposer_reward\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false + (gogoproto.nullable) = false ]; bool withdraw_addr_enabled = 4 [(gogoproto.moretags) = "yaml:\"withdraw_addr_enabled\""]; } @@ -42,9 +43,9 @@ message Params { // + one per validator for the zeroeth period, set on initialization message ValidatorHistoricalRewards { repeated cosmos.base.v1beta1.DecCoin cumulative_reward_ratio = 1 [ - (gogoproto.moretags) = "yaml:\"cumulative_reward_ratio\"", + (gogoproto.moretags) = "yaml:\"cumulative_reward_ratio\"", (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins", - (gogoproto.nullable) = false + (gogoproto.nullable) = false ]; uint32 reference_count = 2 [(gogoproto.moretags) = "yaml:\"reference_count\""]; } @@ -53,25 +54,29 @@ message ValidatorHistoricalRewards { // period for a validator kept as a running counter and incremented // each block as long as the validator's tokens remain constant. message ValidatorCurrentRewards { - repeated cosmos.base.v1beta1.DecCoin rewards = 1 - [(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins", (gogoproto.nullable) = false]; + repeated cosmos.base.v1beta1.DecCoin rewards = 1 [ + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins", + (gogoproto.nullable) = false + ]; uint64 period = 2; } // ValidatorAccumulatedCommission represents accumulated commission // for a validator kept as a running counter, can be withdrawn at any time. message ValidatorAccumulatedCommission { - repeated cosmos.base.v1beta1.DecCoin commission = 1 - [(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins", (gogoproto.nullable) = false]; + repeated cosmos.base.v1beta1.DecCoin commission = 1 [ + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins", + (gogoproto.nullable) = false + ]; } // ValidatorOutstandingRewards represents outstanding (un-withdrawn) rewards // for a validator inexpensive to track, allows simple sanity checks. message ValidatorOutstandingRewards { repeated cosmos.base.v1beta1.DecCoin rewards = 1 [ - (gogoproto.moretags) = "yaml:\"rewards\"", + (gogoproto.moretags) = "yaml:\"rewards\"", (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins", - (gogoproto.nullable) = false + (gogoproto.nullable) = false ]; } @@ -81,22 +86,27 @@ message ValidatorOutstandingRewards { // for delegations which are withdrawn after a slash has occurred. message ValidatorSlashEvent { uint64 validator_period = 1 [(gogoproto.moretags) = "yaml:\"validator_period\""]; - string fraction = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; + string fraction = 2 [ + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; } // ValidatorSlashEvents is a collection of ValidatorSlashEvent messages. message ValidatorSlashEvents { - option (gogoproto.goproto_stringer) = false; - repeated ValidatorSlashEvent validator_slash_events = 1 - [(gogoproto.moretags) = "yaml:\"validator_slash_events\"", (gogoproto.nullable) = false]; + option (gogoproto.goproto_stringer) = false; + repeated ValidatorSlashEvent validator_slash_events = 1 [ + (gogoproto.moretags) = "yaml:\"validator_slash_events\"", + (gogoproto.nullable) = false + ]; } // FeePool is the global fee pool for distribution. message FeePool { repeated cosmos.base.v1beta1.DecCoin community_pool = 1 [ - (gogoproto.nullable) = false, + (gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins", - (gogoproto.moretags) = "yaml:\"community_pool\"" + (gogoproto.moretags) = "yaml:\"community_pool\"" ]; } @@ -104,15 +114,17 @@ message FeePool { // together with how many coins are proposed to be spent, and to which // recipient account. message CommunityPoolSpendProposal { - option (gogoproto.equal) = false; - option (gogoproto.goproto_getters) = false; + option (gogoproto.equal) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; - string title = 1; - string description = 2; - string recipient = 3; - repeated cosmos.base.v1beta1.Coin amount = 4 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + string title = 1; + string description = 2; + string recipient = 3; + repeated cosmos.base.v1beta1.Coin amount = 4 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; } // DelegatorStartingInfo represents the starting info for a delegator reward @@ -123,35 +135,40 @@ message CommunityPoolSpendProposal { // thus sdk.Dec is used. message DelegatorStartingInfo { uint64 previous_period = 1 [(gogoproto.moretags) = "yaml:\"previous_period\""]; - string stake = 2 [ - (gogoproto.moretags) = "yaml:\"stake\"", + string stake = 2 [ + (gogoproto.moretags) = "yaml:\"stake\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false + (gogoproto.nullable) = false + ]; + uint64 height = 3 [ + (gogoproto.moretags) = "yaml:\"creation_height\"", + (gogoproto.jsontag) = "creation_height" ]; - uint64 height = 3 [(gogoproto.moretags) = "yaml:\"creation_height\"", (gogoproto.jsontag) = "creation_height"]; } // DelegationDelegatorReward represents the properties // of a delegator's delegation reward. message DelegationDelegatorReward { - option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = true; string validator_address = 1 [(gogoproto.moretags) = "yaml:\"validator_address\""]; - repeated cosmos.base.v1beta1.DecCoin reward = 2 - [(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins", (gogoproto.nullable) = false]; + repeated cosmos.base.v1beta1.DecCoin reward = 2 [ + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins", + (gogoproto.nullable) = false + ]; } // CommunityPoolSpendProposalWithDeposit defines a CommunityPoolSpendProposal // with a deposit message CommunityPoolSpendProposalWithDeposit { - option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = true; - string title = 1 [(gogoproto.moretags) = "yaml:\"title\""]; + string title = 1 [(gogoproto.moretags) = "yaml:\"title\""]; string description = 2 [(gogoproto.moretags) = "yaml:\"description\""]; - string recipient = 3 [(gogoproto.moretags) = "yaml:\"recipient\""]; - string amount = 4 [(gogoproto.moretags) = "yaml:\"amount\""]; - string deposit = 5 [(gogoproto.moretags) = "yaml:\"deposit\""]; + string recipient = 3 [(gogoproto.moretags) = "yaml:\"recipient\""]; + string amount = 4 [(gogoproto.moretags) = "yaml:\"amount\""]; + string deposit = 5 [(gogoproto.moretags) = "yaml:\"deposit\""]; } diff --git a/third_party/proto/cosmos/distribution/v1beta1/genesis.proto b/third_party/proto/cosmos/distribution/v1beta1/genesis.proto index c0b17cdf..087898d3 100644 --- a/third_party/proto/cosmos/distribution/v1beta1/genesis.proto +++ b/third_party/proto/cosmos/distribution/v1beta1/genesis.proto @@ -1,18 +1,19 @@ syntax = "proto3"; -package cosmos.distribution.v1beta1; -option go_package = "github.com/cosmos/cosmos-sdk/x/distribution/types"; -option (gogoproto.equal_all) = true; +package cosmos.distribution.v1beta1; -import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; import "cosmos/distribution/v1beta1/distribution.proto"; +import "gogoproto/gogo.proto"; + +option go_package = "github.com/cosmos/cosmos-sdk/x/distribution/types"; +option (gogoproto.equal_all) = true; // DelegatorWithdrawInfo is the address for where distributions rewards are // withdrawn to by default this struct is only used at genesis to feed in // default withdraw addresses. message DelegatorWithdrawInfo { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // delegator_address is the address of the delegator. @@ -24,7 +25,7 @@ message DelegatorWithdrawInfo { // ValidatorOutstandingRewardsRecord is used for import/export via genesis json. message ValidatorOutstandingRewardsRecord { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // validator_address is the address of the validator. @@ -33,29 +34,31 @@ message ValidatorOutstandingRewardsRecord { // outstanding_rewards represents the oustanding rewards of a validator. repeated cosmos.base.v1beta1.DecCoin outstanding_rewards = 2 [ (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins", - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"outstanding_rewards\"" + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"outstanding_rewards\"" ]; } // ValidatorAccumulatedCommissionRecord is used for import / export via genesis // json. message ValidatorAccumulatedCommissionRecord { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // validator_address is the address of the validator. string validator_address = 1 [(gogoproto.moretags) = "yaml:\"validator_address\""]; // accumulated is the accumulated commission of a validator. - ValidatorAccumulatedCommission accumulated = 2 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"accumulated\""]; + ValidatorAccumulatedCommission accumulated = 2 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"accumulated\"" + ]; } // ValidatorHistoricalRewardsRecord is used for import / export via genesis // json. message ValidatorHistoricalRewardsRecord { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // validator_address is the address of the validator. @@ -65,24 +68,30 @@ message ValidatorHistoricalRewardsRecord { uint64 period = 2; // rewards defines the historical rewards of a validator. - ValidatorHistoricalRewards rewards = 3 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"rewards\""]; + ValidatorHistoricalRewards rewards = 3 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"rewards\"" + ]; } // ValidatorCurrentRewardsRecord is used for import / export via genesis json. message ValidatorCurrentRewardsRecord { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // validator_address is the address of the validator. string validator_address = 1 [(gogoproto.moretags) = "yaml:\"validator_address\""]; // rewards defines the current rewards of a validator. - ValidatorCurrentRewards rewards = 2 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"rewards\""]; + ValidatorCurrentRewards rewards = 2 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"rewards\"" + ]; } // DelegatorStartingInfoRecord used for import / export via genesis json. message DelegatorStartingInfoRecord { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // delegator_address is the address of the delegator. @@ -92,13 +101,15 @@ message DelegatorStartingInfoRecord { string validator_address = 2 [(gogoproto.moretags) = "yaml:\"validator_address\""]; // starting_info defines the starting info of a delegator. - DelegatorStartingInfo starting_info = 3 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"starting_info\""]; + DelegatorStartingInfo starting_info = 3 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"starting_info\"" + ]; } // ValidatorSlashEventRecord is used for import / export via genesis json. message ValidatorSlashEventRecord { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // validator_address is the address of the validator. @@ -108,48 +119,71 @@ message ValidatorSlashEventRecord { // period is the period of the slash event. uint64 period = 3; // validator_slash_event describes the slash event. - ValidatorSlashEvent validator_slash_event = 4 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"event\""]; + ValidatorSlashEvent validator_slash_event = 4 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"event\"" + ]; } // GenesisState defines the distribution module's genesis state. message GenesisState { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // params defines all the paramaters of the module. - Params params = 1 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"params\""]; + Params params = 1 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"params\"" + ]; // fee_pool defines the fee pool at genesis. - FeePool fee_pool = 2 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"fee_pool\""]; + FeePool fee_pool = 2 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"fee_pool\"" + ]; // fee_pool defines the delegator withdraw infos at genesis. - repeated DelegatorWithdrawInfo delegator_withdraw_infos = 3 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"delegator_withdraw_infos\""]; + repeated DelegatorWithdrawInfo delegator_withdraw_infos = 3 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"delegator_withdraw_infos\"" + ]; // fee_pool defines the previous proposer at genesis. string previous_proposer = 4 [(gogoproto.moretags) = "yaml:\"previous_proposer\""]; // fee_pool defines the outstanding rewards of all validators at genesis. - repeated ValidatorOutstandingRewardsRecord outstanding_rewards = 5 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"outstanding_rewards\""]; + repeated ValidatorOutstandingRewardsRecord outstanding_rewards = 5 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"outstanding_rewards\"" + ]; // fee_pool defines the accumulated commisions of all validators at genesis. - repeated ValidatorAccumulatedCommissionRecord validator_accumulated_commissions = 6 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"validator_accumulated_commissions\""]; + repeated ValidatorAccumulatedCommissionRecord validator_accumulated_commissions = 6 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"validator_accumulated_commissions\"" + ]; // fee_pool defines the historical rewards of all validators at genesis. - repeated ValidatorHistoricalRewardsRecord validator_historical_rewards = 7 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"validator_historical_rewards\""]; + repeated ValidatorHistoricalRewardsRecord validator_historical_rewards = 7 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"validator_historical_rewards\"" + ]; // fee_pool defines the current rewards of all validators at genesis. - repeated ValidatorCurrentRewardsRecord validator_current_rewards = 8 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"validator_current_rewards\""]; + repeated ValidatorCurrentRewardsRecord validator_current_rewards = 8 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"validator_current_rewards\"" + ]; // fee_pool defines the delegator starting infos at genesis. - repeated DelegatorStartingInfoRecord delegator_starting_infos = 9 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"delegator_starting_infos\""]; + repeated DelegatorStartingInfoRecord delegator_starting_infos = 9 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"delegator_starting_infos\"" + ]; // fee_pool defines the validator slash events at genesis. - repeated ValidatorSlashEventRecord validator_slash_events = 10 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"validator_slash_events\""]; + repeated ValidatorSlashEventRecord validator_slash_events = 10 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"validator_slash_events\"" + ]; } diff --git a/third_party/proto/cosmos/distribution/v1beta1/query.proto b/third_party/proto/cosmos/distribution/v1beta1/query.proto index 2991218d..aea02d59 100644 --- a/third_party/proto/cosmos/distribution/v1beta1/query.proto +++ b/third_party/proto/cosmos/distribution/v1beta1/query.proto @@ -1,11 +1,12 @@ syntax = "proto3"; + package cosmos.distribution.v1beta1; import "cosmos/base/query/v1beta1/pagination.proto"; -import "gogoproto/gogo.proto"; -import "google/api/annotations.proto"; import "cosmos/base/v1beta1/coin.proto"; import "cosmos/distribution/v1beta1/distribution.proto"; +import "gogoproto/gogo.proto"; +import "google/api/annotations.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/distribution/types"; @@ -17,16 +18,17 @@ service Query { } // ValidatorOutstandingRewards queries rewards of a validator address. - rpc ValidatorOutstandingRewards(QueryValidatorOutstandingRewardsRequest) - returns (QueryValidatorOutstandingRewardsResponse) { - option (google.api.http).get = "/cosmos/distribution/v1beta1/validators/" - "{validator_address}/outstanding_rewards"; + rpc ValidatorOutstandingRewards(QueryValidatorOutstandingRewardsRequest) returns (QueryValidatorOutstandingRewardsResponse) { + option (google.api.http).get = + "/cosmos/distribution/v1beta1/validators/" + "{validator_address}/outstanding_rewards"; } // ValidatorCommission queries accumulated commission for a validator. rpc ValidatorCommission(QueryValidatorCommissionRequest) returns (QueryValidatorCommissionResponse) { - option (google.api.http).get = "/cosmos/distribution/v1beta1/validators/" - "{validator_address}/commission"; + option (google.api.http).get = + "/cosmos/distribution/v1beta1/validators/" + "{validator_address}/commission"; } // ValidatorSlashes queries slash events of a validator. @@ -36,8 +38,9 @@ service Query { // DelegationRewards queries the total rewards accrued by a delegation. rpc DelegationRewards(QueryDelegationRewardsRequest) returns (QueryDelegationRewardsResponse) { - option (google.api.http).get = "/cosmos/distribution/v1beta1/delegators/{delegator_address}/rewards/" - "{validator_address}"; + option (google.api.http).get = + "/cosmos/distribution/v1beta1/delegators/{delegator_address}/rewards/" + "{validator_address}"; } // DelegationTotalRewards queries the total rewards accrued by a each @@ -48,14 +51,16 @@ service Query { // DelegatorValidators queries the validators of a delegator. rpc DelegatorValidators(QueryDelegatorValidatorsRequest) returns (QueryDelegatorValidatorsResponse) { - option (google.api.http).get = "/cosmos/distribution/v1beta1/delegators/" - "{delegator_address}/validators"; + option (google.api.http).get = + "/cosmos/distribution/v1beta1/delegators/" + "{delegator_address}/validators"; } // DelegatorWithdrawAddress queries withdraw address of a delegator. rpc DelegatorWithdrawAddress(QueryDelegatorWithdrawAddressRequest) returns (QueryDelegatorWithdrawAddressResponse) { - option (google.api.http).get = "/cosmos/distribution/v1beta1/delegators/" - "{delegator_address}/withdraw_address"; + option (google.api.http).get = + "/cosmos/distribution/v1beta1/delegators/" + "{delegator_address}/withdraw_address"; } // CommunityPool queries the community pool coins. @@ -103,7 +108,7 @@ message QueryValidatorCommissionResponse { // QueryValidatorSlashesRequest is the request type for the // Query/ValidatorSlashes RPC method message QueryValidatorSlashesRequest { - option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = true; // validator_address defines the validator address to query for. @@ -129,7 +134,7 @@ message QueryValidatorSlashesResponse { // QueryDelegationRewardsRequest is the request type for the // Query/DelegationRewards RPC method. message QueryDelegationRewardsRequest { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // delegator_address defines the delegator address to query for. @@ -142,14 +147,16 @@ message QueryDelegationRewardsRequest { // Query/DelegationRewards RPC method. message QueryDelegationRewardsResponse { // rewards defines the rewards accrued by a delegation. - repeated cosmos.base.v1beta1.DecCoin rewards = 1 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins"]; + repeated cosmos.base.v1beta1.DecCoin rewards = 1 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins" + ]; } // QueryDelegationTotalRewardsRequest is the request type for the // Query/DelegationTotalRewards RPC method. message QueryDelegationTotalRewardsRequest { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // delegator_address defines the delegator address to query for. string delegator_address = 1; @@ -161,14 +168,16 @@ message QueryDelegationTotalRewardsResponse { // rewards defines all the rewards accrued by a delegator. repeated DelegationDelegatorReward rewards = 1 [(gogoproto.nullable) = false]; // total defines the sum of all the rewards. - repeated cosmos.base.v1beta1.DecCoin total = 2 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins"]; + repeated cosmos.base.v1beta1.DecCoin total = 2 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins" + ]; } // QueryDelegatorValidatorsRequest is the request type for the // Query/DelegatorValidators RPC method. message QueryDelegatorValidatorsRequest { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // delegator_address defines the delegator address to query for. @@ -178,7 +187,7 @@ message QueryDelegatorValidatorsRequest { // QueryDelegatorValidatorsResponse is the response type for the // Query/DelegatorValidators RPC method. message QueryDelegatorValidatorsResponse { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // validators defines the validators a delegator is delegating for. @@ -188,7 +197,7 @@ message QueryDelegatorValidatorsResponse { // QueryDelegatorWithdrawAddressRequest is the request type for the // Query/DelegatorWithdrawAddress RPC method. message QueryDelegatorWithdrawAddressRequest { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // delegator_address defines the delegator address to query for. @@ -198,7 +207,7 @@ message QueryDelegatorWithdrawAddressRequest { // QueryDelegatorWithdrawAddressResponse is the response type for the // Query/DelegatorWithdrawAddress RPC method. message QueryDelegatorWithdrawAddressResponse { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // withdraw_address defines the delegator address to query for. @@ -213,6 +222,8 @@ message QueryCommunityPoolRequest {} // RPC method. message QueryCommunityPoolResponse { // pool defines community pool's coins. - repeated cosmos.base.v1beta1.DecCoin pool = 1 - [(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins", (gogoproto.nullable) = false]; + repeated cosmos.base.v1beta1.DecCoin pool = 1 [ + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins", + (gogoproto.nullable) = false + ]; } diff --git a/third_party/proto/cosmos/distribution/v1beta1/tx.proto b/third_party/proto/cosmos/distribution/v1beta1/tx.proto index e6ce478b..3351b1d2 100644 --- a/third_party/proto/cosmos/distribution/v1beta1/tx.proto +++ b/third_party/proto/cosmos/distribution/v1beta1/tx.proto @@ -1,11 +1,12 @@ syntax = "proto3"; -package cosmos.distribution.v1beta1; -option go_package = "github.com/cosmos/cosmos-sdk/x/distribution/types"; -option (gogoproto.equal_all) = true; +package cosmos.distribution.v1beta1; -import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; +import "gogoproto/gogo.proto"; + +option go_package = "github.com/cosmos/cosmos-sdk/x/distribution/types"; +option (gogoproto.equal_all) = true; // Msg defines the distribution Msg service. service Msg { @@ -29,11 +30,11 @@ service Msg { // MsgSetWithdrawAddress sets the withdraw address for // a delegator (or validator self-delegation). message MsgSetWithdrawAddress { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; string delegator_address = 1 [(gogoproto.moretags) = "yaml:\"delegator_address\""]; - string withdraw_address = 2 [(gogoproto.moretags) = "yaml:\"withdraw_address\""]; + string withdraw_address = 2 [(gogoproto.moretags) = "yaml:\"withdraw_address\""]; } // MsgSetWithdrawAddressResponse defines the Msg/SetWithdrawAddress response type. @@ -42,7 +43,7 @@ message MsgSetWithdrawAddressResponse {} // MsgWithdrawDelegatorReward represents delegation withdrawal to a delegator // from a single validator. message MsgWithdrawDelegatorReward { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; string delegator_address = 1 [(gogoproto.moretags) = "yaml:\"delegator_address\""]; @@ -55,7 +56,7 @@ message MsgWithdrawDelegatorRewardResponse {} // MsgWithdrawValidatorCommission withdraws the full commission to the validator // address. message MsgWithdrawValidatorCommission { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; string validator_address = 1 [(gogoproto.moretags) = "yaml:\"validator_address\""]; @@ -67,11 +68,13 @@ message MsgWithdrawValidatorCommissionResponse {} // MsgFundCommunityPool allows an account to directly // fund the community pool. message MsgFundCommunityPool { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - repeated cosmos.base.v1beta1.Coin amount = 1 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + repeated cosmos.base.v1beta1.Coin amount = 1 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; string depositor = 2; } diff --git a/third_party/proto/cosmos/evidence/v1beta1/evidence.proto b/third_party/proto/cosmos/evidence/v1beta1/evidence.proto index 14612c31..8b174ccd 100644 --- a/third_party/proto/cosmos/evidence/v1beta1/evidence.proto +++ b/third_party/proto/cosmos/evidence/v1beta1/evidence.proto @@ -1,21 +1,25 @@ syntax = "proto3"; -package cosmos.evidence.v1beta1; -option go_package = "github.com/cosmos/cosmos-sdk/x/evidence/types"; -option (gogoproto.equal_all) = true; +package cosmos.evidence.v1beta1; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; +option go_package = "github.com/cosmos/cosmos-sdk/x/evidence/types"; +option (gogoproto.equal_all) = true; + // Equivocation implements the Evidence interface and defines evidence of double // signing misbehavior. message Equivocation { option (gogoproto.goproto_stringer) = false; - option (gogoproto.goproto_getters) = false; - option (gogoproto.equal) = false; + option (gogoproto.goproto_getters) = false; + option (gogoproto.equal) = false; - int64 height = 1; - google.protobuf.Timestamp time = 2 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; - int64 power = 3; - string consensus_address = 4 [(gogoproto.moretags) = "yaml:\"consensus_address\""]; -} \ No newline at end of file + int64 height = 1; + google.protobuf.Timestamp time = 2 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true + ]; + int64 power = 3; + string consensus_address = 4 [(gogoproto.moretags) = "yaml:\"consensus_address\""]; +} diff --git a/third_party/proto/cosmos/evidence/v1beta1/genesis.proto b/third_party/proto/cosmos/evidence/v1beta1/genesis.proto index 199f446f..a2821786 100644 --- a/third_party/proto/cosmos/evidence/v1beta1/genesis.proto +++ b/third_party/proto/cosmos/evidence/v1beta1/genesis.proto @@ -1,10 +1,11 @@ syntax = "proto3"; -package cosmos.evidence.v1beta1; -option go_package = "github.com/cosmos/cosmos-sdk/x/evidence/types"; +package cosmos.evidence.v1beta1; import "google/protobuf/any.proto"; +option go_package = "github.com/cosmos/cosmos-sdk/x/evidence/types"; + // GenesisState defines the evidence module's genesis state. message GenesisState { // evidence defines all the evidence at genesis. diff --git a/third_party/proto/cosmos/evidence/v1beta1/query.proto b/third_party/proto/cosmos/evidence/v1beta1/query.proto index eda00544..07c3de00 100644 --- a/third_party/proto/cosmos/evidence/v1beta1/query.proto +++ b/third_party/proto/cosmos/evidence/v1beta1/query.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + package cosmos.evidence.v1beta1; import "cosmos/base/query/v1beta1/pagination.proto"; import "gogoproto/gogo.proto"; -import "google/protobuf/any.proto"; import "google/api/annotations.proto"; +import "google/protobuf/any.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/evidence/types"; diff --git a/third_party/proto/cosmos/evidence/v1beta1/tx.proto b/third_party/proto/cosmos/evidence/v1beta1/tx.proto index 38795f25..bf7b2b54 100644 --- a/third_party/proto/cosmos/evidence/v1beta1/tx.proto +++ b/third_party/proto/cosmos/evidence/v1beta1/tx.proto @@ -1,12 +1,13 @@ syntax = "proto3"; -package cosmos.evidence.v1beta1; -option go_package = "github.com/cosmos/cosmos-sdk/x/evidence/types"; -option (gogoproto.equal_all) = true; +package cosmos.evidence.v1beta1; +import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; -import "cosmos_proto/cosmos.proto"; + +option go_package = "github.com/cosmos/cosmos-sdk/x/evidence/types"; +option (gogoproto.equal_all) = true; // Msg defines the evidence Msg service. service Msg { @@ -18,11 +19,11 @@ service Msg { // MsgSubmitEvidence represents a message that supports submitting arbitrary // Evidence of misbehavior such as equivocation or counterfactual signing. message MsgSubmitEvidence { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string submitter = 1; - google.protobuf.Any evidence = 2 [(cosmos_proto.accepts_interface) = "Evidence"]; + string submitter = 1; + google.protobuf.Any evidence = 2 [(cosmos_proto.accepts_interface) = "Evidence"]; } // MsgSubmitEvidenceResponse defines the Msg/SubmitEvidence response type. diff --git a/third_party/proto/cosmos/feegrant/v1beta1/feegrant.proto b/third_party/proto/cosmos/feegrant/v1beta1/feegrant.proto index a86691f9..0494dbae 100644 --- a/third_party/proto/cosmos/feegrant/v1beta1/feegrant.proto +++ b/third_party/proto/cosmos/feegrant/v1beta1/feegrant.proto @@ -1,13 +1,14 @@ // Since: cosmos-sdk 0.43 syntax = "proto3"; + package cosmos.feegrant.v1beta1; +import "cosmos/base/v1beta1/coin.proto"; +import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; -import "cosmos_proto/cosmos.proto"; -import "cosmos/base/v1beta1/coin.proto"; -import "google/protobuf/timestamp.proto"; import "google/protobuf/duration.proto"; +import "google/protobuf/timestamp.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/feegrant"; @@ -19,8 +20,10 @@ message BasicAllowance { // spend_limit specifies the maximum amount of tokens that can be spent // by this allowance and will be updated as tokens are spent. If it is // empty, there is no spend limit and any amount of coins can be spent. - repeated cosmos.base.v1beta1.Coin spend_limit = 1 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + repeated cosmos.base.v1beta1.Coin spend_limit = 1 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; // expiration specifies an optional time when this allowance expires google.protobuf.Timestamp expiration = 2 [(gogoproto.stdtime) = true]; @@ -36,26 +39,36 @@ message PeriodicAllowance { // period specifies the time duration in which period_spend_limit coins can // be spent before that allowance is reset - google.protobuf.Duration period = 2 [(gogoproto.stdduration) = true, (gogoproto.nullable) = false]; + google.protobuf.Duration period = 2 [ + (gogoproto.stdduration) = true, + (gogoproto.nullable) = false + ]; // period_spend_limit specifies the maximum number of coins that can be spent // in the period - repeated cosmos.base.v1beta1.Coin period_spend_limit = 3 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + repeated cosmos.base.v1beta1.Coin period_spend_limit = 3 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; // period_can_spend is the number of coins left to be spent before the period_reset time - repeated cosmos.base.v1beta1.Coin period_can_spend = 4 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + repeated cosmos.base.v1beta1.Coin period_can_spend = 4 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; // period_reset is the time at which this period resets and a new one begins, // it is calculated from the start time of the first transaction after the // last period ended - google.protobuf.Timestamp period_reset = 5 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; + google.protobuf.Timestamp period_reset = 5 [ + (gogoproto.stdtime) = true, + (gogoproto.nullable) = false + ]; } // AllowedMsgAllowance creates allowance only for specified message types. message AllowedMsgAllowance { - option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_getters) = false; option (cosmos_proto.implements_interface) = "FeeAllowanceI"; // allowance can be any of basic and filtered fee allowance. diff --git a/third_party/proto/cosmos/feegrant/v1beta1/genesis.proto b/third_party/proto/cosmos/feegrant/v1beta1/genesis.proto index 5b1ac4ca..c0e6e151 100644 --- a/third_party/proto/cosmos/feegrant/v1beta1/genesis.proto +++ b/third_party/proto/cosmos/feegrant/v1beta1/genesis.proto @@ -1,9 +1,10 @@ // Since: cosmos-sdk 0.43 syntax = "proto3"; + package cosmos.feegrant.v1beta1; -import "gogoproto/gogo.proto"; import "cosmos/feegrant/v1beta1/feegrant.proto"; +import "gogoproto/gogo.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/feegrant"; diff --git a/third_party/proto/cosmos/feegrant/v1beta1/query.proto b/third_party/proto/cosmos/feegrant/v1beta1/query.proto index 9cf2a498..a040c6e0 100644 --- a/third_party/proto/cosmos/feegrant/v1beta1/query.proto +++ b/third_party/proto/cosmos/feegrant/v1beta1/query.proto @@ -1,16 +1,16 @@ // Since: cosmos-sdk 0.43 syntax = "proto3"; + package cosmos.feegrant.v1beta1; -import "cosmos/feegrant/v1beta1/feegrant.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; +import "cosmos/feegrant/v1beta1/feegrant.proto"; import "google/api/annotations.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/feegrant"; // Query defines the gRPC querier service. service Query { - // Allowance returns fee granted to the grantee by the granter. rpc Allowance(QueryAllowanceRequest) returns (QueryAllowanceResponse) { option (google.api.http).get = "/cosmos/feegrant/v1beta1/allowance/{granter}/{grantee}"; diff --git a/third_party/proto/cosmos/feegrant/v1beta1/tx.proto b/third_party/proto/cosmos/feegrant/v1beta1/tx.proto index 2d875e92..3f41ef8c 100644 --- a/third_party/proto/cosmos/feegrant/v1beta1/tx.proto +++ b/third_party/proto/cosmos/feegrant/v1beta1/tx.proto @@ -1,16 +1,16 @@ // Since: cosmos-sdk 0.43 syntax = "proto3"; + package cosmos.feegrant.v1beta1; +import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; -import "cosmos_proto/cosmos.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/feegrant"; // Msg defines the feegrant msg service. service Msg { - // GrantAllowance grants fee allowance to the grantee on the granter's // account with the provided expiration time. rpc GrantAllowance(MsgGrantAllowance) returns (MsgGrantAllowanceResponse); diff --git a/third_party/proto/cosmos/genutil/v1beta1/genesis.proto b/third_party/proto/cosmos/genutil/v1beta1/genesis.proto index a0207793..9a1e494a 100644 --- a/third_party/proto/cosmos/genutil/v1beta1/genesis.proto +++ b/third_party/proto/cosmos/genutil/v1beta1/genesis.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package cosmos.genutil.v1beta1; import "gogoproto/gogo.proto"; @@ -10,7 +11,7 @@ message GenesisState { // gen_txs defines the genesis transactions. repeated bytes gen_txs = 1 [ (gogoproto.casttype) = "encoding/json.RawMessage", - (gogoproto.jsontag) = "gentxs", + (gogoproto.jsontag) = "gentxs", (gogoproto.moretags) = "yaml:\"gentxs\"" ]; } diff --git a/third_party/proto/cosmos/gov/v1beta1/genesis.proto b/third_party/proto/cosmos/gov/v1beta1/genesis.proto index a9995004..f746f9b1 100644 --- a/third_party/proto/cosmos/gov/v1beta1/genesis.proto +++ b/third_party/proto/cosmos/gov/v1beta1/genesis.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package cosmos.gov.v1beta1; -import "gogoproto/gogo.proto"; import "cosmos/gov/v1beta1/gov.proto"; +import "gogoproto/gogo.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types"; @@ -12,15 +12,33 @@ message GenesisState { // starting_proposal_id is the ID of the starting proposal. uint64 starting_proposal_id = 1 [(gogoproto.moretags) = "yaml:\"starting_proposal_id\""]; // deposits defines all the deposits present at genesis. - repeated Deposit deposits = 2 [(gogoproto.castrepeated) = "Deposits", (gogoproto.nullable) = false]; + repeated Deposit deposits = 2 [ + (gogoproto.castrepeated) = "Deposits", + (gogoproto.nullable) = false + ]; // votes defines all the votes present at genesis. - repeated Vote votes = 3 [(gogoproto.castrepeated) = "Votes", (gogoproto.nullable) = false]; + repeated Vote votes = 3 [ + (gogoproto.castrepeated) = "Votes", + (gogoproto.nullable) = false + ]; // proposals defines all the proposals present at genesis. - repeated Proposal proposals = 4 [(gogoproto.castrepeated) = "Proposals", (gogoproto.nullable) = false]; + repeated Proposal proposals = 4 [ + (gogoproto.castrepeated) = "Proposals", + (gogoproto.nullable) = false + ]; // params defines all the paramaters of related to deposit. - DepositParams deposit_params = 5 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"deposit_params\""]; + DepositParams deposit_params = 5 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"deposit_params\"" + ]; // params defines all the paramaters of related to voting. - VotingParams voting_params = 6 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"voting_params\""]; + VotingParams voting_params = 6 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"voting_params\"" + ]; // params defines all the paramaters of related to tally. - TallyParams tally_params = 7 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"tally_params\""]; + TallyParams tally_params = 7 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"tally_params\"" + ]; } diff --git a/third_party/proto/cosmos/gov/v1beta1/gov.proto b/third_party/proto/cosmos/gov/v1beta1/gov.proto index 344b5ada..c4d82817 100644 --- a/third_party/proto/cosmos/gov/v1beta1/gov.proto +++ b/third_party/proto/cosmos/gov/v1beta1/gov.proto @@ -1,17 +1,18 @@ syntax = "proto3"; + package cosmos.gov.v1beta1; import "cosmos/base/v1beta1/coin.proto"; -import "gogoproto/gogo.proto"; import "cosmos_proto/cosmos.proto"; -import "google/protobuf/timestamp.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; import "google/protobuf/duration.proto"; +import "google/protobuf/timestamp.proto"; -option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types"; +option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types"; +option (gogoproto.goproto_getters_all) = false; option (gogoproto.goproto_stringer_all) = false; -option (gogoproto.stringer_all) = false; -option (gogoproto.goproto_getters_all) = false; +option (gogoproto.stringer_all) = false; // VoteOption enumerates the valid vote options for a given governance proposal. enum VoteOption { @@ -34,10 +35,10 @@ enum VoteOption { // Since: cosmos-sdk 0.43 message WeightedVoteOption { VoteOption option = 1; - string weight = 2 [ + string weight = 2 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"weight\"" + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"weight\"" ]; } @@ -48,7 +49,7 @@ message TextProposal { option (gogoproto.equal) = true; - string title = 1; + string title = 1; string description = 2; } @@ -56,36 +57,55 @@ message TextProposal { // proposal. message Deposit { option (gogoproto.goproto_getters) = false; - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; - uint64 proposal_id = 1 [(gogoproto.moretags) = "yaml:\"proposal_id\""]; - string depositor = 2; - repeated cosmos.base.v1beta1.Coin amount = 3 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + uint64 proposal_id = 1 [(gogoproto.moretags) = "yaml:\"proposal_id\""]; + string depositor = 2; + repeated cosmos.base.v1beta1.Coin amount = 3 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; } // Proposal defines the core field members of a governance proposal. message Proposal { option (gogoproto.equal) = true; - uint64 proposal_id = 1 [(gogoproto.jsontag) = "id", (gogoproto.moretags) = "yaml:\"id\""]; - google.protobuf.Any content = 2 [(cosmos_proto.accepts_interface) = "Content"]; - ProposalStatus status = 3 [(gogoproto.moretags) = "yaml:\"proposal_status\""]; - TallyResult final_tally_result = 4 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"final_tally_result\""]; - google.protobuf.Timestamp submit_time = 5 - [(gogoproto.stdtime) = true, (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"submit_time\""]; - google.protobuf.Timestamp deposit_end_time = 6 - [(gogoproto.stdtime) = true, (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"deposit_end_time\""]; + uint64 proposal_id = 1 [ + (gogoproto.jsontag) = "id", + (gogoproto.moretags) = "yaml:\"id\"" + ]; + google.protobuf.Any content = 2 [(cosmos_proto.accepts_interface) = "Content"]; + ProposalStatus status = 3 [(gogoproto.moretags) = "yaml:\"proposal_status\""]; + TallyResult final_tally_result = 4 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"final_tally_result\"" + ]; + google.protobuf.Timestamp submit_time = 5 [ + (gogoproto.stdtime) = true, + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"submit_time\"" + ]; + google.protobuf.Timestamp deposit_end_time = 6 [ + (gogoproto.stdtime) = true, + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"deposit_end_time\"" + ]; repeated cosmos.base.v1beta1.Coin total_deposit = 7 [ - (gogoproto.nullable) = false, + (gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", - (gogoproto.moretags) = "yaml:\"total_deposit\"" + (gogoproto.moretags) = "yaml:\"total_deposit\"" + ]; + google.protobuf.Timestamp voting_start_time = 8 [ + (gogoproto.stdtime) = true, + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"voting_start_time\"" + ]; + google.protobuf.Timestamp voting_end_time = 9 [ + (gogoproto.stdtime) = true, + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"voting_end_time\"" ]; - google.protobuf.Timestamp voting_start_time = 8 - [(gogoproto.stdtime) = true, (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"voting_start_time\""]; - google.protobuf.Timestamp voting_end_time = 9 - [(gogoproto.stdtime) = true, (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"voting_end_time\""]; } // ProposalStatus enumerates the valid statuses of a proposal. @@ -115,13 +135,22 @@ enum ProposalStatus { message TallyResult { option (gogoproto.equal) = true; - string yes = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false]; - string abstain = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false]; - string no = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false]; + string yes = 1 [ + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false + ]; + string abstain = 2 [ + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false + ]; + string no = 3 [ + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false + ]; string no_with_veto = 4 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"no_with_veto\"" + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"no_with_veto\"" ]; } @@ -129,14 +158,14 @@ message TallyResult { // A Vote consists of a proposal ID, the voter, and the vote option. message Vote { option (gogoproto.goproto_stringer) = false; - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; uint64 proposal_id = 1 [(gogoproto.moretags) = "yaml:\"proposal_id\""]; - string voter = 2; + string voter = 2; // Deprecated: Prefer to use `options` instead. This field is set in queries // if and only if `len(options) == 1` and that option has weight 1. In all // other cases, this field will default to VOTE_OPTION_UNSPECIFIED. - VoteOption option = 3 [deprecated = true]; + VoteOption option = 3 [deprecated = true]; // Since: cosmos-sdk 0.43 repeated WeightedVoteOption options = 4 [(gogoproto.nullable) = false]; } @@ -145,19 +174,19 @@ message Vote { message DepositParams { // Minimum deposit for a proposal to enter voting period. repeated cosmos.base.v1beta1.Coin min_deposit = 1 [ - (gogoproto.nullable) = false, + (gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", - (gogoproto.moretags) = "yaml:\"min_deposit\"", - (gogoproto.jsontag) = "min_deposit,omitempty" + (gogoproto.moretags) = "yaml:\"min_deposit\"", + (gogoproto.jsontag) = "min_deposit,omitempty" ]; // Maximum period for Atom holders to deposit on a proposal. Initial value: 2 // months. google.protobuf.Duration max_deposit_period = 2 [ - (gogoproto.nullable) = false, + (gogoproto.nullable) = false, (gogoproto.stdduration) = true, - (gogoproto.jsontag) = "max_deposit_period,omitempty", - (gogoproto.moretags) = "yaml:\"max_deposit_period\"" + (gogoproto.jsontag) = "max_deposit_period,omitempty", + (gogoproto.moretags) = "yaml:\"max_deposit_period\"" ]; } @@ -165,10 +194,10 @@ message DepositParams { message VotingParams { // Length of the voting period. google.protobuf.Duration voting_period = 1 [ - (gogoproto.nullable) = false, + (gogoproto.nullable) = false, (gogoproto.stdduration) = true, - (gogoproto.jsontag) = "voting_period,omitempty", - (gogoproto.moretags) = "yaml:\"voting_period\"" + (gogoproto.jsontag) = "voting_period,omitempty", + (gogoproto.moretags) = "yaml:\"voting_period\"" ]; } @@ -178,23 +207,23 @@ message TallyParams { // considered valid. bytes quorum = 1 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false, - (gogoproto.jsontag) = "quorum,omitempty" + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "quorum,omitempty" ]; // Minimum proportion of Yes votes for proposal to pass. Default value: 0.5. bytes threshold = 2 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false, - (gogoproto.jsontag) = "threshold,omitempty" + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "threshold,omitempty" ]; // Minimum value of Veto votes to Total votes ratio for proposal to be // vetoed. Default value: 1/3. bytes veto_threshold = 3 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false, - (gogoproto.jsontag) = "veto_threshold,omitempty", - (gogoproto.moretags) = "yaml:\"veto_threshold\"" + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "veto_threshold,omitempty", + (gogoproto.moretags) = "yaml:\"veto_threshold\"" ]; } diff --git a/third_party/proto/cosmos/gov/v1beta1/query.proto b/third_party/proto/cosmos/gov/v1beta1/query.proto index da62bdba..bb3ec5a1 100644 --- a/third_party/proto/cosmos/gov/v1beta1/query.proto +++ b/third_party/proto/cosmos/gov/v1beta1/query.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + package cosmos.gov.v1beta1; import "cosmos/base/query/v1beta1/pagination.proto"; +import "cosmos/gov/v1beta1/gov.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -import "cosmos/gov/v1beta1/gov.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types"; @@ -64,7 +65,7 @@ message QueryProposalResponse { // QueryProposalsRequest is the request type for the Query/Proposals RPC method. message QueryProposalsRequest { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // proposal_status defines the status of the proposals. @@ -91,7 +92,7 @@ message QueryProposalsResponse { // QueryVoteRequest is the request type for the Query/Vote RPC method. message QueryVoteRequest { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // proposal_id defines the unique id of the proposal. @@ -145,7 +146,7 @@ message QueryParamsResponse { // QueryDepositRequest is the request type for the Query/Deposit RPC method. message QueryDepositRequest { option (gogoproto.goproto_getters) = false; - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; // proposal_id defines the unique id of the proposal. uint64 proposal_id = 1; diff --git a/third_party/proto/cosmos/gov/v1beta1/tx.proto b/third_party/proto/cosmos/gov/v1beta1/tx.proto index 36c0a95d..5a601f65 100644 --- a/third_party/proto/cosmos/gov/v1beta1/tx.proto +++ b/third_party/proto/cosmos/gov/v1beta1/tx.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package cosmos.gov.v1beta1; import "cosmos/base/v1beta1/coin.proto"; @@ -29,35 +30,41 @@ service Msg { // MsgSubmitProposal defines an sdk.Msg type that supports submitting arbitrary // proposal Content. message MsgSubmitProposal { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_stringer) = false; - option (gogoproto.stringer) = false; - option (gogoproto.goproto_getters) = false; + option (gogoproto.stringer) = false; + option (gogoproto.goproto_getters) = false; - google.protobuf.Any content = 1 [(cosmos_proto.accepts_interface) = "Content"]; + google.protobuf.Any content = 1 [(cosmos_proto.accepts_interface) = "Content"]; repeated cosmos.base.v1beta1.Coin initial_deposit = 2 [ - (gogoproto.nullable) = false, + (gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", - (gogoproto.moretags) = "yaml:\"initial_deposit\"" + (gogoproto.moretags) = "yaml:\"initial_deposit\"" ]; string proposer = 3; } // MsgSubmitProposalResponse defines the Msg/SubmitProposal response type. message MsgSubmitProposalResponse { - uint64 proposal_id = 1 [(gogoproto.jsontag) = "proposal_id", (gogoproto.moretags) = "yaml:\"proposal_id\""]; + uint64 proposal_id = 1 [ + (gogoproto.jsontag) = "proposal_id", + (gogoproto.moretags) = "yaml:\"proposal_id\"" + ]; } // MsgVote defines a message to cast a vote. message MsgVote { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_stringer) = false; - option (gogoproto.stringer) = false; - option (gogoproto.goproto_getters) = false; + option (gogoproto.stringer) = false; + option (gogoproto.goproto_getters) = false; - uint64 proposal_id = 1 [(gogoproto.jsontag) = "proposal_id", (gogoproto.moretags) = "yaml:\"proposal_id\""]; - string voter = 2; - VoteOption option = 3; + uint64 proposal_id = 1 [ + (gogoproto.jsontag) = "proposal_id", + (gogoproto.moretags) = "yaml:\"proposal_id\"" + ]; + string voter = 2; + VoteOption option = 3; } // MsgVoteResponse defines the Msg/Vote response type. @@ -67,14 +74,14 @@ message MsgVoteResponse {} // // Since: cosmos-sdk 0.43 message MsgVoteWeighted { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_stringer) = false; - option (gogoproto.stringer) = false; - option (gogoproto.goproto_getters) = false; + option (gogoproto.stringer) = false; + option (gogoproto.goproto_getters) = false; - uint64 proposal_id = 1 [(gogoproto.moretags) = "yaml:\"proposal_id\""]; - string voter = 2; - repeated WeightedVoteOption options = 3 [(gogoproto.nullable) = false]; + uint64 proposal_id = 1 [(gogoproto.moretags) = "yaml:\"proposal_id\""]; + string voter = 2; + repeated WeightedVoteOption options = 3 [(gogoproto.nullable) = false]; } // MsgVoteWeightedResponse defines the Msg/VoteWeighted response type. @@ -84,15 +91,20 @@ message MsgVoteWeightedResponse {} // MsgDeposit defines a message to submit a deposit to an existing proposal. message MsgDeposit { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_stringer) = false; - option (gogoproto.stringer) = false; - option (gogoproto.goproto_getters) = false; + option (gogoproto.stringer) = false; + option (gogoproto.goproto_getters) = false; - uint64 proposal_id = 1 [(gogoproto.jsontag) = "proposal_id", (gogoproto.moretags) = "yaml:\"proposal_id\""]; - string depositor = 2; - repeated cosmos.base.v1beta1.Coin amount = 3 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + uint64 proposal_id = 1 [ + (gogoproto.jsontag) = "proposal_id", + (gogoproto.moretags) = "yaml:\"proposal_id\"" + ]; + string depositor = 2; + repeated cosmos.base.v1beta1.Coin amount = 3 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; } // MsgDepositResponse defines the Msg/Deposit response type. diff --git a/third_party/proto/cosmos/mint/v1beta1/genesis.proto b/third_party/proto/cosmos/mint/v1beta1/genesis.proto index 4e783fb5..fda838b6 100644 --- a/third_party/proto/cosmos/mint/v1beta1/genesis.proto +++ b/third_party/proto/cosmos/mint/v1beta1/genesis.proto @@ -1,8 +1,9 @@ syntax = "proto3"; + package cosmos.mint.v1beta1; -import "gogoproto/gogo.proto"; import "cosmos/mint/v1beta1/mint.proto"; +import "gogoproto/gogo.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/mint/types"; diff --git a/third_party/proto/cosmos/mint/v1beta1/mint.proto b/third_party/proto/cosmos/mint/v1beta1/mint.proto index f94d4ae2..13c1d17b 100644 --- a/third_party/proto/cosmos/mint/v1beta1/mint.proto +++ b/third_party/proto/cosmos/mint/v1beta1/mint.proto @@ -1,20 +1,23 @@ syntax = "proto3"; -package cosmos.mint.v1beta1; -option go_package = "github.com/cosmos/cosmos-sdk/x/mint/types"; +package cosmos.mint.v1beta1; import "gogoproto/gogo.proto"; +option go_package = "github.com/cosmos/cosmos-sdk/x/mint/types"; + // Minter represents the minting state. message Minter { // current annual inflation rate - string inflation = 1 - [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; + string inflation = 1 [ + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; // current annual expected provisions string annual_provisions = 2 [ - (gogoproto.moretags) = "yaml:\"annual_provisions\"", + (gogoproto.moretags) = "yaml:\"annual_provisions\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false + (gogoproto.nullable) = false ]; } @@ -26,27 +29,27 @@ message Params { string mint_denom = 1; // maximum annual change in inflation rate string inflation_rate_change = 2 [ - (gogoproto.moretags) = "yaml:\"inflation_rate_change\"", + (gogoproto.moretags) = "yaml:\"inflation_rate_change\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false + (gogoproto.nullable) = false ]; // maximum inflation rate string inflation_max = 3 [ - (gogoproto.moretags) = "yaml:\"inflation_max\"", + (gogoproto.moretags) = "yaml:\"inflation_max\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false + (gogoproto.nullable) = false ]; // minimum inflation rate string inflation_min = 4 [ - (gogoproto.moretags) = "yaml:\"inflation_min\"", + (gogoproto.moretags) = "yaml:\"inflation_min\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false + (gogoproto.nullable) = false ]; // goal of percent bonded atoms string goal_bonded = 5 [ - (gogoproto.moretags) = "yaml:\"goal_bonded\"", + (gogoproto.moretags) = "yaml:\"goal_bonded\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false + (gogoproto.nullable) = false ]; // expected blocks per year uint64 blocks_per_year = 6 [(gogoproto.moretags) = "yaml:\"blocks_per_year\""]; diff --git a/third_party/proto/cosmos/mint/v1beta1/query.proto b/third_party/proto/cosmos/mint/v1beta1/query.proto index acd341d7..9d7a632e 100644 --- a/third_party/proto/cosmos/mint/v1beta1/query.proto +++ b/third_party/proto/cosmos/mint/v1beta1/query.proto @@ -1,9 +1,10 @@ syntax = "proto3"; + package cosmos.mint.v1beta1; +import "cosmos/mint/v1beta1/mint.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -import "cosmos/mint/v1beta1/mint.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/mint/types"; @@ -41,7 +42,10 @@ message QueryInflationRequest {} // method. message QueryInflationResponse { // inflation is the current minting inflation value. - bytes inflation = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; + bytes inflation = 1 [ + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; } // QueryAnnualProvisionsRequest is the request type for the @@ -52,6 +56,8 @@ message QueryAnnualProvisionsRequest {} // Query/AnnualProvisions RPC method. message QueryAnnualProvisionsResponse { // annual_provisions is the current minting annual provisions value. - bytes annual_provisions = 1 - [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; + bytes annual_provisions = 1 [ + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; } diff --git a/third_party/proto/cosmos/msg/v1/msg.proto b/third_party/proto/cosmos/msg/v1/msg.proto index 89bdf312..c8f088a9 100644 --- a/third_party/proto/cosmos/msg/v1/msg.proto +++ b/third_party/proto/cosmos/msg/v1/msg.proto @@ -19,4 +19,4 @@ extend google.protobuf.MessageOptions { // kind in case the signer information is contained within // a message inside the cosmos message. repeated string signer = 11110000; -} \ No newline at end of file +} diff --git a/third_party/proto/cosmos/params/v1beta1/params.proto b/third_party/proto/cosmos/params/v1beta1/params.proto index 5382fd79..e610bf7e 100644 --- a/third_party/proto/cosmos/params/v1beta1/params.proto +++ b/third_party/proto/cosmos/params/v1beta1/params.proto @@ -1,19 +1,20 @@ syntax = "proto3"; -package cosmos.params.v1beta1; -option go_package = "github.com/cosmos/cosmos-sdk/x/params/types/proposal"; -option (gogoproto.equal_all) = true; +package cosmos.params.v1beta1; import "gogoproto/gogo.proto"; +option go_package = "github.com/cosmos/cosmos-sdk/x/params/types/proposal"; +option (gogoproto.equal_all) = true; + // ParameterChangeProposal defines a proposal to change one or more parameters. message ParameterChangeProposal { - option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; - string title = 1; - string description = 2; - repeated ParamChange changes = 3 [(gogoproto.nullable) = false]; + string title = 1; + string description = 2; + repeated ParamChange changes = 3 [(gogoproto.nullable) = false]; } // ParamChange defines an individual parameter change, for use in @@ -22,6 +23,6 @@ message ParamChange { option (gogoproto.goproto_stringer) = false; string subspace = 1; - string key = 2; - string value = 3; + string key = 2; + string value = 3; } diff --git a/third_party/proto/cosmos/params/v1beta1/query.proto b/third_party/proto/cosmos/params/v1beta1/query.proto index 1078e02a..e80d49df 100644 --- a/third_party/proto/cosmos/params/v1beta1/query.proto +++ b/third_party/proto/cosmos/params/v1beta1/query.proto @@ -1,9 +1,10 @@ syntax = "proto3"; + package cosmos.params.v1beta1; +import "cosmos/params/v1beta1/params.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -import "cosmos/params/v1beta1/params.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/params/types/proposal"; diff --git a/third_party/proto/cosmos/slashing/v1beta1/genesis.proto b/third_party/proto/cosmos/slashing/v1beta1/genesis.proto index a7aebcfb..4be85981 100644 --- a/third_party/proto/cosmos/slashing/v1beta1/genesis.proto +++ b/third_party/proto/cosmos/slashing/v1beta1/genesis.proto @@ -1,10 +1,11 @@ syntax = "proto3"; -package cosmos.slashing.v1beta1; -option go_package = "github.com/cosmos/cosmos-sdk/x/slashing/types"; +package cosmos.slashing.v1beta1; -import "gogoproto/gogo.proto"; import "cosmos/slashing/v1beta1/slashing.proto"; +import "gogoproto/gogo.proto"; + +option go_package = "github.com/cosmos/cosmos-sdk/x/slashing/types"; // GenesisState defines the slashing module's genesis state. message GenesisState { @@ -13,13 +14,17 @@ message GenesisState { // signing_infos represents a map between validator addresses and their // signing infos. - repeated SigningInfo signing_infos = 2 - [(gogoproto.moretags) = "yaml:\"signing_infos\"", (gogoproto.nullable) = false]; + repeated SigningInfo signing_infos = 2 [ + (gogoproto.moretags) = "yaml:\"signing_infos\"", + (gogoproto.nullable) = false + ]; // missed_blocks represents a map between validator addresses and their // missed blocks. - repeated ValidatorMissedBlocks missed_blocks = 3 - [(gogoproto.moretags) = "yaml:\"missed_blocks\"", (gogoproto.nullable) = false]; + repeated ValidatorMissedBlocks missed_blocks = 3 [ + (gogoproto.moretags) = "yaml:\"missed_blocks\"", + (gogoproto.nullable) = false + ]; } // SigningInfo stores validator signing info of corresponding address. @@ -27,8 +32,10 @@ message SigningInfo { // address is the validator address. string address = 1; // validator_signing_info represents the signing info of this validator. - ValidatorSigningInfo validator_signing_info = 2 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"validator_signing_info\""]; + ValidatorSigningInfo validator_signing_info = 2 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"validator_signing_info\"" + ]; } // ValidatorMissedBlocks contains array of missed blocks of corresponding @@ -37,8 +44,10 @@ message ValidatorMissedBlocks { // address is the validator address. string address = 1; // missed_blocks is an array of missed blocks by the validator. - repeated MissedBlock missed_blocks = 2 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"missed_blocks\""]; + repeated MissedBlock missed_blocks = 2 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"missed_blocks\"" + ]; } // MissedBlock contains height and missed status as boolean. diff --git a/third_party/proto/cosmos/slashing/v1beta1/query.proto b/third_party/proto/cosmos/slashing/v1beta1/query.proto index 869049a0..1b506b57 100644 --- a/third_party/proto/cosmos/slashing/v1beta1/query.proto +++ b/third_party/proto/cosmos/slashing/v1beta1/query.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + package cosmos.slashing.v1beta1; import "cosmos/base/query/v1beta1/pagination.proto"; +import "cosmos/slashing/v1beta1/slashing.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -import "cosmos/slashing/v1beta1/slashing.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/slashing/types"; @@ -58,6 +59,6 @@ message QuerySigningInfosRequest { // method message QuerySigningInfosResponse { // info is the signing info of all validators - repeated cosmos.slashing.v1beta1.ValidatorSigningInfo info = 1 [(gogoproto.nullable) = false]; - cosmos.base.query.v1beta1.PageResponse pagination = 2; + repeated cosmos.slashing.v1beta1.ValidatorSigningInfo info = 1 [(gogoproto.nullable) = false]; + cosmos.base.query.v1beta1.PageResponse pagination = 2; } diff --git a/third_party/proto/cosmos/slashing/v1beta1/slashing.proto b/third_party/proto/cosmos/slashing/v1beta1/slashing.proto index 882a0fb6..d00fe545 100644 --- a/third_party/proto/cosmos/slashing/v1beta1/slashing.proto +++ b/third_party/proto/cosmos/slashing/v1beta1/slashing.proto @@ -1,17 +1,18 @@ syntax = "proto3"; -package cosmos.slashing.v1beta1; -option go_package = "github.com/cosmos/cosmos-sdk/x/slashing/types"; -option (gogoproto.equal_all) = true; +package cosmos.slashing.v1beta1; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; +option go_package = "github.com/cosmos/cosmos-sdk/x/slashing/types"; +option (gogoproto.equal_all) = true; + // ValidatorSigningInfo defines a validator's signing info for monitoring their // liveness activity. message ValidatorSigningInfo { - option (gogoproto.equal) = true; + option (gogoproto.equal) = true; option (gogoproto.goproto_stringer) = false; string address = 1; @@ -22,8 +23,11 @@ message ValidatorSigningInfo { // `SignedBlocksWindow` param determines the index in the `MissedBlocksBitArray`. int64 index_offset = 3 [(gogoproto.moretags) = "yaml:\"index_offset\""]; // Timestamp until which the validator is jailed due to liveness downtime. - google.protobuf.Timestamp jailed_until = 4 - [(gogoproto.moretags) = "yaml:\"jailed_until\"", (gogoproto.stdtime) = true, (gogoproto.nullable) = false]; + google.protobuf.Timestamp jailed_until = 4 [ + (gogoproto.moretags) = "yaml:\"jailed_until\"", + (gogoproto.stdtime) = true, + (gogoproto.nullable) = false + ]; // Whether or not a validator has been tombstoned (killed out of validator set). It is set // once the validator commits an equivocation or for any other configured misbehiavor. bool tombstoned = 5; @@ -34,25 +38,25 @@ message ValidatorSigningInfo { // Params represents the parameters used for by the slashing module. message Params { - int64 signed_blocks_window = 1 [(gogoproto.moretags) = "yaml:\"signed_blocks_window\""]; + int64 signed_blocks_window = 1 [(gogoproto.moretags) = "yaml:\"signed_blocks_window\""]; bytes min_signed_per_window = 2 [ - (gogoproto.moretags) = "yaml:\"min_signed_per_window\"", + (gogoproto.moretags) = "yaml:\"min_signed_per_window\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false + (gogoproto.nullable) = false ]; google.protobuf.Duration downtime_jail_duration = 3 [ - (gogoproto.nullable) = false, + (gogoproto.nullable) = false, (gogoproto.stdduration) = true, - (gogoproto.moretags) = "yaml:\"downtime_jail_duration\"" + (gogoproto.moretags) = "yaml:\"downtime_jail_duration\"" ]; bytes slash_fraction_double_sign = 4 [ - (gogoproto.moretags) = "yaml:\"slash_fraction_double_sign\"", + (gogoproto.moretags) = "yaml:\"slash_fraction_double_sign\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false + (gogoproto.nullable) = false ]; bytes slash_fraction_downtime = 5 [ - (gogoproto.moretags) = "yaml:\"slash_fraction_downtime\"", + (gogoproto.moretags) = "yaml:\"slash_fraction_downtime\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false + (gogoproto.nullable) = false ]; } diff --git a/third_party/proto/cosmos/slashing/v1beta1/tx.proto b/third_party/proto/cosmos/slashing/v1beta1/tx.proto index 4d63370e..947a52bc 100644 --- a/third_party/proto/cosmos/slashing/v1beta1/tx.proto +++ b/third_party/proto/cosmos/slashing/v1beta1/tx.proto @@ -1,11 +1,12 @@ syntax = "proto3"; -package cosmos.slashing.v1beta1; -option go_package = "github.com/cosmos/cosmos-sdk/x/slashing/types"; -option (gogoproto.equal_all) = true; +package cosmos.slashing.v1beta1; import "gogoproto/gogo.proto"; +option go_package = "github.com/cosmos/cosmos-sdk/x/slashing/types"; +option (gogoproto.equal_all) = true; + // Msg defines the slashing Msg service. service Msg { // Unjail defines a method for unjailing a jailed validator, thus returning @@ -16,11 +17,14 @@ service Msg { // MsgUnjail defines the Msg/Unjail request type message MsgUnjail { - option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = true; - string validator_addr = 1 [(gogoproto.moretags) = "yaml:\"address\"", (gogoproto.jsontag) = "address"]; + string validator_addr = 1 [ + (gogoproto.moretags) = "yaml:\"address\"", + (gogoproto.jsontag) = "address" + ]; } // MsgUnjailResponse defines the Msg/Unjail response type -message MsgUnjailResponse {} \ No newline at end of file +message MsgUnjailResponse {} diff --git a/third_party/proto/cosmos/staking/v1beta1/authz.proto b/third_party/proto/cosmos/staking/v1beta1/authz.proto index d50c329c..3e6bafeb 100644 --- a/third_party/proto/cosmos/staking/v1beta1/authz.proto +++ b/third_party/proto/cosmos/staking/v1beta1/authz.proto @@ -1,9 +1,10 @@ syntax = "proto3"; + package cosmos.staking.v1beta1; -import "gogoproto/gogo.proto"; -import "cosmos_proto/cosmos.proto"; import "cosmos/base/v1beta1/coin.proto"; +import "cosmos_proto/cosmos.proto"; +import "gogoproto/gogo.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/staking/types"; diff --git a/third_party/proto/cosmos/staking/v1beta1/genesis.proto b/third_party/proto/cosmos/staking/v1beta1/genesis.proto index d1563dbc..ea937a53 100644 --- a/third_party/proto/cosmos/staking/v1beta1/genesis.proto +++ b/third_party/proto/cosmos/staking/v1beta1/genesis.proto @@ -1,10 +1,11 @@ syntax = "proto3"; -package cosmos.staking.v1beta1; -option go_package = "github.com/cosmos/cosmos-sdk/x/staking/types"; +package cosmos.staking.v1beta1; -import "gogoproto/gogo.proto"; import "cosmos/staking/v1beta1/staking.proto"; +import "gogoproto/gogo.proto"; + +option go_package = "github.com/cosmos/cosmos-sdk/x/staking/types"; // GenesisState defines the staking module's genesis state. message GenesisState { @@ -15,14 +16,16 @@ message GenesisState { // the previous end block. bytes last_total_power = 2 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", - (gogoproto.moretags) = "yaml:\"last_total_power\"", - (gogoproto.nullable) = false + (gogoproto.moretags) = "yaml:\"last_total_power\"", + (gogoproto.nullable) = false ]; // last_validator_powers is a special index that provides a historical list // of the last-block's bonded validators. - repeated LastValidatorPower last_validator_powers = 3 - [(gogoproto.moretags) = "yaml:\"last_validator_powers\"", (gogoproto.nullable) = false]; + repeated LastValidatorPower last_validator_powers = 3 [ + (gogoproto.moretags) = "yaml:\"last_validator_powers\"", + (gogoproto.nullable) = false + ]; // delegations defines the validator set at genesis. repeated Validator validators = 4 [(gogoproto.nullable) = false]; @@ -31,8 +34,10 @@ message GenesisState { repeated Delegation delegations = 5 [(gogoproto.nullable) = false]; // unbonding_delegations defines the unbonding delegations active at genesis. - repeated UnbondingDelegation unbonding_delegations = 6 - [(gogoproto.moretags) = "yaml:\"unbonding_delegations\"", (gogoproto.nullable) = false]; + repeated UnbondingDelegation unbonding_delegations = 6 [ + (gogoproto.moretags) = "yaml:\"unbonding_delegations\"", + (gogoproto.nullable) = false + ]; // redelegations defines the redelegations active at genesis. repeated Redelegation redelegations = 7 [(gogoproto.nullable) = false]; @@ -42,7 +47,7 @@ message GenesisState { // LastValidatorPower required for validator set update logic. message LastValidatorPower { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // address is the address of the validator. diff --git a/third_party/proto/cosmos/staking/v1beta1/query.proto b/third_party/proto/cosmos/staking/v1beta1/query.proto index 4852c535..025f47c7 100644 --- a/third_party/proto/cosmos/staking/v1beta1/query.proto +++ b/third_party/proto/cosmos/staking/v1beta1/query.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + package cosmos.staking.v1beta1; import "cosmos/base/query/v1beta1/pagination.proto"; +import "cosmos/staking/v1beta1/staking.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -import "cosmos/staking/v1beta1/staking.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/staking/types"; @@ -26,23 +27,25 @@ service Query { } // ValidatorUnbondingDelegations queries unbonding delegations of a validator. - rpc ValidatorUnbondingDelegations(QueryValidatorUnbondingDelegationsRequest) - returns (QueryValidatorUnbondingDelegationsResponse) { - option (google.api.http).get = "/cosmos/staking/v1beta1/validators/" - "{validator_addr}/unbonding_delegations"; + rpc ValidatorUnbondingDelegations(QueryValidatorUnbondingDelegationsRequest) returns (QueryValidatorUnbondingDelegationsResponse) { + option (google.api.http).get = + "/cosmos/staking/v1beta1/validators/" + "{validator_addr}/unbonding_delegations"; } // Delegation queries delegate info for given validator delegator pair. rpc Delegation(QueryDelegationRequest) returns (QueryDelegationResponse) { - option (google.api.http).get = "/cosmos/staking/v1beta1/validators/{validator_addr}/delegations/" - "{delegator_addr}"; + option (google.api.http).get = + "/cosmos/staking/v1beta1/validators/{validator_addr}/delegations/" + "{delegator_addr}"; } // UnbondingDelegation queries unbonding info for given validator delegator // pair. rpc UnbondingDelegation(QueryUnbondingDelegationRequest) returns (QueryUnbondingDelegationResponse) { - option (google.api.http).get = "/cosmos/staking/v1beta1/validators/{validator_addr}/delegations/" - "{delegator_addr}/unbonding_delegation"; + option (google.api.http).get = + "/cosmos/staking/v1beta1/validators/{validator_addr}/delegations/" + "{delegator_addr}/unbonding_delegation"; } // DelegatorDelegations queries all delegations of a given delegator address. @@ -52,10 +55,10 @@ service Query { // DelegatorUnbondingDelegations queries all unbonding delegations of a given // delegator address. - rpc DelegatorUnbondingDelegations(QueryDelegatorUnbondingDelegationsRequest) - returns (QueryDelegatorUnbondingDelegationsResponse) { - option (google.api.http).get = "/cosmos/staking/v1beta1/delegators/" - "{delegator_addr}/unbonding_delegations"; + rpc DelegatorUnbondingDelegations(QueryDelegatorUnbondingDelegationsRequest) returns (QueryDelegatorUnbondingDelegationsResponse) { + option (google.api.http).get = + "/cosmos/staking/v1beta1/delegators/" + "{delegator_addr}/unbonding_delegations"; } // Redelegations queries redelegations of given address. @@ -72,8 +75,9 @@ service Query { // DelegatorValidator queries validator info for given delegator validator // pair. rpc DelegatorValidator(QueryDelegatorValidatorRequest) returns (QueryDelegatorValidatorResponse) { - option (google.api.http).get = "/cosmos/staking/v1beta1/delegators/{delegator_addr}/validators/" - "{validator_addr}"; + option (google.api.http).get = + "/cosmos/staking/v1beta1/delegators/{delegator_addr}/validators/" + "{validator_addr}"; } // HistoricalInfo queries the historical info for given height. @@ -135,8 +139,10 @@ message QueryValidatorDelegationsRequest { // QueryValidatorDelegationsResponse is response type for the // Query/ValidatorDelegations RPC method message QueryValidatorDelegationsResponse { - repeated DelegationResponse delegation_responses = 1 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "DelegationResponses"]; + repeated DelegationResponse delegation_responses = 1 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "DelegationResponses" + ]; // pagination defines the pagination in the response. cosmos.base.query.v1beta1.PageResponse pagination = 2; @@ -163,7 +169,7 @@ message QueryValidatorUnbondingDelegationsResponse { // QueryDelegationRequest is request type for the Query/Delegation RPC method. message QueryDelegationRequest { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // delegator_addr defines the delegator address to query for. @@ -182,7 +188,7 @@ message QueryDelegationResponse { // QueryUnbondingDelegationRequest is request type for the // Query/UnbondingDelegation RPC method. message QueryUnbondingDelegationRequest { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // delegator_addr defines the delegator address to query for. @@ -202,7 +208,7 @@ message QueryUnbondingDelegationResponse { // QueryDelegatorDelegationsRequest is request type for the // Query/DelegatorDelegations RPC method. message QueryDelegatorDelegationsRequest { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // delegator_addr defines the delegator address to query for. @@ -225,7 +231,7 @@ message QueryDelegatorDelegationsResponse { // QueryDelegatorUnbondingDelegationsRequest is request type for the // Query/DelegatorUnbondingDelegations RPC method. message QueryDelegatorUnbondingDelegationsRequest { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // delegator_addr defines the delegator address to query for. @@ -247,7 +253,7 @@ message QueryDelegatorUnbondingDelegationsResponse { // QueryRedelegationsRequest is request type for the Query/Redelegations RPC // method. message QueryRedelegationsRequest { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // delegator_addr defines the delegator address to query for. @@ -275,7 +281,7 @@ message QueryRedelegationsResponse { // QueryDelegatorValidatorsRequest is request type for the // Query/DelegatorValidators RPC method. message QueryDelegatorValidatorsRequest { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // delegator_addr defines the delegator address to query for. @@ -298,7 +304,7 @@ message QueryDelegatorValidatorsResponse { // QueryDelegatorValidatorRequest is request type for the // Query/DelegatorValidator RPC method. message QueryDelegatorValidatorRequest { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // delegator_addr defines the delegator address to query for. diff --git a/third_party/proto/cosmos/staking/v1beta1/staking.proto b/third_party/proto/cosmos/staking/v1beta1/staking.proto index 76e9599e..9c6213ba 100644 --- a/third_party/proto/cosmos/staking/v1beta1/staking.proto +++ b/third_party/proto/cosmos/staking/v1beta1/staking.proto @@ -1,13 +1,13 @@ syntax = "proto3"; + package cosmos.staking.v1beta1; +import "cosmos/base/v1beta1/coin.proto"; +import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; - -import "cosmos_proto/cosmos.proto"; -import "cosmos/base/v1beta1/coin.proto"; import "tendermint/types/types.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/staking/types"; @@ -18,46 +18,55 @@ option go_package = "github.com/cosmos/cosmos-sdk/x/staking/types"; // (`n` is set by the staking module's `historical_entries` parameter). message HistoricalInfo { tendermint.types.Header header = 1 [(gogoproto.nullable) = false]; - repeated Validator valset = 2 [(gogoproto.nullable) = false]; + repeated Validator valset = 2 [(gogoproto.nullable) = false]; } // CommissionRates defines the initial commission rates to be used for creating // a validator. message CommissionRates { - option (gogoproto.equal) = true; + option (gogoproto.equal) = true; option (gogoproto.goproto_stringer) = false; // rate is the commission rate charged to delegators, as a fraction. - string rate = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; + string rate = 1 [ + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; // max_rate defines the maximum commission rate which validator can ever charge, as a fraction. string max_rate = 2 [ - (gogoproto.moretags) = "yaml:\"max_rate\"", + (gogoproto.moretags) = "yaml:\"max_rate\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false + (gogoproto.nullable) = false ]; // max_change_rate defines the maximum daily increase of the validator commission, as a fraction. string max_change_rate = 3 [ - (gogoproto.moretags) = "yaml:\"max_change_rate\"", + (gogoproto.moretags) = "yaml:\"max_change_rate\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false + (gogoproto.nullable) = false ]; } // Commission defines commission parameters for a given validator. message Commission { - option (gogoproto.equal) = true; + option (gogoproto.equal) = true; option (gogoproto.goproto_stringer) = false; // commission_rates defines the initial commission rates to be used for creating a validator. - CommissionRates commission_rates = 1 [(gogoproto.embed) = true, (gogoproto.nullable) = false]; + CommissionRates commission_rates = 1 [ + (gogoproto.embed) = true, + (gogoproto.nullable) = false + ]; // update_time is the last time the commission rate was changed. - google.protobuf.Timestamp update_time = 2 - [(gogoproto.nullable) = false, (gogoproto.stdtime) = true, (gogoproto.moretags) = "yaml:\"update_time\""]; + google.protobuf.Timestamp update_time = 2 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true, + (gogoproto.moretags) = "yaml:\"update_time\"" + ]; } // Description defines a validator description. message Description { - option (gogoproto.equal) = true; + option (gogoproto.equal) = true; option (gogoproto.goproto_stringer) = false; // moniker defines a human-readable name for the validator. @@ -81,41 +90,49 @@ message Description { // exchange rate. Voting power can be calculated as total bonded shares // multiplied by exchange rate. message Validator { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_stringer) = false; - option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_getters) = false; // operator_address defines the address of the validator's operator; bech encoded in JSON. string operator_address = 1 [(gogoproto.moretags) = "yaml:\"operator_address\""]; // consensus_pubkey is the consensus public key of the validator, as a Protobuf Any. - google.protobuf.Any consensus_pubkey = 2 - [(cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey", (gogoproto.moretags) = "yaml:\"consensus_pubkey\""]; + google.protobuf.Any consensus_pubkey = 2 [ + (cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey", + (gogoproto.moretags) = "yaml:\"consensus_pubkey\"" + ]; // jailed defined whether the validator has been jailed from bonded status or not. bool jailed = 3; // status is the validator status (bonded/unbonding/unbonded). BondStatus status = 4; // tokens define the delegated tokens (incl. self-delegation). - string tokens = 5 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false]; + string tokens = 5 [ + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false + ]; // delegator_shares defines total shares issued to a validator's delegators. string delegator_shares = 6 [ - (gogoproto.moretags) = "yaml:\"delegator_shares\"", + (gogoproto.moretags) = "yaml:\"delegator_shares\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false + (gogoproto.nullable) = false ]; // description defines the description terms for the validator. Description description = 7 [(gogoproto.nullable) = false]; // unbonding_height defines, if unbonding, the height at which this validator has begun unbonding. int64 unbonding_height = 8 [(gogoproto.moretags) = "yaml:\"unbonding_height\""]; // unbonding_time defines, if unbonding, the min time for the validator to complete unbonding. - google.protobuf.Timestamp unbonding_time = 9 - [(gogoproto.nullable) = false, (gogoproto.stdtime) = true, (gogoproto.moretags) = "yaml:\"unbonding_time\""]; + google.protobuf.Timestamp unbonding_time = 9 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true, + (gogoproto.moretags) = "yaml:\"unbonding_time\"" + ]; // commission defines the commission parameters. Commission commission = 10 [(gogoproto.nullable) = false]; // min_self_delegation is the validator's self declared minimum self delegation. string min_self_delegation = 11 [ - (gogoproto.moretags) = "yaml:\"min_self_delegation\"", + (gogoproto.moretags) = "yaml:\"min_self_delegation\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", - (gogoproto.nullable) = false + (gogoproto.nullable) = false ]; } @@ -136,7 +153,7 @@ enum BondStatus { // ValAddresses defines a repeated set of validator addresses. message ValAddresses { option (gogoproto.goproto_stringer) = false; - option (gogoproto.stringer) = true; + option (gogoproto.stringer) = true; repeated string addresses = 1; } @@ -145,8 +162,8 @@ message ValAddresses { // It is intended to be used as a marshalable pointer. For example, a DVPair can // be used to construct the key to getting an UnbondingDelegation from state. message DVPair { - option (gogoproto.equal) = false; - option (gogoproto.goproto_getters) = false; + option (gogoproto.equal) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; string delegator_address = 1 [(gogoproto.moretags) = "yaml:\"delegator_address\""]; @@ -163,11 +180,11 @@ message DVPairs { // example, a DVVTriplet can be used to construct the key to getting a // Redelegation from state. message DVVTriplet { - option (gogoproto.equal) = false; - option (gogoproto.goproto_getters) = false; + option (gogoproto.equal) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; - string delegator_address = 1 [(gogoproto.moretags) = "yaml:\"delegator_address\""]; + string delegator_address = 1 [(gogoproto.moretags) = "yaml:\"delegator_address\""]; string validator_src_address = 2 [(gogoproto.moretags) = "yaml:\"validator_src_address\""]; string validator_dst_address = 3 [(gogoproto.moretags) = "yaml:\"validator_dst_address\""]; } @@ -181,8 +198,8 @@ message DVVTriplets { // owned by one delegator, and is associated with the voting power of one // validator. message Delegation { - option (gogoproto.equal) = false; - option (gogoproto.goproto_getters) = false; + option (gogoproto.equal) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; // delegator_address is the bech32-encoded address of the delegator. @@ -190,14 +207,17 @@ message Delegation { // validator_address is the bech32-encoded address of the validator. string validator_address = 2 [(gogoproto.moretags) = "yaml:\"validator_address\""]; // shares define the delegation shares received. - string shares = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; + string shares = 3 [ + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; } // UnbondingDelegation stores all of a single delegator's unbonding bonds // for a single validator in an time-ordered list. message UnbondingDelegation { - option (gogoproto.equal) = false; - option (gogoproto.goproto_getters) = false; + option (gogoproto.equal) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; // delegator_address is the bech32-encoded address of the delegator. @@ -210,50 +230,61 @@ message UnbondingDelegation { // UnbondingDelegationEntry defines an unbonding object with relevant metadata. message UnbondingDelegationEntry { - option (gogoproto.equal) = true; + option (gogoproto.equal) = true; option (gogoproto.goproto_stringer) = false; // creation_height is the height which the unbonding took place. int64 creation_height = 1 [(gogoproto.moretags) = "yaml:\"creation_height\""]; // completion_time is the unix time for unbonding completion. - google.protobuf.Timestamp completion_time = 2 - [(gogoproto.nullable) = false, (gogoproto.stdtime) = true, (gogoproto.moretags) = "yaml:\"completion_time\""]; + google.protobuf.Timestamp completion_time = 2 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true, + (gogoproto.moretags) = "yaml:\"completion_time\"" + ]; // initial_balance defines the tokens initially scheduled to receive at completion. string initial_balance = 3 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"initial_balance\"" + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"initial_balance\"" ]; // balance defines the tokens to receive at completion. - string balance = 4 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false]; + string balance = 4 [ + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false + ]; } // RedelegationEntry defines a redelegation object with relevant metadata. message RedelegationEntry { - option (gogoproto.equal) = true; + option (gogoproto.equal) = true; option (gogoproto.goproto_stringer) = false; // creation_height defines the height which the redelegation took place. int64 creation_height = 1 [(gogoproto.moretags) = "yaml:\"creation_height\""]; // completion_time defines the unix time for redelegation completion. - google.protobuf.Timestamp completion_time = 2 - [(gogoproto.nullable) = false, (gogoproto.stdtime) = true, (gogoproto.moretags) = "yaml:\"completion_time\""]; + google.protobuf.Timestamp completion_time = 2 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true, + (gogoproto.moretags) = "yaml:\"completion_time\"" + ]; // initial_balance defines the initial balance when redelegation started. string initial_balance = 3 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"initial_balance\"" + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"initial_balance\"" ]; // shares_dst is the amount of destination-validator shares created by redelegation. - string shares_dst = 4 - [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; + string shares_dst = 4 [ + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; } // Redelegation contains the list of a particular delegator's redelegating bonds // from a particular source validator to a particular destination validator. message Redelegation { - option (gogoproto.equal) = false; - option (gogoproto.goproto_getters) = false; + option (gogoproto.equal) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; // delegator_address is the bech32-encoded address of the delegator. @@ -268,12 +299,15 @@ message Redelegation { // Params defines the parameters for the staking module. message Params { - option (gogoproto.equal) = true; + option (gogoproto.equal) = true; option (gogoproto.goproto_stringer) = false; // unbonding_time is the time duration of unbonding. - google.protobuf.Duration unbonding_time = 1 - [(gogoproto.nullable) = false, (gogoproto.stdduration) = true, (gogoproto.moretags) = "yaml:\"unbonding_time\""]; + google.protobuf.Duration unbonding_time = 1 [ + (gogoproto.nullable) = false, + (gogoproto.stdduration) = true, + (gogoproto.moretags) = "yaml:\"unbonding_time\"" + ]; // max_validators is the maximum number of validators. uint32 max_validators = 2 [(gogoproto.moretags) = "yaml:\"max_validators\""]; // max_entries is the max entries for either unbonding delegation or redelegation (per pair/trio). @@ -287,7 +321,7 @@ message Params { // DelegationResponse is equivalent to Delegation except that it contains a // balance in addition to shares which is more suitable for client responses. message DelegationResponse { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_stringer) = false; Delegation delegation = 1 [(gogoproto.nullable) = false]; @@ -302,7 +336,10 @@ message RedelegationEntryResponse { option (gogoproto.equal) = true; RedelegationEntry redelegation_entry = 1 [(gogoproto.nullable) = false]; - string balance = 4 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false]; + string balance = 4 [ + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false + ]; } // RedelegationResponse is equivalent to a Redelegation except that its entries @@ -311,24 +348,24 @@ message RedelegationEntryResponse { message RedelegationResponse { option (gogoproto.equal) = false; - Redelegation redelegation = 1 [(gogoproto.nullable) = false]; - repeated RedelegationEntryResponse entries = 2 [(gogoproto.nullable) = false]; + Redelegation redelegation = 1 [(gogoproto.nullable) = false]; + repeated RedelegationEntryResponse entries = 2 [(gogoproto.nullable) = false]; } // Pool is used for tracking bonded and not-bonded token supply of the bond // denomination. message Pool { option (gogoproto.description) = true; - option (gogoproto.equal) = true; - string not_bonded_tokens = 1 [ + option (gogoproto.equal) = true; + string not_bonded_tokens = 1 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", - (gogoproto.jsontag) = "not_bonded_tokens", - (gogoproto.nullable) = false + (gogoproto.jsontag) = "not_bonded_tokens", + (gogoproto.nullable) = false ]; string bonded_tokens = 2 [ - (gogoproto.jsontag) = "bonded_tokens", + (gogoproto.jsontag) = "bonded_tokens", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"bonded_tokens\"" + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"bonded_tokens\"" ]; } diff --git a/third_party/proto/cosmos/staking/v1beta1/tx.proto b/third_party/proto/cosmos/staking/v1beta1/tx.proto index 7b05d89e..843235fd 100644 --- a/third_party/proto/cosmos/staking/v1beta1/tx.proto +++ b/third_party/proto/cosmos/staking/v1beta1/tx.proto @@ -1,13 +1,13 @@ syntax = "proto3"; -package cosmos.staking.v1beta1; -import "google/protobuf/any.proto"; -import "google/protobuf/timestamp.proto"; -import "gogoproto/gogo.proto"; +package cosmos.staking.v1beta1; -import "cosmos_proto/cosmos.proto"; import "cosmos/base/v1beta1/coin.proto"; import "cosmos/staking/v1beta1/staking.proto"; +import "cosmos_proto/cosmos.proto"; +import "gogoproto/gogo.proto"; +import "google/protobuf/any.proto"; +import "google/protobuf/timestamp.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/staking/types"; @@ -34,20 +34,20 @@ service Msg { // MsgCreateValidator defines a SDK message for creating a new validator. message MsgCreateValidator { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - Description description = 1 [(gogoproto.nullable) = false]; - CommissionRates commission = 2 [(gogoproto.nullable) = false]; - string min_self_delegation = 3 [ + Description description = 1 [(gogoproto.nullable) = false]; + CommissionRates commission = 2 [(gogoproto.nullable) = false]; + string min_self_delegation = 3 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", - (gogoproto.moretags) = "yaml:\"min_self_delegation\"", - (gogoproto.nullable) = false + (gogoproto.moretags) = "yaml:\"min_self_delegation\"", + (gogoproto.nullable) = false ]; - string delegator_address = 4 [(gogoproto.moretags) = "yaml:\"delegator_address\""]; - string validator_address = 5 [(gogoproto.moretags) = "yaml:\"validator_address\""]; - google.protobuf.Any pubkey = 6 [(cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey"]; - cosmos.base.v1beta1.Coin value = 7 [(gogoproto.nullable) = false]; + string delegator_address = 4 [(gogoproto.moretags) = "yaml:\"delegator_address\""]; + string validator_address = 5 [(gogoproto.moretags) = "yaml:\"validator_address\""]; + google.protobuf.Any pubkey = 6 [(cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey"]; + cosmos.base.v1beta1.Coin value = 7 [(gogoproto.nullable) = false]; } // MsgCreateValidatorResponse defines the Msg/CreateValidator response type. @@ -55,11 +55,11 @@ message MsgCreateValidatorResponse {} // MsgEditValidator defines a SDK message for editing an existing validator. message MsgEditValidator { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - Description description = 1 [(gogoproto.nullable) = false]; - string validator_address = 2 [(gogoproto.moretags) = "yaml:\"address\""]; + Description description = 1 [(gogoproto.nullable) = false]; + string validator_address = 2 [(gogoproto.moretags) = "yaml:\"address\""]; // We pass a reference to the new commission rate and min self delegation as // it's not mandatory to update. If not updated, the deserialized rate will be @@ -67,11 +67,11 @@ message MsgEditValidator { // REF: #2373 string commission_rate = 3 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.moretags) = "yaml:\"commission_rate\"" + (gogoproto.moretags) = "yaml:\"commission_rate\"" ]; string min_self_delegation = 4 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", - (gogoproto.moretags) = "yaml:\"min_self_delegation\"" + (gogoproto.moretags) = "yaml:\"min_self_delegation\"" ]; } @@ -81,12 +81,12 @@ message MsgEditValidatorResponse {} // MsgDelegate defines a SDK message for performing a delegation of coins // from a delegator to a validator. message MsgDelegate { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string delegator_address = 1 [(gogoproto.moretags) = "yaml:\"delegator_address\""]; - string validator_address = 2 [(gogoproto.moretags) = "yaml:\"validator_address\""]; - cosmos.base.v1beta1.Coin amount = 3 [(gogoproto.nullable) = false]; + string delegator_address = 1 [(gogoproto.moretags) = "yaml:\"delegator_address\""]; + string validator_address = 2 [(gogoproto.moretags) = "yaml:\"validator_address\""]; + cosmos.base.v1beta1.Coin amount = 3 [(gogoproto.nullable) = false]; } // MsgDelegateResponse defines the Msg/Delegate response type. @@ -95,32 +95,38 @@ message MsgDelegateResponse {} // MsgBeginRedelegate defines a SDK message for performing a redelegation // of coins from a delegator and source validator to a destination validator. message MsgBeginRedelegate { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string delegator_address = 1 [(gogoproto.moretags) = "yaml:\"delegator_address\""]; - string validator_src_address = 2 [(gogoproto.moretags) = "yaml:\"validator_src_address\""]; - string validator_dst_address = 3 [(gogoproto.moretags) = "yaml:\"validator_dst_address\""]; - cosmos.base.v1beta1.Coin amount = 4 [(gogoproto.nullable) = false]; + string delegator_address = 1 [(gogoproto.moretags) = "yaml:\"delegator_address\""]; + string validator_src_address = 2 [(gogoproto.moretags) = "yaml:\"validator_src_address\""]; + string validator_dst_address = 3 [(gogoproto.moretags) = "yaml:\"validator_dst_address\""]; + cosmos.base.v1beta1.Coin amount = 4 [(gogoproto.nullable) = false]; } // MsgBeginRedelegateResponse defines the Msg/BeginRedelegate response type. message MsgBeginRedelegateResponse { - google.protobuf.Timestamp completion_time = 1 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; + google.protobuf.Timestamp completion_time = 1 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true + ]; } // MsgUndelegate defines a SDK message for performing an undelegation from a // delegate and a validator. message MsgUndelegate { - option (gogoproto.equal) = false; + option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string delegator_address = 1 [(gogoproto.moretags) = "yaml:\"delegator_address\""]; - string validator_address = 2 [(gogoproto.moretags) = "yaml:\"validator_address\""]; - cosmos.base.v1beta1.Coin amount = 3 [(gogoproto.nullable) = false]; + string delegator_address = 1 [(gogoproto.moretags) = "yaml:\"delegator_address\""]; + string validator_address = 2 [(gogoproto.moretags) = "yaml:\"validator_address\""]; + cosmos.base.v1beta1.Coin amount = 3 [(gogoproto.nullable) = false]; } // MsgUndelegateResponse defines the Msg/Undelegate response type. message MsgUndelegateResponse { - google.protobuf.Timestamp completion_time = 1 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; + google.protobuf.Timestamp completion_time = 1 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true + ]; } diff --git a/third_party/proto/cosmos/tx/signing/v1beta1/signing.proto b/third_party/proto/cosmos/tx/signing/v1beta1/signing.proto index c76c231a..44026ad1 100644 --- a/third_party/proto/cosmos/tx/signing/v1beta1/signing.proto +++ b/third_party/proto/cosmos/tx/signing/v1beta1/signing.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package cosmos.tx.signing.v1beta1; import "cosmos/crypto/multisig/v1beta1/multisig.proto"; @@ -27,7 +28,7 @@ enum SignMode { // SIGN_MODE_EIP_191 specifies the sign mode for EIP 191 signing on the Cosmos // SDK. Ref: https://eips.ethereum.org/EIPS/eip-191 - // + // // Currently, SIGN_MODE_EIP_191 is registered as a SignMode enum variant, // but is not implemented on the SDK by default. To enable EIP-191, you need // to pass a custom `TxConfig` that has an implementation of diff --git a/third_party/proto/cosmos/tx/v1beta1/service.proto b/third_party/proto/cosmos/tx/v1beta1/service.proto index 7a014f4b..cf9cf583 100644 --- a/third_party/proto/cosmos/tx/v1beta1/service.proto +++ b/third_party/proto/cosmos/tx/v1beta1/service.proto @@ -1,16 +1,17 @@ syntax = "proto3"; + package cosmos.tx.v1beta1; -import "google/api/annotations.proto"; import "cosmos/base/abci/v1beta1/abci.proto"; +import "cosmos/base/query/v1beta1/pagination.proto"; import "cosmos/tx/v1beta1/tx.proto"; import "gogoproto/gogo.proto"; -import "cosmos/base/query/v1beta1/pagination.proto"; +import "google/api/annotations.proto"; import "tendermint/types/block.proto"; import "tendermint/types/types.proto"; +option go_package = "github.com/cosmos/cosmos-sdk/types/tx"; option (gogoproto.goproto_registration) = true; -option go_package = "github.com/cosmos/cosmos-sdk/types/tx"; // Service defines a gRPC service for interacting with transactions. service Service { @@ -51,7 +52,7 @@ message GetTxsEventRequest { repeated string events = 1; // pagination defines a pagination for the request. cosmos.base.query.v1beta1.PageRequest pagination = 2; - OrderBy order_by = 3; + OrderBy order_by = 3; } // OrderBy defines the sorting order @@ -79,8 +80,8 @@ message GetTxsEventResponse { // RPC method. message BroadcastTxRequest { // tx_bytes is the raw transaction. - bytes tx_bytes = 1; - BroadcastMode mode = 2; + bytes tx_bytes = 1; + BroadcastMode mode = 2; } // BroadcastMode specifies the broadcast mode for the TxService.Broadcast RPC method. @@ -159,7 +160,7 @@ message GetBlockWithTxsResponse { // txs are the transactions in the block. repeated cosmos.tx.v1beta1.Tx txs = 1; .tendermint.types.BlockID block_id = 2; - .tendermint.types.Block block = 3; + .tendermint.types.Block block = 3; // pagination defines a pagination for the response. cosmos.base.query.v1beta1.PageResponse pagination = 4; -} \ No newline at end of file +} diff --git a/third_party/proto/cosmos/tx/v1beta1/tx.proto b/third_party/proto/cosmos/tx/v1beta1/tx.proto index 6d5caf12..0c2abb5a 100644 --- a/third_party/proto/cosmos/tx/v1beta1/tx.proto +++ b/third_party/proto/cosmos/tx/v1beta1/tx.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + package cosmos.tx.v1beta1; -import "gogoproto/gogo.proto"; -import "cosmos/crypto/multisig/v1beta1/multisig.proto"; import "cosmos/base/v1beta1/coin.proto"; +import "cosmos/crypto/multisig/v1beta1/multisig.proto"; import "cosmos/tx/signing/v1beta1/signing.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; option go_package = "github.com/cosmos/cosmos-sdk/types/tx"; @@ -164,8 +165,10 @@ message ModeInfo { // which must be above some miminum to be accepted into the mempool. message Fee { // amount is the amount of coins to be paid as a fee - repeated cosmos.base.v1beta1.Coin amount = 1 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + repeated cosmos.base.v1beta1.Coin amount = 1 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; // gas_limit is the maximum gas that can be used in transaction processing // before an out of gas error occurs diff --git a/third_party/proto/cosmos/upgrade/v1beta1/query.proto b/third_party/proto/cosmos/upgrade/v1beta1/query.proto index dd14ba64..9c3d88f0 100644 --- a/third_party/proto/cosmos/upgrade/v1beta1/query.proto +++ b/third_party/proto/cosmos/upgrade/v1beta1/query.proto @@ -1,9 +1,10 @@ syntax = "proto3"; + package cosmos.upgrade.v1beta1; -import "google/protobuf/any.proto"; -import "google/api/annotations.proto"; import "cosmos/upgrade/v1beta1/upgrade.proto"; +import "google/api/annotations.proto"; +import "google/protobuf/any.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/upgrade/types"; @@ -26,7 +27,7 @@ service Query { // This rpc is deprecated now that IBC has its own replacement // (https://github.com/cosmos/ibc-go/blob/2c880a22e9f9cc75f62b527ca94aa75ce1106001/proto/ibc/core/client/v1/query.proto#L54) rpc UpgradedConsensusState(QueryUpgradedConsensusStateRequest) returns (QueryUpgradedConsensusStateResponse) { - option deprecated = true; + option deprecated = true; option (google.api.http).get = "/cosmos/upgrade/v1beta1/upgraded_consensus_state/{last_height}"; } diff --git a/third_party/proto/cosmos/upgrade/v1beta1/upgrade.proto b/third_party/proto/cosmos/upgrade/v1beta1/upgrade.proto index e888b393..5e437f89 100644 --- a/third_party/proto/cosmos/upgrade/v1beta1/upgrade.proto +++ b/third_party/proto/cosmos/upgrade/v1beta1/upgrade.proto @@ -1,16 +1,17 @@ syntax = "proto3"; + package cosmos.upgrade.v1beta1; -import "google/protobuf/any.proto"; import "gogoproto/gogo.proto"; +import "google/protobuf/any.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/cosmos/cosmos-sdk/x/upgrade/types"; +option go_package = "github.com/cosmos/cosmos-sdk/x/upgrade/types"; option (gogoproto.goproto_getters_all) = false; // Plan specifies information about a planned upgrade and when it should occur. message Plan { - option (gogoproto.equal) = true; + option (gogoproto.equal) = true; option (gogoproto.goproto_stringer) = false; // Sets the name for the upgrade. This name will be used by the upgraded @@ -25,7 +26,11 @@ message Plan { // Deprecated: Time based upgrades have been deprecated. Time based upgrade logic // has been removed from the SDK. // If this field is not empty, an error will be thrown. - google.protobuf.Timestamp time = 2 [deprecated = true, (gogoproto.stdtime) = true, (gogoproto.nullable) = false]; + google.protobuf.Timestamp time = 2 [ + deprecated = true, + (gogoproto.stdtime) = true, + (gogoproto.nullable) = false + ]; // The height at which the upgrade must be performed. // Only used if Time is not set. @@ -38,28 +43,30 @@ message Plan { // Deprecated: UpgradedClientState field has been deprecated. IBC upgrade logic has been // moved to the IBC module in the sub module 02-client. // If this field is not empty, an error will be thrown. - google.protobuf.Any upgraded_client_state = 5 - [deprecated = true, (gogoproto.moretags) = "yaml:\"upgraded_client_state\""]; + google.protobuf.Any upgraded_client_state = 5 [ + deprecated = true, + (gogoproto.moretags) = "yaml:\"upgraded_client_state\"" + ]; } // SoftwareUpgradeProposal is a gov Content type for initiating a software // upgrade. message SoftwareUpgradeProposal { - option (gogoproto.equal) = true; + option (gogoproto.equal) = true; option (gogoproto.goproto_stringer) = false; - string title = 1; + string title = 1; string description = 2; - Plan plan = 3 [(gogoproto.nullable) = false]; + Plan plan = 3 [(gogoproto.nullable) = false]; } // CancelSoftwareUpgradeProposal is a gov Content type for cancelling a software // upgrade. message CancelSoftwareUpgradeProposal { - option (gogoproto.equal) = true; + option (gogoproto.equal) = true; option (gogoproto.goproto_stringer) = false; - string title = 1; + string title = 1; string description = 2; } @@ -67,7 +74,7 @@ message CancelSoftwareUpgradeProposal { // // Since: cosmos-sdk 0.43 message ModuleVersion { - option (gogoproto.equal) = true; + option (gogoproto.equal) = true; option (gogoproto.goproto_stringer) = true; // name of the app module diff --git a/third_party/proto/cosmos/vesting/v1beta1/tx.proto b/third_party/proto/cosmos/vesting/v1beta1/tx.proto index c49be802..b84936ff 100644 --- a/third_party/proto/cosmos/vesting/v1beta1/tx.proto +++ b/third_party/proto/cosmos/vesting/v1beta1/tx.proto @@ -1,8 +1,9 @@ syntax = "proto3"; + package cosmos.vesting.v1beta1; -import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; +import "gogoproto/gogo.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"; @@ -18,14 +19,16 @@ service Msg { message MsgCreateVestingAccount { option (gogoproto.equal) = true; - string from_address = 1 [(gogoproto.moretags) = "yaml:\"from_address\""]; - string to_address = 2 [(gogoproto.moretags) = "yaml:\"to_address\""]; - repeated cosmos.base.v1beta1.Coin amount = 3 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + string from_address = 1 [(gogoproto.moretags) = "yaml:\"from_address\""]; + string to_address = 2 [(gogoproto.moretags) = "yaml:\"to_address\""]; + repeated cosmos.base.v1beta1.Coin amount = 3 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; int64 end_time = 4 [(gogoproto.moretags) = "yaml:\"end_time\""]; - bool delayed = 5; + bool delayed = 5; } // MsgCreateVestingAccountResponse defines the Msg/CreateVestingAccount response type. -message MsgCreateVestingAccountResponse {} \ No newline at end of file +message MsgCreateVestingAccountResponse {} diff --git a/third_party/proto/cosmos/vesting/v1beta1/vesting.proto b/third_party/proto/cosmos/vesting/v1beta1/vesting.proto index e9f661f9..5c0ba93e 100644 --- a/third_party/proto/cosmos/vesting/v1beta1/vesting.proto +++ b/third_party/proto/cosmos/vesting/v1beta1/vesting.proto @@ -1,33 +1,34 @@ syntax = "proto3"; + package cosmos.vesting.v1beta1; -import "gogoproto/gogo.proto"; -import "cosmos/base/v1beta1/coin.proto"; import "cosmos/auth/v1beta1/auth.proto"; +import "cosmos/base/v1beta1/coin.proto"; +import "gogoproto/gogo.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"; // BaseVestingAccount implements the VestingAccount interface. It contains all // the necessary fields needed for any vesting account implementation. message BaseVestingAccount { - option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; - cosmos.auth.v1beta1.BaseAccount base_account = 1 [(gogoproto.embed) = true]; + cosmos.auth.v1beta1.BaseAccount base_account = 1 [(gogoproto.embed) = true]; repeated cosmos.base.v1beta1.Coin original_vesting = 2 [ - (gogoproto.nullable) = false, + (gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", - (gogoproto.moretags) = "yaml:\"original_vesting\"" + (gogoproto.moretags) = "yaml:\"original_vesting\"" ]; repeated cosmos.base.v1beta1.Coin delegated_free = 3 [ - (gogoproto.nullable) = false, + (gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", - (gogoproto.moretags) = "yaml:\"delegated_free\"" + (gogoproto.moretags) = "yaml:\"delegated_free\"" ]; repeated cosmos.base.v1beta1.Coin delegated_vesting = 4 [ - (gogoproto.nullable) = false, + (gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", - (gogoproto.moretags) = "yaml:\"delegated_vesting\"" + (gogoproto.moretags) = "yaml:\"delegated_vesting\"" ]; int64 end_time = 5 [(gogoproto.moretags) = "yaml:\"end_time\""]; } @@ -35,18 +36,18 @@ message BaseVestingAccount { // ContinuousVestingAccount implements the VestingAccount interface. It // continuously vests by unlocking coins linearly with respect to time. message ContinuousVestingAccount { - option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; BaseVestingAccount base_vesting_account = 1 [(gogoproto.embed) = true]; - int64 start_time = 2 [(gogoproto.moretags) = "yaml:\"start_time\""]; + int64 start_time = 2 [(gogoproto.moretags) = "yaml:\"start_time\""]; } // DelayedVestingAccount implements the VestingAccount interface. It vests all // coins after a specific time, but non prior. In other words, it keeps them // locked until a specified time. message DelayedVestingAccount { - option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; BaseVestingAccount base_vesting_account = 1 [(gogoproto.embed) = true]; @@ -56,20 +57,25 @@ message DelayedVestingAccount { message Period { option (gogoproto.goproto_stringer) = false; - int64 length = 1; - repeated cosmos.base.v1beta1.Coin amount = 2 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + int64 length = 1; + repeated cosmos.base.v1beta1.Coin amount = 2 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; } // PeriodicVestingAccount implements the VestingAccount interface. It // periodically vests by unlocking coins during each specified period. message PeriodicVestingAccount { - option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; BaseVestingAccount base_vesting_account = 1 [(gogoproto.embed) = true]; - int64 start_time = 2 [(gogoproto.moretags) = "yaml:\"start_time\""]; - repeated Period vesting_periods = 3 [(gogoproto.moretags) = "yaml:\"vesting_periods\"", (gogoproto.nullable) = false]; + int64 start_time = 2 [(gogoproto.moretags) = "yaml:\"start_time\""]; + repeated Period vesting_periods = 3 [ + (gogoproto.moretags) = "yaml:\"vesting_periods\"", + (gogoproto.nullable) = false + ]; } // PermanentLockedAccount implements the VestingAccount interface. It does @@ -78,7 +84,7 @@ message PeriodicVestingAccount { // // Since: cosmos-sdk 0.43 message PermanentLockedAccount { - option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; BaseVestingAccount base_vesting_account = 1 [(gogoproto.embed) = true]; diff --git a/third_party/proto/cosmos_proto/cosmos.proto b/third_party/proto/cosmos_proto/cosmos.proto index d4719a38..6a3f5ea0 100644 --- a/third_party/proto/cosmos_proto/cosmos.proto +++ b/third_party/proto/cosmos_proto/cosmos.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package cosmos_proto; import "google/protobuf/descriptor.proto"; @@ -11,4 +12,6 @@ extend google.protobuf.MessageOptions { string implements_interface = 93002; } -extend google.protobuf.FieldOptions { string accepts_interface = 93001; } +extend google.protobuf.FieldOptions { + string accepts_interface = 93001; +} diff --git a/third_party/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto b/third_party/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto index 4bde4739..3654858d 100644 --- a/third_party/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto +++ b/third_party/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package ethermint.crypto.v1.ethsecp256k1; import "gogoproto/gogo.proto"; @@ -16,4 +17,6 @@ message PubKey { // PrivKey defines a type alias for an ecdsa.PrivateKey that implements // Tendermint's PrivateKey interface. -message PrivKey { bytes key = 1; } +message PrivKey { + bytes key = 1; +} diff --git a/third_party/proto/ethermint/evm/v1/evm.proto b/third_party/proto/ethermint/evm/v1/evm.proto index b74b27ae..314a33d7 100644 --- a/third_party/proto/ethermint/evm/v1/evm.proto +++ b/third_party/proto/ethermint/evm/v1/evm.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package ethermint.evm.v1; import "gogoproto/gogo.proto"; @@ -9,11 +10,11 @@ option go_package = "github.com/evmos/ethermint/x/evm/types"; message Params { // evm denom represents the token denomination used to run the EVM state // transitions. - string evm_denom = 1 [ (gogoproto.moretags) = "yaml:\"evm_denom\"" ]; + string evm_denom = 1 [(gogoproto.moretags) = "yaml:\"evm_denom\""]; // enable create toggles state transitions that use the vm.Create function - bool enable_create = 2 [ (gogoproto.moretags) = "yaml:\"enable_create\"" ]; + bool enable_create = 2 [(gogoproto.moretags) = "yaml:\"enable_create\""]; // enable call toggles state transitions that use the vm.Call function - bool enable_call = 3 [ (gogoproto.moretags) = "yaml:\"enable_call\"" ]; + bool enable_call = 3 [(gogoproto.moretags) = "yaml:\"enable_call\""]; // extra eips defines the additional EIPs for the vm.Config repeated int64 extra_eips = 4 [ (gogoproto.customname) = "ExtraEIPs", @@ -24,7 +25,7 @@ message Params { (gogoproto.moretags) = "yaml:\"chain_config\"", (gogoproto.nullable) = false ]; - // Allow unprotected transactions defines if replay-protected (i.e non EIP155 + // Allow unprotected transactions defines if replay-protected (i.e non EIP155 // signed) transactions can be executed on the state machine. bool allow_unprotected_txs = 6; } @@ -153,15 +154,15 @@ message Log { // but not secured by consensus. // block in which the transaction was included - uint64 block_number = 4 [ (gogoproto.jsontag) = "blockNumber" ]; + uint64 block_number = 4 [(gogoproto.jsontag) = "blockNumber"]; // hash of the transaction - string tx_hash = 5 [ (gogoproto.jsontag) = "transactionHash" ]; + string tx_hash = 5 [(gogoproto.jsontag) = "transactionHash"]; // index of the transaction in the block - uint64 tx_index = 6 [ (gogoproto.jsontag) = "transactionIndex" ]; + uint64 tx_index = 6 [(gogoproto.jsontag) = "transactionIndex"]; // hash of the block in which the transaction was included - string block_hash = 7 [ (gogoproto.jsontag) = "blockHash" ]; + string block_hash = 7 [(gogoproto.jsontag) = "blockHash"]; // index of the log in the block - uint64 index = 8 [ (gogoproto.jsontag) = "logIndex" ]; + uint64 index = 8 [(gogoproto.jsontag) = "logIndex"]; // The Removed field is true if this log was reverted due to a chain // reorganisation. You must pay attention to this field if you receive logs @@ -176,8 +177,7 @@ message TxResult { // contract_address contains the ethereum address of the created contract (if // any). If the state transition is an evm.Call, the contract address will be // empty. - string contract_address = 1 - [ (gogoproto.moretags) = "yaml:\"contract_address\"" ]; + string contract_address = 1 [(gogoproto.moretags) = "yaml:\"contract_address\""]; // bloom represents the bloom filter bytes bytes bloom = 2; // tx_logs contains the transaction hash and the proto-compatible ethereum @@ -201,7 +201,7 @@ message AccessTuple { // hex formatted ethereum address string address = 1; // hex formatted hashes of the storage keys - repeated string storage_keys = 2 [ (gogoproto.jsontag) = "storageKeys" ]; + repeated string storage_keys = 2 [(gogoproto.jsontag) = "storageKeys"]; } // TraceConfig holds extra parameters to trace functions. @@ -219,9 +219,9 @@ message TraceConfig { // number of blocks the tracer is willing to go back uint64 reexec = 3; // disable stack capture - bool disable_stack = 5 [ (gogoproto.jsontag) = "disableStack" ]; + bool disable_stack = 5 [(gogoproto.jsontag) = "disableStack"]; // disable storage capture - bool disable_storage = 6 [ (gogoproto.jsontag) = "disableStorage" ]; + bool disable_storage = 6 [(gogoproto.jsontag) = "disableStorage"]; // print output during capture end bool debug = 8; // maximum length of output, but zero means unlimited @@ -229,7 +229,7 @@ message TraceConfig { // Chain overrides, can be used to execute a trace using future fork rules ChainConfig overrides = 10; // enable memory capture - bool enable_memory = 11 [ (gogoproto.jsontag) = "enableMemory" ]; + bool enable_memory = 11 [(gogoproto.jsontag) = "enableMemory"]; // enable return data capture - bool enable_return_data = 12 [ (gogoproto.jsontag) = "enableReturnData" ]; + bool enable_return_data = 12 [(gogoproto.jsontag) = "enableReturnData"]; } diff --git a/third_party/proto/ethermint/evm/v1/genesis.proto b/third_party/proto/ethermint/evm/v1/genesis.proto index 196bbd23..d61f4bc6 100644 --- a/third_party/proto/ethermint/evm/v1/genesis.proto +++ b/third_party/proto/ethermint/evm/v1/genesis.proto @@ -1,17 +1,18 @@ syntax = "proto3"; + package ethermint.evm.v1; -import "gogoproto/gogo.proto"; import "ethermint/evm/v1/evm.proto"; +import "gogoproto/gogo.proto"; option go_package = "github.com/evmos/ethermint/x/evm/types"; // GenesisState defines the evm module's genesis state. message GenesisState { // accounts is an array containing the ethereum genesis accounts. - repeated GenesisAccount accounts = 1 [ (gogoproto.nullable) = false ]; + repeated GenesisAccount accounts = 1 [(gogoproto.nullable) = false]; // params defines all the parameters of the module. - Params params = 2 [ (gogoproto.nullable) = false ]; + Params params = 2 [(gogoproto.nullable) = false]; } // GenesisAccount defines an account to be initialized in the genesis state. @@ -23,6 +24,8 @@ message GenesisAccount { // code defines the hex bytes of the account code. string code = 2; // storage defines the set of state key values for the account. - repeated State storage = 3 - [ (gogoproto.nullable) = false, (gogoproto.castrepeated) = "Storage" ]; + repeated State storage = 3 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "Storage" + ]; } diff --git a/third_party/proto/ethermint/evm/v1/query.proto b/third_party/proto/ethermint/evm/v1/query.proto index 537bc7cf..9981a131 100644 --- a/third_party/proto/ethermint/evm/v1/query.proto +++ b/third_party/proto/ethermint/evm/v1/query.proto @@ -1,11 +1,12 @@ syntax = "proto3"; + package ethermint.evm.v1; -import "gogoproto/gogo.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "google/api/annotations.proto"; import "ethermint/evm/v1/evm.proto"; import "ethermint/evm/v1/tx.proto"; +import "gogoproto/gogo.proto"; +import "google/api/annotations.proto"; import "google/protobuf/timestamp.proto"; option go_package = "github.com/evmos/ethermint/x/evm/types"; @@ -18,17 +19,14 @@ service Query { } // CosmosAccount queries an Ethereum account's Cosmos Address. - rpc CosmosAccount(QueryCosmosAccountRequest) - returns (QueryCosmosAccountResponse) { + rpc CosmosAccount(QueryCosmosAccountRequest) returns (QueryCosmosAccountResponse) { option (google.api.http).get = "/ethermint/evm/v1/cosmos_account/{address}"; } // ValidatorAccount queries an Ethereum account's from a validator consensus // Address. - rpc ValidatorAccount(QueryValidatorAccountRequest) - returns (QueryValidatorAccountResponse) { - option (google.api.http).get = - "/ethermint/evm/v1/validator_account/{cons_address}"; + rpc ValidatorAccount(QueryValidatorAccountRequest) returns (QueryValidatorAccountResponse) { + option (google.api.http).get = "/ethermint/evm/v1/validator_account/{cons_address}"; } // Balance queries the balance of a the EVM denomination for a single @@ -77,7 +75,6 @@ service Query { rpc BaseFee(QueryBaseFeeRequest) returns (QueryBaseFeeResponse) { option (google.api.http).get = "/ethermint/evm/v1/base_fee"; } - } // QueryAccountRequest is the request type for the Query/Account RPC method. @@ -216,7 +213,7 @@ message QueryParamsRequest {} // QueryParamsResponse defines the response type for querying x/evm parameters. message QueryParamsResponse { // params define the evm module parameters. - Params params = 1 [ (gogoproto.nullable) = false ]; + Params params = 1 [(gogoproto.nullable) = false]; } // EthCallRequest defines EthCall request @@ -250,7 +247,10 @@ message QueryTraceTxRequest { // block hex hash of requested transaction string block_hash = 6; // block time of requested transaction - google.protobuf.Timestamp block_time = 7 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; + google.protobuf.Timestamp block_time = 7 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true + ]; } // QueryTraceTxResponse defines TraceTx response @@ -270,7 +270,10 @@ message QueryTraceBlockRequest { // block hex hash string block_hash = 6; // block time - google.protobuf.Timestamp block_time = 7 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; + google.protobuf.Timestamp block_time = 7 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true + ]; } // QueryTraceBlockResponse defines TraceBlock response @@ -284,6 +287,5 @@ message QueryBaseFeeRequest {} // BaseFeeResponse returns the EIP1559 base fee. message QueryBaseFeeResponse { - string base_fee = 1 - [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int" ]; + string base_fee = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"]; } diff --git a/third_party/proto/ethermint/evm/v1/tx.proto b/third_party/proto/ethermint/evm/v1/tx.proto index 9dc53f2f..e6e0b0b6 100644 --- a/third_party/proto/ethermint/evm/v1/tx.proto +++ b/third_party/proto/ethermint/evm/v1/tx.proto @@ -1,11 +1,12 @@ syntax = "proto3"; + package ethermint.evm.v1; +import "cosmos_proto/cosmos.proto"; +import "ethermint/evm/v1/evm.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "google/protobuf/any.proto"; -import "cosmos_proto/cosmos.proto"; -import "ethermint/evm/v1/evm.proto"; option go_package = "github.com/evmos/ethermint/x/evm/types"; @@ -14,7 +15,8 @@ service Msg { // EthereumTx defines a method submitting Ethereum transactions. rpc EthereumTx(MsgEthereumTx) returns (MsgEthereumTxResponse) { option (google.api.http).post = "/ethermint/evm/v1/ethereum_tx"; - }; + } + } // MsgEthereumTx encapsulates an Ethereum transaction as an SDK message. @@ -25,10 +27,11 @@ message MsgEthereumTx { google.protobuf.Any data = 1; // caches + // encoded storage size of the transaction - double size = 2 [ (gogoproto.jsontag) = "-" ]; + double size = 2 [(gogoproto.jsontag) = "-"]; // transaction hash in hex format - string hash = 3 [ (gogoproto.moretags) = "rlp:\"-\"" ]; + string hash = 3 [(gogoproto.moretags) = "rlp:\"-\""]; // ethereum signer address in hex format. This address value is checked // against the address derived from the signature (V, R, S) using the // secp256k1 elliptic curve @@ -37,7 +40,7 @@ message MsgEthereumTx { // LegacyTx is the transaction data of regular Ethereum transactions. // NOTE: All non-protected transactions (i.e non EIP155 signed) will fail if the -// AllowUnprotectedTxs parameter is disabled. +// AllowUnprotectedTxs parameter is disabled. message LegacyTx { option (gogoproto.goproto_getters) = false; option (cosmos_proto.implements_interface) = "TxData"; @@ -45,10 +48,9 @@ message LegacyTx { // nonce corresponds to the account nonce (transaction sequence). uint64 nonce = 1; // gas price defines the value for each gas unit - string gas_price = 2 - [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int" ]; + string gas_price = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"]; // gas defines the gas limit defined for the transaction. - uint64 gas = 3 [ (gogoproto.customname) = "GasLimit" ]; + uint64 gas = 3 [(gogoproto.customname) = "GasLimit"]; // hex formatted address of the recipient string to = 4; // value defines the unsigned integer value of the transaction amount. @@ -80,10 +82,9 @@ message AccessListTx { // nonce corresponds to the account nonce (transaction sequence). uint64 nonce = 2; // gas price defines the value for each gas unit - string gas_price = 3 - [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int" ]; + string gas_price = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"]; // gas defines the gas limit defined for the transaction. - uint64 gas = 4 [ (gogoproto.customname) = "GasLimit" ]; + uint64 gas = 4 [(gogoproto.customname) = "GasLimit"]; // hex formatted address of the recipient string to = 5; // value defines the unsigned integer value of the transaction amount. @@ -120,13 +121,11 @@ message DynamicFeeTx { // nonce corresponds to the account nonce (transaction sequence). uint64 nonce = 2; // gas tip cap defines the max value for the gas tip - string gas_tip_cap = 3 - [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int" ]; + string gas_tip_cap = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"]; // gas fee cap defines the max value for the gas fee - string gas_fee_cap = 4 - [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int" ]; + string gas_fee_cap = 4 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"]; // gas defines the gas limit defined for the transaction. - uint64 gas = 5 [ (gogoproto.customname) = "GasLimit" ]; + uint64 gas = 5 [(gogoproto.customname) = "GasLimit"]; // hex formatted address of the recipient string to = 6; // value defines the the transaction amount. diff --git a/third_party/proto/ethermint/feemarket/v1/feemarket.proto b/third_party/proto/ethermint/feemarket/v1/feemarket.proto index 8508ec71..fd5bea19 100644 --- a/third_party/proto/ethermint/feemarket/v1/feemarket.proto +++ b/third_party/proto/ethermint/feemarket/v1/feemarket.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package ethermint.feemarket.v1; import "gogoproto/gogo.proto"; @@ -16,7 +17,7 @@ message Params { // have. uint32 elasticity_multiplier = 3; // DEPRECATED: initial base fee for EIP-1559 blocks. - reserved 4; + reserved 4; reserved "initial_base_fee"; // height at which the base fee calculation is enabled. int64 enable_height = 5; diff --git a/third_party/proto/ethermint/feemarket/v1/genesis.proto b/third_party/proto/ethermint/feemarket/v1/genesis.proto index e3307844..e65fed72 100644 --- a/third_party/proto/ethermint/feemarket/v1/genesis.proto +++ b/third_party/proto/ethermint/feemarket/v1/genesis.proto @@ -1,15 +1,16 @@ syntax = "proto3"; + package ethermint.feemarket.v1; -import "gogoproto/gogo.proto"; import "ethermint/feemarket/v1/feemarket.proto"; +import "gogoproto/gogo.proto"; option go_package = "github.com/evmos/ethermint/x/feemarket/types"; // GenesisState defines the feemarket module's genesis state. message GenesisState { // params defines all the paramaters of the module. - Params params = 1 [ (gogoproto.nullable) = false ]; + Params params = 1 [(gogoproto.nullable) = false]; // DEPRECATED: base fee is the exported value from previous software version. // Zero by default. reserved 2; @@ -17,4 +18,4 @@ message GenesisState { // block gas is the amount of gas wanted on the last block before the upgrade. // Zero by default. uint64 block_gas = 3; -} \ No newline at end of file +} diff --git a/third_party/proto/ethermint/feemarket/v1/query.proto b/third_party/proto/ethermint/feemarket/v1/query.proto index f8b672b0..9a5b64f6 100644 --- a/third_party/proto/ethermint/feemarket/v1/query.proto +++ b/third_party/proto/ethermint/feemarket/v1/query.proto @@ -1,10 +1,11 @@ syntax = "proto3"; + package ethermint.feemarket.v1; +import "ethermint/feemarket/v1/feemarket.proto"; import "gogoproto/gogo.proto"; // import "cosmos/base/query/v1beta1/pagination.proto"; import "google/api/annotations.proto"; -import "ethermint/feemarket/v1/feemarket.proto"; option go_package = "github.com/evmos/ethermint/x/feemarket/types"; @@ -32,7 +33,7 @@ message QueryParamsRequest {} // QueryParamsResponse defines the response type for querying x/evm parameters. message QueryParamsResponse { // params define the evm module parameters. - Params params = 1 [ (gogoproto.nullable) = false ]; + Params params = 1 [(gogoproto.nullable) = false]; } // QueryBaseFeeRequest defines the request type for querying the EIP1559 base @@ -41,8 +42,7 @@ message QueryBaseFeeRequest {} // BaseFeeResponse returns the EIP1559 base fee. message QueryBaseFeeResponse { - string base_fee = 1 - [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int" ]; + string base_fee = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"]; } // QueryBlockGasRequest defines the request type for querying the EIP1559 base @@ -50,4 +50,6 @@ message QueryBaseFeeResponse { message QueryBlockGasRequest {} // QueryBlockGasResponse returns block gas used for a given height. -message QueryBlockGasResponse { int64 gas = 1; } \ No newline at end of file +message QueryBlockGasResponse { + int64 gas = 1; +} diff --git a/third_party/proto/ethermint/types/v1/account.proto b/third_party/proto/ethermint/types/v1/account.proto index 4a3a5d5d..ae2130db 100644 --- a/third_party/proto/ethermint/types/v1/account.proto +++ b/third_party/proto/ethermint/types/v1/account.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package ethermint.types.v1; import "cosmos/auth/v1beta1/auth.proto"; @@ -14,12 +15,11 @@ message EthAccount { option (gogoproto.goproto_stringer) = false; option (gogoproto.equal) = false; - option (cosmos_proto.implements_interface) = - "github.com/cosmos/cosmos-sdk/x/auth/types.AccountI"; + option (cosmos_proto.implements_interface) = "github.com/cosmos/cosmos-sdk/x/auth/types.AccountI"; cosmos.auth.v1beta1.BaseAccount base_account = 1 [ (gogoproto.embed) = true, (gogoproto.moretags) = "yaml:\"base_account\"" ]; - string code_hash = 2 [ (gogoproto.moretags) = "yaml:\"code_hash\"" ]; + string code_hash = 2 [(gogoproto.moretags) = "yaml:\"code_hash\""]; } diff --git a/third_party/proto/ethermint/types/v1/web3.proto b/third_party/proto/ethermint/types/v1/web3.proto index df6bf65b..bac1cf8e 100644 --- a/third_party/proto/ethermint/types/v1/web3.proto +++ b/third_party/proto/ethermint/types/v1/web3.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package ethermint.types.v1; import "gogoproto/gogo.proto"; @@ -17,9 +18,9 @@ message ExtensionOptionsWeb3Tx { // fee payer is an account address for the fee payer. It will be validated // during EIP712 signature checking. - string fee_payer = 2 [ (gogoproto.jsontag) = "feePayer,omitempty" ]; + string fee_payer = 2 [(gogoproto.jsontag) = "feePayer,omitempty"]; // fee payer sig is a signature data from the fee paying account, // allows to perform fee delegation when using EIP712 Domain. - bytes fee_payer_sig = 3 [ (gogoproto.jsontag) = "feePayerSig,omitempty" ]; + bytes fee_payer_sig = 3 [(gogoproto.jsontag) = "feePayerSig,omitempty"]; } diff --git a/third_party/proto/gogoproto/gogo.proto b/third_party/proto/gogoproto/gogo.proto index 91ff4718..678b130e 100644 --- a/third_party/proto/gogoproto/gogo.proto +++ b/third_party/proto/gogoproto/gogo.proto @@ -27,13 +27,14 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. syntax = "proto2"; + package gogoproto; import "google/protobuf/descriptor.proto"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "GoGoProtos"; option go_package = "github.com/gogo/protobuf/gogoproto"; +option java_outer_classname = "GoGoProtos"; +option java_package = "com.google.protobuf"; extend google.protobuf.EnumOptions { optional bool goproto_enum_prefix = 62001; diff --git a/third_party/proto/google/api/httpbody.proto b/third_party/proto/google/api/httpbody.proto index 4428515c..96c82b99 100644 --- a/third_party/proto/google/api/httpbody.proto +++ b/third_party/proto/google/api/httpbody.proto @@ -75,4 +75,4 @@ message HttpBody { // Application specific response metadata. Must be set in the first response // for streaming APIs. repeated google.protobuf.Any extensions = 3; -} \ No newline at end of file +} diff --git a/third_party/proto/ibc/applications/interchain_accounts/controller/v1/controller.proto b/third_party/proto/ibc/applications/interchain_accounts/controller/v1/controller.proto index aa7cd7ce..23a277f7 100644 --- a/third_party/proto/ibc/applications/interchain_accounts/controller/v1/controller.proto +++ b/third_party/proto/ibc/applications/interchain_accounts/controller/v1/controller.proto @@ -2,14 +2,13 @@ syntax = "proto3"; package ibc.applications.interchain_accounts.controller.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/controller/types"; - import "gogoproto/gogo.proto"; +option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/controller/types"; + // Params defines the set of on-chain interchain accounts parameters. // The following parameters may be used to disable the controller submodule. message Params { // controller_enabled enables or disables the controller submodule. - bool controller_enabled = 1 - [ (gogoproto.moretags) = "yaml:\"controller_enabled\"" ]; + bool controller_enabled = 1 [(gogoproto.moretags) = "yaml:\"controller_enabled\""]; } diff --git a/third_party/proto/ibc/applications/interchain_accounts/controller/v1/query.proto b/third_party/proto/ibc/applications/interchain_accounts/controller/v1/query.proto index 3a4d63aa..3eacf67c 100644 --- a/third_party/proto/ibc/applications/interchain_accounts/controller/v1/query.proto +++ b/third_party/proto/ibc/applications/interchain_accounts/controller/v1/query.proto @@ -2,17 +2,16 @@ syntax = "proto3"; package ibc.applications.interchain_accounts.controller.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/controller/types"; - -import "ibc/applications/interchain_accounts/controller/v1/controller.proto"; import "google/api/annotations.proto"; +import "ibc/applications/interchain_accounts/controller/v1/controller.proto"; + +option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/controller/types"; // Query provides defines the gRPC querier service. service Query { // Params queries all parameters of the ICA controller submodule. rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { - option (google.api.http).get = - "/ibc/apps/interchain_accounts/controller/v1/params"; + option (google.api.http).get = "/ibc/apps/interchain_accounts/controller/v1/params"; } } diff --git a/third_party/proto/ibc/applications/interchain_accounts/host/v1/host.proto b/third_party/proto/ibc/applications/interchain_accounts/host/v1/host.proto index 6b772a43..fda30042 100644 --- a/third_party/proto/ibc/applications/interchain_accounts/host/v1/host.proto +++ b/third_party/proto/ibc/applications/interchain_accounts/host/v1/host.proto @@ -2,17 +2,16 @@ syntax = "proto3"; package ibc.applications.interchain_accounts.host.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/types"; - import "gogoproto/gogo.proto"; +option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/types"; + // Params defines the set of on-chain interchain accounts parameters. // The following parameters may be used to disable the host submodule. message Params { // host_enabled enables or disables the host submodule. - bool host_enabled = 1 [ (gogoproto.moretags) = "yaml:\"host_enabled\"" ]; + bool host_enabled = 1 [(gogoproto.moretags) = "yaml:\"host_enabled\""]; // allow_messages defines a list of sdk message typeURLs allowed to be // executed on a host chain. - repeated string allow_messages = 2 - [ (gogoproto.moretags) = "yaml:\"allow_messages\"" ]; + repeated string allow_messages = 2 [(gogoproto.moretags) = "yaml:\"allow_messages\""]; } diff --git a/third_party/proto/ibc/applications/interchain_accounts/host/v1/query.proto b/third_party/proto/ibc/applications/interchain_accounts/host/v1/query.proto index c95625dd..ba371e4a 100644 --- a/third_party/proto/ibc/applications/interchain_accounts/host/v1/query.proto +++ b/third_party/proto/ibc/applications/interchain_accounts/host/v1/query.proto @@ -2,17 +2,16 @@ syntax = "proto3"; package ibc.applications.interchain_accounts.host.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/types"; - import "google/api/annotations.proto"; import "ibc/applications/interchain_accounts/host/v1/host.proto"; +option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/types"; + // Query provides defines the gRPC querier service. service Query { // Params queries all parameters of the ICA host submodule. rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { - option (google.api.http).get = - "/ibc/apps/interchain_accounts/host/v1/params"; + option (google.api.http).get = "/ibc/apps/interchain_accounts/host/v1/params"; } } diff --git a/third_party/proto/ibc/applications/interchain_accounts/v1/account.proto b/third_party/proto/ibc/applications/interchain_accounts/v1/account.proto index 4336bd9f..04c371e8 100644 --- a/third_party/proto/ibc/applications/interchain_accounts/v1/account.proto +++ b/third_party/proto/ibc/applications/interchain_accounts/v1/account.proto @@ -2,11 +2,11 @@ syntax = "proto3"; package ibc.applications.interchain_accounts.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/types"; - +import "cosmos/auth/v1beta1/auth.proto"; import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -import "cosmos/auth/v1beta1/auth.proto"; + +option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/types"; // An InterchainAccount is defined as a BaseAccount & the address of the account // owner on the controller chain @@ -19,5 +19,5 @@ message InterchainAccount { (gogoproto.embed) = true, (gogoproto.moretags) = "yaml:\"base_account\"" ]; - string account_owner = 2 [ (gogoproto.moretags) = "yaml:\"account_owner\"" ]; + string account_owner = 2 [(gogoproto.moretags) = "yaml:\"account_owner\""]; } diff --git a/third_party/proto/ibc/applications/interchain_accounts/v1/genesis.proto b/third_party/proto/ibc/applications/interchain_accounts/v1/genesis.proto index 087b7b96..bce3776d 100644 --- a/third_party/proto/ibc/applications/interchain_accounts/v1/genesis.proto +++ b/third_party/proto/ibc/applications/interchain_accounts/v1/genesis.proto @@ -2,12 +2,12 @@ syntax = "proto3"; package ibc.applications.interchain_accounts.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/types"; - import "gogoproto/gogo.proto"; import "ibc/applications/interchain_accounts/controller/v1/controller.proto"; import "ibc/applications/interchain_accounts/host/v1/host.proto"; +option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/types"; + // GenesisState defines the interchain accounts genesis state message GenesisState { ControllerGenesisState controller_genesis_state = 1 [ @@ -32,8 +32,7 @@ message ControllerGenesisState { (gogoproto.moretags) = "yaml:\"interchain_accounts\"" ]; repeated string ports = 3; - ibc.applications.interchain_accounts.controller.v1.Params params = 4 - [ (gogoproto.nullable) = false ]; + ibc.applications.interchain_accounts.controller.v1.Params params = 4 [(gogoproto.nullable) = false]; } // HostGenesisState defines the interchain accounts host genesis state @@ -47,23 +46,21 @@ message HostGenesisState { (gogoproto.moretags) = "yaml:\"interchain_accounts\"" ]; string port = 3; - ibc.applications.interchain_accounts.host.v1.Params params = 4 - [ (gogoproto.nullable) = false ]; + ibc.applications.interchain_accounts.host.v1.Params params = 4 [(gogoproto.nullable) = false]; } // ActiveChannel contains a connection ID, port ID and associated active channel // ID message ActiveChannel { - string connection_id = 1 [ (gogoproto.moretags) = "yaml:\"connection_id\"" ]; - string port_id = 2 [ (gogoproto.moretags) = "yaml:\"port_id\"" ]; - string channel_id = 3 [ (gogoproto.moretags) = "yaml:\"channel_id\"" ]; + string connection_id = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""]; + string port_id = 2 [(gogoproto.moretags) = "yaml:\"port_id\""]; + string channel_id = 3 [(gogoproto.moretags) = "yaml:\"channel_id\""]; } // RegisteredInterchainAccount contains a connection ID, port ID and associated // interchain account address message RegisteredInterchainAccount { - string connection_id = 1 [ (gogoproto.moretags) = "yaml:\"connection_id\"" ]; - string port_id = 2 [ (gogoproto.moretags) = "yaml:\"port_id\"" ]; - string account_address = 3 - [ (gogoproto.moretags) = "yaml:\"account_address\"" ]; -} \ No newline at end of file + string connection_id = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""]; + string port_id = 2 [(gogoproto.moretags) = "yaml:\"port_id\""]; + string account_address = 3 [(gogoproto.moretags) = "yaml:\"account_address\""]; +} diff --git a/third_party/proto/ibc/applications/interchain_accounts/v1/metadata.proto b/third_party/proto/ibc/applications/interchain_accounts/v1/metadata.proto index d0229ff9..8186beb0 100644 --- a/third_party/proto/ibc/applications/interchain_accounts/v1/metadata.proto +++ b/third_party/proto/ibc/applications/interchain_accounts/v1/metadata.proto @@ -2,10 +2,10 @@ syntax = "proto3"; package ibc.applications.interchain_accounts.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/types"; - import "gogoproto/gogo.proto"; +option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/types"; + // Metadata defines a set of protocol specific data encoded into the ICS27 // channel version bytestring See ICS004: // https://github.com/cosmos/ibc/tree/master/spec/core/ics-004-channel-and-packet-semantics#Versioning @@ -14,12 +14,10 @@ message Metadata { string version = 1; // controller_connection_id is the connection identifier associated with the // controller chain - string controller_connection_id = 2 - [ (gogoproto.moretags) = "yaml:\"controller_connection_id\"" ]; + string controller_connection_id = 2 [(gogoproto.moretags) = "yaml:\"controller_connection_id\""]; // host_connection_id is the connection identifier associated with the host // chain - string host_connection_id = 3 - [ (gogoproto.moretags) = "yaml:\"host_connection_id\"" ]; + string host_connection_id = 3 [(gogoproto.moretags) = "yaml:\"host_connection_id\""]; // address defines the interchain account address to be fulfilled upon the // OnChanOpenTry handshake step NOTE: the address field is empty on the // OnChanOpenInit handshake step diff --git a/third_party/proto/ibc/applications/interchain_accounts/v1/packet.proto b/third_party/proto/ibc/applications/interchain_accounts/v1/packet.proto index 2535c05f..6b359b47 100644 --- a/third_party/proto/ibc/applications/interchain_accounts/v1/packet.proto +++ b/third_party/proto/ibc/applications/interchain_accounts/v1/packet.proto @@ -2,10 +2,10 @@ syntax = "proto3"; package ibc.applications.interchain_accounts.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/types"; - -import "google/protobuf/any.proto"; import "gogoproto/gogo.proto"; +import "google/protobuf/any.proto"; + +option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/types"; // Type defines a classification of message issued from a controller chain to // its associated interchain accounts host @@ -13,9 +13,9 @@ enum Type { option (gogoproto.goproto_enum_prefix) = false; // Default zero value enumeration - TYPE_UNSPECIFIED = 0 [ (gogoproto.enumvalue_customname) = "UNSPECIFIED" ]; + TYPE_UNSPECIFIED = 0 [(gogoproto.enumvalue_customname) = "UNSPECIFIED"]; // Execute a transaction on an interchain accounts host chain - TYPE_EXECUTE_TX = 1 [ (gogoproto.enumvalue_customname) = "EXECUTE_TX" ]; + TYPE_EXECUTE_TX = 1 [(gogoproto.enumvalue_customname) = "EXECUTE_TX"]; } // InterchainAccountPacketData is comprised of a raw transaction, type of @@ -28,4 +28,6 @@ message InterchainAccountPacketData { // CosmosTx contains a list of sdk.Msg's. It should be used when sending // transactions to an SDK host chain. -message CosmosTx { repeated google.protobuf.Any messages = 1; } +message CosmosTx { + repeated google.protobuf.Any messages = 1; +} diff --git a/third_party/proto/ibc/applications/transfer/v1/genesis.proto b/third_party/proto/ibc/applications/transfer/v1/genesis.proto index ef240f2c..536ba832 100644 --- a/third_party/proto/ibc/applications/transfer/v1/genesis.proto +++ b/third_party/proto/ibc/applications/transfer/v1/genesis.proto @@ -2,18 +2,18 @@ syntax = "proto3"; package ibc.applications.transfer.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"; - -import "ibc/applications/transfer/v1/transfer.proto"; import "gogoproto/gogo.proto"; +import "ibc/applications/transfer/v1/transfer.proto"; + +option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"; // GenesisState defines the ibc-transfer genesis state message GenesisState { - string port_id = 1 [ (gogoproto.moretags) = "yaml:\"port_id\"" ]; + string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; repeated DenomTrace denom_traces = 2 [ (gogoproto.castrepeated) = "Traces", (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"denom_traces\"" ]; - Params params = 3 [ (gogoproto.nullable) = false ]; + Params params = 3 [(gogoproto.nullable) = false]; } diff --git a/third_party/proto/ibc/applications/transfer/v1/query.proto b/third_party/proto/ibc/applications/transfer/v1/query.proto index 335ee007..6356e19b 100644 --- a/third_party/proto/ibc/applications/transfer/v1/query.proto +++ b/third_party/proto/ibc/applications/transfer/v1/query.proto @@ -2,10 +2,10 @@ syntax = "proto3"; package ibc.applications.transfer.v1; -import "gogoproto/gogo.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "ibc/applications/transfer/v1/transfer.proto"; +import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; +import "ibc/applications/transfer/v1/transfer.proto"; option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"; @@ -57,8 +57,10 @@ message QueryDenomTracesRequest { // method. message QueryDenomTracesResponse { // denom_traces returns all denominations trace information. - repeated DenomTrace denom_traces = 1 - [ (gogoproto.castrepeated) = "Traces", (gogoproto.nullable) = false ]; + repeated DenomTrace denom_traces = 1 [ + (gogoproto.castrepeated) = "Traces", + (gogoproto.nullable) = false + ]; // pagination defines the pagination in the response. cosmos.base.query.v1beta1.PageResponse pagination = 2; } diff --git a/third_party/proto/ibc/applications/transfer/v1/transfer.proto b/third_party/proto/ibc/applications/transfer/v1/transfer.proto index 611f49ac..978f3b45 100644 --- a/third_party/proto/ibc/applications/transfer/v1/transfer.proto +++ b/third_party/proto/ibc/applications/transfer/v1/transfer.proto @@ -2,10 +2,10 @@ syntax = "proto3"; package ibc.applications.transfer.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"; - import "gogoproto/gogo.proto"; +option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"; + // DenomTrace contains the base denomination for ICS20 fungible tokens and the // source tracing information path. message DenomTrace { @@ -23,9 +23,8 @@ message DenomTrace { message Params { // send_enabled enables or disables all cross-chain token transfers from this // chain. - bool send_enabled = 1 [ (gogoproto.moretags) = "yaml:\"send_enabled\"" ]; + bool send_enabled = 1 [(gogoproto.moretags) = "yaml:\"send_enabled\""]; // receive_enabled enables or disables all cross-chain token transfers to this // chain. - bool receive_enabled = 2 - [ (gogoproto.moretags) = "yaml:\"receive_enabled\"" ]; + bool receive_enabled = 2 [(gogoproto.moretags) = "yaml:\"receive_enabled\""]; } diff --git a/third_party/proto/ibc/applications/transfer/v1/tx.proto b/third_party/proto/ibc/applications/transfer/v1/tx.proto index a115097f..79c89339 100644 --- a/third_party/proto/ibc/applications/transfer/v1/tx.proto +++ b/third_party/proto/ibc/applications/transfer/v1/tx.proto @@ -2,12 +2,12 @@ syntax = "proto3"; package ibc.applications.transfer.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"; - -import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; +import "gogoproto/gogo.proto"; import "ibc/core/client/v1/client.proto"; +option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"; + // Msg defines the ibc/transfer Msg service. service Msg { // Transfer defines a rpc handler method for MsgTransfer. @@ -22,12 +22,11 @@ message MsgTransfer { option (gogoproto.goproto_getters) = false; // the port on which the packet will be sent - string source_port = 1 [ (gogoproto.moretags) = "yaml:\"source_port\"" ]; + string source_port = 1 [(gogoproto.moretags) = "yaml:\"source_port\""]; // the channel by which the packet will be sent - string source_channel = 2 - [ (gogoproto.moretags) = "yaml:\"source_channel\"" ]; + string source_channel = 2 [(gogoproto.moretags) = "yaml:\"source_channel\""]; // the tokens to be transferred - cosmos.base.v1beta1.Coin token = 3 [ (gogoproto.nullable) = false ]; + cosmos.base.v1beta1.Coin token = 3 [(gogoproto.nullable) = false]; // the sender address string sender = 4; // the recipient address on the destination chain @@ -40,8 +39,7 @@ message MsgTransfer { ]; // Timeout timestamp in absolute nanoseconds since unix epoch. // The timeout is disabled when set to 0. - uint64 timeout_timestamp = 7 - [ (gogoproto.moretags) = "yaml:\"timeout_timestamp\"" ]; + uint64 timeout_timestamp = 7 [(gogoproto.moretags) = "yaml:\"timeout_timestamp\""]; } // MsgTransferResponse defines the Msg/Transfer response type. diff --git a/third_party/proto/ibc/core/channel/v1/channel.proto b/third_party/proto/ibc/core/channel/v1/channel.proto index 8c002c00..17cca5b8 100644 --- a/third_party/proto/ibc/core/channel/v1/channel.proto +++ b/third_party/proto/ibc/core/channel/v1/channel.proto @@ -2,11 +2,11 @@ syntax = "proto3"; package ibc.core.channel.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"; - import "gogoproto/gogo.proto"; import "ibc/core/client/v1/client.proto"; +option go_package = "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"; + // Channel defines pipeline for exactly-once packet delivery between specific // modules on separate blockchains, which has at least one end capable of // sending packets and one end capable of receiving packets. @@ -18,11 +18,10 @@ message Channel { // whether the channel is ordered or unordered Order ordering = 2; // counterparty channel end - Counterparty counterparty = 3 [ (gogoproto.nullable) = false ]; + Counterparty counterparty = 3 [(gogoproto.nullable) = false]; // list of connection identifiers, in order, along which packets sent on // this channel will travel - repeated string connection_hops = 4 - [ (gogoproto.moretags) = "yaml:\"connection_hops\"" ]; + repeated string connection_hops = 4 [(gogoproto.moretags) = "yaml:\"connection_hops\""]; // opaque channel version, which is agreed upon during the handshake string version = 5; } @@ -37,11 +36,10 @@ message IdentifiedChannel { // whether the channel is ordered or unordered Order ordering = 2; // counterparty channel end - Counterparty counterparty = 3 [ (gogoproto.nullable) = false ]; + Counterparty counterparty = 3 [(gogoproto.nullable) = false]; // list of connection identifiers, in order, along which packets sent on // this channel will travel - repeated string connection_hops = 4 - [ (gogoproto.moretags) = "yaml:\"connection_hops\"" ]; + repeated string connection_hops = 4 [(gogoproto.moretags) = "yaml:\"connection_hops\""]; // opaque channel version, which is agreed upon during the handshake string version = 5; // port identifier @@ -56,18 +54,17 @@ enum State { option (gogoproto.goproto_enum_prefix) = false; // Default State - STATE_UNINITIALIZED_UNSPECIFIED = 0 - [ (gogoproto.enumvalue_customname) = "UNINITIALIZED" ]; + STATE_UNINITIALIZED_UNSPECIFIED = 0 [(gogoproto.enumvalue_customname) = "UNINITIALIZED"]; // A channel has just started the opening handshake. - STATE_INIT = 1 [ (gogoproto.enumvalue_customname) = "INIT" ]; + STATE_INIT = 1 [(gogoproto.enumvalue_customname) = "INIT"]; // A channel has acknowledged the handshake step on the counterparty chain. - STATE_TRYOPEN = 2 [ (gogoproto.enumvalue_customname) = "TRYOPEN" ]; + STATE_TRYOPEN = 2 [(gogoproto.enumvalue_customname) = "TRYOPEN"]; // A channel has completed the handshake. Open channels are // ready to send and receive packets. - STATE_OPEN = 3 [ (gogoproto.enumvalue_customname) = "OPEN" ]; + STATE_OPEN = 3 [(gogoproto.enumvalue_customname) = "OPEN"]; // A channel has been closed and can no longer be used to send or receive // packets. - STATE_CLOSED = 4 [ (gogoproto.enumvalue_customname) = "CLOSED" ]; + STATE_CLOSED = 4 [(gogoproto.enumvalue_customname) = "CLOSED"]; } // Order defines if a channel is ORDERED or UNORDERED @@ -75,12 +72,12 @@ enum Order { option (gogoproto.goproto_enum_prefix) = false; // zero-value for channel ordering - ORDER_NONE_UNSPECIFIED = 0 [ (gogoproto.enumvalue_customname) = "NONE" ]; + ORDER_NONE_UNSPECIFIED = 0 [(gogoproto.enumvalue_customname) = "NONE"]; // packets can be delivered in any order, which may differ from the order in // which they were sent. - ORDER_UNORDERED = 1 [ (gogoproto.enumvalue_customname) = "UNORDERED" ]; + ORDER_UNORDERED = 1 [(gogoproto.enumvalue_customname) = "UNORDERED"]; // packets are delivered exactly in the order which they were sent - ORDER_ORDERED = 2 [ (gogoproto.enumvalue_customname) = "ORDERED" ]; + ORDER_ORDERED = 2 [(gogoproto.enumvalue_customname) = "ORDERED"]; } // Counterparty defines a channel end counterparty @@ -88,9 +85,9 @@ message Counterparty { option (gogoproto.goproto_getters) = false; // port on the counterparty chain which owns the other end of the channel. - string port_id = 1 [ (gogoproto.moretags) = "yaml:\"port_id\"" ]; + string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; // channel end on the counterparty chain - string channel_id = 2 [ (gogoproto.moretags) = "yaml:\"channel_id\"" ]; + string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; } // Packet defines a type that carries data across different chains through IBC @@ -102,16 +99,13 @@ message Packet { // with a later sequence number. uint64 sequence = 1; // identifies the port on the sending chain. - string source_port = 2 [ (gogoproto.moretags) = "yaml:\"source_port\"" ]; + string source_port = 2 [(gogoproto.moretags) = "yaml:\"source_port\""]; // identifies the channel end on the sending chain. - string source_channel = 3 - [ (gogoproto.moretags) = "yaml:\"source_channel\"" ]; + string source_channel = 3 [(gogoproto.moretags) = "yaml:\"source_channel\""]; // identifies the port on the receiving chain. - string destination_port = 4 - [ (gogoproto.moretags) = "yaml:\"destination_port\"" ]; + string destination_port = 4 [(gogoproto.moretags) = "yaml:\"destination_port\""]; // identifies the channel end on the receiving chain. - string destination_channel = 5 - [ (gogoproto.moretags) = "yaml:\"destination_channel\"" ]; + string destination_channel = 5 [(gogoproto.moretags) = "yaml:\"destination_channel\""]; // actual opaque bytes transferred directly to the application module bytes data = 6; // block height after which the packet times out @@ -120,8 +114,7 @@ message Packet { (gogoproto.nullable) = false ]; // block timestamp (in nanoseconds) after which the packet times out - uint64 timeout_timestamp = 8 - [ (gogoproto.moretags) = "yaml:\"timeout_timestamp\"" ]; + uint64 timeout_timestamp = 8 [(gogoproto.moretags) = "yaml:\"timeout_timestamp\""]; } // PacketState defines the generic type necessary to retrieve and store @@ -132,9 +125,9 @@ message PacketState { option (gogoproto.goproto_getters) = false; // channel port identifier. - string port_id = 1 [ (gogoproto.moretags) = "yaml:\"port_id\"" ]; + string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; // channel unique identifier. - string channel_id = 2 [ (gogoproto.moretags) = "yaml:\"channel_id\"" ]; + string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; // packet sequence. uint64 sequence = 3; // embedded data that represents packet state. diff --git a/third_party/proto/ibc/core/channel/v1/genesis.proto b/third_party/proto/ibc/core/channel/v1/genesis.proto index c17ee4e7..2cd109da 100644 --- a/third_party/proto/ibc/core/channel/v1/genesis.proto +++ b/third_party/proto/ibc/core/channel/v1/genesis.proto @@ -2,20 +2,20 @@ syntax = "proto3"; package ibc.core.channel.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"; - import "gogoproto/gogo.proto"; import "ibc/core/channel/v1/channel.proto"; +option go_package = "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"; + // GenesisState defines the ibc channel submodule's genesis state. message GenesisState { repeated IdentifiedChannel channels = 1 [ (gogoproto.casttype) = "IdentifiedChannel", (gogoproto.nullable) = false ]; - repeated PacketState acknowledgements = 2 [ (gogoproto.nullable) = false ]; - repeated PacketState commitments = 3 [ (gogoproto.nullable) = false ]; - repeated PacketState receipts = 4 [ (gogoproto.nullable) = false ]; + repeated PacketState acknowledgements = 2 [(gogoproto.nullable) = false]; + repeated PacketState commitments = 3 [(gogoproto.nullable) = false]; + repeated PacketState receipts = 4 [(gogoproto.nullable) = false]; repeated PacketSequence send_sequences = 5 [ (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"send_sequences\"" @@ -29,14 +29,13 @@ message GenesisState { (gogoproto.moretags) = "yaml:\"ack_sequences\"" ]; // the sequence for the next generated channel identifier - uint64 next_channel_sequence = 8 - [ (gogoproto.moretags) = "yaml:\"next_channel_sequence\"" ]; + uint64 next_channel_sequence = 8 [(gogoproto.moretags) = "yaml:\"next_channel_sequence\""]; } // PacketSequence defines the genesis type necessary to retrieve and store // next send and receive sequences. message PacketSequence { - string port_id = 1 [ (gogoproto.moretags) = "yaml:\"port_id\"" ]; - string channel_id = 2 [ (gogoproto.moretags) = "yaml:\"channel_id\"" ]; + string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; + string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; uint64 sequence = 3; } diff --git a/third_party/proto/ibc/core/channel/v1/query.proto b/third_party/proto/ibc/core/channel/v1/query.proto index 2cd41022..0ee46518 100644 --- a/third_party/proto/ibc/core/channel/v1/query.proto +++ b/third_party/proto/ibc/core/channel/v1/query.proto @@ -2,21 +2,20 @@ syntax = "proto3"; package ibc.core.channel.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"; - -import "ibc/core/client/v1/client.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "ibc/core/channel/v1/channel.proto"; +import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "google/protobuf/any.proto"; -import "gogoproto/gogo.proto"; +import "ibc/core/channel/v1/channel.proto"; +import "ibc/core/client/v1/client.proto"; + +option go_package = "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"; // Query provides defines the gRPC querier service service Query { // Channel queries an IBC Channel. rpc Channel(QueryChannelRequest) returns (QueryChannelResponse) { - option (google.api.http).get = - "/ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}"; + option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}"; } // Channels queries all the IBC channels of a chain. @@ -26,92 +25,88 @@ service Query { // ConnectionChannels queries all the channels associated with a connection // end. - rpc ConnectionChannels(QueryConnectionChannelsRequest) - returns (QueryConnectionChannelsResponse) { - option (google.api.http).get = - "/ibc/core/channel/v1/connections/{connection}/channels"; + rpc ConnectionChannels(QueryConnectionChannelsRequest) returns (QueryConnectionChannelsResponse) { + option (google.api.http).get = "/ibc/core/channel/v1/connections/{connection}/channels"; } // ChannelClientState queries for the client state for the channel associated // with the provided channel identifiers. - rpc ChannelClientState(QueryChannelClientStateRequest) - returns (QueryChannelClientStateResponse) { - option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/" - "ports/{port_id}/client_state"; + rpc ChannelClientState(QueryChannelClientStateRequest) returns (QueryChannelClientStateResponse) { + option (google.api.http).get = + "/ibc/core/channel/v1/channels/{channel_id}/" + "ports/{port_id}/client_state"; } // ChannelConsensusState queries for the consensus state for the channel // associated with the provided channel identifiers. - rpc ChannelConsensusState(QueryChannelConsensusStateRequest) - returns (QueryChannelConsensusStateResponse) { - option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/" - "ports/{port_id}/consensus_state/revision/" - "{revision_number}/height/{revision_height}"; + rpc ChannelConsensusState(QueryChannelConsensusStateRequest) returns (QueryChannelConsensusStateResponse) { + option (google.api.http).get = + "/ibc/core/channel/v1/channels/{channel_id}/" + "ports/{port_id}/consensus_state/revision/" + "{revision_number}/height/{revision_height}"; } // PacketCommitment queries a stored packet commitment hash. - rpc PacketCommitment(QueryPacketCommitmentRequest) - returns (QueryPacketCommitmentResponse) { + rpc PacketCommitment(QueryPacketCommitmentRequest) returns (QueryPacketCommitmentResponse) { option (google.api.http).get = - "/ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/" - "packet_commitments/{sequence}"; + "/ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/" + "packet_commitments/{sequence}"; } // PacketCommitments returns all the packet commitments hashes associated // with a channel. - rpc PacketCommitments(QueryPacketCommitmentsRequest) - returns (QueryPacketCommitmentsResponse) { - option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/" - "ports/{port_id}/packet_commitments"; + rpc PacketCommitments(QueryPacketCommitmentsRequest) returns (QueryPacketCommitmentsResponse) { + option (google.api.http).get = + "/ibc/core/channel/v1/channels/{channel_id}/" + "ports/{port_id}/packet_commitments"; } // PacketReceipt queries if a given packet sequence has been received on the // queried chain - rpc PacketReceipt(QueryPacketReceiptRequest) - returns (QueryPacketReceiptResponse) { - option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/" - "ports/{port_id}/packet_receipts/{sequence}"; + rpc PacketReceipt(QueryPacketReceiptRequest) returns (QueryPacketReceiptResponse) { + option (google.api.http).get = + "/ibc/core/channel/v1/channels/{channel_id}/" + "ports/{port_id}/packet_receipts/{sequence}"; } // PacketAcknowledgement queries a stored packet acknowledgement hash. - rpc PacketAcknowledgement(QueryPacketAcknowledgementRequest) - returns (QueryPacketAcknowledgementResponse) { - option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/" - "ports/{port_id}/packet_acks/{sequence}"; + rpc PacketAcknowledgement(QueryPacketAcknowledgementRequest) returns (QueryPacketAcknowledgementResponse) { + option (google.api.http).get = + "/ibc/core/channel/v1/channels/{channel_id}/" + "ports/{port_id}/packet_acks/{sequence}"; } // PacketAcknowledgements returns all the packet acknowledgements associated // with a channel. - rpc PacketAcknowledgements(QueryPacketAcknowledgementsRequest) - returns (QueryPacketAcknowledgementsResponse) { - option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/" - "ports/{port_id}/packet_acknowledgements"; + rpc PacketAcknowledgements(QueryPacketAcknowledgementsRequest) returns (QueryPacketAcknowledgementsResponse) { + option (google.api.http).get = + "/ibc/core/channel/v1/channels/{channel_id}/" + "ports/{port_id}/packet_acknowledgements"; } // UnreceivedPackets returns all the unreceived IBC packets associated with a // channel and sequences. - rpc UnreceivedPackets(QueryUnreceivedPacketsRequest) - returns (QueryUnreceivedPacketsResponse) { + rpc UnreceivedPackets(QueryUnreceivedPacketsRequest) returns (QueryUnreceivedPacketsResponse) { option (google.api.http).get = - "/ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/" - "packet_commitments/" - "{packet_commitment_sequences}/unreceived_packets"; + "/ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/" + "packet_commitments/" + "{packet_commitment_sequences}/unreceived_packets"; } // UnreceivedAcks returns all the unreceived IBC acknowledgements associated // with a channel and sequences. - rpc UnreceivedAcks(QueryUnreceivedAcksRequest) - returns (QueryUnreceivedAcksResponse) { - option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/" - "ports/{port_id}/packet_commitments/" - "{packet_ack_sequences}/unreceived_acks"; + rpc UnreceivedAcks(QueryUnreceivedAcksRequest) returns (QueryUnreceivedAcksResponse) { + option (google.api.http).get = + "/ibc/core/channel/v1/channels/{channel_id}/" + "ports/{port_id}/packet_commitments/" + "{packet_ack_sequences}/unreceived_acks"; } // NextSequenceReceive returns the next receive sequence for a given channel. - rpc NextSequenceReceive(QueryNextSequenceReceiveRequest) - returns (QueryNextSequenceReceiveResponse) { - option (google.api.http).get = "/ibc/core/channel/v1/channels/{channel_id}/" - "ports/{port_id}/next_sequence"; + rpc NextSequenceReceive(QueryNextSequenceReceiveRequest) returns (QueryNextSequenceReceiveResponse) { + option (google.api.http).get = + "/ibc/core/channel/v1/channels/{channel_id}/" + "ports/{port_id}/next_sequence"; } } @@ -132,7 +127,7 @@ message QueryChannelResponse { // merkle proof of existence bytes proof = 2; // height at which the proof was retrieved - ibc.core.client.v1.Height proof_height = 3 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false]; } // QueryChannelsRequest is the request type for the Query/Channels RPC method @@ -148,7 +143,7 @@ message QueryChannelsResponse { // pagination response cosmos.base.query.v1beta1.PageResponse pagination = 2; // query block height - ibc.core.client.v1.Height height = 3 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height height = 3 [(gogoproto.nullable) = false]; } // QueryConnectionChannelsRequest is the request type for the @@ -168,7 +163,7 @@ message QueryConnectionChannelsResponse { // pagination response cosmos.base.query.v1beta1.PageResponse pagination = 2; // query block height - ibc.core.client.v1.Height height = 3 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height height = 3 [(gogoproto.nullable) = false]; } // QueryChannelClientStateRequest is the request type for the Query/ClientState @@ -188,7 +183,7 @@ message QueryChannelClientStateResponse { // merkle proof of existence bytes proof = 2; // height at which the proof was retrieved - ibc.core.client.v1.Height proof_height = 3 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false]; } // QueryChannelConsensusStateRequest is the request type for the @@ -214,7 +209,7 @@ message QueryChannelConsensusStateResponse { // merkle proof of existence bytes proof = 3; // height at which the proof was retrieved - ibc.core.client.v1.Height proof_height = 4 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height proof_height = 4 [(gogoproto.nullable) = false]; } // QueryPacketCommitmentRequest is the request type for the @@ -237,7 +232,7 @@ message QueryPacketCommitmentResponse { // merkle proof of existence bytes proof = 2; // height at which the proof was retrieved - ibc.core.client.v1.Height proof_height = 3 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false]; } // QueryPacketCommitmentsRequest is the request type for the @@ -258,7 +253,7 @@ message QueryPacketCommitmentsResponse { // pagination response cosmos.base.query.v1beta1.PageResponse pagination = 2; // query block height - ibc.core.client.v1.Height height = 3 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height height = 3 [(gogoproto.nullable) = false]; } // QueryPacketReceiptRequest is the request type for the @@ -281,7 +276,7 @@ message QueryPacketReceiptResponse { // merkle proof of existence bytes proof = 3; // height at which the proof was retrieved - ibc.core.client.v1.Height proof_height = 4 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height proof_height = 4 [(gogoproto.nullable) = false]; } // QueryPacketAcknowledgementRequest is the request type for the @@ -304,7 +299,7 @@ message QueryPacketAcknowledgementResponse { // merkle proof of existence bytes proof = 2; // height at which the proof was retrieved - ibc.core.client.v1.Height proof_height = 3 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false]; } // QueryPacketAcknowledgementsRequest is the request type for the @@ -327,7 +322,7 @@ message QueryPacketAcknowledgementsResponse { // pagination response cosmos.base.query.v1beta1.PageResponse pagination = 2; // query block height - ibc.core.client.v1.Height height = 3 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height height = 3 [(gogoproto.nullable) = false]; } // QueryUnreceivedPacketsRequest is the request type for the @@ -347,7 +342,7 @@ message QueryUnreceivedPacketsResponse { // list of unreceived packet sequences repeated uint64 sequences = 1; // query block height - ibc.core.client.v1.Height height = 2 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height height = 2 [(gogoproto.nullable) = false]; } // QueryUnreceivedAcks is the request type for the @@ -367,7 +362,7 @@ message QueryUnreceivedAcksResponse { // list of unreceived acknowledgement sequences repeated uint64 sequences = 1; // query block height - ibc.core.client.v1.Height height = 2 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height height = 2 [(gogoproto.nullable) = false]; } // QueryNextSequenceReceiveRequest is the request type for the @@ -387,5 +382,5 @@ message QueryNextSequenceReceiveResponse { // merkle proof of existence bytes proof = 2; // height at which the proof was retrieved - ibc.core.client.v1.Height proof_height = 3 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false]; } diff --git a/third_party/proto/ibc/core/channel/v1/tx.proto b/third_party/proto/ibc/core/channel/v1/tx.proto index 5d83c8fc..0aac245b 100644 --- a/third_party/proto/ibc/core/channel/v1/tx.proto +++ b/third_party/proto/ibc/core/channel/v1/tx.proto @@ -2,11 +2,11 @@ syntax = "proto3"; package ibc.core.channel.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"; - import "gogoproto/gogo.proto"; -import "ibc/core/client/v1/client.proto"; import "ibc/core/channel/v1/channel.proto"; +import "ibc/core/client/v1/client.proto"; + +option go_package = "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"; // Msg defines the ibc/channel Msg service. service Msg { @@ -20,17 +20,14 @@ service Msg { rpc ChannelOpenAck(MsgChannelOpenAck) returns (MsgChannelOpenAckResponse); // ChannelOpenConfirm defines a rpc handler method for MsgChannelOpenConfirm. - rpc ChannelOpenConfirm(MsgChannelOpenConfirm) - returns (MsgChannelOpenConfirmResponse); + rpc ChannelOpenConfirm(MsgChannelOpenConfirm) returns (MsgChannelOpenConfirmResponse); // ChannelCloseInit defines a rpc handler method for MsgChannelCloseInit. - rpc ChannelCloseInit(MsgChannelCloseInit) - returns (MsgChannelCloseInitResponse); + rpc ChannelCloseInit(MsgChannelCloseInit) returns (MsgChannelCloseInitResponse); // ChannelCloseConfirm defines a rpc handler method for // MsgChannelCloseConfirm. - rpc ChannelCloseConfirm(MsgChannelCloseConfirm) - returns (MsgChannelCloseConfirmResponse); + rpc ChannelCloseConfirm(MsgChannelCloseConfirm) returns (MsgChannelCloseConfirmResponse); // RecvPacket defines a rpc handler method for MsgRecvPacket. rpc RecvPacket(MsgRecvPacket) returns (MsgRecvPacketResponse); @@ -51,14 +48,14 @@ message MsgChannelOpenInit { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string port_id = 1 [ (gogoproto.moretags) = "yaml:\"port_id\"" ]; - Channel channel = 2 [ (gogoproto.nullable) = false ]; + string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; + Channel channel = 2 [(gogoproto.nullable) = false]; string signer = 3; } // MsgChannelOpenInitResponse defines the Msg/ChannelOpenInit response type. message MsgChannelOpenInitResponse { - string channel_id = 1 [ (gogoproto.moretags) = "yaml:\"channel_id\"" ]; + string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""]; } // MsgChannelOpenInit defines a msg sent by a Relayer to try to open a channel @@ -68,17 +65,15 @@ message MsgChannelOpenTry { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string port_id = 1 [ (gogoproto.moretags) = "yaml:\"port_id\"" ]; + string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; // in the case of crossing hello's, when both chains call OpenInit, we need // the channel identifier of the previous channel in state INIT - string previous_channel_id = 2 - [ (gogoproto.moretags) = "yaml:\"previous_channel_id\"" ]; + string previous_channel_id = 2 [(gogoproto.moretags) = "yaml:\"previous_channel_id\""]; // NOTE: the version field within the channel has been deprecated. Its value // will be ignored by core IBC. - Channel channel = 3 [ (gogoproto.nullable) = false ]; - string counterparty_version = 4 - [ (gogoproto.moretags) = "yaml:\"counterparty_version\"" ]; - bytes proof_init = 5 [ (gogoproto.moretags) = "yaml:\"proof_init\"" ]; + Channel channel = 3 [(gogoproto.nullable) = false]; + string counterparty_version = 4 [(gogoproto.moretags) = "yaml:\"counterparty_version\""]; + bytes proof_init = 5 [(gogoproto.moretags) = "yaml:\"proof_init\""]; ibc.core.client.v1.Height proof_height = 6 [ (gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false @@ -95,13 +90,11 @@ message MsgChannelOpenAck { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string port_id = 1 [ (gogoproto.moretags) = "yaml:\"port_id\"" ]; - string channel_id = 2 [ (gogoproto.moretags) = "yaml:\"channel_id\"" ]; - string counterparty_channel_id = 3 - [ (gogoproto.moretags) = "yaml:\"counterparty_channel_id\"" ]; - string counterparty_version = 4 - [ (gogoproto.moretags) = "yaml:\"counterparty_version\"" ]; - bytes proof_try = 5 [ (gogoproto.moretags) = "yaml:\"proof_try\"" ]; + string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; + string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; + string counterparty_channel_id = 3 [(gogoproto.moretags) = "yaml:\"counterparty_channel_id\""]; + string counterparty_version = 4 [(gogoproto.moretags) = "yaml:\"counterparty_version\""]; + bytes proof_try = 5 [(gogoproto.moretags) = "yaml:\"proof_try\""]; ibc.core.client.v1.Height proof_height = 6 [ (gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false @@ -118,9 +111,9 @@ message MsgChannelOpenConfirm { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string port_id = 1 [ (gogoproto.moretags) = "yaml:\"port_id\"" ]; - string channel_id = 2 [ (gogoproto.moretags) = "yaml:\"channel_id\"" ]; - bytes proof_ack = 3 [ (gogoproto.moretags) = "yaml:\"proof_ack\"" ]; + string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; + string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; + bytes proof_ack = 3 [(gogoproto.moretags) = "yaml:\"proof_ack\""]; ibc.core.client.v1.Height proof_height = 4 [ (gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false @@ -138,8 +131,8 @@ message MsgChannelCloseInit { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string port_id = 1 [ (gogoproto.moretags) = "yaml:\"port_id\"" ]; - string channel_id = 2 [ (gogoproto.moretags) = "yaml:\"channel_id\"" ]; + string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; + string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; string signer = 3; } @@ -152,9 +145,9 @@ message MsgChannelCloseConfirm { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string port_id = 1 [ (gogoproto.moretags) = "yaml:\"port_id\"" ]; - string channel_id = 2 [ (gogoproto.moretags) = "yaml:\"channel_id\"" ]; - bytes proof_init = 3 [ (gogoproto.moretags) = "yaml:\"proof_init\"" ]; + string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; + string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; + bytes proof_init = 3 [(gogoproto.moretags) = "yaml:\"proof_init\""]; ibc.core.client.v1.Height proof_height = 4 [ (gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false @@ -171,9 +164,8 @@ message MsgRecvPacket { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - Packet packet = 1 [ (gogoproto.nullable) = false ]; - bytes proof_commitment = 2 - [ (gogoproto.moretags) = "yaml:\"proof_commitment\"" ]; + Packet packet = 1 [(gogoproto.nullable) = false]; + bytes proof_commitment = 2 [(gogoproto.moretags) = "yaml:\"proof_commitment\""]; ibc.core.client.v1.Height proof_height = 3 [ (gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false @@ -189,15 +181,13 @@ message MsgTimeout { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - Packet packet = 1 [ (gogoproto.nullable) = false ]; - bytes proof_unreceived = 2 - [ (gogoproto.moretags) = "yaml:\"proof_unreceived\"" ]; + Packet packet = 1 [(gogoproto.nullable) = false]; + bytes proof_unreceived = 2 [(gogoproto.moretags) = "yaml:\"proof_unreceived\""]; ibc.core.client.v1.Height proof_height = 3 [ (gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false ]; - uint64 next_sequence_recv = 4 - [ (gogoproto.moretags) = "yaml:\"next_sequence_recv\"" ]; + uint64 next_sequence_recv = 4 [(gogoproto.moretags) = "yaml:\"next_sequence_recv\""]; string signer = 5; } @@ -209,16 +199,14 @@ message MsgTimeoutOnClose { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - Packet packet = 1 [ (gogoproto.nullable) = false ]; - bytes proof_unreceived = 2 - [ (gogoproto.moretags) = "yaml:\"proof_unreceived\"" ]; - bytes proof_close = 3 [ (gogoproto.moretags) = "yaml:\"proof_close\"" ]; + Packet packet = 1 [(gogoproto.nullable) = false]; + bytes proof_unreceived = 2 [(gogoproto.moretags) = "yaml:\"proof_unreceived\""]; + bytes proof_close = 3 [(gogoproto.moretags) = "yaml:\"proof_close\""]; ibc.core.client.v1.Height proof_height = 4 [ (gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false ]; - uint64 next_sequence_recv = 5 - [ (gogoproto.moretags) = "yaml:\"next_sequence_recv\"" ]; + uint64 next_sequence_recv = 5 [(gogoproto.moretags) = "yaml:\"next_sequence_recv\""]; string signer = 6; } @@ -230,9 +218,9 @@ message MsgAcknowledgement { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - Packet packet = 1 [ (gogoproto.nullable) = false ]; + Packet packet = 1 [(gogoproto.nullable) = false]; bytes acknowledgement = 2; - bytes proof_acked = 3 [ (gogoproto.moretags) = "yaml:\"proof_acked\"" ]; + bytes proof_acked = 3 [(gogoproto.moretags) = "yaml:\"proof_acked\""]; ibc.core.client.v1.Height proof_height = 4 [ (gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false diff --git a/third_party/proto/ibc/core/client/v1/client.proto b/third_party/proto/ibc/core/client/v1/client.proto index 2d6f3375..c568893f 100644 --- a/third_party/proto/ibc/core/client/v1/client.proto +++ b/third_party/proto/ibc/core/client/v1/client.proto @@ -2,37 +2,35 @@ syntax = "proto3"; package ibc.core.client.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"; - +import "cosmos/upgrade/v1beta1/upgrade.proto"; import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; -import "cosmos/upgrade/v1beta1/upgrade.proto"; + +option go_package = "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"; // IdentifiedClientState defines a client state with an additional client // identifier field. message IdentifiedClientState { // client identifier - string client_id = 1 [ (gogoproto.moretags) = "yaml:\"client_id\"" ]; + string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; // client state - google.protobuf.Any client_state = 2 - [ (gogoproto.moretags) = "yaml:\"client_state\"" ]; + google.protobuf.Any client_state = 2 [(gogoproto.moretags) = "yaml:\"client_state\""]; } // ConsensusStateWithHeight defines a consensus state with an additional height // field. message ConsensusStateWithHeight { // consensus state height - Height height = 1 [ (gogoproto.nullable) = false ]; + Height height = 1 [(gogoproto.nullable) = false]; // consensus state - google.protobuf.Any consensus_state = 2 - [ (gogoproto.moretags) = "yaml:\"consensus_state\"" ]; + google.protobuf.Any consensus_state = 2 [(gogoproto.moretags) = "yaml:\"consensus_state\""]; } // ClientConsensusStates defines all the stored consensus states for a given // client. message ClientConsensusStates { // client identifier - string client_id = 1 [ (gogoproto.moretags) = "yaml:\"client_id\"" ]; + string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; // consensus states and their heights associated with the client repeated ConsensusStateWithHeight consensus_states = 2 [ (gogoproto.moretags) = "yaml:\"consensus_states\"", @@ -52,12 +50,10 @@ message ClientUpdateProposal { // the description of the proposal string description = 2; // the client identifier for the client to be updated if the proposal passes - string subject_client_id = 3 - [ (gogoproto.moretags) = "yaml:\"subject_client_id\"" ]; + string subject_client_id = 3 [(gogoproto.moretags) = "yaml:\"subject_client_id\""]; // the substitute client identifier for the client standing in for the subject // client - string substitute_client_id = 4 - [ (gogoproto.moretags) = "yaml:\"substitute_client_id\"" ]; + string substitute_client_id = 4 [(gogoproto.moretags) = "yaml:\"substitute_client_id\""]; } // UpgradeProposal is a gov Content type for initiating an IBC breaking @@ -69,7 +65,7 @@ message UpgradeProposal { string title = 1; string description = 2; - cosmos.upgrade.v1beta1.Plan plan = 3 [ (gogoproto.nullable) = false ]; + cosmos.upgrade.v1beta1.Plan plan = 3 [(gogoproto.nullable) = false]; // An UpgradedClientState must be provided to perform an IBC breaking upgrade. // This will make the chain commit to the correct upgraded (self) client state @@ -77,8 +73,7 @@ message UpgradeProposal { // new upgraded client is valid by verifying a proof on the previous version // of the chain. This will allow IBC connections to persist smoothly across // planned chain upgrades - google.protobuf.Any upgraded_client_state = 4 - [ (gogoproto.moretags) = "yaml:\"upgraded_client_state\"" ]; + google.protobuf.Any upgraded_client_state = 4 [(gogoproto.moretags) = "yaml:\"upgraded_client_state\""]; } // Height is a monotonically increasing data type @@ -96,16 +91,13 @@ message Height { option (gogoproto.goproto_stringer) = false; // the revision that the client is currently on - uint64 revision_number = 1 - [ (gogoproto.moretags) = "yaml:\"revision_number\"" ]; + uint64 revision_number = 1 [(gogoproto.moretags) = "yaml:\"revision_number\""]; // the height within the given revision - uint64 revision_height = 2 - [ (gogoproto.moretags) = "yaml:\"revision_height\"" ]; + uint64 revision_height = 2 [(gogoproto.moretags) = "yaml:\"revision_height\""]; } // Params defines the set of IBC light client parameters. message Params { // allowed_clients defines the list of allowed client state types. - repeated string allowed_clients = 1 - [ (gogoproto.moretags) = "yaml:\"allowed_clients\"" ]; + repeated string allowed_clients = 1 [(gogoproto.moretags) = "yaml:\"allowed_clients\""]; } diff --git a/third_party/proto/ibc/core/client/v1/genesis.proto b/third_party/proto/ibc/core/client/v1/genesis.proto index 4c113fa9..883bdc19 100644 --- a/third_party/proto/ibc/core/client/v1/genesis.proto +++ b/third_party/proto/ibc/core/client/v1/genesis.proto @@ -2,10 +2,10 @@ syntax = "proto3"; package ibc.core.client.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"; - -import "ibc/core/client/v1/client.proto"; import "gogoproto/gogo.proto"; +import "ibc/core/client/v1/client.proto"; + +option go_package = "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"; // GenesisState defines the ibc client submodule's genesis state. message GenesisState { @@ -25,13 +25,11 @@ message GenesisState { (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"clients_metadata\"" ]; - Params params = 4 [ (gogoproto.nullable) = false ]; + Params params = 4 [(gogoproto.nullable) = false]; // create localhost on initialization - bool create_localhost = 5 - [ (gogoproto.moretags) = "yaml:\"create_localhost\"" ]; + bool create_localhost = 5 [(gogoproto.moretags) = "yaml:\"create_localhost\""]; // the sequence for the next generated client identifier - uint64 next_client_sequence = 6 - [ (gogoproto.moretags) = "yaml:\"next_client_sequence\"" ]; + uint64 next_client_sequence = 6 [(gogoproto.moretags) = "yaml:\"next_client_sequence\""]; } // GenesisMetadata defines the genesis type for metadata that clients may return @@ -48,7 +46,7 @@ message GenesisMetadata { // IdentifiedGenesisMetadata has the client metadata with the corresponding // client id. message IdentifiedGenesisMetadata { - string client_id = 1 [ (gogoproto.moretags) = "yaml:\"client_id\"" ]; + string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; repeated GenesisMetadata client_metadata = 2 [ (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"client_metadata\"" diff --git a/third_party/proto/ibc/core/client/v1/query.proto b/third_party/proto/ibc/core/client/v1/query.proto index a3dad846..03fb06ab 100644 --- a/third_party/proto/ibc/core/client/v1/query.proto +++ b/third_party/proto/ibc/core/client/v1/query.proto @@ -2,69 +2,59 @@ syntax = "proto3"; package ibc.core.client.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"; - import "cosmos/base/query/v1beta1/pagination.proto"; -import "ibc/core/client/v1/client.proto"; -import "google/protobuf/any.proto"; -import "google/api/annotations.proto"; import "gogoproto/gogo.proto"; +import "google/api/annotations.proto"; +import "google/protobuf/any.proto"; +import "ibc/core/client/v1/client.proto"; + +option go_package = "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"; // Query provides defines the gRPC querier service service Query { // ClientState queries an IBC light client. rpc ClientState(QueryClientStateRequest) returns (QueryClientStateResponse) { - option (google.api.http).get = - "/ibc/core/client/v1/client_states/{client_id}"; + option (google.api.http).get = "/ibc/core/client/v1/client_states/{client_id}"; } // ClientStates queries all the IBC light clients of a chain. - rpc ClientStates(QueryClientStatesRequest) - returns (QueryClientStatesResponse) { + rpc ClientStates(QueryClientStatesRequest) returns (QueryClientStatesResponse) { option (google.api.http).get = "/ibc/core/client/v1/client_states"; } // ConsensusState queries a consensus state associated with a client state at // a given height. - rpc ConsensusState(QueryConsensusStateRequest) - returns (QueryConsensusStateResponse) { - option (google.api.http).get = "/ibc/core/client/v1/consensus_states/" - "{client_id}/revision/{revision_number}/" - "height/{revision_height}"; + rpc ConsensusState(QueryConsensusStateRequest) returns (QueryConsensusStateResponse) { + option (google.api.http).get = + "/ibc/core/client/v1/consensus_states/" + "{client_id}/revision/{revision_number}/" + "height/{revision_height}"; } // ConsensusStates queries all the consensus state associated with a given // client. - rpc ConsensusStates(QueryConsensusStatesRequest) - returns (QueryConsensusStatesResponse) { - option (google.api.http).get = - "/ibc/core/client/v1/consensus_states/{client_id}"; + rpc ConsensusStates(QueryConsensusStatesRequest) returns (QueryConsensusStatesResponse) { + option (google.api.http).get = "/ibc/core/client/v1/consensus_states/{client_id}"; } // Status queries the status of an IBC client. - rpc ClientStatus(QueryClientStatusRequest) - returns (QueryClientStatusResponse) { - option (google.api.http).get = - "/ibc/core/client/v1/client_status/{client_id}"; + rpc ClientStatus(QueryClientStatusRequest) returns (QueryClientStatusResponse) { + option (google.api.http).get = "/ibc/core/client/v1/client_status/{client_id}"; } // ClientParams queries all parameters of the ibc client. - rpc ClientParams(QueryClientParamsRequest) - returns (QueryClientParamsResponse) { + rpc ClientParams(QueryClientParamsRequest) returns (QueryClientParamsResponse) { option (google.api.http).get = "/ibc/client/v1/params"; } // UpgradedClientState queries an Upgraded IBC light client. - rpc UpgradedClientState(QueryUpgradedClientStateRequest) - returns (QueryUpgradedClientStateResponse) { + rpc UpgradedClientState(QueryUpgradedClientStateRequest) returns (QueryUpgradedClientStateResponse) { option (google.api.http).get = "/ibc/core/client/v1/upgraded_client_states"; } // UpgradedConsensusState queries an Upgraded IBC consensus state. - rpc UpgradedConsensusState(QueryUpgradedConsensusStateRequest) - returns (QueryUpgradedConsensusStateResponse) { - option (google.api.http).get = - "/ibc/core/client/v1/upgraded_consensus_states"; + rpc UpgradedConsensusState(QueryUpgradedConsensusStateRequest) returns (QueryUpgradedConsensusStateResponse) { + option (google.api.http).get = "/ibc/core/client/v1/upgraded_consensus_states"; } } @@ -84,7 +74,7 @@ message QueryClientStateResponse { // merkle proof of existence bytes proof = 2; // height at which the proof was retrieved - ibc.core.client.v1.Height proof_height = 3 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false]; } // QueryClientStatesRequest is the request type for the Query/ClientStates RPC @@ -129,7 +119,7 @@ message QueryConsensusStateResponse { // merkle proof of existence bytes proof = 2; // height at which the proof was retrieved - ibc.core.client.v1.Height proof_height = 3 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false]; } // QueryConsensusStatesRequest is the request type for the Query/ConsensusStates @@ -145,8 +135,7 @@ message QueryConsensusStatesRequest { // Query/ConsensusStates RPC method message QueryConsensusStatesResponse { // consensus states associated with the identifier - repeated ConsensusStateWithHeight consensus_states = 1 - [ (gogoproto.nullable) = false ]; + repeated ConsensusStateWithHeight consensus_states = 1 [(gogoproto.nullable) = false]; // pagination response cosmos.base.query.v1beta1.PageResponse pagination = 2; } @@ -160,7 +149,9 @@ message QueryClientStatusRequest { // QueryClientStatusResponse is the response type for the Query/ClientStatus RPC // method. It returns the current status of the IBC client. -message QueryClientStatusResponse { string status = 1; } +message QueryClientStatusResponse { + string status = 1; +} // QueryClientParamsRequest is the request type for the Query/ClientParams RPC // method. diff --git a/third_party/proto/ibc/core/client/v1/tx.proto b/third_party/proto/ibc/core/client/v1/tx.proto index 635ad7a7..bc191829 100644 --- a/third_party/proto/ibc/core/client/v1/tx.proto +++ b/third_party/proto/ibc/core/client/v1/tx.proto @@ -2,11 +2,11 @@ syntax = "proto3"; package ibc.core.client.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"; - import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; +option go_package = "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"; + // Msg defines the ibc/client Msg service. service Msg { // CreateClient defines a rpc handler method for MsgCreateClient. @@ -19,8 +19,7 @@ service Msg { rpc UpgradeClient(MsgUpgradeClient) returns (MsgUpgradeClientResponse); // SubmitMisbehaviour defines a rpc handler method for MsgSubmitMisbehaviour. - rpc SubmitMisbehaviour(MsgSubmitMisbehaviour) - returns (MsgSubmitMisbehaviourResponse); + rpc SubmitMisbehaviour(MsgSubmitMisbehaviour) returns (MsgSubmitMisbehaviourResponse); } // MsgCreateClient defines a message to create an IBC client @@ -29,12 +28,10 @@ message MsgCreateClient { option (gogoproto.goproto_getters) = false; // light client state - google.protobuf.Any client_state = 1 - [ (gogoproto.moretags) = "yaml:\"client_state\"" ]; + google.protobuf.Any client_state = 1 [(gogoproto.moretags) = "yaml:\"client_state\""]; // consensus state associated with the client that corresponds to a given // height. - google.protobuf.Any consensus_state = 2 - [ (gogoproto.moretags) = "yaml:\"consensus_state\"" ]; + google.protobuf.Any consensus_state = 2 [(gogoproto.moretags) = "yaml:\"consensus_state\""]; // signer address string signer = 3; } @@ -49,7 +46,7 @@ message MsgUpdateClient { option (gogoproto.goproto_getters) = false; // client unique identifier - string client_id = 1 [ (gogoproto.moretags) = "yaml:\"client_id\"" ]; + string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; // header to update the light client google.protobuf.Any header = 2; // signer address @@ -66,20 +63,16 @@ message MsgUpgradeClient { option (gogoproto.goproto_getters) = false; // client unique identifier - string client_id = 1 [ (gogoproto.moretags) = "yaml:\"client_id\"" ]; + string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; // upgraded client state - google.protobuf.Any client_state = 2 - [ (gogoproto.moretags) = "yaml:\"client_state\"" ]; + google.protobuf.Any client_state = 2 [(gogoproto.moretags) = "yaml:\"client_state\""]; // upgraded consensus state, only contains enough information to serve as a // basis of trust in update logic - google.protobuf.Any consensus_state = 3 - [ (gogoproto.moretags) = "yaml:\"consensus_state\"" ]; + google.protobuf.Any consensus_state = 3 [(gogoproto.moretags) = "yaml:\"consensus_state\""]; // proof that old chain committed to new client - bytes proof_upgrade_client = 4 - [ (gogoproto.moretags) = "yaml:\"proof_upgrade_client\"" ]; + bytes proof_upgrade_client = 4 [(gogoproto.moretags) = "yaml:\"proof_upgrade_client\""]; // proof that old chain committed to new consensus state - bytes proof_upgrade_consensus_state = 5 - [ (gogoproto.moretags) = "yaml:\"proof_upgrade_consensus_state\"" ]; + bytes proof_upgrade_consensus_state = 5 [(gogoproto.moretags) = "yaml:\"proof_upgrade_consensus_state\""]; // signer address string signer = 6; } @@ -94,7 +87,7 @@ message MsgSubmitMisbehaviour { option (gogoproto.goproto_getters) = false; // client unique identifier - string client_id = 1 [ (gogoproto.moretags) = "yaml:\"client_id\"" ]; + string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; // misbehaviour used for freezing the light client google.protobuf.Any misbehaviour = 2; // signer address diff --git a/third_party/proto/ibc/core/commitment/v1/commitment.proto b/third_party/proto/ibc/core/commitment/v1/commitment.proto index 620ae589..6b4dd853 100644 --- a/third_party/proto/ibc/core/commitment/v1/commitment.proto +++ b/third_party/proto/ibc/core/commitment/v1/commitment.proto @@ -2,11 +2,11 @@ syntax = "proto3"; package ibc.core.commitment.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/core/23-commitment/types"; - import "gogoproto/gogo.proto"; import "proofs.proto"; +option go_package = "github.com/cosmos/ibc-go/v3/modules/core/23-commitment/types"; + // MerkleRoot defines a merkle root hash. // In the Cosmos SDK, the AppHash of a block header becomes the root. message MerkleRoot { @@ -19,7 +19,7 @@ message MerkleRoot { // The constructed key from the Path and the key will be append(Path.KeyPath, // append(Path.KeyPrefix, key...)) message MerklePrefix { - bytes key_prefix = 1 [ (gogoproto.moretags) = "yaml:\"key_prefix\"" ]; + bytes key_prefix = 1 [(gogoproto.moretags) = "yaml:\"key_prefix\""]; } // MerklePath is the path used to verify commitment proofs, which can be an @@ -28,7 +28,7 @@ message MerklePrefix { message MerklePath { option (gogoproto.goproto_stringer) = false; - repeated string key_path = 1 [ (gogoproto.moretags) = "yaml:\"key_path\"" ]; + repeated string key_path = 1 [(gogoproto.moretags) = "yaml:\"key_path\""]; } // MerkleProof is a wrapper type over a chain of CommitmentProofs. @@ -36,4 +36,6 @@ message MerklePath { // elements, verifiable in conjunction with a known commitment root. Proofs // should be succinct. // MerkleProofs are ordered from leaf-to-root -message MerkleProof { repeated ics23.CommitmentProof proofs = 1; } +message MerkleProof { + repeated ics23.CommitmentProof proofs = 1; +} diff --git a/third_party/proto/ibc/core/connection/v1/connection.proto b/third_party/proto/ibc/core/connection/v1/connection.proto index 97f478b4..9bd312fc 100644 --- a/third_party/proto/ibc/core/connection/v1/connection.proto +++ b/third_party/proto/ibc/core/connection/v1/connection.proto @@ -2,11 +2,11 @@ syntax = "proto3"; package ibc.core.connection.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types"; - import "gogoproto/gogo.proto"; import "ibc/core/commitment/v1/commitment.proto"; +option go_package = "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types"; + // ICS03 - Connection Data Structures as defined in // https://github.com/cosmos/ibc/blob/master/spec/core/ics-003-connection-semantics#data-structures @@ -17,18 +17,18 @@ import "ibc/core/commitment/v1/commitment.proto"; message ConnectionEnd { option (gogoproto.goproto_getters) = false; // client associated with this connection. - string client_id = 1 [ (gogoproto.moretags) = "yaml:\"client_id\"" ]; + string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; // IBC version which can be utilised to determine encodings or protocols for // channels or packets utilising this connection. repeated Version versions = 2; // current state of the connection end. State state = 3; // counterparty chain associated with this connection. - Counterparty counterparty = 4 [ (gogoproto.nullable) = false ]; + Counterparty counterparty = 4 [(gogoproto.nullable) = false]; // delay period that must pass before a consensus state can be used for // packet-verification NOTE: delay period logic is only implemented by some // clients. - uint64 delay_period = 5 [ (gogoproto.moretags) = "yaml:\"delay_period\"" ]; + uint64 delay_period = 5 [(gogoproto.moretags) = "yaml:\"delay_period\""]; } // IdentifiedConnection defines a connection with additional connection @@ -36,18 +36,18 @@ message ConnectionEnd { message IdentifiedConnection { option (gogoproto.goproto_getters) = false; // connection identifier. - string id = 1 [ (gogoproto.moretags) = "yaml:\"id\"" ]; + string id = 1 [(gogoproto.moretags) = "yaml:\"id\""]; // client associated with this connection. - string client_id = 2 [ (gogoproto.moretags) = "yaml:\"client_id\"" ]; + string client_id = 2 [(gogoproto.moretags) = "yaml:\"client_id\""]; // IBC version which can be utilised to determine encodings or protocols for // channels or packets utilising this connection repeated Version versions = 3; // current state of the connection end. State state = 4; // counterparty chain associated with this connection. - Counterparty counterparty = 5 [ (gogoproto.nullable) = false ]; + Counterparty counterparty = 5 [(gogoproto.nullable) = false]; // delay period associated with this connection. - uint64 delay_period = 6 [ (gogoproto.moretags) = "yaml:\"delay_period\"" ]; + uint64 delay_period = 6 [(gogoproto.moretags) = "yaml:\"delay_period\""]; } // State defines if a connection is in one of the following states: @@ -56,15 +56,14 @@ enum State { option (gogoproto.goproto_enum_prefix) = false; // Default State - STATE_UNINITIALIZED_UNSPECIFIED = 0 - [ (gogoproto.enumvalue_customname) = "UNINITIALIZED" ]; + STATE_UNINITIALIZED_UNSPECIFIED = 0 [(gogoproto.enumvalue_customname) = "UNINITIALIZED"]; // A connection end has just started the opening handshake. - STATE_INIT = 1 [ (gogoproto.enumvalue_customname) = "INIT" ]; + STATE_INIT = 1 [(gogoproto.enumvalue_customname) = "INIT"]; // A connection end has acknowledged the handshake step on the counterparty // chain. - STATE_TRYOPEN = 2 [ (gogoproto.enumvalue_customname) = "TRYOPEN" ]; + STATE_TRYOPEN = 2 [(gogoproto.enumvalue_customname) = "TRYOPEN"]; // A connection end has completed the handshake. - STATE_OPEN = 3 [ (gogoproto.enumvalue_customname) = "OPEN" ]; + STATE_OPEN = 3 [(gogoproto.enumvalue_customname) = "OPEN"]; } // Counterparty defines the counterparty chain associated with a connection end. @@ -73,13 +72,12 @@ message Counterparty { // identifies the client on the counterparty chain associated with a given // connection. - string client_id = 1 [ (gogoproto.moretags) = "yaml:\"client_id\"" ]; + string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; // identifies the connection end on the counterparty chain associated with a // given connection. - string connection_id = 2 [ (gogoproto.moretags) = "yaml:\"connection_id\"" ]; + string connection_id = 2 [(gogoproto.moretags) = "yaml:\"connection_id\""]; // commitment merkle prefix of the counterparty chain. - ibc.core.commitment.v1.MerklePrefix prefix = 3 - [ (gogoproto.nullable) = false ]; + ibc.core.commitment.v1.MerklePrefix prefix = 3 [(gogoproto.nullable) = false]; } // ClientPaths define all the connection paths for a client state. @@ -91,7 +89,7 @@ message ClientPaths { // ConnectionPaths define all the connection paths for a given client state. message ConnectionPaths { // client state unique identifier - string client_id = 1 [ (gogoproto.moretags) = "yaml:\"client_id\"" ]; + string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; // list of connection paths repeated string paths = 2; } @@ -113,6 +111,5 @@ message Params { // delay. This parameter should reflect the largest amount of time that the // chain might reasonably take to produce the next block under normal // operating conditions. A safe choice is 3-5x the expected time per block. - uint64 max_expected_time_per_block = 1 - [ (gogoproto.moretags) = "yaml:\"max_expected_time_per_block\"" ]; + uint64 max_expected_time_per_block = 1 [(gogoproto.moretags) = "yaml:\"max_expected_time_per_block\""]; } diff --git a/third_party/proto/ibc/core/connection/v1/genesis.proto b/third_party/proto/ibc/core/connection/v1/genesis.proto index 8152eda0..4e5c9533 100644 --- a/third_party/proto/ibc/core/connection/v1/genesis.proto +++ b/third_party/proto/ibc/core/connection/v1/genesis.proto @@ -2,21 +2,19 @@ syntax = "proto3"; package ibc.core.connection.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types"; - import "gogoproto/gogo.proto"; import "ibc/core/connection/v1/connection.proto"; +option go_package = "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types"; + // GenesisState defines the ibc connection submodule's genesis state. message GenesisState { - repeated IdentifiedConnection connections = 1 - [ (gogoproto.nullable) = false ]; + repeated IdentifiedConnection connections = 1 [(gogoproto.nullable) = false]; repeated ConnectionPaths client_connection_paths = 2 [ (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"client_connection_paths\"" ]; // the sequence for the next generated connection identifier - uint64 next_connection_sequence = 3 - [ (gogoproto.moretags) = "yaml:\"next_connection_sequence\"" ]; - Params params = 4 [ (gogoproto.nullable) = false ]; + uint64 next_connection_sequence = 3 [(gogoproto.moretags) = "yaml:\"next_connection_sequence\""]; + Params params = 4 [(gogoproto.nullable) = false]; } diff --git a/third_party/proto/ibc/core/connection/v1/query.proto b/third_party/proto/ibc/core/connection/v1/query.proto index b50ac2e7..921b8607 100644 --- a/third_party/proto/ibc/core/connection/v1/query.proto +++ b/third_party/proto/ibc/core/connection/v1/query.proto @@ -2,21 +2,20 @@ syntax = "proto3"; package ibc.core.connection.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types"; - -import "gogoproto/gogo.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "ibc/core/client/v1/client.proto"; -import "ibc/core/connection/v1/connection.proto"; +import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "google/protobuf/any.proto"; +import "ibc/core/client/v1/client.proto"; +import "ibc/core/connection/v1/connection.proto"; + +option go_package = "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types"; // Query provides defines the gRPC querier service service Query { // Connection queries an IBC connection end. rpc Connection(QueryConnectionRequest) returns (QueryConnectionResponse) { - option (google.api.http).get = - "/ibc/core/connection/v1/connections/{connection_id}"; + option (google.api.http).get = "/ibc/core/connection/v1/connections/{connection_id}"; } // Connections queries all the IBC connections of a chain. @@ -26,27 +25,22 @@ service Query { // ClientConnections queries the connection paths associated with a client // state. - rpc ClientConnections(QueryClientConnectionsRequest) - returns (QueryClientConnectionsResponse) { - option (google.api.http).get = - "/ibc/core/connection/v1/client_connections/{client_id}"; + rpc ClientConnections(QueryClientConnectionsRequest) returns (QueryClientConnectionsResponse) { + option (google.api.http).get = "/ibc/core/connection/v1/client_connections/{client_id}"; } // ConnectionClientState queries the client state associated with the // connection. - rpc ConnectionClientState(QueryConnectionClientStateRequest) - returns (QueryConnectionClientStateResponse) { - option (google.api.http).get = - "/ibc/core/connection/v1/connections/{connection_id}/client_state"; + rpc ConnectionClientState(QueryConnectionClientStateRequest) returns (QueryConnectionClientStateResponse) { + option (google.api.http).get = "/ibc/core/connection/v1/connections/{connection_id}/client_state"; } // ConnectionConsensusState queries the consensus state associated with the // connection. - rpc ConnectionConsensusState(QueryConnectionConsensusStateRequest) - returns (QueryConnectionConsensusStateResponse) { + rpc ConnectionConsensusState(QueryConnectionConsensusStateRequest) returns (QueryConnectionConsensusStateResponse) { option (google.api.http).get = - "/ibc/core/connection/v1/connections/{connection_id}/consensus_state/" - "revision/{revision_number}/height/{revision_height}"; + "/ibc/core/connection/v1/connections/{connection_id}/consensus_state/" + "revision/{revision_number}/height/{revision_height}"; } } @@ -66,7 +60,7 @@ message QueryConnectionResponse { // merkle proof of existence bytes proof = 2; // height at which the proof was retrieved - ibc.core.client.v1.Height proof_height = 3 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false]; } // QueryConnectionsRequest is the request type for the Query/Connections RPC @@ -83,7 +77,7 @@ message QueryConnectionsResponse { // pagination response cosmos.base.query.v1beta1.PageResponse pagination = 2; // query block height - ibc.core.client.v1.Height height = 3 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height height = 3 [(gogoproto.nullable) = false]; } // QueryClientConnectionsRequest is the request type for the @@ -101,14 +95,14 @@ message QueryClientConnectionsResponse { // merkle proof of existence bytes proof = 2; // height at which the proof was generated - ibc.core.client.v1.Height proof_height = 3 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false]; } // QueryConnectionClientStateRequest is the request type for the // Query/ConnectionClientState RPC method message QueryConnectionClientStateRequest { // connection identifier - string connection_id = 1 [ (gogoproto.moretags) = "yaml:\"connection_id\"" ]; + string connection_id = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""]; } // QueryConnectionClientStateResponse is the response type for the @@ -119,14 +113,14 @@ message QueryConnectionClientStateResponse { // merkle proof of existence bytes proof = 2; // height at which the proof was retrieved - ibc.core.client.v1.Height proof_height = 3 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false]; } // QueryConnectionConsensusStateRequest is the request type for the // Query/ConnectionConsensusState RPC method message QueryConnectionConsensusStateRequest { // connection identifier - string connection_id = 1 [ (gogoproto.moretags) = "yaml:\"connection_id\"" ]; + string connection_id = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""]; uint64 revision_number = 2; uint64 revision_height = 3; } @@ -141,5 +135,5 @@ message QueryConnectionConsensusStateResponse { // merkle proof of existence bytes proof = 3; // height at which the proof was retrieved - ibc.core.client.v1.Height proof_height = 4 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height proof_height = 4 [(gogoproto.nullable) = false]; } diff --git a/third_party/proto/ibc/core/connection/v1/tx.proto b/third_party/proto/ibc/core/connection/v1/tx.proto index 4d7669b4..1e9f905e 100644 --- a/third_party/proto/ibc/core/connection/v1/tx.proto +++ b/third_party/proto/ibc/core/connection/v1/tx.proto @@ -2,31 +2,27 @@ syntax = "proto3"; package ibc.core.connection.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types"; - import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; import "ibc/core/client/v1/client.proto"; import "ibc/core/connection/v1/connection.proto"; +option go_package = "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types"; + // Msg defines the ibc/connection Msg service. service Msg { // ConnectionOpenInit defines a rpc handler method for MsgConnectionOpenInit. - rpc ConnectionOpenInit(MsgConnectionOpenInit) - returns (MsgConnectionOpenInitResponse); + rpc ConnectionOpenInit(MsgConnectionOpenInit) returns (MsgConnectionOpenInitResponse); // ConnectionOpenTry defines a rpc handler method for MsgConnectionOpenTry. - rpc ConnectionOpenTry(MsgConnectionOpenTry) - returns (MsgConnectionOpenTryResponse); + rpc ConnectionOpenTry(MsgConnectionOpenTry) returns (MsgConnectionOpenTryResponse); // ConnectionOpenAck defines a rpc handler method for MsgConnectionOpenAck. - rpc ConnectionOpenAck(MsgConnectionOpenAck) - returns (MsgConnectionOpenAckResponse); + rpc ConnectionOpenAck(MsgConnectionOpenAck) returns (MsgConnectionOpenAckResponse); // ConnectionOpenConfirm defines a rpc handler method for // MsgConnectionOpenConfirm. - rpc ConnectionOpenConfirm(MsgConnectionOpenConfirm) - returns (MsgConnectionOpenConfirmResponse); + rpc ConnectionOpenConfirm(MsgConnectionOpenConfirm) returns (MsgConnectionOpenConfirmResponse); } // MsgConnectionOpenInit defines the msg sent by an account on Chain A to @@ -35,10 +31,10 @@ message MsgConnectionOpenInit { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string client_id = 1 [ (gogoproto.moretags) = "yaml:\"client_id\"" ]; - Counterparty counterparty = 2 [ (gogoproto.nullable) = false ]; + string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; + Counterparty counterparty = 2 [(gogoproto.nullable) = false]; Version version = 3; - uint64 delay_period = 4 [ (gogoproto.moretags) = "yaml:\"delay_period\"" ]; + uint64 delay_period = 4 [(gogoproto.moretags) = "yaml:\"delay_period\""]; string signer = 5; } @@ -52,29 +48,25 @@ message MsgConnectionOpenTry { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string client_id = 1 [ (gogoproto.moretags) = "yaml:\"client_id\"" ]; + string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; // in the case of crossing hello's, when both chains call OpenInit, we need // the connection identifier of the previous connection in state INIT - string previous_connection_id = 2 - [ (gogoproto.moretags) = "yaml:\"previous_connection_id\"" ]; - google.protobuf.Any client_state = 3 - [ (gogoproto.moretags) = "yaml:\"client_state\"" ]; - Counterparty counterparty = 4 [ (gogoproto.nullable) = false ]; - uint64 delay_period = 5 [ (gogoproto.moretags) = "yaml:\"delay_period\"" ]; - repeated Version counterparty_versions = 6 - [ (gogoproto.moretags) = "yaml:\"counterparty_versions\"" ]; + string previous_connection_id = 2 [(gogoproto.moretags) = "yaml:\"previous_connection_id\""]; + google.protobuf.Any client_state = 3 [(gogoproto.moretags) = "yaml:\"client_state\""]; + Counterparty counterparty = 4 [(gogoproto.nullable) = false]; + uint64 delay_period = 5 [(gogoproto.moretags) = "yaml:\"delay_period\""]; + repeated Version counterparty_versions = 6 [(gogoproto.moretags) = "yaml:\"counterparty_versions\""]; ibc.core.client.v1.Height proof_height = 7 [ (gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false ]; // proof of the initialization the connection on Chain A: `UNITIALIZED -> // INIT` - bytes proof_init = 8 [ (gogoproto.moretags) = "yaml:\"proof_init\"" ]; + bytes proof_init = 8 [(gogoproto.moretags) = "yaml:\"proof_init\""]; // proof of client state included in message - bytes proof_client = 9 [ (gogoproto.moretags) = "yaml:\"proof_client\"" ]; + bytes proof_client = 9 [(gogoproto.moretags) = "yaml:\"proof_client\""]; // proof of client consensus state - bytes proof_consensus = 10 - [ (gogoproto.moretags) = "yaml:\"proof_consensus\"" ]; + bytes proof_consensus = 10 [(gogoproto.moretags) = "yaml:\"proof_consensus\""]; ibc.core.client.v1.Height consensus_height = 11 [ (gogoproto.moretags) = "yaml:\"consensus_height\"", (gogoproto.nullable) = false @@ -91,24 +83,21 @@ message MsgConnectionOpenAck { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string connection_id = 1 [ (gogoproto.moretags) = "yaml:\"connection_id\"" ]; - string counterparty_connection_id = 2 - [ (gogoproto.moretags) = "yaml:\"counterparty_connection_id\"" ]; + string connection_id = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""]; + string counterparty_connection_id = 2 [(gogoproto.moretags) = "yaml:\"counterparty_connection_id\""]; Version version = 3; - google.protobuf.Any client_state = 4 - [ (gogoproto.moretags) = "yaml:\"client_state\"" ]; + google.protobuf.Any client_state = 4 [(gogoproto.moretags) = "yaml:\"client_state\""]; ibc.core.client.v1.Height proof_height = 5 [ (gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false ]; // proof of the initialization the connection on Chain B: `UNITIALIZED -> // TRYOPEN` - bytes proof_try = 6 [ (gogoproto.moretags) = "yaml:\"proof_try\"" ]; + bytes proof_try = 6 [(gogoproto.moretags) = "yaml:\"proof_try\""]; // proof of client state included in message - bytes proof_client = 7 [ (gogoproto.moretags) = "yaml:\"proof_client\"" ]; + bytes proof_client = 7 [(gogoproto.moretags) = "yaml:\"proof_client\""]; // proof of client consensus state - bytes proof_consensus = 8 - [ (gogoproto.moretags) = "yaml:\"proof_consensus\"" ]; + bytes proof_consensus = 8 [(gogoproto.moretags) = "yaml:\"proof_consensus\""]; ibc.core.client.v1.Height consensus_height = 9 [ (gogoproto.moretags) = "yaml:\"consensus_height\"", (gogoproto.nullable) = false @@ -125,9 +114,9 @@ message MsgConnectionOpenConfirm { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string connection_id = 1 [ (gogoproto.moretags) = "yaml:\"connection_id\"" ]; + string connection_id = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""]; // proof for the change of the connection state on Chain A: `INIT -> OPEN` - bytes proof_ack = 2 [ (gogoproto.moretags) = "yaml:\"proof_ack\"" ]; + bytes proof_ack = 2 [(gogoproto.moretags) = "yaml:\"proof_ack\""]; ibc.core.client.v1.Height proof_height = 3 [ (gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false diff --git a/third_party/proto/ibc/core/types/v1/genesis.proto b/third_party/proto/ibc/core/types/v1/genesis.proto index e1b6ab4a..0f078c42 100644 --- a/third_party/proto/ibc/core/types/v1/genesis.proto +++ b/third_party/proto/ibc/core/types/v1/genesis.proto @@ -2,12 +2,12 @@ syntax = "proto3"; package ibc.core.types.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/core/types"; - import "gogoproto/gogo.proto"; +import "ibc/core/channel/v1/genesis.proto"; import "ibc/core/client/v1/genesis.proto"; import "ibc/core/connection/v1/genesis.proto"; -import "ibc/core/channel/v1/genesis.proto"; + +option go_package = "github.com/cosmos/ibc-go/v3/modules/core/types"; // GenesisState defines the ibc module's genesis state. message GenesisState { diff --git a/third_party/proto/ibc/lightclients/localhost/v1/localhost.proto b/third_party/proto/ibc/lightclients/localhost/v1/localhost.proto index e9e5a406..3a7dc00d 100644 --- a/third_party/proto/ibc/lightclients/localhost/v1/localhost.proto +++ b/third_party/proto/ibc/lightclients/localhost/v1/localhost.proto @@ -2,17 +2,17 @@ syntax = "proto3"; package ibc.lightclients.localhost.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/light-clients/09-localhost/types"; - import "gogoproto/gogo.proto"; import "ibc/core/client/v1/client.proto"; +option go_package = "github.com/cosmos/ibc-go/v3/modules/light-clients/09-localhost/types"; + // ClientState defines a loopback (localhost) client. It requires (read-only) // access to keys outside the client prefix. message ClientState { option (gogoproto.goproto_getters) = false; // self chain ID - string chain_id = 1 [ (gogoproto.moretags) = "yaml:\"chain_id\"" ]; + string chain_id = 1 [(gogoproto.moretags) = "yaml:\"chain_id\""]; // self latest block height - ibc.core.client.v1.Height height = 2 [ (gogoproto.nullable) = false ]; + ibc.core.client.v1.Height height = 2 [(gogoproto.nullable) = false]; } diff --git a/third_party/proto/ibc/lightclients/solomachine/v1/solomachine.proto b/third_party/proto/ibc/lightclients/solomachine/v1/solomachine.proto index 011e77b6..314295e4 100644 --- a/third_party/proto/ibc/lightclients/solomachine/v1/solomachine.proto +++ b/third_party/proto/ibc/lightclients/solomachine/v1/solomachine.proto @@ -2,12 +2,12 @@ syntax = "proto3"; package ibc.lightclients.solomachine.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/core/02-client/legacy/v100"; - -import "ibc/core/connection/v1/connection.proto"; -import "ibc/core/channel/v1/channel.proto"; import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; +import "ibc/core/channel/v1/channel.proto"; +import "ibc/core/connection/v1/connection.proto"; + +option go_package = "github.com/cosmos/ibc-go/v3/modules/core/02-client/legacy/v100"; // ClientState defines a solo machine client that tracks the current consensus // state and if the client is frozen. @@ -16,14 +16,11 @@ message ClientState { // latest sequence of the client state uint64 sequence = 1; // frozen sequence of the solo machine - uint64 frozen_sequence = 2 - [ (gogoproto.moretags) = "yaml:\"frozen_sequence\"" ]; - ConsensusState consensus_state = 3 - [ (gogoproto.moretags) = "yaml:\"consensus_state\"" ]; + uint64 frozen_sequence = 2 [(gogoproto.moretags) = "yaml:\"frozen_sequence\""]; + ConsensusState consensus_state = 3 [(gogoproto.moretags) = "yaml:\"consensus_state\""]; // when set to true, will allow governance to update a solo machine client. // The client will be unfrozen if it is frozen. - bool allow_update_after_proposal = 4 - [ (gogoproto.moretags) = "yaml:\"allow_update_after_proposal\"" ]; + bool allow_update_after_proposal = 4 [(gogoproto.moretags) = "yaml:\"allow_update_after_proposal\""]; } // ConsensusState defines a solo machine consensus state. The sequence of a @@ -32,8 +29,7 @@ message ClientState { message ConsensusState { option (gogoproto.goproto_getters) = false; // public key of the solo machine - google.protobuf.Any public_key = 1 - [ (gogoproto.moretags) = "yaml:\"public_key\"" ]; + google.protobuf.Any public_key = 1 [(gogoproto.moretags) = "yaml:\"public_key\""]; // diversifier allows the same public key to be re-used across different solo // machine clients (potentially on different chains) without being considered // misbehaviour. @@ -48,22 +44,18 @@ message Header { uint64 sequence = 1; uint64 timestamp = 2; bytes signature = 3; - google.protobuf.Any new_public_key = 4 - [ (gogoproto.moretags) = "yaml:\"new_public_key\"" ]; - string new_diversifier = 5 - [ (gogoproto.moretags) = "yaml:\"new_diversifier\"" ]; + google.protobuf.Any new_public_key = 4 [(gogoproto.moretags) = "yaml:\"new_public_key\""]; + string new_diversifier = 5 [(gogoproto.moretags) = "yaml:\"new_diversifier\""]; } // Misbehaviour defines misbehaviour for a solo machine which consists // of a sequence and two signatures over different messages at that sequence. message Misbehaviour { option (gogoproto.goproto_getters) = false; - string client_id = 1 [ (gogoproto.moretags) = "yaml:\"client_id\"" ]; + string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; uint64 sequence = 2; - SignatureAndData signature_one = 3 - [ (gogoproto.moretags) = "yaml:\"signature_one\"" ]; - SignatureAndData signature_two = 4 - [ (gogoproto.moretags) = "yaml:\"signature_two\"" ]; + SignatureAndData signature_one = 3 [(gogoproto.moretags) = "yaml:\"signature_one\""]; + SignatureAndData signature_two = 4 [(gogoproto.moretags) = "yaml:\"signature_two\""]; } // SignatureAndData contains a signature and the data signed over to create that @@ -71,7 +63,7 @@ message Misbehaviour { message SignatureAndData { option (gogoproto.goproto_getters) = false; bytes signature = 1; - DataType data_type = 2 [ (gogoproto.moretags) = "yaml:\"data_type\"" ]; + DataType data_type = 2 [(gogoproto.moretags) = "yaml:\"data_type\""]; bytes data = 3; uint64 timestamp = 4; } @@ -80,7 +72,7 @@ message SignatureAndData { // signature. message TimestampedSignatureData { option (gogoproto.goproto_getters) = false; - bytes signature_data = 1 [ (gogoproto.moretags) = "yaml:\"signature_data\"" ]; + bytes signature_data = 1 [(gogoproto.moretags) = "yaml:\"signature_data\""]; uint64 timestamp = 2; } @@ -92,7 +84,7 @@ message SignBytes { uint64 timestamp = 2; string diversifier = 3; // type of the data used - DataType data_type = 4 [ (gogoproto.moretags) = "yaml:\"data_type\"" ]; + DataType data_type = 4 [(gogoproto.moretags) = "yaml:\"data_type\""]; // marshaled data bytes data = 5; } @@ -103,32 +95,25 @@ enum DataType { option (gogoproto.goproto_enum_prefix) = false; // Default State - DATA_TYPE_UNINITIALIZED_UNSPECIFIED = 0 - [ (gogoproto.enumvalue_customname) = "UNSPECIFIED" ]; + DATA_TYPE_UNINITIALIZED_UNSPECIFIED = 0 [(gogoproto.enumvalue_customname) = "UNSPECIFIED"]; // Data type for client state verification - DATA_TYPE_CLIENT_STATE = 1 [ (gogoproto.enumvalue_customname) = "CLIENT" ]; + DATA_TYPE_CLIENT_STATE = 1 [(gogoproto.enumvalue_customname) = "CLIENT"]; // Data type for consensus state verification - DATA_TYPE_CONSENSUS_STATE = 2 - [ (gogoproto.enumvalue_customname) = "CONSENSUS" ]; + DATA_TYPE_CONSENSUS_STATE = 2 [(gogoproto.enumvalue_customname) = "CONSENSUS"]; // Data type for connection state verification - DATA_TYPE_CONNECTION_STATE = 3 - [ (gogoproto.enumvalue_customname) = "CONNECTION" ]; + DATA_TYPE_CONNECTION_STATE = 3 [(gogoproto.enumvalue_customname) = "CONNECTION"]; // Data type for channel state verification - DATA_TYPE_CHANNEL_STATE = 4 [ (gogoproto.enumvalue_customname) = "CHANNEL" ]; + DATA_TYPE_CHANNEL_STATE = 4 [(gogoproto.enumvalue_customname) = "CHANNEL"]; // Data type for packet commitment verification - DATA_TYPE_PACKET_COMMITMENT = 5 - [ (gogoproto.enumvalue_customname) = "PACKETCOMMITMENT" ]; + DATA_TYPE_PACKET_COMMITMENT = 5 [(gogoproto.enumvalue_customname) = "PACKETCOMMITMENT"]; // Data type for packet acknowledgement verification - DATA_TYPE_PACKET_ACKNOWLEDGEMENT = 6 - [ (gogoproto.enumvalue_customname) = "PACKETACKNOWLEDGEMENT" ]; + DATA_TYPE_PACKET_ACKNOWLEDGEMENT = 6 [(gogoproto.enumvalue_customname) = "PACKETACKNOWLEDGEMENT"]; // Data type for packet receipt absence verification - DATA_TYPE_PACKET_RECEIPT_ABSENCE = 7 - [ (gogoproto.enumvalue_customname) = "PACKETRECEIPTABSENCE" ]; + DATA_TYPE_PACKET_RECEIPT_ABSENCE = 7 [(gogoproto.enumvalue_customname) = "PACKETRECEIPTABSENCE"]; // Data type for next sequence recv verification - DATA_TYPE_NEXT_SEQUENCE_RECV = 8 - [ (gogoproto.enumvalue_customname) = "NEXTSEQUENCERECV" ]; + DATA_TYPE_NEXT_SEQUENCE_RECV = 8 [(gogoproto.enumvalue_customname) = "NEXTSEQUENCERECV"]; // Data type for header verification - DATA_TYPE_HEADER = 9 [ (gogoproto.enumvalue_customname) = "HEADER" ]; + DATA_TYPE_HEADER = 9 [(gogoproto.enumvalue_customname) = "HEADER"]; } // HeaderData returns the SignBytes data for update verification. @@ -136,11 +121,9 @@ message HeaderData { option (gogoproto.goproto_getters) = false; // header public key - google.protobuf.Any new_pub_key = 1 - [ (gogoproto.moretags) = "yaml:\"new_pub_key\"" ]; + google.protobuf.Any new_pub_key = 1 [(gogoproto.moretags) = "yaml:\"new_pub_key\""]; // header diversifier - string new_diversifier = 2 - [ (gogoproto.moretags) = "yaml:\"new_diversifier\"" ]; + string new_diversifier = 2 [(gogoproto.moretags) = "yaml:\"new_diversifier\""]; } // ClientStateData returns the SignBytes data for client state verification. @@ -148,8 +131,7 @@ message ClientStateData { option (gogoproto.goproto_getters) = false; bytes path = 1; - google.protobuf.Any client_state = 2 - [ (gogoproto.moretags) = "yaml:\"client_state\"" ]; + google.protobuf.Any client_state = 2 [(gogoproto.moretags) = "yaml:\"client_state\""]; } // ConsensusStateData returns the SignBytes data for consensus state @@ -158,8 +140,7 @@ message ConsensusStateData { option (gogoproto.goproto_getters) = false; bytes path = 1; - google.protobuf.Any consensus_state = 2 - [ (gogoproto.moretags) = "yaml:\"consensus_state\"" ]; + google.protobuf.Any consensus_state = 2 [(gogoproto.moretags) = "yaml:\"consensus_state\""]; } // ConnectionStateData returns the SignBytes data for connection state @@ -196,11 +177,13 @@ message PacketAcknowledgementData { // PacketReceiptAbsenceData returns the SignBytes data for // packet receipt absence verification. -message PacketReceiptAbsenceData { bytes path = 1; } +message PacketReceiptAbsenceData { + bytes path = 1; +} // NextSequenceRecvData returns the SignBytes data for verification of the next // sequence to be received. message NextSequenceRecvData { bytes path = 1; - uint64 next_seq_recv = 2 [ (gogoproto.moretags) = "yaml:\"next_seq_recv\"" ]; + uint64 next_seq_recv = 2 [(gogoproto.moretags) = "yaml:\"next_seq_recv\""]; } diff --git a/third_party/proto/ibc/lightclients/solomachine/v2/solomachine.proto b/third_party/proto/ibc/lightclients/solomachine/v2/solomachine.proto index 6f8d79fc..b7c5d3e9 100644 --- a/third_party/proto/ibc/lightclients/solomachine/v2/solomachine.proto +++ b/third_party/proto/ibc/lightclients/solomachine/v2/solomachine.proto @@ -2,12 +2,12 @@ syntax = "proto3"; package ibc.lightclients.solomachine.v2; -option go_package = "github.com/cosmos/ibc-go/v3/modules/light-clients/06-solomachine/types"; - -import "ibc/core/connection/v1/connection.proto"; -import "ibc/core/channel/v1/channel.proto"; import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; +import "ibc/core/channel/v1/channel.proto"; +import "ibc/core/connection/v1/connection.proto"; + +option go_package = "github.com/cosmos/ibc-go/v3/modules/light-clients/06-solomachine/types"; // ClientState defines a solo machine client that tracks the current consensus // state and if the client is frozen. @@ -16,13 +16,11 @@ message ClientState { // latest sequence of the client state uint64 sequence = 1; // frozen sequence of the solo machine - bool is_frozen = 2 [ (gogoproto.moretags) = "yaml:\"is_frozen\"" ]; - ConsensusState consensus_state = 3 - [ (gogoproto.moretags) = "yaml:\"consensus_state\"" ]; + bool is_frozen = 2 [(gogoproto.moretags) = "yaml:\"is_frozen\""]; + ConsensusState consensus_state = 3 [(gogoproto.moretags) = "yaml:\"consensus_state\""]; // when set to true, will allow governance to update a solo machine client. // The client will be unfrozen if it is frozen. - bool allow_update_after_proposal = 4 - [ (gogoproto.moretags) = "yaml:\"allow_update_after_proposal\"" ]; + bool allow_update_after_proposal = 4 [(gogoproto.moretags) = "yaml:\"allow_update_after_proposal\""]; } // ConsensusState defines a solo machine consensus state. The sequence of a @@ -31,8 +29,7 @@ message ClientState { message ConsensusState { option (gogoproto.goproto_getters) = false; // public key of the solo machine - google.protobuf.Any public_key = 1 - [ (gogoproto.moretags) = "yaml:\"public_key\"" ]; + google.protobuf.Any public_key = 1 [(gogoproto.moretags) = "yaml:\"public_key\""]; // diversifier allows the same public key to be re-used across different solo // machine clients (potentially on different chains) without being considered // misbehaviour. @@ -47,22 +44,18 @@ message Header { uint64 sequence = 1; uint64 timestamp = 2; bytes signature = 3; - google.protobuf.Any new_public_key = 4 - [ (gogoproto.moretags) = "yaml:\"new_public_key\"" ]; - string new_diversifier = 5 - [ (gogoproto.moretags) = "yaml:\"new_diversifier\"" ]; + google.protobuf.Any new_public_key = 4 [(gogoproto.moretags) = "yaml:\"new_public_key\""]; + string new_diversifier = 5 [(gogoproto.moretags) = "yaml:\"new_diversifier\""]; } // Misbehaviour defines misbehaviour for a solo machine which consists // of a sequence and two signatures over different messages at that sequence. message Misbehaviour { option (gogoproto.goproto_getters) = false; - string client_id = 1 [ (gogoproto.moretags) = "yaml:\"client_id\"" ]; + string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; uint64 sequence = 2; - SignatureAndData signature_one = 3 - [ (gogoproto.moretags) = "yaml:\"signature_one\"" ]; - SignatureAndData signature_two = 4 - [ (gogoproto.moretags) = "yaml:\"signature_two\"" ]; + SignatureAndData signature_one = 3 [(gogoproto.moretags) = "yaml:\"signature_one\""]; + SignatureAndData signature_two = 4 [(gogoproto.moretags) = "yaml:\"signature_two\""]; } // SignatureAndData contains a signature and the data signed over to create that @@ -70,7 +63,7 @@ message Misbehaviour { message SignatureAndData { option (gogoproto.goproto_getters) = false; bytes signature = 1; - DataType data_type = 2 [ (gogoproto.moretags) = "yaml:\"data_type\"" ]; + DataType data_type = 2 [(gogoproto.moretags) = "yaml:\"data_type\""]; bytes data = 3; uint64 timestamp = 4; } @@ -79,7 +72,7 @@ message SignatureAndData { // signature. message TimestampedSignatureData { option (gogoproto.goproto_getters) = false; - bytes signature_data = 1 [ (gogoproto.moretags) = "yaml:\"signature_data\"" ]; + bytes signature_data = 1 [(gogoproto.moretags) = "yaml:\"signature_data\""]; uint64 timestamp = 2; } @@ -91,7 +84,7 @@ message SignBytes { uint64 timestamp = 2; string diversifier = 3; // type of the data used - DataType data_type = 4 [ (gogoproto.moretags) = "yaml:\"data_type\"" ]; + DataType data_type = 4 [(gogoproto.moretags) = "yaml:\"data_type\""]; // marshaled data bytes data = 5; } @@ -102,32 +95,25 @@ enum DataType { option (gogoproto.goproto_enum_prefix) = false; // Default State - DATA_TYPE_UNINITIALIZED_UNSPECIFIED = 0 - [ (gogoproto.enumvalue_customname) = "UNSPECIFIED" ]; + DATA_TYPE_UNINITIALIZED_UNSPECIFIED = 0 [(gogoproto.enumvalue_customname) = "UNSPECIFIED"]; // Data type for client state verification - DATA_TYPE_CLIENT_STATE = 1 [ (gogoproto.enumvalue_customname) = "CLIENT" ]; + DATA_TYPE_CLIENT_STATE = 1 [(gogoproto.enumvalue_customname) = "CLIENT"]; // Data type for consensus state verification - DATA_TYPE_CONSENSUS_STATE = 2 - [ (gogoproto.enumvalue_customname) = "CONSENSUS" ]; + DATA_TYPE_CONSENSUS_STATE = 2 [(gogoproto.enumvalue_customname) = "CONSENSUS"]; // Data type for connection state verification - DATA_TYPE_CONNECTION_STATE = 3 - [ (gogoproto.enumvalue_customname) = "CONNECTION" ]; + DATA_TYPE_CONNECTION_STATE = 3 [(gogoproto.enumvalue_customname) = "CONNECTION"]; // Data type for channel state verification - DATA_TYPE_CHANNEL_STATE = 4 [ (gogoproto.enumvalue_customname) = "CHANNEL" ]; + DATA_TYPE_CHANNEL_STATE = 4 [(gogoproto.enumvalue_customname) = "CHANNEL"]; // Data type for packet commitment verification - DATA_TYPE_PACKET_COMMITMENT = 5 - [ (gogoproto.enumvalue_customname) = "PACKETCOMMITMENT" ]; + DATA_TYPE_PACKET_COMMITMENT = 5 [(gogoproto.enumvalue_customname) = "PACKETCOMMITMENT"]; // Data type for packet acknowledgement verification - DATA_TYPE_PACKET_ACKNOWLEDGEMENT = 6 - [ (gogoproto.enumvalue_customname) = "PACKETACKNOWLEDGEMENT" ]; + DATA_TYPE_PACKET_ACKNOWLEDGEMENT = 6 [(gogoproto.enumvalue_customname) = "PACKETACKNOWLEDGEMENT"]; // Data type for packet receipt absence verification - DATA_TYPE_PACKET_RECEIPT_ABSENCE = 7 - [ (gogoproto.enumvalue_customname) = "PACKETRECEIPTABSENCE" ]; + DATA_TYPE_PACKET_RECEIPT_ABSENCE = 7 [(gogoproto.enumvalue_customname) = "PACKETRECEIPTABSENCE"]; // Data type for next sequence recv verification - DATA_TYPE_NEXT_SEQUENCE_RECV = 8 - [ (gogoproto.enumvalue_customname) = "NEXTSEQUENCERECV" ]; + DATA_TYPE_NEXT_SEQUENCE_RECV = 8 [(gogoproto.enumvalue_customname) = "NEXTSEQUENCERECV"]; // Data type for header verification - DATA_TYPE_HEADER = 9 [ (gogoproto.enumvalue_customname) = "HEADER" ]; + DATA_TYPE_HEADER = 9 [(gogoproto.enumvalue_customname) = "HEADER"]; } // HeaderData returns the SignBytes data for update verification. @@ -135,11 +121,9 @@ message HeaderData { option (gogoproto.goproto_getters) = false; // header public key - google.protobuf.Any new_pub_key = 1 - [ (gogoproto.moretags) = "yaml:\"new_pub_key\"" ]; + google.protobuf.Any new_pub_key = 1 [(gogoproto.moretags) = "yaml:\"new_pub_key\""]; // header diversifier - string new_diversifier = 2 - [ (gogoproto.moretags) = "yaml:\"new_diversifier\"" ]; + string new_diversifier = 2 [(gogoproto.moretags) = "yaml:\"new_diversifier\""]; } // ClientStateData returns the SignBytes data for client state verification. @@ -147,8 +131,7 @@ message ClientStateData { option (gogoproto.goproto_getters) = false; bytes path = 1; - google.protobuf.Any client_state = 2 - [ (gogoproto.moretags) = "yaml:\"client_state\"" ]; + google.protobuf.Any client_state = 2 [(gogoproto.moretags) = "yaml:\"client_state\""]; } // ConsensusStateData returns the SignBytes data for consensus state @@ -157,8 +140,7 @@ message ConsensusStateData { option (gogoproto.goproto_getters) = false; bytes path = 1; - google.protobuf.Any consensus_state = 2 - [ (gogoproto.moretags) = "yaml:\"consensus_state\"" ]; + google.protobuf.Any consensus_state = 2 [(gogoproto.moretags) = "yaml:\"consensus_state\""]; } // ConnectionStateData returns the SignBytes data for connection state @@ -195,11 +177,13 @@ message PacketAcknowledgementData { // PacketReceiptAbsenceData returns the SignBytes data for // packet receipt absence verification. -message PacketReceiptAbsenceData { bytes path = 1; } +message PacketReceiptAbsenceData { + bytes path = 1; +} // NextSequenceRecvData returns the SignBytes data for verification of the next // sequence to be received. message NextSequenceRecvData { bytes path = 1; - uint64 next_seq_recv = 2 [ (gogoproto.moretags) = "yaml:\"next_seq_recv\"" ]; + uint64 next_seq_recv = 2 [(gogoproto.moretags) = "yaml:\"next_seq_recv\""]; } diff --git a/third_party/proto/ibc/lightclients/tendermint/v1/tendermint.proto b/third_party/proto/ibc/lightclients/tendermint/v1/tendermint.proto index 62b3ac76..bc26a3db 100644 --- a/third_party/proto/ibc/lightclients/tendermint/v1/tendermint.proto +++ b/third_party/proto/ibc/lightclients/tendermint/v1/tendermint.proto @@ -2,16 +2,16 @@ syntax = "proto3"; package ibc.lightclients.tendermint.v1; -option go_package = "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types"; - -import "tendermint/types/validator.proto"; -import "tendermint/types/types.proto"; -import "proofs.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; import "ibc/core/client/v1/client.proto"; import "ibc/core/commitment/v1/commitment.proto"; -import "gogoproto/gogo.proto"; +import "proofs.proto"; +import "tendermint/types/types.proto"; +import "tendermint/types/validator.proto"; + +option go_package = "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types"; // ClientState from Tendermint tracks the current validator set, latest height, // and a possible frozen height. @@ -54,8 +54,7 @@ message ClientState { ]; // Proof specifications used in verifying counterparty state - repeated ics23.ProofSpec proof_specs = 8 - [ (gogoproto.moretags) = "yaml:\"proof_specs\"" ]; + repeated ics23.ProofSpec proof_specs = 8 [(gogoproto.moretags) = "yaml:\"proof_specs\""]; // Path at which next upgraded client will be committed. // Each element corresponds to the key for a single CommitmentProof in the @@ -64,17 +63,14 @@ message ClientState { // under `{upgradepath}/{upgradeHeight}/consensusState` For SDK chains using // the default upgrade module, upgrade_path should be []string{"upgrade", // "upgradedIBCState"}` - repeated string upgrade_path = 9 - [ (gogoproto.moretags) = "yaml:\"upgrade_path\"" ]; + repeated string upgrade_path = 9 [(gogoproto.moretags) = "yaml:\"upgrade_path\""]; // This flag, when set to true, will allow governance to recover a client // which has expired - bool allow_update_after_expiry = 10 - [ (gogoproto.moretags) = "yaml:\"allow_update_after_expiry\"" ]; + bool allow_update_after_expiry = 10 [(gogoproto.moretags) = "yaml:\"allow_update_after_expiry\""]; // This flag, when set to true, will allow governance to unfreeze a client // whose chain has experienced a misbehaviour event - bool allow_update_after_misbehaviour = 11 - [ (gogoproto.moretags) = "yaml:\"allow_update_after_misbehaviour\"" ]; + bool allow_update_after_misbehaviour = 11 [(gogoproto.moretags) = "yaml:\"allow_update_after_misbehaviour\""]; } // ConsensusState defines the consensus state from Tendermint. @@ -83,13 +79,14 @@ message ConsensusState { // timestamp that corresponds to the block height in which the ConsensusState // was stored. - google.protobuf.Timestamp timestamp = 1 - [ (gogoproto.nullable) = false, (gogoproto.stdtime) = true ]; + google.protobuf.Timestamp timestamp = 1 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true + ]; // commitment root (i.e app hash) - ibc.core.commitment.v1.MerkleRoot root = 2 [ (gogoproto.nullable) = false ]; + ibc.core.commitment.v1.MerkleRoot root = 2 [(gogoproto.nullable) = false]; bytes next_validators_hash = 3 [ - (gogoproto.casttype) = - "github.com/tendermint/tendermint/libs/bytes.HexBytes", + (gogoproto.casttype) = "github.com/tendermint/tendermint/libs/bytes.HexBytes", (gogoproto.moretags) = "yaml:\"next_validators_hash\"" ]; } @@ -99,7 +96,7 @@ message ConsensusState { message Misbehaviour { option (gogoproto.goproto_getters) = false; - string client_id = 1 [ (gogoproto.moretags) = "yaml:\"client_id\"" ]; + string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; Header header_1 = 2 [ (gogoproto.customname) = "Header1", (gogoproto.moretags) = "yaml:\"header_1\"" @@ -128,14 +125,12 @@ message Header { (gogoproto.moretags) = "yaml:\"signed_header\"" ]; - .tendermint.types.ValidatorSet validator_set = 2 - [ (gogoproto.moretags) = "yaml:\"validator_set\"" ]; + .tendermint.types.ValidatorSet validator_set = 2 [(gogoproto.moretags) = "yaml:\"validator_set\""]; ibc.core.client.v1.Height trusted_height = 3 [ (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"trusted_height\"" ]; - .tendermint.types.ValidatorSet trusted_validators = 4 - [ (gogoproto.moretags) = "yaml:\"trusted_validators\"" ]; + .tendermint.types.ValidatorSet trusted_validators = 4 [(gogoproto.moretags) = "yaml:\"trusted_validators\""]; } // Fraction defines the protobuf message type for tmmath.Fraction that only diff --git a/third_party/proto/proofs.proto b/third_party/proto/proofs.proto index f36281dd..f1feacbe 100644 --- a/third_party/proto/proofs.proto +++ b/third_party/proto/proofs.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package ics23; + option go_package = "github.com/confio/ics23/go"; enum HashOp { @@ -198,7 +199,9 @@ message InnerSpec { /* BatchProof is a group of multiple proof types than can be compressed */ -message BatchProof { repeated BatchEntry entries = 1; } +message BatchProof { + repeated BatchEntry entries = 1; +} // Use BatchEntry not CommitmentProof, to avoid recursion message BatchEntry { diff --git a/third_party/proto/tendermint/abci/types.proto b/third_party/proto/tendermint/abci/types.proto index 36503cbf..21a0a9fe 100644 --- a/third_party/proto/tendermint/abci/types.proto +++ b/third_party/proto/tendermint/abci/types.proto @@ -1,16 +1,17 @@ syntax = "proto3"; -package tendermint.abci; -option go_package = "github.com/tendermint/tendermint/abci/types"; +package tendermint.abci; +import "gogoproto/gogo.proto"; +import "google/protobuf/timestamp.proto"; +import "tendermint/crypto/keys.proto"; // For more information on gogo.proto, see: // https://github.com/gogo/protobuf/blob/master/extensions.md import "tendermint/crypto/proof.proto"; -import "tendermint/types/types.proto"; -import "tendermint/crypto/keys.proto"; import "tendermint/types/params.proto"; -import "google/protobuf/timestamp.proto"; -import "gogoproto/gogo.proto"; +import "tendermint/types/types.proto"; + +option go_package = "github.com/tendermint/tendermint/abci/types"; // This file is copied from http://github.com/tendermint/abci // NOTE: When using custom types, mind the warnings. @@ -39,7 +40,9 @@ message Request { } } -message RequestEcho { string message = 1; } +message RequestEcho { + string message = 1; +} message RequestFlush {} @@ -56,11 +59,13 @@ message RequestSetOption { } message RequestInitChain { - google.protobuf.Timestamp time = 1 - [ (gogoproto.nullable) = false, (gogoproto.stdtime) = true ]; + google.protobuf.Timestamp time = 1 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true + ]; string chain_id = 2; ConsensusParams consensus_params = 3; - repeated ValidatorUpdate validators = 4 [ (gogoproto.nullable) = false ]; + repeated ValidatorUpdate validators = 4 [(gogoproto.nullable) = false]; bytes app_state_bytes = 5; int64 initial_height = 6; } @@ -74,14 +79,14 @@ message RequestQuery { message RequestBeginBlock { bytes hash = 1; - tendermint.types.Header header = 2 [ (gogoproto.nullable) = false ]; - LastCommitInfo last_commit_info = 3 [ (gogoproto.nullable) = false ]; - repeated Evidence byzantine_validators = 4 [ (gogoproto.nullable) = false ]; + tendermint.types.Header header = 2 [(gogoproto.nullable) = false]; + LastCommitInfo last_commit_info = 3 [(gogoproto.nullable) = false]; + repeated Evidence byzantine_validators = 4 [(gogoproto.nullable) = false]; } enum CheckTxType { - NEW = 0 [ (gogoproto.enumvalue_customname) = "New" ]; - RECHECK = 1 [ (gogoproto.enumvalue_customname) = "Recheck" ]; + NEW = 0 [(gogoproto.enumvalue_customname) = "New"]; + RECHECK = 1 [(gogoproto.enumvalue_customname) = "Recheck"]; } message RequestCheckTx { @@ -89,9 +94,13 @@ message RequestCheckTx { CheckTxType type = 2; } -message RequestDeliverTx { bytes tx = 1; } +message RequestDeliverTx { + bytes tx = 1; +} -message RequestEndBlock { int64 height = 1; } +message RequestEndBlock { + int64 height = 1; +} message RequestCommit {} @@ -101,7 +110,7 @@ message RequestListSnapshots {} // offers a snapshot to the application message RequestOfferSnapshot { Snapshot snapshot = 1; // snapshot offered by peers - bytes app_hash = 2; // light client-verified app hash for snapshot height + bytes app_hash = 2; // light client-verified app hash for snapshot height } // loads a snapshot chunk @@ -143,9 +152,13 @@ message Response { } // nondeterministic -message ResponseException { string error = 1; } +message ResponseException { + string error = 1; +} -message ResponseEcho { string message = 1; } +message ResponseEcho { + string message = 1; +} message ResponseFlush {} @@ -169,14 +182,14 @@ message ResponseSetOption { message ResponseInitChain { ConsensusParams consensus_params = 1; - repeated ValidatorUpdate validators = 2 [ (gogoproto.nullable) = false ]; + repeated ValidatorUpdate validators = 2 [(gogoproto.nullable) = false]; bytes app_hash = 3; } message ResponseQuery { uint32 code = 1; // bytes data = 2; // use "value" instead. - string log = 3; // nondeterministic + string log = 3; // nondeterministic string info = 4; // nondeterministic int64 index = 5; bytes key = 6; @@ -196,10 +209,10 @@ message ResponseBeginBlock { message ResponseCheckTx { uint32 code = 1; bytes data = 2; - string log = 3; // nondeterministic + string log = 3; // nondeterministic string info = 4; // nondeterministic - int64 gas_wanted = 5 [ json_name = "gas_wanted" ]; - int64 gas_used = 6 [ json_name = "gas_used" ]; + int64 gas_wanted = 5 [json_name = "gas_wanted"]; + int64 gas_used = 6 [json_name = "gas_used"]; repeated Event events = 7 [ (gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty" @@ -210,10 +223,10 @@ message ResponseCheckTx { message ResponseDeliverTx { uint32 code = 1; bytes data = 2; - string log = 3; // nondeterministic + string log = 3; // nondeterministic string info = 4; // nondeterministic - int64 gas_wanted = 5 [ json_name = "gas_wanted" ]; - int64 gas_used = 6 [ json_name = "gas_used" ]; + int64 gas_wanted = 5 [json_name = "gas_wanted"]; + int64 gas_used = 6 [json_name = "gas_used"]; repeated Event events = 7 [ (gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty" @@ -222,8 +235,7 @@ message ResponseDeliverTx { } message ResponseEndBlock { - repeated ValidatorUpdate validator_updates = 1 - [ (gogoproto.nullable) = false ]; + repeated ValidatorUpdate validator_updates = 1 [(gogoproto.nullable) = false]; ConsensusParams consensus_param_updates = 2; repeated Event events = 3 [ (gogoproto.nullable) = false, @@ -237,22 +249,26 @@ message ResponseCommit { int64 retain_height = 3; } -message ResponseListSnapshots { repeated Snapshot snapshots = 1; } +message ResponseListSnapshots { + repeated Snapshot snapshots = 1; +} message ResponseOfferSnapshot { Result result = 1; enum Result { - UNKNOWN = 0; // Unknown result, abort all snapshot restoration - ACCEPT = 1; // Snapshot accepted, apply chunks - ABORT = 2; // Abort all snapshot restoration - REJECT = 3; // Reject this specific snapshot, try others + UNKNOWN = 0; // Unknown result, abort all snapshot restoration + ACCEPT = 1; // Snapshot accepted, apply chunks + ABORT = 2; // Abort all snapshot restoration + REJECT = 3; // Reject this specific snapshot, try others REJECT_FORMAT = 4; // Reject all snapshots of this format, try others REJECT_SENDER = 5; // Reject all snapshots from the sender(s), try others } } -message ResponseLoadSnapshotChunk { bytes chunk = 1; } +message ResponseLoadSnapshotChunk { + bytes chunk = 1; +} message ResponseApplySnapshotChunk { Result result = 1; @@ -260,11 +276,11 @@ message ResponseApplySnapshotChunk { repeated string reject_senders = 3; // Chunk senders to reject and ban enum Result { - UNKNOWN = 0; // Unknown result, abort all snapshot restoration - ACCEPT = 1; // Chunk successfully accepted - ABORT = 2; // Abort all snapshot restoration - RETRY = 3; // Retry chunk (combine with refetch and reject) - RETRY_SNAPSHOT = 4; // Retry snapshot (combine with refetch and reject) + UNKNOWN = 0; // Unknown result, abort all snapshot restoration + ACCEPT = 1; // Chunk successfully accepted + ABORT = 2; // Abort all snapshot restoration + RETRY = 3; // Retry chunk (combine with refetch and reject) + RETRY_SNAPSHOT = 4; // Retry snapshot (combine with refetch and reject) REJECT_SNAPSHOT = 5; // Reject this snapshot, try others } } @@ -291,7 +307,7 @@ message BlockParams { message LastCommitInfo { int32 round = 1; - repeated VoteInfo votes = 2 [ (gogoproto.nullable) = false ]; + repeated VoteInfo votes = 2 [(gogoproto.nullable) = false]; } // Event allows application developers to attach additional information to @@ -319,7 +335,7 @@ message TxResult { int64 height = 1; uint32 index = 2; bytes tx = 3; - ResponseDeliverTx result = 4 [ (gogoproto.nullable) = false ]; + ResponseDeliverTx result = 4 [(gogoproto.nullable) = false]; } //---------------------------------------- @@ -334,13 +350,13 @@ message Validator { // ValidatorUpdate message ValidatorUpdate { - tendermint.crypto.PublicKey pub_key = 1 [ (gogoproto.nullable) = false ]; + tendermint.crypto.PublicKey pub_key = 1 [(gogoproto.nullable) = false]; int64 power = 2; } // VoteInfo message VoteInfo { - Validator validator = 1 [ (gogoproto.nullable) = false ]; + Validator validator = 1 [(gogoproto.nullable) = false]; bool signed_last_block = 2; } @@ -353,12 +369,14 @@ enum EvidenceType { message Evidence { EvidenceType type = 1; // The offending validator - Validator validator = 2 [ (gogoproto.nullable) = false ]; + Validator validator = 2 [(gogoproto.nullable) = false]; // The height when the offense occurred int64 height = 3; // The corresponding time where the offense occurred - google.protobuf.Timestamp time = 4 - [ (gogoproto.nullable) = false, (gogoproto.stdtime) = true ]; + google.protobuf.Timestamp time = 4 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true + ]; // Total voting power of the validator set in case the ABCI application does // not store historical validators. // https://github.com/tendermint/tendermint/issues/4581 @@ -369,10 +387,10 @@ message Evidence { // State Sync Types message Snapshot { - uint64 height = 1; // The height at which the snapshot was taken - uint32 format = 2; // The application-specific snapshot format - uint32 chunks = 3; // Number of chunks in the snapshot - bytes hash = 4; // Arbitrary snapshot hash, equal only if identical + uint64 height = 1; // The height at which the snapshot was taken + uint32 format = 2; // The application-specific snapshot format + uint32 chunks = 3; // Number of chunks in the snapshot + bytes hash = 4; // Arbitrary snapshot hash, equal only if identical bytes metadata = 5; // Arbitrary application metadata } @@ -393,8 +411,6 @@ service ABCIApplication { rpc EndBlock(RequestEndBlock) returns (ResponseEndBlock); rpc ListSnapshots(RequestListSnapshots) returns (ResponseListSnapshots); rpc OfferSnapshot(RequestOfferSnapshot) returns (ResponseOfferSnapshot); - rpc LoadSnapshotChunk(RequestLoadSnapshotChunk) - returns (ResponseLoadSnapshotChunk); - rpc ApplySnapshotChunk(RequestApplySnapshotChunk) - returns (ResponseApplySnapshotChunk); + rpc LoadSnapshotChunk(RequestLoadSnapshotChunk) returns (ResponseLoadSnapshotChunk); + rpc ApplySnapshotChunk(RequestApplySnapshotChunk) returns (ResponseApplySnapshotChunk); } diff --git a/third_party/proto/tendermint/crypto/keys.proto b/third_party/proto/tendermint/crypto/keys.proto index 8b1b2250..2dc554c5 100644 --- a/third_party/proto/tendermint/crypto/keys.proto +++ b/third_party/proto/tendermint/crypto/keys.proto @@ -1,10 +1,11 @@ syntax = "proto3"; -package tendermint.crypto; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/crypto"; +package tendermint.crypto; import "gogoproto/gogo.proto"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/crypto"; + // PublicKey defines the keys available for use with Tendermint Validators message PublicKey { option (gogoproto.compare) = true; diff --git a/third_party/proto/tendermint/crypto/proof.proto b/third_party/proto/tendermint/crypto/proof.proto index 58657a78..49ea33b2 100644 --- a/third_party/proto/tendermint/crypto/proof.proto +++ b/third_party/proto/tendermint/crypto/proof.proto @@ -1,10 +1,11 @@ syntax = "proto3"; -package tendermint.crypto; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/crypto"; +package tendermint.crypto; import "gogoproto/gogo.proto"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/crypto"; + message Proof { int64 total = 1; int64 index = 2; @@ -36,4 +37,6 @@ message ProofOp { } // ProofOps is Merkle proof defined by the list of ProofOps -message ProofOps { repeated ProofOp ops = 1 [ (gogoproto.nullable) = false ]; } +message ProofOps { + repeated ProofOp ops = 1 [(gogoproto.nullable) = false]; +} diff --git a/third_party/proto/tendermint/libs/bits/types.proto b/third_party/proto/tendermint/libs/bits/types.proto index 4cae6efd..d1c1ab52 100644 --- a/third_party/proto/tendermint/libs/bits/types.proto +++ b/third_party/proto/tendermint/libs/bits/types.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package tendermint.libs.bits; option go_package = "github.com/tendermint/tendermint/proto/tendermint/libs/bits"; diff --git a/third_party/proto/tendermint/p2p/types.proto b/third_party/proto/tendermint/p2p/types.proto index 96523884..d0758587 100644 --- a/third_party/proto/tendermint/p2p/types.proto +++ b/third_party/proto/tendermint/p2p/types.proto @@ -1,34 +1,35 @@ syntax = "proto3"; -package tendermint.p2p; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/p2p"; +package tendermint.p2p; import "gogoproto/gogo.proto"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/p2p"; + message NetAddress { - string id = 1 [ (gogoproto.customname) = "ID" ]; - string ip = 2 [ (gogoproto.customname) = "IP" ]; + string id = 1 [(gogoproto.customname) = "ID"]; + string ip = 2 [(gogoproto.customname) = "IP"]; uint32 port = 3; } message ProtocolVersion { - uint64 p2p = 1 [ (gogoproto.customname) = "P2P" ]; + uint64 p2p = 1 [(gogoproto.customname) = "P2P"]; uint64 block = 2; uint64 app = 3; } message DefaultNodeInfo { - ProtocolVersion protocol_version = 1 [ (gogoproto.nullable) = false ]; - string default_node_id = 2 [ (gogoproto.customname) = "DefaultNodeID" ]; + ProtocolVersion protocol_version = 1 [(gogoproto.nullable) = false]; + string default_node_id = 2 [(gogoproto.customname) = "DefaultNodeID"]; string listen_addr = 3; string network = 4; string version = 5; bytes channels = 6; string moniker = 7; - DefaultNodeInfoOther other = 8 [ (gogoproto.nullable) = false ]; + DefaultNodeInfoOther other = 8 [(gogoproto.nullable) = false]; } message DefaultNodeInfoOther { string tx_index = 1; - string rpc_address = 2 [ (gogoproto.customname) = "RPCAddress" ]; + string rpc_address = 2 [(gogoproto.customname) = "RPCAddress"]; } diff --git a/third_party/proto/tendermint/types/block.proto b/third_party/proto/tendermint/types/block.proto index 8f769eb2..44b50011 100644 --- a/third_party/proto/tendermint/types/block.proto +++ b/third_party/proto/tendermint/types/block.proto @@ -1,15 +1,16 @@ syntax = "proto3"; -package tendermint.types; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; +package tendermint.types; import "gogoproto/gogo.proto"; -import "tendermint/types/types.proto"; import "tendermint/types/evidence.proto"; +import "tendermint/types/types.proto"; + +option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; message Block { - Header header = 1 [ (gogoproto.nullable) = false ]; - Data data = 2 [ (gogoproto.nullable) = false ]; - tendermint.types.EvidenceList evidence = 3 [ (gogoproto.nullable) = false ]; + Header header = 1 [(gogoproto.nullable) = false]; + Data data = 2 [(gogoproto.nullable) = false]; + tendermint.types.EvidenceList evidence = 3 [(gogoproto.nullable) = false]; Commit last_commit = 4; } diff --git a/third_party/proto/tendermint/types/evidence.proto b/third_party/proto/tendermint/types/evidence.proto index b96e8c91..fb0bc6ca 100644 --- a/third_party/proto/tendermint/types/evidence.proto +++ b/third_party/proto/tendermint/types/evidence.proto @@ -1,13 +1,14 @@ syntax = "proto3"; -package tendermint.types; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; +package tendermint.types; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; import "tendermint/types/types.proto"; import "tendermint/types/validator.proto"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; + message Evidence { oneof sum { DuplicateVoteEvidence duplicate_vote_evidence = 1; @@ -22,8 +23,10 @@ message DuplicateVoteEvidence { tendermint.types.Vote vote_b = 2; int64 total_voting_power = 3; int64 validator_power = 4; - google.protobuf.Timestamp timestamp = 5 - [ (gogoproto.nullable) = false, (gogoproto.stdtime) = true ]; + google.protobuf.Timestamp timestamp = 5 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true + ]; } // LightClientAttackEvidence contains evidence of a set of validators attempting @@ -33,10 +36,12 @@ message LightClientAttackEvidence { int64 common_height = 2; repeated tendermint.types.Validator byzantine_validators = 3; int64 total_voting_power = 4; - google.protobuf.Timestamp timestamp = 5 - [ (gogoproto.nullable) = false, (gogoproto.stdtime) = true ]; + google.protobuf.Timestamp timestamp = 5 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true + ]; } message EvidenceList { - repeated Evidence evidence = 1 [ (gogoproto.nullable) = false ]; + repeated Evidence evidence = 1 [(gogoproto.nullable) = false]; } diff --git a/third_party/proto/tendermint/types/params.proto b/third_party/proto/tendermint/types/params.proto index 38ab12fa..9f41ea92 100644 --- a/third_party/proto/tendermint/types/params.proto +++ b/third_party/proto/tendermint/types/params.proto @@ -1,20 +1,20 @@ syntax = "proto3"; -package tendermint.types; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; +package tendermint.types; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; option (gogoproto.equal_all) = true; // ConsensusParams contains consensus critical parameters that determine the // validity of blocks. message ConsensusParams { - BlockParams block = 1 [ (gogoproto.nullable) = false ]; - EvidenceParams evidence = 2 [ (gogoproto.nullable) = false ]; - ValidatorParams validator = 3 [ (gogoproto.nullable) = false ]; - VersionParams version = 4 [ (gogoproto.nullable) = false ]; + BlockParams block = 1 [(gogoproto.nullable) = false]; + EvidenceParams evidence = 2 [(gogoproto.nullable) = false]; + ValidatorParams validator = 3 [(gogoproto.nullable) = false]; + VersionParams version = 4 [(gogoproto.nullable) = false]; } // BlockParams contains limits on the block size. @@ -45,8 +45,10 @@ message EvidenceParams { // It should correspond with an app's "unbonding period" or other similar // mechanism for handling [Nothing-At-Stake // attacks](https://github.com/ethereum/wiki/wiki/Proof-of-Stake-FAQ#what-is-the-nothing-at-stake-problem-and-how-can-it-be-fixed). - google.protobuf.Duration max_age_duration = 2 - [ (gogoproto.nullable) = false, (gogoproto.stdduration) = true ]; + google.protobuf.Duration max_age_duration = 2 [ + (gogoproto.nullable) = false, + (gogoproto.stdduration) = true + ]; // This sets the maximum size of total evidence in bytes that can be committed // in a single block. and should fall comfortably under the max block bytes. diff --git a/third_party/proto/tendermint/types/types.proto b/third_party/proto/tendermint/types/types.proto index f681bc4c..ddc9e5c5 100644 --- a/third_party/proto/tendermint/types/types.proto +++ b/third_party/proto/tendermint/types/types.proto @@ -1,26 +1,24 @@ syntax = "proto3"; -package tendermint.types; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; +package tendermint.types; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; import "tendermint/crypto/proof.proto"; -import "tendermint/version/types.proto"; import "tendermint/types/validator.proto"; +import "tendermint/version/types.proto"; + +option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; // BlockIdFlag indicates which BlcokID the signature is for enum BlockIDFlag { option (gogoproto.goproto_enum_stringer) = true; option (gogoproto.goproto_enum_prefix) = false; - BLOCK_ID_FLAG_UNKNOWN = 0 - [ (gogoproto.enumvalue_customname) = "BlockIDFlagUnknown" ]; - BLOCK_ID_FLAG_ABSENT = 1 - [ (gogoproto.enumvalue_customname) = "BlockIDFlagAbsent" ]; - BLOCK_ID_FLAG_COMMIT = 2 - [ (gogoproto.enumvalue_customname) = "BlockIDFlagCommit" ]; - BLOCK_ID_FLAG_NIL = 3 [ (gogoproto.enumvalue_customname) = "BlockIDFlagNil" ]; + BLOCK_ID_FLAG_UNKNOWN = 0 [(gogoproto.enumvalue_customname) = "BlockIDFlagUnknown"]; + BLOCK_ID_FLAG_ABSENT = 1 [(gogoproto.enumvalue_customname) = "BlockIDFlagAbsent"]; + BLOCK_ID_FLAG_COMMIT = 2 [(gogoproto.enumvalue_customname) = "BlockIDFlagCommit"]; + BLOCK_ID_FLAG_NIL = 3 [(gogoproto.enumvalue_customname) = "BlockIDFlagNil"]; } // SignedMsgType is a type of signed message in the consensus. @@ -28,17 +26,13 @@ enum SignedMsgType { option (gogoproto.goproto_enum_stringer) = true; option (gogoproto.goproto_enum_prefix) = false; - SIGNED_MSG_TYPE_UNKNOWN = 0 - [ (gogoproto.enumvalue_customname) = "UnknownType" ]; + SIGNED_MSG_TYPE_UNKNOWN = 0 [(gogoproto.enumvalue_customname) = "UnknownType"]; // Votes - SIGNED_MSG_TYPE_PREVOTE = 1 - [ (gogoproto.enumvalue_customname) = "PrevoteType" ]; - SIGNED_MSG_TYPE_PRECOMMIT = 2 - [ (gogoproto.enumvalue_customname) = "PrecommitType" ]; + SIGNED_MSG_TYPE_PREVOTE = 1 [(gogoproto.enumvalue_customname) = "PrevoteType"]; + SIGNED_MSG_TYPE_PRECOMMIT = 2 [(gogoproto.enumvalue_customname) = "PrecommitType"]; // Proposals - SIGNED_MSG_TYPE_PROPOSAL = 32 - [ (gogoproto.enumvalue_customname) = "ProposalType" ]; + SIGNED_MSG_TYPE_PROPOSAL = 32 [(gogoproto.enumvalue_customname) = "ProposalType"]; } // PartsetHeader @@ -50,13 +44,13 @@ message PartSetHeader { message Part { uint32 index = 1; bytes bytes = 2; - tendermint.crypto.Proof proof = 3 [ (gogoproto.nullable) = false ]; + tendermint.crypto.Proof proof = 3 [(gogoproto.nullable) = false]; } // BlockID message BlockID { bytes hash = 1; - PartSetHeader part_set_header = 2 [ (gogoproto.nullable) = false ]; + PartSetHeader part_set_header = 2 [(gogoproto.nullable) = false]; } // -------------------------------- @@ -64,29 +58,30 @@ message BlockID { // Header defines the structure of a Tendermint block header. message Header { // basic block info - tendermint.version.Consensus version = 1 [ (gogoproto.nullable) = false ]; - string chain_id = 2 [ (gogoproto.customname) = "ChainID" ]; + tendermint.version.Consensus version = 1 [(gogoproto.nullable) = false]; + string chain_id = 2 [(gogoproto.customname) = "ChainID"]; int64 height = 3; - google.protobuf.Timestamp time = 4 - [ (gogoproto.nullable) = false, (gogoproto.stdtime) = true ]; + google.protobuf.Timestamp time = 4 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true + ]; // prev block info - BlockID last_block_id = 5 [ (gogoproto.nullable) = false ]; + BlockID last_block_id = 5 [(gogoproto.nullable) = false]; // hashes of block data bytes last_commit_hash = 6; // commit from validators from the last block - bytes data_hash = 7; // transactions + bytes data_hash = 7; // transactions // hashes from the app output from the prev block - bytes validators_hash = 8; // validators for the current block + bytes validators_hash = 8; // validators for the current block bytes next_validators_hash = 9; // validators for the next block - bytes consensus_hash = 10; // consensus params for current block - bytes app_hash = 11; // state after txs from the previous block - bytes last_results_hash = - 12; // root hash of all results from the txs from the previous block + bytes consensus_hash = 10; // consensus params for current block + bytes app_hash = 11; // state after txs from the previous block + bytes last_results_hash = 12; // root hash of all results from the txs from the previous block // consensus info - bytes evidence_hash = 13; // evidence included in the block + bytes evidence_hash = 13; // evidence included in the block bytes proposer_address = 14; // original proposer of the block } @@ -108,8 +103,10 @@ message Vote { (gogoproto.nullable) = false, (gogoproto.customname) = "BlockID" ]; // zero if vote is nil. - google.protobuf.Timestamp timestamp = 5 - [ (gogoproto.nullable) = false, (gogoproto.stdtime) = true ]; + google.protobuf.Timestamp timestamp = 5 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true + ]; bytes validator_address = 6; int32 validator_index = 7; bytes signature = 8; @@ -120,17 +117,21 @@ message Vote { message Commit { int64 height = 1; int32 round = 2; - BlockID block_id = 3 - [ (gogoproto.nullable) = false, (gogoproto.customname) = "BlockID" ]; - repeated CommitSig signatures = 4 [ (gogoproto.nullable) = false ]; + BlockID block_id = 3 [ + (gogoproto.nullable) = false, + (gogoproto.customname) = "BlockID" + ]; + repeated CommitSig signatures = 4 [(gogoproto.nullable) = false]; } // CommitSig is a part of the Vote included in a Commit. message CommitSig { BlockIDFlag block_id_flag = 1; bytes validator_address = 2; - google.protobuf.Timestamp timestamp = 3 - [ (gogoproto.nullable) = false, (gogoproto.stdtime) = true ]; + google.protobuf.Timestamp timestamp = 3 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true + ]; bytes signature = 4; } @@ -139,10 +140,14 @@ message Proposal { int64 height = 2; int32 round = 3; int32 pol_round = 4; - BlockID block_id = 5 - [ (gogoproto.customname) = "BlockID", (gogoproto.nullable) = false ]; - google.protobuf.Timestamp timestamp = 6 - [ (gogoproto.nullable) = false, (gogoproto.stdtime) = true ]; + BlockID block_id = 5 [ + (gogoproto.customname) = "BlockID", + (gogoproto.nullable) = false + ]; + google.protobuf.Timestamp timestamp = 6 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true + ]; bytes signature = 7; } @@ -157,10 +162,12 @@ message LightBlock { } message BlockMeta { - BlockID block_id = 1 - [ (gogoproto.customname) = "BlockID", (gogoproto.nullable) = false ]; + BlockID block_id = 1 [ + (gogoproto.customname) = "BlockID", + (gogoproto.nullable) = false + ]; int64 block_size = 2; - Header header = 3 [ (gogoproto.nullable) = false ]; + Header header = 3 [(gogoproto.nullable) = false]; int64 num_txs = 4; } diff --git a/third_party/proto/tendermint/types/validator.proto b/third_party/proto/tendermint/types/validator.proto index 5e6dc8ba..9f957153 100644 --- a/third_party/proto/tendermint/types/validator.proto +++ b/third_party/proto/tendermint/types/validator.proto @@ -1,11 +1,12 @@ syntax = "proto3"; -package tendermint.types; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; +package tendermint.types; import "gogoproto/gogo.proto"; import "tendermint/crypto/keys.proto"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; + message ValidatorSet { repeated Validator validators = 1; Validator proposer = 2; @@ -14,7 +15,7 @@ message ValidatorSet { message Validator { bytes address = 1; - tendermint.crypto.PublicKey pub_key = 2 [ (gogoproto.nullable) = false ]; + tendermint.crypto.PublicKey pub_key = 2 [(gogoproto.nullable) = false]; int64 voting_power = 3; int64 proposer_priority = 4; } diff --git a/third_party/proto/tendermint/version/types.proto b/third_party/proto/tendermint/version/types.proto index 4b7a52dd..76bcdc0d 100644 --- a/third_party/proto/tendermint/version/types.proto +++ b/third_party/proto/tendermint/version/types.proto @@ -1,10 +1,11 @@ syntax = "proto3"; -package tendermint.version; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/version"; +package tendermint.version; import "gogoproto/gogo.proto"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/version"; + // App includes the protocol and software version for the application. // This information is included in ResponseInfo. The App.Protocol can be // updated in ResponseEndBlock. diff --git a/x/vesting/client/cli/tx.go b/x/vesting/client/cli/tx.go index 31eb5d03..fff70e2e 100644 --- a/x/vesting/client/cli/tx.go +++ b/x/vesting/client/cli/tx.go @@ -15,7 +15,7 @@ import ( "github.com/okp4/okp4d/x/vesting/types" ) -// Transaction command flags +// FlagDelayed Transaction command flags. const ( FlagDelayed = "delayed" ) @@ -133,6 +133,8 @@ type InputPeriod struct { // NewMsgCreatePeriodicVestingAccountCmd returns a CLI command handler for creating a // MsgCreatePeriodicVestingAccountCmd transaction. +// +//nolint:funlen,lll func NewMsgCreatePeriodicVestingAccountCmd() *cobra.Command { cmd := &cobra.Command{ Use: "create-periodic-vesting-account [to_address] [periods_json_file]", @@ -181,7 +183,6 @@ func NewMsgCreatePeriodicVestingAccountCmd() *cobra.Command { var periods []types.Period for i, p := range vestingData.Periods { - amount, err := sdk.ParseCoinsNormalized(p.Coins) if err != nil { return err diff --git a/x/vesting/client/testutil/suite.go b/x/vesting/client/testutil/suite.go index 53deb6cb..3da35efb 100644 --- a/x/vesting/client/testutil/suite.go +++ b/x/vesting/client/testutil/suite.go @@ -40,6 +40,7 @@ func (s *IntegrationTestSuite) TearDownSuite() { s.network.Cleanup() } +//nolint:funlen func (s *IntegrationTestSuite) TestNewMsgCreateVestingAccountCmd() { val := s.network.Validators[0] @@ -147,6 +148,7 @@ func (s *IntegrationTestSuite) TestNewMsgCreateVestingAccountCmd() { } } +//nolint:funlen func (s *IntegrationTestSuite) TestNewMsgCreatePermanentLockedAccountCmd() { val := s.network.Validators[0] diff --git a/x/vesting/msg_server.go b/x/vesting/msg_server.go index 468666f0..d3cd5322 100644 --- a/x/vesting/msg_server.go +++ b/x/vesting/msg_server.go @@ -26,7 +26,9 @@ func NewMsgServerImpl(k keeper.AccountKeeper, bk types.BankKeeper) types.MsgServ var _ types.MsgServer = msgServer{} -func (s msgServer) CreateVestingAccount(goCtx context.Context, msg *types.MsgCreateVestingAccount) (*types.MsgCreateVestingAccountResponse, error) { +//nolint:funlen +func (s msgServer) CreateVestingAccount(goCtx context.Context, + msg *types.MsgCreateVestingAccount) (*types.MsgCreateVestingAccountResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) ak := s.AccountKeeper bk := s.BankKeeper @@ -94,7 +96,8 @@ func (s msgServer) CreateVestingAccount(goCtx context.Context, msg *types.MsgCre return &types.MsgCreateVestingAccountResponse{}, nil } -func (s msgServer) CreatePermanentLockedAccount(goCtx context.Context, msg *types.MsgCreatePermanentLockedAccount) (*types.MsgCreatePermanentLockedAccountResponse, error) { +func (s msgServer) CreatePermanentLockedAccount(goCtx context.Context, + msg *types.MsgCreatePermanentLockedAccount) (*types.MsgCreatePermanentLockedAccountResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) ak := s.AccountKeeper bk := s.BankKeeper @@ -155,7 +158,8 @@ func (s msgServer) CreatePermanentLockedAccount(goCtx context.Context, msg *type return &types.MsgCreatePermanentLockedAccountResponse{}, nil } -func (s msgServer) CreatePeriodicVestingAccount(goCtx context.Context, msg *types.MsgCreatePeriodicVestingAccount) (*types.MsgCreatePeriodicVestingAccountResponse, error) { +func (s msgServer) CreatePeriodicVestingAccount(goCtx context.Context, + msg *types.MsgCreatePeriodicVestingAccount) (*types.MsgCreatePeriodicVestingAccountResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) ak := s.AccountKeeper @@ -214,7 +218,9 @@ func (s msgServer) CreatePeriodicVestingAccount(goCtx context.Context, msg *type return &types.MsgCreatePeriodicVestingAccountResponse{}, nil } -func (s msgServer) CreateCliffVestingAccount(goCtx context.Context, msg *types.MsgCreateCliffVestingAccount) (*types.MsgCreateCliffVestingAccountResponse, error) { +//nolint:funlen +func (s msgServer) CreateCliffVestingAccount(goCtx context.Context, + msg *types.MsgCreateCliffVestingAccount) (*types.MsgCreateCliffVestingAccountResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) ak := s.AccountKeeper bk := s.BankKeeper diff --git a/x/vesting/types/codec.go b/x/vesting/types/codec.go index 9721ae44..582a8add 100644 --- a/x/vesting/types/codec.go +++ b/x/vesting/types/codec.go @@ -12,7 +12,7 @@ import ( ) // RegisterLegacyAminoCodec registers the vesting interfaces and concrete types on the -// provided LegacyAmino codec. These types are used for Amino JSON serialization +// provided LegacyAmino codec. These types are used for Amino JSON serialization. func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { cdc.RegisterInterface((*exported.VestingAccount)(nil), nil) cdc.RegisterConcrete(&BaseVestingAccount{}, "cosmos-sdk/BaseVestingAccount", nil) @@ -26,7 +26,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { } // RegisterInterface associates protoName with AccountI and VestingAccount -// Interfaces and creates a registry of it's concrete implementations +// Interfaces and creates a registry of it's concrete implementations. func RegisterInterfaces(registry types.InterfaceRegistry) { registry.RegisterInterface( "vesting.v1beta1.VestingAccount", @@ -79,5 +79,5 @@ func init() { // Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be // used to properly serialize MsgGrant and MsgExec instances - //RegisterLegacyAminoCodec(authzcodec.Amino) + // RegisterLegacyAminoCodec(authzcodec.Amino) } diff --git a/x/vesting/types/constants.go b/x/vesting/types/constants.go index 1d0b0ebb..5fd3ce15 100644 --- a/x/vesting/types/constants.go +++ b/x/vesting/types/constants.go @@ -7,6 +7,6 @@ const ( // AttributeValueCategory is an alias for the message event value. AttributeValueCategory = ModuleName - // RouterKey defines the module's message routing key + // RouterKey defines the module's message routing key. RouterKey = ModuleName ) diff --git a/x/vesting/types/genesis_test.go b/x/vesting/types/genesis_test.go index 98aabb15..d8b8d6d9 100644 --- a/x/vesting/types/genesis_test.go +++ b/x/vesting/types/genesis_test.go @@ -17,7 +17,7 @@ var ( addr2 = sdk.ValAddress(pk2.Address()) ) -// require invalid vesting account fails validation +// require invalid vesting account fails validation. func TestValidateGenesisInvalidAccounts(t *testing.T) { acc1 := authtypes.NewBaseAccountWithAddress(sdk.AccAddress(addr1)) acc1Balance := sdk.NewCoins(sdk.NewInt64Coin(sdk.DefaultBondDenom, 150)) diff --git a/x/vesting/types/msgs.go b/x/vesting/types/msgs.go index 2d0b57bb..339375d0 100644 --- a/x/vesting/types/msgs.go +++ b/x/vesting/types/msgs.go @@ -30,7 +30,11 @@ var _ sdk.Msg = &MsgCreateCliffVestingAccount{} // NewMsgCreateVestingAccount returns a reference to a new MsgCreateVestingAccount. // //nolint:interfacer -func NewMsgCreateVestingAccount(fromAddr, toAddr sdk.AccAddress, amount sdk.Coins, endTime int64, delayed bool) *MsgCreateVestingAccount { +func NewMsgCreateVestingAccount(fromAddr, + toAddr sdk.AccAddress, + amount sdk.Coins, + endTime int64, + delayed bool) *MsgCreateVestingAccount { return &MsgCreateVestingAccount{ FromAddress: fromAddr.String(), ToAddress: toAddr.String(), @@ -134,7 +138,10 @@ func (msg MsgCreatePermanentLockedAccount) GetSigners() []sdk.AccAddress { // NewMsgCreatePeriodicVestingAccount returns a reference to a new MsgCreatePeriodicVestingAccount. // //nolint:interfacer -func NewMsgCreatePeriodicVestingAccount(fromAddr, toAddr sdk.AccAddress, startTime int64, periods []Period) *MsgCreatePeriodicVestingAccount { +func NewMsgCreatePeriodicVestingAccount(fromAddr, + toAddr sdk.AccAddress, + startTime int64, + periods []Period) *MsgCreatePeriodicVestingAccount { return &MsgCreatePeriodicVestingAccount{ FromAddress: fromAddr.String(), ToAddress: toAddr.String(), @@ -198,7 +205,10 @@ func (msg MsgCreatePeriodicVestingAccount) ValidateBasic() error { // NewMsgCreateCliffVestingAccount returns a reference to a new MsgCreateCliffVestingAccount. // //nolint:interfacer -func NewMsgCreateCliffVestingAccount(fromAddr, toAddr sdk.AccAddress, amount sdk.Coins, endTime, cliffTime int64) *MsgCreateCliffVestingAccount { +func NewMsgCreateCliffVestingAccount(fromAddr, + toAddr sdk.AccAddress, + amount sdk.Coins, + endTime, cliffTime int64) *MsgCreateCliffVestingAccount { return &MsgCreateCliffVestingAccount{ FromAddress: fromAddr.String(), ToAddress: toAddr.String(), diff --git a/x/vesting/types/period.go b/x/vesting/types/period.go index 2d64fd61..d733e639 100644 --- a/x/vesting/types/period.go +++ b/x/vesting/types/period.go @@ -10,21 +10,21 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) -// Periods stores all vesting periods passed as part of a PeriodicVestingAccount +// Periods stores all vesting periods passed as part of a PeriodicVestingAccount. type Periods []Period -// Duration is converts the period Length from seconds to a time.Duration +// Duration is converts the period Length from seconds to a time.Duration. func (p Period) Duration() time.Duration { return time.Duration(p.Length) * time.Second } -// String implements the fmt.Stringer interface +// String implements the fmt.Stringer interface. func (p Period) String() string { out, _ := yaml.Marshal(p) return string(out) } -// TotalLength return the total length in seconds for a period +// TotalLength return the total length in seconds for a period. func (p Periods) TotalLength() int64 { var total int64 for _, period := range p { @@ -33,13 +33,13 @@ func (p Periods) TotalLength() int64 { return total } -// TotalDuration returns the total duration of the period +// TotalDuration returns the total duration of the period. func (p Periods) TotalDuration() time.Duration { - len := p.TotalLength() - return time.Duration(len) * time.Second + totalLen := p.TotalLength() + return time.Duration(totalLen) * time.Second } -// TotalDuration returns the sum of coins for the period +// TotalDuration returns the sum of coins for the period. func (p Periods) TotalAmount() sdk.Coins { total := sdk.Coins{} for _, period := range p { @@ -48,9 +48,9 @@ func (p Periods) TotalAmount() sdk.Coins { return total } -// String implements the fmt.Stringer interface +// String implements the fmt.Stringer interface. func (p Periods) String() string { - periodsListString := make([]string, len(p)) + periodsListString := make([]string, 0, len(p)) for _, period := range p { periodsListString = append(periodsListString, period.String()) } diff --git a/x/vesting/types/test_common.go b/x/vesting/types/test_common.go index 0e22ea23..d1646187 100644 --- a/x/vesting/types/test_common.go +++ b/x/vesting/types/test_common.go @@ -8,19 +8,19 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) -// NewTestMsg generates a test message +// NewTestMsg generates a test message. func NewTestMsg(addrs ...sdk.AccAddress) *testdata.TestMsg { return testdata.NewTestMsg(addrs...) } -// NewTestCoins coins to more than cover the fee +// NewTestCoins coins to more than cover the fee. func NewTestCoins() sdk.Coins { return sdk.Coins{ sdk.NewInt64Coin("atom", 10000000), } } -// KeyTestPubAddr generates a test key pair +// KeyTestPubAddr generates a test key pair. func KeyTestPubAddr() (cryptotypes.PrivKey, cryptotypes.PubKey, sdk.AccAddress) { key := secp256k1.GenPrivKey() pub := key.PubKey() diff --git a/x/vesting/types/vesting_account.go b/x/vesting/types/vesting_account.go index cb137e7a..cdb033e7 100644 --- a/x/vesting/types/vesting_account.go +++ b/x/vesting/types/vesting_account.go @@ -12,7 +12,7 @@ import ( vestexported "github.com/okp4/okp4d/x/vesting/exported" ) -// Compile-time type assertions +// Compile-time type assertions. var ( _ authtypes.AccountI = (*BaseVestingAccount)(nil) _ vestexported.VestingAccount = (*ContinuousVestingAccount)(nil) @@ -122,7 +122,7 @@ func (bva *BaseVestingAccount) TrackUndelegation(amount sdk.Coins) { } } -// GetOriginalVesting returns a vesting account's original vesting amount +// GetOriginalVesting returns a vesting account's original vesting amount. func (bva BaseVestingAccount) GetOriginalVesting() sdk.Coins { return bva.OriginalVesting } @@ -139,12 +139,12 @@ func (bva BaseVestingAccount) GetDelegatedVesting() sdk.Coins { return bva.DelegatedVesting } -// GetEndTime returns a vesting account's end time +// GetEndTime returns a vesting account's end time. func (bva BaseVestingAccount) GetEndTime() int64 { return bva.EndTime } -// Validate checks for errors on the account fields +// Validate checks for errors on the account fields. func (bva BaseVestingAccount) Validate() error { if !(bva.DelegatedVesting.IsAllLTE(bva.OriginalVesting)) { return errors.New("delegated vesting amount cannot be greater than original vesting amount") @@ -200,7 +200,7 @@ var ( _ authtypes.GenesisAccount = (*ContinuousVestingAccount)(nil) ) -// NewContinuousVestingAccountRaw creates a new ContinuousVestingAccount object from BaseVestingAccount +// NewContinuousVestingAccountRaw creates a new ContinuousVestingAccount object from BaseVestingAccount. func NewContinuousVestingAccountRaw(bva *BaseVestingAccount, startTime int64) *ContinuousVestingAccount { return &ContinuousVestingAccount{ BaseVestingAccount: bva, @@ -208,8 +208,10 @@ func NewContinuousVestingAccountRaw(bva *BaseVestingAccount, startTime int64) *C } } -// NewContinuousVestingAccount returns a new ContinuousVestingAccount -func NewContinuousVestingAccount(baseAcc *authtypes.BaseAccount, originalVesting sdk.Coins, startTime, endTime int64) *ContinuousVestingAccount { +// NewContinuousVestingAccount returns a new ContinuousVestingAccount. +func NewContinuousVestingAccount(baseAcc *authtypes.BaseAccount, + originalVesting sdk.Coins, + startTime, endTime int64) *ContinuousVestingAccount { baseVestingAcc := &BaseVestingAccount{ BaseAccount: baseAcc, OriginalVesting: originalVesting, @@ -274,7 +276,7 @@ func (cva ContinuousVestingAccount) GetStartTime() int64 { return cva.StartTime } -// Validate checks for errors on the account fields +// Validate checks for errors on the account fields. func (cva ContinuousVestingAccount) Validate() error { if cva.GetStartTime() >= cva.GetEndTime() { return errors.New("vesting start-time cannot be before end-time") @@ -316,7 +318,7 @@ var ( _ authtypes.GenesisAccount = (*PeriodicVestingAccount)(nil) ) -// NewPeriodicVestingAccountRaw creates a new PeriodicVestingAccount object from BaseVestingAccount +// NewPeriodicVestingAccountRaw creates a new PeriodicVestingAccount object from BaseVestingAccount. func NewPeriodicVestingAccountRaw(bva *BaseVestingAccount, startTime int64, periods Periods) *PeriodicVestingAccount { return &PeriodicVestingAccount{ BaseVestingAccount: bva, @@ -325,8 +327,11 @@ func NewPeriodicVestingAccountRaw(bva *BaseVestingAccount, startTime int64, peri } } -// NewPeriodicVestingAccount returns a new PeriodicVestingAccount -func NewPeriodicVestingAccount(baseAcc *authtypes.BaseAccount, originalVesting sdk.Coins, startTime int64, periods Periods) *PeriodicVestingAccount { +// NewPeriodicVestingAccount returns a new PeriodicVestingAccount. +func NewPeriodicVestingAccount(baseAcc *authtypes.BaseAccount, + originalVesting sdk.Coins, + startTime int64, + periods Periods) *PeriodicVestingAccount { endTime := startTime for _, p := range periods { endTime += p.Length @@ -407,7 +412,7 @@ func (pva PeriodicVestingAccount) GetVestingPeriods() Periods { return pva.VestingPeriods } -// Validate checks for errors on the account fields +// Validate checks for errors on the account fields. func (pva PeriodicVestingAccount) Validate() error { if pva.GetStartTime() >= pva.GetEndTime() { return errors.New("vesting start-time cannot be before end-time") @@ -462,14 +467,14 @@ var ( _ authtypes.GenesisAccount = (*DelayedVestingAccount)(nil) ) -// NewDelayedVestingAccountRaw creates a new DelayedVestingAccount object from BaseVestingAccount +// NewDelayedVestingAccountRaw creates a new DelayedVestingAccount object from BaseVestingAccount. func NewDelayedVestingAccountRaw(bva *BaseVestingAccount) *DelayedVestingAccount { return &DelayedVestingAccount{ BaseVestingAccount: bva, } } -// NewDelayedVestingAccount returns a DelayedVestingAccount +// NewDelayedVestingAccount returns a DelayedVestingAccount. func NewDelayedVestingAccount(baseAcc *authtypes.BaseAccount, originalVesting sdk.Coins, endTime int64) *DelayedVestingAccount { baseVestingAcc := &BaseVestingAccount{ BaseAccount: baseAcc, @@ -514,7 +519,7 @@ func (dva DelayedVestingAccount) GetStartTime() int64 { return 0 } -// Validate checks for errors on the account fields +// Validate checks for errors on the account fields. func (dva DelayedVestingAccount) Validate() error { return dva.BaseVestingAccount.Validate() } @@ -532,7 +537,7 @@ var ( _ authtypes.GenesisAccount = (*PermanentLockedAccount)(nil) ) -// NewPermanentLockedAccount returns a PermanentLockedAccount +// NewPermanentLockedAccount returns a PermanentLockedAccount. func NewPermanentLockedAccount(baseAcc *authtypes.BaseAccount, coins sdk.Coins) *PermanentLockedAccount { baseVestingAcc := &BaseVestingAccount{ BaseAccount: baseAcc, @@ -579,7 +584,7 @@ func (plva PermanentLockedAccount) GetEndTime() int64 { return 0 } -// Validate checks for errors on the account fields +// Validate checks for errors on the account fields. func (plva PermanentLockedAccount) Validate() error { if plva.EndTime > 0 { return errors.New("permanently vested accounts cannot have an end-time") @@ -600,17 +605,19 @@ var ( _ authtypes.GenesisAccount = (*CliffVestingAccount)(nil) ) -// NewCliffVestingAccountRaw creates a new CliffVestingAccount object from BaseVestingAccount -func NewCliffVestingAccountRaw(bva *BaseVestingAccount, startTime int64, cliff_time int64) *CliffVestingAccount { +// NewCliffVestingAccountRaw creates a new CliffVestingAccount object from BaseVestingAccount. +func NewCliffVestingAccountRaw(bva *BaseVestingAccount, startTime int64, cliffTime int64) *CliffVestingAccount { return &CliffVestingAccount{ BaseVestingAccount: bva, StartTime: startTime, - CliffTime: cliff_time, + CliffTime: cliffTime, } } -// NewCliffVestingAccount returns a new CliffVestingAccount -func NewCliffVestingAccount(baseAcc *authtypes.BaseAccount, originalVesting sdk.Coins, startTime, cliff_time, endTime int64) *CliffVestingAccount { +// NewCliffVestingAccount returns a new CliffVestingAccount. +func NewCliffVestingAccount(baseAcc *authtypes.BaseAccount, + originalVesting sdk.Coins, + startTime, cliffTime, endTime int64) *CliffVestingAccount { baseVestingAcc := &BaseVestingAccount{ BaseAccount: baseAcc, OriginalVesting: originalVesting, @@ -619,7 +626,7 @@ func NewCliffVestingAccount(baseAcc *authtypes.BaseAccount, originalVesting sdk. return &CliffVestingAccount{ StartTime: startTime, - CliffTime: cliff_time, + CliffTime: cliffTime, BaseVestingAccount: baseVestingAcc, } } @@ -682,7 +689,7 @@ func (cva CliffVestingAccount) GetCliffTime() int64 { return cva.CliffTime } -// Validate checks for errors on the account fields +// Validate checks for errors on the account fields. func (cva CliffVestingAccount) Validate() error { if cva.GetStartTime() >= cva.GetEndTime() { return errors.New("vesting start-time cannot be before end-time") diff --git a/x/vesting/types/vesting_account_test.go b/x/vesting/types/vesting_account_test.go index 5f3af1af..d1954c85 100644 --- a/x/vesting/types/vesting_account_test.go +++ b/x/vesting/types/vesting_account_test.go @@ -758,6 +758,7 @@ func TestSpendableCoinsCliffVestingAcc(t *testing.T) { require.Equal(t, sdk.Coins{sdk.NewInt64Coin(feeDenom, 250), sdk.NewInt64Coin(stakeDenom, 25)}, lockedCoins) } +//nolint:lll func TestGenesisAccountValidate(t *testing.T) { pubkey := secp256k1.GenPrivKey().PubKey() addr := sdk.AccAddress(pubkey.Address())