diff --git a/axelar/auxiliary/v1beta1/service.proto b/axelar/auxiliary/v1beta1/service.proto index 6d2a08e..a219078 100644 --- a/axelar/auxiliary/v1beta1/service.proto +++ b/axelar/auxiliary/v1beta1/service.proto @@ -9,12 +9,14 @@ import "axelar/auxiliary/v1beta1/tx.proto"; option (gogoproto.goproto_registration) = true; -// Msg defines the nexus Msg service. +// Msg defines the auxiliary Msg service. service MsgService { rpc Batch(BatchRequest) returns (BatchResponse) { option (google.api.http) = { - post : "/axelar/auxiliary/batch" + post : "/axelar/auxiliary/v1beta1/batch" body : "*" + // Deprecated: use /axelar/auxiliary/v1beta1/batch instead + additional_bindings : {post : "/axelar/auxiliary/batch" body : "*"} }; } } diff --git a/axelar/axelarnet/v1beta1/params.proto b/axelar/axelarnet/v1beta1/params.proto index 5d669fb..6bdec46 100644 --- a/axelar/axelarnet/v1beta1/params.proto +++ b/axelar/axelarnet/v1beta1/params.proto @@ -14,14 +14,19 @@ message Params { reserved 2; // transaction_fee_rate was removed in v0.15 uint64 transfer_limit = 3; uint64 end_blocker_limit = 4; + // Deprecated in v1.4: call_contracts_proposal_min_deposits is no longer used repeated CallContractProposalMinDeposit call_contracts_proposal_min_deposits = 5 [ + deprecated = true, (gogoproto.castrepeated) = "CallContractProposalMinDeposits", (gogoproto.nullable) = false ]; } +// Deprecated in v1.4: CallContractProposalMinDeposit is no longer used message CallContractProposalMinDeposit { + option deprecated = true; + string chain = 1 [ (gogoproto.casttype) = "github.com/axelarnetwork/axelar-core/x/nexus/exported.ChainName" ]; diff --git a/axelar/axelarnet/v1beta1/proposal.proto b/axelar/axelarnet/v1beta1/proposal.proto index 8e7736a..f895360 100644 --- a/axelar/axelarnet/v1beta1/proposal.proto +++ b/axelar/axelarnet/v1beta1/proposal.proto @@ -8,9 +8,10 @@ import "amino/amino.proto"; option go_package = "github.com/axelarnetwork/axelar-core/x/axelarnet/types"; option (gogoproto.goproto_getters_all) = false; -// CallContractsProposal is a gov Content type for calling contracts on other -// chains +// Deprecated in v1.4: CallContractsProposal is no longer supported. +// Use the new governance proposal flow instead. message CallContractsProposal { + option deprecated = true; option (amino.name) = "axelarnet/CallContractsProposal"; option (gogoproto.goproto_stringer) = false; @@ -19,7 +20,9 @@ message CallContractsProposal { repeated ContractCall contract_calls = 3 [ (gogoproto.nullable) = false ]; } +// Deprecated in v1.4: ContractCall is no longer supported message ContractCall { + option deprecated = true; option (gogoproto.goproto_stringer) = false; string chain = 1 diff --git a/axelar/axelarnet/v1beta1/service.proto b/axelar/axelarnet/v1beta1/service.proto index 8ca7cb3..6430525 100644 --- a/axelar/axelarnet/v1beta1/service.proto +++ b/axelar/axelarnet/v1beta1/service.proto @@ -12,78 +12,95 @@ option (gogoproto.goproto_registration) = true; // Msg defines the axelarnet Msg service. service MsgService { - rpc Link(LinkRequest) returns (LinkResponse) { - option (google.api.http) = { - post : "/axelar/axelarnet/link" - body : "*" - }; - } - - rpc ConfirmDeposit(ConfirmDepositRequest) returns (ConfirmDepositResponse) { - option (google.api.http) = { - post : "/axelar/axelarnet/confirm_deposit" - body : "*" - }; - } - rpc ExecutePendingTransfers(ExecutePendingTransfersRequest) returns (ExecutePendingTransfersResponse) { option (google.api.http) = { - post : "/axelar/axelarnet/execute_pending_transfers" + post : "/axelar/axelarnet/v1beta1/execute_pending_transfers" body : "*" + // Deprecated: use /axelar/axelarnet/v1beta1/execute_pending_transfers + // instead + additional_bindings : { + post : "/axelar/axelarnet/execute_pending_transfers" + body : "*" + } }; } rpc AddCosmosBasedChain(AddCosmosBasedChainRequest) returns (AddCosmosBasedChainResponse) { option (google.api.http) = { - post : "/axelar/axelarnet/add_cosmos_based_chain" + post : "/axelar/axelarnet/v1beta1/add_cosmos_based_chain" body : "*" + // Deprecated: use /axelar/axelarnet/v1beta1/add_cosmos_based_chain + // instead + additional_bindings : { + post : "/axelar/axelarnet/add_cosmos_based_chain" + body : "*" + } }; } rpc RegisterAsset(RegisterAssetRequest) returns (RegisterAssetResponse) { option (google.api.http) = { - post : "/axelar/axelarnet/register_asset" + post : "/axelar/axelarnet/v1beta1/register_asset" body : "*" + // Deprecated: use /axelar/axelarnet/v1beta1/register_asset instead + additional_bindings : { + post : "/axelar/axelarnet/register_asset" + body : "*" + } }; } rpc RouteIBCTransfers(RouteIBCTransfersRequest) returns (RouteIBCTransfersResponse) { option (google.api.http) = { - post : "/axelar/axelarnet/route_ibc_transfers" + post : "/axelar/axelarnet/v1beta1/route_ibc_transfers" body : "*" + // Deprecated: use /axelar/axelarnet/v1beta1/route_ibc_transfers instead + additional_bindings : { + post : "/axelar/axelarnet/route_ibc_transfers" + body : "*" + } }; } rpc RegisterFeeCollector(RegisterFeeCollectorRequest) returns (RegisterFeeCollectorResponse) { option (google.api.http) = { - post : "/axelar/axelarnet/register_fee_collector" + post : "/axelar/axelarnet/v1beta1/register_fee_collector" body : "*" + // Deprecated: use /axelar/axelarnet/v1beta1/register_fee_collector + // instead + additional_bindings : { + post : "/axelar/axelarnet/register_fee_collector" + body : "*" + } }; } rpc RetryIBCTransfer(RetryIBCTransferRequest) returns (RetryIBCTransferResponse) { option (google.api.http) = { - post : "/axelar/axelarnet/retry_ibc_transfer" + post : "/axelar/axelarnet/v1beta1/retry_ibc_transfer" body : "*" + // Deprecated: use /axelar/axelarnet/v1beta1/retry_ibc_transfer instead + additional_bindings : { + post : "/axelar/axelarnet/retry_ibc_transfer" + body : "*" + } }; } rpc RouteMessage(RouteMessageRequest) returns (RouteMessageResponse) { option (google.api.http) = { - post : "/axelar/axelarnet/route_message" - body : "*" - }; - } - - rpc CallContract(CallContractRequest) returns (CallContractResponse) { - option (google.api.http) = { - post : "/axelar/axelarnet/call_contract" + post : "/axelar/axelarnet/v1beta1/route_message" body : "*" + // Deprecated: use /axelar/axelarnet/v1beta1/route_message instead + additional_bindings : { + post : "/axelar/axelarnet/route_message" + body : "*" + } }; } diff --git a/axelar/axelarnet/v1beta1/tx.proto b/axelar/axelarnet/v1beta1/tx.proto index 6070cfb..d5c81da 100644 --- a/axelar/axelarnet/v1beta1/tx.proto +++ b/axelar/axelarnet/v1beta1/tx.proto @@ -275,7 +275,9 @@ message RouteMessageRequest { message RouteMessageResponse {} +// Deprecated in v1.4: CallContractRequest is no longer supported message CallContractRequest { + option deprecated = true; option (amino.name) = "axelarnet/CallContract"; option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; option (cosmos.msg.v1.signer) = "sender"; @@ -296,7 +298,8 @@ message CallContractRequest { string sender = 6 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; } -message CallContractResponse {} +// Deprecated in v1.4: CallContractResponse is no longer supported +message CallContractResponse { option deprecated = true; } message UpdateParamsRequest { option (amino.name) = "axelarnet/UpdateParams"; diff --git a/axelar/evm/v1beta1/events.proto b/axelar/evm/v1beta1/events.proto index bcdd74e..51bf611 100644 --- a/axelar/evm/v1beta1/events.proto +++ b/axelar/evm/v1beta1/events.proto @@ -93,6 +93,7 @@ message ConfirmKeyTransferStarted { [ (gogoproto.nullable) = false, (gogoproto.embed) = true ]; } +// Deprecated in v0.22: use ConfirmGatewayTxsStarted instead message ConfirmGatewayTxStarted { option deprecated = true; @@ -283,7 +284,10 @@ message ContractCallWithMintApproved { cosmos.base.v1beta1.Coin asset = 8 [ (gogoproto.nullable) = false ]; } +// Deprecated in v1.4: link-deposit protocol removed message TokenSent { + option deprecated = true; + string chain = 1 [ (gogoproto.casttype) = "github.com/axelarnetwork/axelar-core/x/nexus/exported.ChainName" ]; diff --git a/axelar/evm/v1beta1/genesis.proto b/axelar/evm/v1beta1/genesis.proto index 3e0edc4..07bbe5a 100644 --- a/axelar/evm/v1beta1/genesis.proto +++ b/axelar/evm/v1beta1/genesis.proto @@ -15,11 +15,7 @@ message GenesisState { message Chain { Params params = 1 [ (gogoproto.nullable) = false ]; - repeated BurnerInfo burner_infos = 2 [ (gogoproto.nullable) = false ]; utils.v1beta1.QueueState command_queue = 3 [ (gogoproto.nullable) = false ]; - repeated ERC20Deposit confirmed_deposits = 4 - [ (gogoproto.nullable) = false ]; - repeated ERC20Deposit burned_deposits = 5 [ (gogoproto.nullable) = false ]; repeated CommandBatchMetadata command_batches = 8 [ (gogoproto.nullable) = false ]; @@ -29,10 +25,13 @@ message GenesisState { repeated Event events = 11 [ (gogoproto.nullable) = false ]; utils.v1beta1.QueueState confirmed_event_queue = 12 [ (gogoproto.nullable) = false ]; - repeated ERC20Deposit legacy_confirmed_deposits = 13 - [ (gogoproto.nullable) = false ]; - repeated ERC20Deposit legacy_burned_deposits = 14 - [ (gogoproto.nullable) = false ]; + + // Deprecated in v1.4: link-deposit protocol removed + reserved 2; // burner_infos + reserved 4; // confirmed_deposits + reserved 5; // burned_deposits + reserved 13; // legacy_confirmed_deposits + reserved 14; // legacy_burned_deposits } repeated Chain chains = 3 [ (gogoproto.nullable) = false ]; diff --git a/axelar/evm/v1beta1/query.proto b/axelar/evm/v1beta1/query.proto index 61de10b..eea94ce 100644 --- a/axelar/evm/v1beta1/query.proto +++ b/axelar/evm/v1beta1/query.proto @@ -69,13 +69,15 @@ message KeyAddressResponse { string threshold = 3; } +// Deprecated in v0.19 message QueryTokenAddressResponse { - option deprecated = true; // Deprecated in v19 + option deprecated = true; string address = 1; bool confirmed = 2; } +// Deprecated in v1.4: link-deposit protocol removed message QueryDepositStateParams { option deprecated = true; @@ -88,6 +90,7 @@ message QueryDepositStateParams { [ (gogoproto.nullable) = false, (gogoproto.customtype) = "Address" ]; } +// Deprecated in v1.4: link-deposit protocol removed message DepositStateRequest { option deprecated = true; @@ -97,6 +100,7 @@ message DepositStateRequest { QueryDepositStateParams params = 2; } +// Deprecated in v1.4: link-deposit protocol removed message DepositStateResponse { option deprecated = true; @@ -157,12 +161,18 @@ message QueryCommandResponse { uint32 max_gas_cost = 5; } +// Deprecated in v1.4: BurnerInfoRequest is no longer used (link-deposit +// protocol removed) message BurnerInfoRequest { + option deprecated = true; bytes address = 1 [ (gogoproto.nullable) = false, (gogoproto.customtype) = "Address" ]; } +// Deprecated in v1.4: BurnerInfoResponse is no longer used (link-deposit +// protocol removed) message BurnerInfoResponse { + option deprecated = true; string chain = 1 [ (gogoproto.casttype) = "github.com/axelarnetwork/axelar-core/x/nexus/exported.ChainName" ]; @@ -179,7 +189,9 @@ message GatewayAddressResponse { string address = 1; } message BytecodeRequest { string chain = 1; - string contract = 2; + // Deprecated: contract is no longer used. The query now only returns token + // bytecode. + string contract = 2 [ deprecated = true ]; } message BytecodeResponse { string bytecode = 1; } diff --git a/axelar/evm/v1beta1/service.proto b/axelar/evm/v1beta1/service.proto index 05495a5..5e040b7 100644 --- a/axelar/evm/v1beta1/service.proto +++ b/axelar/evm/v1beta1/service.proto @@ -14,8 +14,10 @@ option (gogoproto.goproto_registration) = true; service MsgService { rpc SetGateway(SetGatewayRequest) returns (SetGatewayResponse) { option (google.api.http) = { - post : "/axelar/evm/set_gateway" + post : "/axelar/evm/v1beta1/set_gateway" body : "*" + // Deprecated: use /axelar/evm/v1beta1/set_gateway instead + additional_bindings : {post : "/axelar/evm/set_gateway" body : "*"} }; } @@ -23,99 +25,100 @@ service MsgService { rpc ConfirmGatewayTx(ConfirmGatewayTxRequest) returns (ConfirmGatewayTxResponse) { option (google.api.http) = { - post : "/axelar/evm/confirm_gateway_tx" + post : "/axelar/evm/v1beta1/confirm_gateway_tx" body : "*" + // Deprecated: use /axelar/evm/v1beta1/confirm_gateway_tx instead + additional_bindings : {post : "/axelar/evm/confirm_gateway_tx" body : "*"} }; } rpc ConfirmGatewayTxs(ConfirmGatewayTxsRequest) returns (ConfirmGatewayTxsResponse) { option (google.api.http) = { - post : "/axelar/evm/confirm_gateway_txs" - body : "*" - }; - } - - rpc Link(LinkRequest) returns (LinkResponse) { - option (google.api.http) = { - post : "/axelar/evm/link" + post : "/axelar/evm/v1beta1/confirm_gateway_txs" body : "*" + // Deprecated: use /axelar/evm/v1beta1/confirm_gateway_txs instead + additional_bindings : { + post : "/axelar/evm/confirm_gateway_txs" + body : "*" + } }; } rpc ConfirmToken(ConfirmTokenRequest) returns (ConfirmTokenResponse) { option (google.api.http) = { - post : "/axelar/evm/confirm_token" - body : "*" - }; - } - - rpc ConfirmDeposit(ConfirmDepositRequest) returns (ConfirmDepositResponse) { - option (google.api.http) = { - post : "/axelar/evm/confirm_deposit" + post : "/axelar/evm/v1beta1/confirm_token" body : "*" + // Deprecated: use /axelar/evm/v1beta1/confirm_token instead + additional_bindings : {post : "/axelar/evm/confirm_token" body : "*"} }; } rpc ConfirmTransferKey(ConfirmTransferKeyRequest) returns (ConfirmTransferKeyResponse) { option (google.api.http) = { - post : "/axelar/evm/confirm_transfer_key" + post : "/axelar/evm/v1beta1/confirm_transfer_key" body : "*" + // Deprecated: use /axelar/evm/v1beta1/confirm_transfer_key instead + additional_bindings : { + post : "/axelar/evm/confirm_transfer_key" + body : "*" + } }; } rpc CreateDeployToken(CreateDeployTokenRequest) returns (CreateDeployTokenResponse) { option (google.api.http) = { - post : "/axelar/evm/create_deploy_token" - body : "*" - }; - } - - rpc CreateBurnTokens(CreateBurnTokensRequest) - returns (CreateBurnTokensResponse) { - option (google.api.http) = { - post : "/axelar/evm/create_burn_tokens" - body : "*" - }; - } - - rpc CreatePendingTransfers(CreatePendingTransfersRequest) - returns (CreatePendingTransfersResponse) { - option (google.api.http) = { - post : "/axelar/evm/create_pending_transfers" + post : "/axelar/evm/v1beta1/create_deploy_token" body : "*" + // Deprecated: use /axelar/evm/v1beta1/create_deploy_token instead + additional_bindings : { + post : "/axelar/evm/create_deploy_token" + body : "*" + } }; } rpc CreateTransferOperatorship(CreateTransferOperatorshipRequest) returns (CreateTransferOperatorshipResponse) { option (google.api.http) = { - post : "/axelar/evm/create_transfer_operatorship" + post : "/axelar/evm/v1beta1/create_transfer_operatorship" body : "*" + // Deprecated: use /axelar/evm/v1beta1/create_transfer_operatorship + // instead + additional_bindings : { + post : "/axelar/evm/create_transfer_operatorship" + body : "*" + } }; } rpc SignCommands(SignCommandsRequest) returns (SignCommandsResponse) { option (google.api.http) = { - post : "/axelar/evm/sign_commands" + post : "/axelar/evm/v1beta1/sign_commands" body : "*" + // Deprecated: use /axelar/evm/v1beta1/sign_commands instead + additional_bindings : {post : "/axelar/evm/sign_commands" body : "*"} }; } rpc AddChain(AddChainRequest) returns (AddChainResponse) { option (google.api.http) = { - post : "/axelar/evm/add_chain" + post : "/axelar/evm/v1beta1/add_chain" body : "*" + // Deprecated: use /axelar/evm/v1beta1/add_chain instead + additional_bindings : {post : "/axelar/evm/add_chain" body : "*"} }; } rpc RetryFailedEvent(RetryFailedEventRequest) returns (RetryFailedEventResponse) { option (google.api.http) = { - post : "/axelar/evm/retry-failed-event" + post : "/axelar/evm/v1beta1/retry_failed_event" body : "*" + // Deprecated: use /axelar/evm/v1beta1/retry_failed_event instead + additional_bindings : {post : "/axelar/evm/retry-failed-event" body : "*"} }; } @@ -139,11 +142,6 @@ service QueryService { "/axelar/evm/v1beta1/batched_commands/{chain}/{id}"; } - // BurnerInfo queries the burner info for the specified address - rpc BurnerInfo(BurnerInfoRequest) returns (BurnerInfoResponse) { - option (google.api.http).get = "/axelar/evm/v1beta1/burner_info"; - } - // ConfirmationHeight queries the confirmation height for the specified chain rpc ConfirmationHeight(ConfirmationHeightRequest) returns (ConfirmationHeightResponse) { @@ -151,12 +149,6 @@ service QueryService { "/axelar/evm/v1beta1/confirmation_height/{chain}"; } - // DepositState queries the state of the specified deposit - rpc DepositState(DepositStateRequest) returns (DepositStateResponse) { - option deprecated = true; - option (google.api.http).get = "/axelar/evm/v1beta1/deposit_state"; - } - // PendingCommands queries the pending commands for the specified chain rpc PendingCommands(PendingCommandsRequest) returns (PendingCommandsResponse) { diff --git a/axelar/evm/v1beta1/tx.proto b/axelar/evm/v1beta1/tx.proto index b8ba5a3..5cd92ee 100644 --- a/axelar/evm/v1beta1/tx.proto +++ b/axelar/evm/v1beta1/tx.proto @@ -36,6 +36,7 @@ message SetGatewayRequest { message SetGatewayResponse {} +// Deprecated in v0.22: use ConfirmGatewayTxsRequest instead message ConfirmGatewayTxRequest { option (amino.name) = "evm/ConfirmGatewayTxRequest"; option deprecated = true; @@ -61,6 +62,7 @@ message ConfirmGatewayTxRequest { string sender = 4 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; } +// Deprecated in v0.22: use ConfirmGatewayTxsResponse instead message ConfirmGatewayTxResponse { option deprecated = true; } message ConfirmGatewayTxsRequest { @@ -263,22 +265,22 @@ message CreateDeployTokenRequest { [ (gogoproto.customtype) = "cosmossdk.io/math.Int", deprecated = true ]; bytes address = 6 [ (gogoproto.nullable) = false, (gogoproto.customtype) = "Address" ]; - string daily_mint_limit = 7; + // Deprecated in v1.4: daily mint limit is no longer enforced. This field is + // ignored and all tokens are deployed with unlimited minting. + string daily_mint_limit = 7 [ deprecated = true ]; string sender = 8 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; } message CreateDeployTokenResponse {} -// CreatePendingTransfersRequest represents a message to trigger the creation of -// commands handling all pending transfers +// Deprecated in v1.4: CreatePendingTransfersRequest is no longer used. +// The link-deposit protocol has been removed. message CreatePendingTransfersRequest { + option deprecated = true; option (amino.name) = "evm/CreatePendingTransfers"; option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; option (cosmos.msg.v1.signer) = "sender"; - // DEPRECATED: This field is deprecated but must remain to ensure backward - // compatibility. Removing this field would break decoding of historical - // transactions. DO NOT use in new code. bytes sender_deprecated = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress", deprecated = true @@ -289,8 +291,10 @@ message CreatePendingTransfersRequest { string sender = 3 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; } -message CreatePendingTransfersResponse {} +// Deprecated in v1.4: CreatePendingTransfersResponse is no longer used. +message CreatePendingTransfersResponse { option deprecated = true; } +// Deprecated in v0.20: ownership transfer mechanism was removed message CreateTransferOwnershipRequest { option deprecated = true; @@ -315,6 +319,7 @@ message CreateTransferOwnershipRequest { string sender = 4 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; } +// Deprecated in v0.20: ownership transfer mechanism was removed message CreateTransferOwnershipResponse { option deprecated = true; } message CreateTransferOperatorshipRequest { diff --git a/axelar/evm/v1beta1/types.proto b/axelar/evm/v1beta1/types.proto index c2f4a2a..d857539 100644 --- a/axelar/evm/v1beta1/types.proto +++ b/axelar/evm/v1beta1/types.proto @@ -42,11 +42,14 @@ message Event { Status status = 4; oneof event { - EventTokenSent token_sent = 5; + // Deprecated in v1.4: link-deposit protocol removed + EventTokenSent token_sent = 5 [ deprecated = true ]; EventContractCall contract_call = 6; EventContractCallWithToken contract_call_with_token = 7; - EventTransfer transfer = 8; + // Deprecated in v1.4: link-deposit protocol removed + EventTransfer transfer = 8 [ deprecated = true ]; EventTokenDeployed token_deployed = 9; + // Deprecated in v0.20: ownership transfer mechanism was removed EventMultisigOwnershipTransferred multisig_ownership_transferred = 10 [ deprecated = true ]; EventMultisigOperatorshipTransferred multisig_operatorship_transferred = 11; @@ -56,7 +59,10 @@ message Event { reserved 13; // singlesig_operatorship_transferred was removed in v0.23 } +// Deprecated in v1.4: link-deposit protocol removed message EventTokenSent { + option deprecated = true; + bytes sender = 1 [ (gogoproto.nullable) = false, (gogoproto.customtype) = "Address" ]; string destination_chain = 2 @@ -97,7 +103,10 @@ message EventContractCallWithToken { ]; } +// Deprecated in v1.4: link-deposit protocol removed message EventTransfer { + option deprecated = true; + bytes to = 1 [ (gogoproto.nullable) = false, (gogoproto.customtype) = "Address" ]; bytes amount = 2 [ @@ -112,6 +121,7 @@ message EventTokenDeployed { [ (gogoproto.nullable) = false, (gogoproto.customtype) = "Address" ]; } +// Deprecated in v0.20: ownership transfer mechanism was removed message EventMultisigOwnershipTransferred { option deprecated = true; diff --git a/axelar/multisig/v1beta1/service.proto b/axelar/multisig/v1beta1/service.proto index d52f835..3615687 100644 --- a/axelar/multisig/v1beta1/service.proto +++ b/axelar/multisig/v1beta1/service.proto @@ -14,30 +14,44 @@ option (gogoproto.goproto_registration) = true; service MsgService { rpc StartKeygen(StartKeygenRequest) returns (StartKeygenResponse) { option (google.api.http) = { - post : "/axelar/multisig/start_keygen" + post : "/axelar/multisig/v1beta1/start_keygen" body : "*" + // Deprecated: use /axelar/multisig/v1beta1/start_keygen instead + additional_bindings : {post : "/axelar/multisig/start_keygen" body : "*"} }; } rpc SubmitPubKey(SubmitPubKeyRequest) returns (SubmitPubKeyResponse) { option (google.api.http) = { - post : "/axelar/multisig/submit_pub_key" + post : "/axelar/multisig/v1beta1/submit_pub_key" body : "*" + // Deprecated: use /axelar/multisig/v1beta1/submit_pub_key instead + additional_bindings : { + post : "/axelar/multisig/submit_pub_key" + body : "*" + } }; } rpc SubmitSignature(SubmitSignatureRequest) returns (SubmitSignatureResponse) { option (google.api.http) = { - post : "/axelar/multisig/submit_signature" + post : "/axelar/multisig/v1beta1/submit_signature" body : "*" + // Deprecated: use /axelar/multisig/v1beta1/submit_signature instead + additional_bindings : { + post : "/axelar/multisig/submit_signature" + body : "*" + } }; } rpc RotateKey(RotateKeyRequest) returns (RotateKeyResponse) { option (google.api.http) = { - post : "/axelar/multisig/rotate_key" + post : "/axelar/multisig/v1beta1/rotate_key" body : "*" + // Deprecated: use /axelar/multisig/v1beta1/rotate_key instead + additional_bindings : {post : "/axelar/multisig/rotate_key" body : "*"} }; } diff --git a/axelar/nexus/v1beta1/events.proto b/axelar/nexus/v1beta1/events.proto index 1c1d70d..02b6990 100644 --- a/axelar/nexus/v1beta1/events.proto +++ b/axelar/nexus/v1beta1/events.proto @@ -37,7 +37,9 @@ message InsufficientFee { cosmos.base.v1beta1.Coin fee = 5 [ (gogoproto.nullable) = false ]; } +// Deprecated in v1.4: rate limiting has been removed. message RateLimitUpdated { + option deprecated = true; string chain = 1 [ (gogoproto.casttype) = "github.com/axelarnetwork/axelar-core/x/nexus/exported.ChainName" ]; @@ -85,6 +87,16 @@ message MessageFailed { "github.com/axelarnetwork/axelar-core/x/nexus/exported.ChainName" ]; } +message MessageRetried { + string id = 1 [ (gogoproto.customname) = "ID" ]; + string source_chain = 2 + [ (gogoproto.casttype) = + "github.com/axelarnetwork/axelar-core/x/nexus/exported.ChainName" ]; + string destination_chain = 3 + [ (gogoproto.casttype) = + "github.com/axelarnetwork/axelar-core/x/nexus/exported.ChainName" ]; +} + message WasmMessageRouted { exported.v1beta1.WasmMessage message = 1 [ (gogoproto.nullable) = false ]; } diff --git a/axelar/nexus/v1beta1/query.proto b/axelar/nexus/v1beta1/query.proto index 19e8c4e..8373731 100644 --- a/axelar/nexus/v1beta1/query.proto +++ b/axelar/nexus/v1beta1/query.proto @@ -3,7 +3,6 @@ package axelar.nexus.v1beta1; option go_package = "github.com/axelarnetwork/axelar-core/x/nexus/types"; -import "google/protobuf/duration.proto"; import "gogoproto/gogo.proto"; import "axelar/nexus/exported/v1beta1/types.proto"; import "axelar/nexus/v1beta1/types.proto"; @@ -112,57 +111,6 @@ message ChainsByAssetResponse { "github.com/axelarnetwork/axelar-core/x/nexus/exported.ChainName" ]; } -// RecipientAddressRequest represents a message that queries the registered -// recipient address for a given deposit address -message RecipientAddressRequest { - string deposit_addr = 1; - string deposit_chain = 2; -} - -message RecipientAddressResponse { - string recipient_addr = 1; - string recipient_chain = 2; -}; - -// TransferRateLimitRequest represents a message that queries the registered -// transfer rate limit and current transfer amounts for a given chain and asset -message TransferRateLimitRequest { - string chain = 1; - string asset = 2; -} - -message TransferRateLimitResponse { TransferRateLimit transfer_rate_limit = 1; } - -message TransferRateLimit { - bytes limit = 1 [ - (gogoproto.customtype) = "cosmossdk.io/math.Int", - (gogoproto.nullable) = false - ]; - google.protobuf.Duration window = 2 - [ (gogoproto.stdduration) = true, (gogoproto.nullable) = false ]; - bytes incoming = 3 [ - deprecated = true, - (gogoproto.customtype) = "cosmossdk.io/math.Int", - (gogoproto.nullable) = false - ]; - bytes outgoing = 4 [ - deprecated = true, - (gogoproto.customtype) = "cosmossdk.io/math.Int", - (gogoproto.nullable) = false - ]; - // time_left indicates the time left in the rate limit window - google.protobuf.Duration time_left = 5 - [ (gogoproto.stdduration) = true, (gogoproto.nullable) = false ]; - bytes from = 6 [ - (gogoproto.customtype) = "cosmossdk.io/math.Int", - (gogoproto.nullable) = false - ]; - bytes to = 7 [ - (gogoproto.customtype) = "cosmossdk.io/math.Int", - (gogoproto.nullable) = false - ]; -} - message MessageRequest { string id = 1 [ (gogoproto.customname) = "ID" ]; } message MessageResponse { diff --git a/axelar/nexus/v1beta1/service.proto b/axelar/nexus/v1beta1/service.proto index 2b61501..71b2e2d 100644 --- a/axelar/nexus/v1beta1/service.proto +++ b/axelar/nexus/v1beta1/service.proto @@ -15,84 +15,85 @@ service MsgService { rpc RegisterChainMaintainer(RegisterChainMaintainerRequest) returns (RegisterChainMaintainerResponse) { option (google.api.http) = { - post : "/axelar/nexus/register_chain_maintainer" + post : "/axelar/nexus/v1beta1/register_chain_maintainer" body : "*" + // Deprecated: use /axelar/nexus/v1beta1/register_chain_maintainer instead + additional_bindings : { + post : "/axelar/nexus/register_chain_maintainer" + body : "*" + } }; } rpc DeregisterChainMaintainer(DeregisterChainMaintainerRequest) returns (DeregisterChainMaintainerResponse) { option (google.api.http) = { - post : "/axelar/nexus/deregister_chain_maintainer" + post : "/axelar/nexus/v1beta1/deregister_chain_maintainer" body : "*" + // Deprecated: use /axelar/nexus/v1beta1/deregister_chain_maintainer + // instead + additional_bindings : { + post : "/axelar/nexus/deregister_chain_maintainer" + body : "*" + } }; } rpc ActivateChain(ActivateChainRequest) returns (ActivateChainResponse) { option (google.api.http) = { - post : "/axelar/nexus/activate_chain" + post : "/axelar/nexus/v1beta1/activate_chain" body : "*" + // Deprecated: use /axelar/nexus/v1beta1/activate_chain instead + additional_bindings : {post : "/axelar/nexus/activate_chain" body : "*"} }; } rpc DeactivateChain(axelar.nexus.v1beta1.DeactivateChainRequest) returns (axelar.nexus.v1beta1.DeactivateChainResponse) { option (google.api.http) = { - post : "/axelar/nexus/deactivate_chain" + post : "/axelar/nexus/v1beta1/deactivate_chain" body : "*" + // Deprecated: use /axelar/nexus/v1beta1/deactivate_chain instead + additional_bindings : {post : "/axelar/nexus/deactivate_chain" body : "*"} }; } rpc RegisterAssetFee(RegisterAssetFeeRequest) returns (RegisterAssetFeeResponse) { option (google.api.http) = { - post : "/axelar/nexus/register_asset_fee" + post : "/axelar/nexus/v1beta1/register_asset_fee" body : "*" + // Deprecated: use /axelar/nexus/v1beta1/register_asset_fee instead + additional_bindings : { + post : "/axelar/nexus/register_asset_fee" + body : "*" + } }; } - rpc SetTransferRateLimit(SetTransferRateLimitRequest) - returns (SetTransferRateLimitResponse) { - option (google.api.http) = { - post : "/axelar/nexus/set_transfer_rate_limit" - body : "*" - }; - } - - rpc EnableLinkDeposit(EnableLinkDepositRequest) - returns (EnableLinkDepositResponse) { + rpc UpdateParams(UpdateParamsRequest) returns (UpdateParamsResponse) { option (google.api.http) = { - post : "/axelar/nexus/enable_link_deposit" + post : "/axelar/nexus/v1beta1/params" body : "*" }; } - rpc DisableLinkDeposit(DisableLinkDepositRequest) - returns (DisableLinkDepositResponse) { + rpc RetryFailedMessage(RetryFailedMessageRequest) + returns (RetryFailedMessageResponse) { option (google.api.http) = { - post : "/axelar/nexus/disable_link_deposit" - body : "*" - }; - } - - rpc UpdateParams(UpdateParamsRequest) returns (UpdateParamsResponse) { - option (google.api.http) = { - post : "/axelar/nexus/v1beta1/params" + post : "/axelar/nexus/v1beta1/retry_failed_message" body : "*" + // Deprecated: use /axelar/nexus/v1beta1/retry_failed_message instead + additional_bindings : { + post : "/axelar/nexus/retry-failed-message" + body : "*" + } }; } } // QueryService defines the gRPC querier service. service QueryService { - // LatestDepositAddress queries the a deposit address by recipient - rpc LatestDepositAddress(LatestDepositAddressRequest) - returns (LatestDepositAddressResponse) { - option (google.api.http).get = - "/axelar/nexus/v1beta1/latest_deposit_address/" - "{recipient_addr}/{recipient_chain}/{deposit_chain}"; - } - // TransfersForChain queries transfers by chain rpc TransfersForChain(TransfersForChainRequest) returns (TransfersForChainResponse) { @@ -139,13 +140,6 @@ service QueryService { "/axelar/nexus/v1beta1/chains_by_asset/{asset}"; } - // RecipientAddress queries the recipient address for a given deposit address - rpc RecipientAddress(RecipientAddressRequest) - returns (RecipientAddressResponse) { - option (google.api.http).get = "/axelar/nexus/v1beta1/recipient_address/" - "{deposit_chain}/{deposit_addr}"; - } - // ChainMaintainers queries the chain maintainers for a given chain rpc ChainMaintainers(ChainMaintainersRequest) returns (ChainMaintainersResponse) { @@ -153,14 +147,6 @@ service QueryService { "/axelar/nexus/v1beta1/chain_maintainers/{chain}"; } - // TransferRateLimit queries the transfer rate limit for a given chain and - // asset. If a rate limit is not set, nil is returned. - rpc TransferRateLimit(TransferRateLimitRequest) - returns (TransferRateLimitResponse) { - option (google.api.http).get = "/axelar/nexus/v1beta1/transfer_rate_limit/" - "{chain}/{asset}"; - } - rpc Message(MessageRequest) returns (MessageResponse) { option (google.api.http).get = "/axelar/nexus/v1beta1/message"; } @@ -170,9 +156,4 @@ service QueryService { get : "/axelar/nexus/v1beta1/params" }; } - - rpc LinkDepositEnabled(LinkDepositEnabledRequest) - returns (LinkDepositEnabledResponse) { - option (google.api.http).get = "/axelar/nexus/v1beta1/link_deposit_enabled"; - } } diff --git a/axelar/nexus/v1beta1/tx.proto b/axelar/nexus/v1beta1/tx.proto index b0e1028..03c5b83 100644 --- a/axelar/nexus/v1beta1/tx.proto +++ b/axelar/nexus/v1beta1/tx.proto @@ -117,16 +117,13 @@ message RegisterAssetFeeRequest { message RegisterAssetFeeResponse {} -// SetTransferRateLimitRequest represents a message to set rate limits on -// transfers +// Deprecated in v1.4: rate limiting has been removed. message SetTransferRateLimitRequest { + option deprecated = true; option (amino.name) = "nexus/SetTransferRateLimit"; option (permission.exported.v1beta1.permission_role) = ROLE_ACCESS_CONTROL; option (cosmos.msg.v1.signer) = "sender"; - // DEPRECATED: This field is deprecated but must remain to ensure backward - // compatibility. Removing this field would break decoding of historical - // transactions. DO NOT use in new code. bytes sender_deprecated = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress", deprecated = true @@ -140,13 +137,15 @@ message SetTransferRateLimitRequest { string sender = 5 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; } -message SetTransferRateLimitResponse {} +message SetTransferRateLimitResponse { option deprecated = true; } +// Deprecated in v1.4: link-deposit protocol has been removed. // EnableLinkDepositRequest enables the link-deposit protocol for cross-chain // transfers. The link-deposit protocol allows users to create deposit addresses // and confirm deposits for cross-chain asset transfers on both EVM and Cosmos // chains. message EnableLinkDepositRequest { + option deprecated = true; option (amino.name) = "nexus/EnableLinkDeposit"; option (permission.exported.v1beta1.permission_role) = ROLE_ACCESS_CONTROL; option (cosmos.msg.v1.signer) = "authority"; @@ -154,12 +153,14 @@ message EnableLinkDepositRequest { string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; } -message EnableLinkDepositResponse {} +message EnableLinkDepositResponse { option deprecated = true; } +// Deprecated in v1.4: link-deposit protocol has been removed. // DisableLinkDepositRequest disables the link-deposit protocol for cross-chain // transfers. When disabled, Link, ConfirmDeposit, and CreateBurnTokens // operations will be rejected. message DisableLinkDepositRequest { + option deprecated = true; option (amino.name) = "nexus/DisableLinkDeposit"; option (permission.exported.v1beta1.permission_role) = ROLE_ACCESS_CONTROL; option (cosmos.msg.v1.signer) = "authority"; @@ -167,7 +168,7 @@ message DisableLinkDepositRequest { string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; } -message DisableLinkDepositResponse {} +message DisableLinkDepositResponse { option deprecated = true; } message UpdateParamsRequest { option (amino.name) = "nexus/UpdateParams"; @@ -179,3 +180,14 @@ message UpdateParamsRequest { } message UpdateParamsResponse {} + +message RetryFailedMessageRequest { + option (amino.name) = "nexus/RetryFailedMessage"; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; + option (cosmos.msg.v1.signer) = "sender"; + + string sender = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; + string id = 2 [ (gogoproto.customname) = "ID" ]; +} + +message RetryFailedMessageResponse {} diff --git a/axelar/permission/v1beta1/service.proto b/axelar/permission/v1beta1/service.proto index 00ca696..03aaaf3 100644 --- a/axelar/permission/v1beta1/service.proto +++ b/axelar/permission/v1beta1/service.proto @@ -10,13 +10,18 @@ import "axelar/permission/v1beta1/query.proto"; option (gogoproto.goproto_registration) = true; -// Msg defines the gov Msg service. +// Msg defines the permission Msg service. service Msg { rpc RegisterController(axelar.permission.v1beta1.RegisterControllerRequest) returns (axelar.permission.v1beta1.RegisterControllerResponse) { option (google.api.http) = { - post : "/axelar/permission/register_controller" + post : "/axelar/permission/v1beta1/register_controller" body : "*" + // Deprecated: use /axelar/permission/v1beta1/register_controller instead + additional_bindings : { + post : "/axelar/permission/register_controller" + body : "*" + } }; } @@ -24,16 +29,28 @@ service Msg { axelar.permission.v1beta1.DeregisterControllerRequest) returns (axelar.permission.v1beta1.DeregisterControllerResponse) { option (google.api.http) = { - post : "/axelar/permission/deregister_controller" + post : "/axelar/permission/v1beta1/deregister_controller" body : "*" + // Deprecated: use /axelar/permission/v1beta1/deregister_controller + // instead + additional_bindings : { + post : "/axelar/permission/deregister_controller" + body : "*" + } }; } rpc UpdateGovernanceKey(axelar.permission.v1beta1.UpdateGovernanceKeyRequest) returns (axelar.permission.v1beta1.UpdateGovernanceKeyResponse) { option (google.api.http) = { - post : "/axelar/permission/update_governance_key" + post : "/axelar/permission/v1beta1/update_governance_key" body : "*" + // Deprecated: use /axelar/permission/v1beta1/update_governance_key + // instead + additional_bindings : { + post : "/axelar/permission/update_governance_key" + body : "*" + } }; } diff --git a/axelar/reward/v1beta1/service.proto b/axelar/reward/v1beta1/service.proto index 44cdf6c..eb0d8d1 100644 --- a/axelar/reward/v1beta1/service.proto +++ b/axelar/reward/v1beta1/service.proto @@ -10,12 +10,14 @@ import "axelar/reward/v1beta1/query.proto"; option (gogoproto.goproto_registration) = true; -// Msg defines the axelarnet Msg service. +// Msg defines the reward Msg service. service MsgService { rpc RefundMsg(RefundMsgRequest) returns (RefundMsgResponse) { option (google.api.http) = { - post : "/axelar/reward/refund_message" + post : "/axelar/reward/v1beta1/refund_message" body : "*" + // Deprecated: use /axelar/reward/v1beta1/refund_message instead + additional_bindings : {post : "/axelar/reward/refund_message" body : "*"} }; } diff --git a/axelar/snapshot/v1beta1/service.proto b/axelar/snapshot/v1beta1/service.proto index 36b2912..2f5f55c 100644 --- a/axelar/snapshot/v1beta1/service.proto +++ b/axelar/snapshot/v1beta1/service.proto @@ -16,8 +16,13 @@ service MsgService { // in a validator account's stead. rpc RegisterProxy(RegisterProxyRequest) returns (RegisterProxyResponse) { option (google.api.http) = { - post : "/axelar/snapshot/register_proxy" + post : "/axelar/snapshot/v1beta1/register_proxy" body : "*" + // Deprecated: use /axelar/snapshot/v1beta1/register_proxy instead + additional_bindings : { + post : "/axelar/snapshot/register_proxy" + body : "*" + } }; } @@ -25,8 +30,13 @@ service MsgService { rpc DeactivateProxy(DeactivateProxyRequest) returns (DeactivateProxyResponse) { option (google.api.http) = { - post : "/axelar/snapshot/deactivate_proxy" + post : "/axelar/snapshot/v1beta1/deactivate_proxy" body : "*" + // Deprecated: use /axelar/snapshot/v1beta1/deactivate_proxy instead + additional_bindings : { + post : "/axelar/snapshot/deactivate_proxy" + body : "*" + } }; } diff --git a/axelar/tss/v1beta1/types.proto b/axelar/tss/v1beta1/types.proto index 86fd8da..1b2193a 100644 --- a/axelar/tss/v1beta1/types.proto +++ b/axelar/tss/v1beta1/types.proto @@ -6,11 +6,6 @@ option go_package = "github.com/axelarnetwork/axelar-core/x/tss/types"; import "gogoproto/gogo.proto"; import "axelar/tss/exported/v1beta1/types.proto"; -message KeygenVoteData { - bytes pub_key = 1; - bytes group_recovery_info = 2; -} - // KeyInfo holds information about a key message KeyInfo { string key_id = 1 [ @@ -21,43 +16,3 @@ message KeyInfo { tss.exported.v1beta1.KeyRole key_role = 2; tss.exported.v1beta1.KeyType key_type = 3; } - -message MultisigInfo { - message Info { - bytes participant = 1 - [ (gogoproto.casttype) = - "github.com/cosmos/cosmos-sdk/types.ValAddress" ]; - repeated bytes data = 2; - } - string id = 1 [ (gogoproto.customname) = "ID" ]; - int64 timeout = 2; - int64 target_num = 3; - repeated Info infos = 4; -} - -message KeyRecoveryInfo { - string key_id = 1 [ - (gogoproto.customname) = "KeyID", - (gogoproto.casttype) = - "github.com/axelarnetwork/axelar-core/x/tss/exported.KeyID" - ]; - bytes public = 2; - map private = 3 [ (gogoproto.nullable) = false ]; -} - -message ExternalKeys { - string chain = 1 - [ (gogoproto.casttype) = - "github.com/axelarnetwork/axelar-core/x/nexus/exported.ChainName" ]; - repeated string key_ids = 2 [ - (gogoproto.customname) = "KeyIDs", - (gogoproto.casttype) = - "github.com/axelarnetwork/axelar-core/x/tss/exported.KeyID" - ]; -} - -message ValidatorStatus { - bytes validator = 1 [ (gogoproto.casttype) = - "github.com/cosmos/cosmos-sdk/types.ValAddress" ]; - uint64 suspended_until = 2; -} diff --git a/axelar/vote/v1beta1/service.proto b/axelar/vote/v1beta1/service.proto index 9e16b11..c5c977b 100644 --- a/axelar/vote/v1beta1/service.proto +++ b/axelar/vote/v1beta1/service.proto @@ -14,8 +14,10 @@ option (gogoproto.goproto_registration) = true; service MsgService { rpc Vote(VoteRequest) returns (VoteResponse) { option (google.api.http) = { - post : "/axelar/vote/vote" + post : "/axelar/vote/v1beta1/vote" body : "*" + // Deprecated: use /axelar/vote/v1beta1/vote instead + additional_bindings : {post : "/axelar/vote/vote" body : "*"} }; } diff --git a/cosmos/app/v1alpha1/config.proto b/cosmos/app/v1alpha1/config.proto index 1aac4b4..f285d6f 100644 --- a/cosmos/app/v1alpha1/config.proto +++ b/cosmos/app/v1alpha1/config.proto @@ -34,7 +34,7 @@ message ModuleConfig { // cosmos.bank.module.v2.Module, the app-specific name "bank" stays the same // and the framework knows that the v2 module should receive all the same state // that the v1 module had. Note: modules should provide info on which versions - // they can migrate from in the ModuleDescriptor.can_migration_from field. + // they can migrate from in the ModuleDescriptor.can_migrate_from field. string name = 1; // config is the config object for the module. Module config messages should @@ -54,4 +54,4 @@ message GolangBinding { // implementation is the implementing type which will be supplied when an input of type interface is requested string implementation = 2; -} \ No newline at end of file +} diff --git a/cosmos/authz/v1beta1/event.proto b/cosmos/authz/v1beta1/event.proto index f763854..97a3e1c 100644 --- a/cosmos/authz/v1beta1/event.proto +++ b/cosmos/authz/v1beta1/event.proto @@ -7,7 +7,7 @@ option go_package = "github.com/cosmos/cosmos-sdk/x/authz"; // EventGrant is emitted on Msg/Grant message EventGrant { - // Msg type URL for which an autorization is granted + // Msg type URL for which an authorization is granted string msg_type_url = 2; // Granter account address string granter = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"]; @@ -17,7 +17,7 @@ message EventGrant { // EventRevoke is emitted on Msg/Revoke message EventRevoke { - // Msg type URL for which an autorization is revoked + // Msg type URL for which an authorization is revoked string msg_type_url = 2; // Granter account address string granter = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"]; diff --git a/cosmos/authz/v1beta1/query.proto b/cosmos/authz/v1beta1/query.proto index f8cff44..3e25df9 100644 --- a/cosmos/authz/v1beta1/query.proto +++ b/cosmos/authz/v1beta1/query.proto @@ -34,7 +34,7 @@ message QueryGrantsRequest { string grantee = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // Optional, msg_type_url, when set, will query only grants matching given msg type. string msg_type_url = 3; - // pagination defines an pagination for the request. + // pagination defines a pagination for the request. cosmos.base.query.v1beta1.PageRequest pagination = 4; } @@ -42,7 +42,7 @@ message QueryGrantsRequest { message QueryGrantsResponse { // authorizations is a list of grants granted for grantee by granter. repeated Grant grants = 1; - // pagination defines an pagination for the response. + // pagination defines a pagination for the response. cosmos.base.query.v1beta1.PageResponse pagination = 2; } @@ -50,7 +50,7 @@ message QueryGrantsResponse { message QueryGranterGrantsRequest { string granter = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; - // pagination defines an pagination for the request. + // pagination defines a pagination for the request. cosmos.base.query.v1beta1.PageRequest pagination = 2; } @@ -58,7 +58,7 @@ message QueryGranterGrantsRequest { message QueryGranterGrantsResponse { // grants is a list of grants granted by the granter. repeated GrantAuthorization grants = 1; - // pagination defines an pagination for the response. + // pagination defines a pagination for the response. cosmos.base.query.v1beta1.PageResponse pagination = 2; } @@ -66,7 +66,7 @@ message QueryGranterGrantsResponse { message QueryGranteeGrantsRequest { string grantee = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; - // pagination defines an pagination for the request. + // pagination defines a pagination for the request. cosmos.base.query.v1beta1.PageRequest pagination = 2; } @@ -74,6 +74,6 @@ message QueryGranteeGrantsRequest { message QueryGranteeGrantsResponse { // grants is a list of grants granted to the grantee. repeated GrantAuthorization grants = 1; - // pagination defines an pagination for the response. + // pagination defines a pagination for the response. cosmos.base.query.v1beta1.PageResponse pagination = 2; } diff --git a/cosmos/base/abci/v1beta1/abci.proto b/cosmos/base/abci/v1beta1/abci.proto index 7438d5e..93eff81 100644 --- a/cosmos/base/abci/v1beta1/abci.proto +++ b/cosmos/base/abci/v1beta1/abci.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package cosmos.base.abci.v1beta1; import "gogoproto/gogo.proto"; -import "cometbft/abci/v2/types.proto"; -import "cometbft/types/v2/block.proto"; +import "tendermint/abci/types.proto"; +import "tendermint/types/block.proto"; import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; @@ -45,7 +45,7 @@ message TxResponse { // these events include those emitted by processing all the messages and those // emitted from the ante. Whereas Logs contains the events, with // additional metadata, emitted only by processing the messages. - repeated cometbft.abci.v2.Event events = 13 + repeated tendermint.abci.Event events = 13 [(gogoproto.nullable) = false, (cosmos_proto.field_added_in) = "cosmos-sdk 0.45"]; } @@ -101,7 +101,7 @@ message Result { // Events contains a slice of Event objects that were emitted during message // or handler execution. - repeated cometbft.abci.v2.Event events = 3 [(gogoproto.nullable) = false]; + repeated tendermint.abci.Event events = 3 [(gogoproto.nullable) = false]; // msg_responses contains the Msg handler responses type packed in Anys. repeated google.protobuf.Any msg_responses = 4 [(cosmos_proto.field_added_in) = "cosmos-sdk 0.46"]; @@ -169,5 +169,5 @@ message SearchBlocksResult { // Max count blocks per page int64 limit = 5; // List of blocks in current page - repeated cometbft.types.v2.Block blocks = 6; + repeated tendermint.types.Block blocks = 6; } diff --git a/cosmos/base/reflection/v2alpha1/reflection.proto b/cosmos/base/reflection/v2alpha1/reflection.proto index 3e8e940..25e0d58 100644 --- a/cosmos/base/reflection/v2alpha1/reflection.proto +++ b/cosmos/base/reflection/v2alpha1/reflection.proto @@ -16,7 +16,7 @@ message AppDescriptor { CodecDescriptor codec = 3; // configuration provides metadata information regarding the sdk.Config type ConfigurationDescriptor configuration = 4; - // query_services provides metadata information regarding the available queriable endpoints + // query_services provides metadata information regarding the available queryable endpoints QueryServicesDescriptor query_services = 5; // tx provides metadata information regarding how to send transactions to the given application TxDescriptor tx = 6; @@ -61,7 +61,7 @@ message ChainDescriptor { // CodecDescriptor describes the registered interfaces and provides metadata information on the types message CodecDescriptor { - // interfaces is a list of the registerted interfaces descriptors + // interfaces is a list of the registered interfaces descriptors repeated InterfaceDescriptor interfaces = 1; } @@ -189,7 +189,7 @@ message GetTxDescriptorResponse { TxDescriptor tx = 1; } -// QueryServicesDescriptor contains the list of cosmos-sdk queriable services +// QueryServicesDescriptor contains the list of cosmos-sdk queryable services message QueryServicesDescriptor { // query_services is a list of cosmos-sdk QueryServiceDescriptor repeated QueryServiceDescriptor query_services = 1; diff --git a/cosmos/base/tendermint/v1beta1/query.proto b/cosmos/base/tendermint/v1beta1/query.proto index aada561..2086ae0 100644 --- a/cosmos/base/tendermint/v1beta1/query.proto +++ b/cosmos/base/tendermint/v1beta1/query.proto @@ -4,12 +4,14 @@ package cosmos.base.tendermint.v1beta1; import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; import "google/api/annotations.proto"; -import "cometbft/p2p/v1/types.proto"; -import "cometbft/types/v2/types.proto"; +import "tendermint/p2p/types.proto"; +import "tendermint/types/types.proto"; +import "tendermint/types/params.proto"; +import "tendermint/abci/types.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; import "cosmos/base/tendermint/v1beta1/types.proto"; import "cosmos_proto/cosmos.proto"; -import "cometbft/types/v2/block.proto"; +import "tendermint/types/block.proto"; import "amino/amino.proto"; option go_package = "github.com/cosmos/cosmos-sdk/client/grpc/cmtservice"; @@ -53,6 +55,20 @@ service Service { option (cosmos_proto.method_added_in) = "cosmos-sdk 0.46"; option (google.api.http).get = "/cosmos/base/tendermint/v1beta1/abci_query"; } + + // GetLatestBlockResults returns the block results for the latest block. + // Block results contain finalize_block_events which include consensus-level + // events like slashing, jailing, and validator set updates. + rpc GetLatestBlockResults(GetLatestBlockResultsRequest) returns (GetLatestBlockResultsResponse) { + option (cosmos_proto.method_added_in) = "cosmos-sdk 0.53"; + option (google.api.http).get = "/cosmos/base/tendermint/v1beta1/block_results/latest"; + } + + // GetBlockResults queries block results for given height. + rpc GetBlockResults(GetBlockResultsRequest) returns (GetBlockResultsResponse) { + option (cosmos_proto.method_added_in) = "cosmos-sdk 0.53"; + option (google.api.http).get = "/cosmos/base/tendermint/v1beta1/block_results/{height}"; + } } // GetValidatorSetByHeightRequest is the request type for the Query/GetValidatorSetByHeight RPC method. @@ -99,10 +115,10 @@ message GetBlockByHeightRequest { // GetBlockByHeightResponse is the response type for the Query/GetBlockByHeight RPC method. message GetBlockByHeightResponse { - cometbft.types.v2.BlockID block_id = 1; + .tendermint.types.BlockID block_id = 1; // Deprecated: please use `sdk_block` instead - cometbft.types.v2.Block block = 2; + .tendermint.types.Block block = 2; Block sdk_block = 3 [(cosmos_proto.field_added_in) = "cosmos-sdk 0.47"]; } @@ -112,10 +128,10 @@ message GetLatestBlockRequest {} // GetLatestBlockResponse is the response type for the Query/GetLatestBlock RPC method. message GetLatestBlockResponse { - cometbft.types.v2.BlockID block_id = 1; + .tendermint.types.BlockID block_id = 1; // Deprecated: please use `sdk_block` instead - cometbft.types.v2.Block block = 2; + .tendermint.types.Block block = 2; Block sdk_block = 3 [(cosmos_proto.field_added_in) = "cosmos-sdk 0.47"]; } @@ -126,6 +142,10 @@ message GetSyncingRequest {} // GetSyncingResponse is the response type for the Query/GetSyncing RPC method. message GetSyncingResponse { bool syncing = 1; + // earliest_block_height is the earliest block height available on this node. + int64 earliest_block_height = 2; + // latest_block_height is the latest block height available on this node. + int64 latest_block_height = 3; } // GetNodeInfoRequest is the request type for the Query/GetNodeInfo RPC method. @@ -133,7 +153,7 @@ message GetNodeInfoRequest {} // GetNodeInfoResponse is the response type for the Query/GetNodeInfo RPC method. message GetNodeInfoResponse { - cometbft.p2p.v1.DefaultNodeInfo default_node_info = 1; + .tendermint.p2p.DefaultNodeInfo default_node_info = 1; VersionInfo application_version = 2; } @@ -202,3 +222,55 @@ message ProofOp { message ProofOps { repeated ProofOp ops = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; } + +// GetBlockResultsRequest is the request type for the Query/GetBlockResults RPC method. +message GetBlockResultsRequest { + int64 height = 1; +} + +// GetLatestBlockResultsRequest is the request type for the Query/GetLatestBlockResults RPC method. +message GetLatestBlockResultsRequest {} + +// GetBlockResultsResponse is the response type for the Query/GetBlockResults RPC method. +message GetBlockResultsResponse { + // height is the block height. + int64 height = 1; + + // txs_results contains the results of each transaction execution. + repeated .tendermint.abci.ExecTxResult txs_results = 2; + + // finalize_block_events contains consensus-level events emitted during block + // finalization, including slashing, jailing, and validator set updates. + repeated .tendermint.abci.Event finalize_block_events = 3; + + // validator_updates contains the validator updates for this block. + repeated .tendermint.abci.ValidatorUpdate validator_updates = 4; + + // consensus_param_updates contains any consensus parameter updates for this block. + .tendermint.types.ConsensusParams consensus_param_updates = 5; + + // app_hash is the app hash after processing this block. + bytes app_hash = 6; +} + +// GetLatestBlockResultsResponse is the response type for the Query/GetLatestBlockResults RPC method. +message GetLatestBlockResultsResponse { + // height is the block height. + int64 height = 1; + + // txs_results contains the results of each transaction execution. + repeated .tendermint.abci.ExecTxResult txs_results = 2; + + // finalize_block_events contains consensus-level events emitted during block + // finalization, including slashing, jailing, and validator set updates. + repeated .tendermint.abci.Event finalize_block_events = 3; + + // validator_updates contains the validator updates for this block. + repeated .tendermint.abci.ValidatorUpdate validator_updates = 4; + + // consensus_param_updates contains any consensus parameter updates for this block. + .tendermint.types.ConsensusParams consensus_param_updates = 5; + + // app_hash is the app hash after processing this block. + bytes app_hash = 6; +} diff --git a/cosmos/base/tendermint/v1beta1/types.proto b/cosmos/base/tendermint/v1beta1/types.proto index c984c1b..624ff41 100644 --- a/cosmos/base/tendermint/v1beta1/types.proto +++ b/cosmos/base/tendermint/v1beta1/types.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package cosmos.base.tendermint.v1beta1; import "gogoproto/gogo.proto"; -import "cometbft/types/v2/types.proto"; -import "cometbft/types/v2/evidence.proto"; -import "cometbft/version/v1/types.proto"; +import "tendermint/types/types.proto"; +import "tendermint/types/evidence.proto"; +import "tendermint/version/types.proto"; import "google/protobuf/timestamp.proto"; import "amino/amino.proto"; @@ -14,22 +14,22 @@ option go_package = "github.com/cosmos/cosmos-sdk/client/grpc/cmtservice"; // field converted to bech32 string. message Block { Header header = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; - cometbft.types.v2.Data data = 2 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; - cometbft.types.v2.EvidenceList evidence = 3 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; - cometbft.types.v2.Commit last_commit = 4; + .tendermint.types.Data data = 2 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; + .tendermint.types.EvidenceList evidence = 3 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; + .tendermint.types.Commit last_commit = 4; } // Header defines the structure of a Tendermint block header. message Header { // basic block info - cometbft.version.v1.Consensus version = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; + .tendermint.version.Consensus version = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; string chain_id = 2 [(gogoproto.customname) = "ChainID"]; int64 height = 3; google.protobuf.Timestamp time = 4 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true, (gogoproto.stdtime) = true]; // prev block info - cometbft.types.v2.BlockID last_block_id = 5 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; + .tendermint.types.BlockID last_block_id = 5 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; // hashes of block data bytes last_commit_hash = 6; // commit from validators from the last block diff --git a/cosmos/consensus/v1/query.proto b/cosmos/consensus/v1/query.proto index e1e0401..ba9f821 100644 --- a/cosmos/consensus/v1/query.proto +++ b/cosmos/consensus/v1/query.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package cosmos.consensus.v1; import "google/api/annotations.proto"; -import "cometbft/types/v2/params.proto"; +import "tendermint/types/params.proto"; import "cosmos_proto/cosmos.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/consensus/types"; @@ -24,5 +24,5 @@ message QueryParamsResponse { // params are the tendermint consensus params stored in the consensus module. // Please note that `params.version` is not populated in this response, it is // tracked separately in the x/upgrade module. - cometbft.types.v2.ConsensusParams params = 1; + tendermint.types.ConsensusParams params = 1; } diff --git a/cosmos/consensus/v1/tx.proto b/cosmos/consensus/v1/tx.proto index 4379a13..1ede7ea 100644 --- a/cosmos/consensus/v1/tx.proto +++ b/cosmos/consensus/v1/tx.proto @@ -4,7 +4,7 @@ package cosmos.consensus.v1; import "amino/amino.proto"; import "cosmos_proto/cosmos.proto"; import "cosmos/msg/v1/msg.proto"; -import "cometbft/types/v2/params.proto"; +import "tendermint/types/params.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/consensus/types"; @@ -32,14 +32,11 @@ message MsgUpdateParams { // separarately in x/upgrade. // // NOTE: All parameters must be supplied. - cometbft.types.v2.BlockParams block = 2; - cometbft.types.v2.EvidenceParams evidence = 3; - cometbft.types.v2.ValidatorParams validator = 4; + tendermint.types.BlockParams block = 2; + tendermint.types.EvidenceParams evidence = 3; + tendermint.types.ValidatorParams validator = 4; - cometbft.types.v2.ABCIParams abci = 5 [deprecated = true, (cosmos_proto.field_added_in) = "cosmos-sdk 0.50"]; - - cometbft.types.v2.SynchronyParams synchrony = 6 [(cosmos_proto.field_added_in) = "cosmos-sdk 0.54"]; - cometbft.types.v2.FeatureParams feature = 7 [(cosmos_proto.field_added_in) = "cosmos-sdk 0.54"]; + tendermint.types.ABCIParams abci = 5 [(cosmos_proto.field_added_in) = "cosmos-sdk 0.50"]; } // MsgUpdateParamsResponse defines the response structure for executing a diff --git a/cosmos/crypto/bls12_381/keys.proto b/cosmos/crypto/bls12_381/keys.proto new file mode 100644 index 0000000..89dafd1 --- /dev/null +++ b/cosmos/crypto/bls12_381/keys.proto @@ -0,0 +1,38 @@ +syntax = "proto3"; +package cosmos.crypto.bls12_381; + +import "amino/amino.proto"; +import "gogoproto/gogo.proto"; + +option go_package = "github.com/cosmos/cosmos-sdk/crypto/keys/bls12_381"; + +// PubKey is an bls12_381 public key for handling CometBFT keys in SDK. +// It's needed for Any serialization and SDK compatibility. +// It must not be used in a non Tendermint key context because it doesn't implement +// ADR-28. Nevertheless, you will like to use bls12_381 in app user level +// then you must create a new proto message and follow ADR-28 for Address construction. +message PubKey { + option (amino.name) = "cometbft/PubKeyBls12_381"; + // The Amino encoding is simply the inner bytes field, and not the Amino + // encoding of the whole PubKey struct. + // + // Example (JSON): + // s := PubKey{Key: []byte{0x01}} + // out := AminoJSONEncoder(s) + // + // Then we have: + // out == `"MQ=="` + // out != `{"key":"MQ=="}` + option (amino.message_encoding) = "key_field"; + option (gogoproto.goproto_stringer) = false; + + bytes key = 1; +} + +// PrivKey defines a bls12_381 private key. +message PrivKey { + option (amino.name) = "cometbft/PrivKeyBls12_381"; + option (amino.message_encoding) = "key_field"; + + bytes key = 1; +} diff --git a/cosmos/crypto/multisig/v1beta1/multisig.proto b/cosmos/crypto/multisig/v1beta1/multisig.proto index bf671f1..f11c47a 100644 --- a/cosmos/crypto/multisig/v1beta1/multisig.proto +++ b/cosmos/crypto/multisig/v1beta1/multisig.proto @@ -6,7 +6,7 @@ import "gogoproto/gogo.proto"; option go_package = "github.com/cosmos/cosmos-sdk/crypto/types"; // MultiSignature wraps the signatures from a multisig.LegacyAminoPubKey. -// See cosmos.tx.v1betata1.ModeInfo.Multi for how to specify which signers +// See cosmos.tx.v1beta1.ModeInfo.Multi for how to specify which signers // signed and with which modes. message MultiSignature { option (gogoproto.goproto_unrecognized) = true; diff --git a/cosmos/distribution/v1beta1/query.proto b/cosmos/distribution/v1beta1/query.proto index 6d7aad8..ea5b463 100644 --- a/cosmos/distribution/v1beta1/query.proto +++ b/cosmos/distribution/v1beta1/query.proto @@ -72,6 +72,25 @@ service Query { rpc CommunityPool(QueryCommunityPoolRequest) returns (QueryCommunityPoolResponse) { option (google.api.http).get = "/cosmos/distribution/v1beta1/community_pool"; } + + // ValidatorHistoricalRewards queries historical rewards for a validator at a specific period. + rpc ValidatorHistoricalRewards(QueryValidatorHistoricalRewardsRequest) + returns (QueryValidatorHistoricalRewardsResponse) { + option (google.api.http).get = "/cosmos/distribution/v1beta1/validators/" + "{validator_address}/historical_rewards/{period}"; + } + + // ValidatorCurrentRewards queries current rewards for a validator. + rpc ValidatorCurrentRewards(QueryValidatorCurrentRewardsRequest) returns (QueryValidatorCurrentRewardsResponse) { + option (google.api.http).get = "/cosmos/distribution/v1beta1/validators/" + "{validator_address}/current_rewards"; + } + + // DelegatorStartingInfo queries the starting info for a delegator. + rpc DelegatorStartingInfo(QueryDelegatorStartingInfoRequest) returns (QueryDelegatorStartingInfoResponse) { + option (google.api.http).get = + "/cosmos/distribution/v1beta1/delegators/{delegator_address}/starting_info/{validator_address}"; + } } // QueryParamsRequest is the request type for the Query/Params RPC method. @@ -255,3 +274,49 @@ message QueryCommunityPoolResponse { (amino.dont_omitempty) = true ]; } + +// QueryValidatorHistoricalRewardsRequest is the request type for the +// Query/ValidatorHistoricalRewards RPC method. +message QueryValidatorHistoricalRewardsRequest { + // validator_address defines the validator address to query for. + string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.ValidatorAddressString"]; + // period defines the period to query historical rewards for. + uint64 period = 2; +} + +// QueryValidatorHistoricalRewardsResponse is the response type for the +// Query/ValidatorHistoricalRewards RPC method. +message QueryValidatorHistoricalRewardsResponse { + // rewards defines the historical rewards of a validator. + ValidatorHistoricalRewards rewards = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; +} + +// QueryValidatorCurrentRewardsRequest is the request type for the +// Query/ValidatorCurrentRewards RPC method. +message QueryValidatorCurrentRewardsRequest { + // validator_address defines the validator address to query for. + string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.ValidatorAddressString"]; +} + +// QueryValidatorCurrentRewardsResponse is the response type for the +// Query/ValidatorCurrentRewards RPC method. +message QueryValidatorCurrentRewardsResponse { + // rewards defines the current rewards of a validator. + ValidatorCurrentRewards rewards = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; +} + +// QueryDelegatorStartingInfoRequest is the request type for the +// Query/DelegatorStartingInfo RPC method. +message QueryDelegatorStartingInfoRequest { + // delegator_address defines the delegator address to query for. + string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + // validator_address defines the validator address to query for. + string validator_address = 2 [(cosmos_proto.scalar) = "cosmos.ValidatorAddressString"]; +} + +// QueryDelegatorStartingInfoResponse is the response type for the +// Query/DelegatorStartingInfo RPC method. +message QueryDelegatorStartingInfoResponse { + // starting_info defines the starting info of a delegator. + DelegatorStartingInfo starting_info = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; +} diff --git a/cosmos/feegrant/v1beta1/query.proto b/cosmos/feegrant/v1beta1/query.proto index d264828..10e46f8 100644 --- a/cosmos/feegrant/v1beta1/query.proto +++ b/cosmos/feegrant/v1beta1/query.proto @@ -11,7 +11,7 @@ option go_package = "github.com/cosmos/cosmos-sdk/x/feegrant"; // Query defines the gRPC querier service. service Query { - // Allowance returns granted allwance to the grantee by the granter. + // Allowance returns granted allowance to the grantee by the granter. rpc Allowance(QueryAllowanceRequest) returns (QueryAllowanceResponse) { option (google.api.http).get = "/cosmos/feegrant/v1beta1/allowance/{granter}/{grantee}"; } @@ -39,7 +39,7 @@ message QueryAllowanceRequest { // QueryAllowanceResponse is the response type for the Query/Allowance RPC method. message QueryAllowanceResponse { - // allowance is a allowance granted for grantee by granter. + // allowance is an allowance granted for grantee by granter. cosmos.feegrant.v1beta1.Grant allowance = 1; } @@ -47,7 +47,7 @@ message QueryAllowanceResponse { message QueryAllowancesRequest { string grantee = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; - // pagination defines an pagination for the request. + // pagination defines a pagination for the request. cosmos.base.query.v1beta1.PageRequest pagination = 2; } @@ -56,7 +56,7 @@ message QueryAllowancesResponse { // allowances are allowance's granted for grantee by granter. repeated cosmos.feegrant.v1beta1.Grant allowances = 1; - // pagination defines an pagination for the response. + // pagination defines a pagination for the response. cosmos.base.query.v1beta1.PageResponse pagination = 2; } @@ -65,7 +65,7 @@ message QueryAllowancesByGranterRequest { option (cosmos_proto.message_added_in) = "cosmos-sdk 0.46"; string granter = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; - // pagination defines an pagination for the request. + // pagination defines a pagination for the request. cosmos.base.query.v1beta1.PageRequest pagination = 2; } @@ -75,6 +75,6 @@ message QueryAllowancesByGranterResponse { // allowances that have been issued by the granter. repeated cosmos.feegrant.v1beta1.Grant allowances = 1; - // pagination defines an pagination for the response. + // pagination defines a pagination for the response. cosmos.base.query.v1beta1.PageResponse pagination = 2; } diff --git a/cosmos/gov/v1/genesis.proto b/cosmos/gov/v1/genesis.proto index 260855e..2e7a3f0 100644 --- a/cosmos/gov/v1/genesis.proto +++ b/cosmos/gov/v1/genesis.proto @@ -18,17 +18,16 @@ message GenesisState { // proposals defines all the proposals present at genesis. repeated Proposal proposals = 4; // Deprecated: Prefer to use `params` instead. - // deposit_params defines all the paramaters of related to deposit. + // deposit_params defines all the parameters of related to deposit. DepositParams deposit_params = 5 [deprecated = true]; // Deprecated: Prefer to use `params` instead. - // voting_params defines all the paramaters of related to voting. + // voting_params defines all the parameters of related to voting. VotingParams voting_params = 6 [deprecated = true]; // Deprecated: Prefer to use `params` instead. - // tally_params defines all the paramaters of related to tally. + // tally_params defines all the parameters of related to tally. TallyParams tally_params = 7 [deprecated = true]; - // params defines all the paramaters of x/gov module. + // params defines all the parameters of x/gov module. Params params = 8 [(cosmos_proto.field_added_in) = "cosmos-sdk 0.47"]; - ; // The constitution allows builders to lay a foundation and define purpose. // This is an immutable string set in genesis. // There are no amendments, to go outside of scope, just fork. diff --git a/cosmos/gov/v1/gov.proto b/cosmos/gov/v1/gov.proto index 29ea9d2..c80d89f 100644 --- a/cosmos/gov/v1/gov.proto +++ b/cosmos/gov/v1/gov.proto @@ -85,13 +85,11 @@ message Proposal { // title is the title of the proposal string title = 11 [(cosmos_proto.field_added_in) = "cosmos-sdk 0.47"]; - ; // summary is a short summary of the proposal string summary = 12 [(cosmos_proto.field_added_in) = "cosmos-sdk 0.47"]; - ; - // proposer is the address of the proposal sumbitter + // proposer is the address of the proposal submitter string proposer = 13 [(cosmos_proto.scalar) = "cosmos.AddressString", (cosmos_proto.field_added_in) = "cosmos-sdk 0.47"]; diff --git a/cosmos/gov/v1/query.proto b/cosmos/gov/v1/query.proto index d484aa1..ebb2127 100644 --- a/cosmos/gov/v1/query.proto +++ b/cosmos/gov/v1/query.proto @@ -152,7 +152,7 @@ message QueryParamsResponse { // Deprecated: Prefer to use `params` instead. // tally_params defines the parameters related to tally. TallyParams tally_params = 3 [deprecated = true]; - // params defines all the paramaters of x/gov module. + // params defines all the parameters of x/gov module. Params params = 4 [(cosmos_proto.field_added_in) = "cosmos-sdk 0.47"]; } diff --git a/cosmos/mint/v1beta1/mint.proto b/cosmos/mint/v1beta1/mint.proto index 440a392..03306d4 100644 --- a/cosmos/mint/v1beta1/mint.proto +++ b/cosmos/mint/v1beta1/mint.proto @@ -59,4 +59,13 @@ message Params { ]; // expected blocks per year uint64 blocks_per_year = 6; + // maximum supply for the token. + // + // A value of "0" indicates an unlimited (infinite) maximum supply. + string max_supply = 7 [ + (cosmos_proto.scalar) = "cosmos.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", + (gogoproto.nullable) = false, + (amino.dont_omitempty) = true + ]; } diff --git a/cosmos/msg/textual/v1/textual.proto b/cosmos/msg/textual/v1/textual.proto index 4f8cd14..63f71d5 100644 --- a/cosmos/msg/textual/v1/textual.proto +++ b/cosmos/msg/textual/v1/textual.proto @@ -9,7 +9,7 @@ extend google.protobuf.MessageOptions { // algorithm used to generate the custom textual representation of the // protobuf message where this annotation is applied. We recommend to use a // short, versioned name as this identifier, e.g. "replace_with_username_v1". - // We also recommand providing a human-readable description as protobuf + // We also recommend providing a human-readable description as protobuf // comments on this annotation, for example a short specification or a link // to the relevant documentation. // diff --git a/cosmos/staking/v1beta1/query.proto b/cosmos/staking/v1beta1/query.proto index 9b98122..5da05ba 100644 --- a/cosmos/staking/v1beta1/query.proto +++ b/cosmos/staking/v1beta1/query.proto @@ -148,7 +148,7 @@ message QueryValidatorsResponse { cosmos.base.query.v1beta1.PageResponse pagination = 2; } -// QueryValidatorRequest is response type for the Query/Validator RPC method +// QueryValidatorRequest is request type for the Query/Validator RPC method message QueryValidatorRequest { // validator_addr defines the validator address to query for. string validator_addr = 1 [(cosmos_proto.scalar) = "cosmos.ValidatorAddressString"]; diff --git a/cosmos/staking/v1beta1/staking.proto b/cosmos/staking/v1beta1/staking.proto index 0625e3c..df644f4 100644 --- a/cosmos/staking/v1beta1/staking.proto +++ b/cosmos/staking/v1beta1/staking.proto @@ -9,8 +9,8 @@ import "google/protobuf/timestamp.proto"; import "cosmos_proto/cosmos.proto"; import "cosmos/base/v1beta1/coin.proto"; import "amino/amino.proto"; -import "cometbft/types/v2/types.proto"; -import "cometbft/abci/v2/types.proto"; +import "tendermint/types/types.proto"; +import "tendermint/abci/types.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/staking/types"; @@ -19,8 +19,8 @@ option go_package = "github.com/cosmos/cosmos-sdk/x/staking/types"; // recent HistoricalInfo // (`n` is set by the staking module's `historical_entries` parameter). message HistoricalInfo { - cometbft.types.v2.Header header = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; - repeated Validator valset = 2 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; + tendermint.types.Header header = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; + repeated Validator valset = 2 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; } // CommissionRates defines the initial commission rates to be used for creating @@ -131,7 +131,7 @@ message Validator { // strictly positive if this validator's unbonding has been stopped by external modules int64 unbonding_on_hold_ref_count = 12; - // list of unbonding ids, each uniquely identifing an unbonding of this validator + // list of unbonding ids, each uniquely identifying an unbonding of this validator repeated uint64 unbonding_ids = 13; } @@ -376,7 +376,7 @@ message Pool { ]; } -// Infraction indicates the infraction a validator commited. +// Infraction indicates the infraction a validator committed. enum Infraction { // UNSPECIFIED defines an empty infraction. INFRACTION_UNSPECIFIED = 0; @@ -389,5 +389,5 @@ enum Infraction { // ValidatorUpdates defines an array of abci.ValidatorUpdate objects. // TODO: explore moving this to proto/cosmos/base to separate modules from tendermint dependence message ValidatorUpdates { - repeated cometbft.abci.v2.ValidatorUpdate updates = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; + repeated tendermint.abci.ValidatorUpdate updates = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; } diff --git a/cosmos/store/streaming/abci/grpc.proto b/cosmos/store/streaming/abci/grpc.proto index 0f62815..25366cd 100644 --- a/cosmos/store/streaming/abci/grpc.proto +++ b/cosmos/store/streaming/abci/grpc.proto @@ -2,15 +2,15 @@ syntax = "proto3"; package cosmos.store.streaming.abci; -import "cometbft/abci/v2/types.proto"; +import "tendermint/abci/types.proto"; import "cosmos/store/v1beta1/listening.proto"; option go_package = "cosmossdk.io/store/streaming/abci"; // ListenEndBlockRequest is the request type for the ListenEndBlock RPC method message ListenFinalizeBlockRequest { - cometbft.abci.v2.FinalizeBlockRequest req = 1; - cometbft.abci.v2.FinalizeBlockResponse res = 2; + tendermint.abci.RequestFinalizeBlock req = 1; + tendermint.abci.ResponseFinalizeBlock res = 2; } // ListenEndBlockResponse is the response type for the ListenEndBlock RPC method @@ -19,8 +19,8 @@ message ListenFinalizeBlockResponse {} // ListenCommitRequest is the request type for the ListenCommit RPC method message ListenCommitRequest { // explicitly pass in block height as ResponseCommit does not contain this info - int64 block_height = 1; - cometbft.abci.v2.CommitResponse res = 2; + int64 block_height = 1; + tendermint.abci.ResponseCommit res = 2; repeated cosmos.store.v1beta1.StoreKVPair change_set = 3; } diff --git a/cosmos/store/v1beta1/listening.proto b/cosmos/store/v1beta1/listening.proto index 4ff386e..0d89255 100644 --- a/cosmos/store/v1beta1/listening.proto +++ b/cosmos/store/v1beta1/listening.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package cosmos.store.v1beta1; -import "cometbft/abci/v2/types.proto"; +import "tendermint/abci/types.proto"; import "cosmos_proto/cosmos.proto"; option go_package = "cosmossdk.io/store/types"; @@ -20,9 +20,9 @@ message StoreKVPair { // BlockMetadata contains all the abci event data of a block // the file streamer dump them into files together with the state changes. message BlockMetadata { - cometbft.abci.v2.CommitResponse response_commit = 6; - cometbft.abci.v2.FinalizeBlockRequest request_finalize_block = 7; - cometbft.abci.v2.FinalizeBlockResponse response_finalize_block = 8; // TODO: should we renumber this? + tendermint.abci.ResponseCommit response_commit = 6; + tendermint.abci.RequestFinalizeBlock request_finalize_block = 7; + tendermint.abci.ResponseFinalizeBlock response_finalize_block = 8; // TODO: should we renumber this? reserved 1, 2, 3, 4, 5; // reserved for from previous use in comet <= 0.37 } diff --git a/cosmos/tx/v1beta1/service.proto b/cosmos/tx/v1beta1/service.proto index 260b378..066b2e2 100644 --- a/cosmos/tx/v1beta1/service.proto +++ b/cosmos/tx/v1beta1/service.proto @@ -5,8 +5,8 @@ import "google/api/annotations.proto"; import "cosmos/base/abci/v1beta1/abci.proto"; import "cosmos/tx/v1beta1/tx.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "cometbft/types/v2/block.proto"; -import "cometbft/types/v2/types.proto"; +import "tendermint/types/block.proto"; +import "tendermint/types/types.proto"; import "cosmos_proto/cosmos.proto"; option go_package = "github.com/cosmos/cosmos-sdk/types/tx"; @@ -207,8 +207,8 @@ message GetBlockWithTxsResponse { option (cosmos_proto.message_added_in) = "cosmos-sdk 0.45.2"; // txs are the transactions in the block. repeated cosmos.tx.v1beta1.Tx txs = 1; - cometbft.types.v2.BlockID block_id = 2; - cometbft.types.v2.Block block = 3; + .tendermint.types.BlockID block_id = 2; + .tendermint.types.Block block = 3; // pagination defines a pagination for the response. cosmos.base.query.v1beta1.PageResponse pagination = 4; } diff --git a/cosmos/tx/v1beta1/tx.proto b/cosmos/tx/v1beta1/tx.proto index 64dcf02..c506b3b 100644 --- a/cosmos/tx/v1beta1/tx.proto +++ b/cosmos/tx/v1beta1/tx.proto @@ -88,7 +88,7 @@ message SignDocDirectAux { // sequence is the sequence number of the signing account. uint64 sequence = 5; - // tips have been depreacted and should not be used + // tips have been deprecated and should not be used Tip tip = 6 [deprecated = true]; } @@ -220,7 +220,7 @@ message ModeInfo { // Fee includes the amount of coins paid in fees and the maximum // gas to be used by the transaction. The ratio yields an effective "gasprice", -// which must be above some miminum to be accepted into the mempool. +// which must be above some minimum 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 [ diff --git a/cosmos/vesting/v1beta1/vesting.proto b/cosmos/vesting/v1beta1/vesting.proto index a766fd9..4e797fc 100644 --- a/cosmos/vesting/v1beta1/vesting.proto +++ b/cosmos/vesting/v1beta1/vesting.proto @@ -50,7 +50,7 @@ message ContinuousVestingAccount { } // DelayedVestingAccount implements the VestingAccount interface. It vests all -// coins after a specific time, but non prior. In other words, it keeps them +// coins after a specific time, but not prior. In other words, it keeps them // locked until a specified time. message DelayedVestingAccount { option (amino.name) = "cosmos-sdk/DelayedVestingAccount"; diff --git a/google/protobuf/descriptor.proto b/google/protobuf/descriptor.proto index 0be20ea..fd12974 100644 --- a/google/protobuf/descriptor.proto +++ b/google/protobuf/descriptor.proto @@ -86,6 +86,9 @@ enum Edition { EDITION_2023 = 1000; EDITION_2024 = 1001; + // A placeholder edition for developing and testing unscheduled features. + EDITION_UNSTABLE = 9999; + // Placeholder editions for testing feature resolution. These should not be // used or relied on outside of tests. EDITION_1_TEST_ONLY = 1; @@ -398,6 +401,9 @@ message ServiceDescriptorProto { repeated MethodDescriptorProto method = 2; optional ServiceOptions options = 3; + + reserved 4; + reserved "stream"; } // Describes a method of a service. @@ -753,8 +759,9 @@ message FieldOptions { // is a formalization for deprecating fields. optional bool deprecated = 3 [default = false]; + // DEPRECATED. DO NOT USE! // For Google-internal migration only. Do not use. - optional bool weak = 10 [default = false]; + optional bool weak = 10 [default = false, deprecated = true]; // Indicate that the field value should not be printed out when using debug // formats, e.g. when the field contains sensitive credentials. @@ -1181,6 +1188,16 @@ message FeatureSet { full_name: ".pb.python", type: ".pb.PythonFeatures" }, + declaration = { + number: 1100, + full_name: ".imp.impress_feature_set", + type: ".imp.ImpressFeatureSet" + }, + declaration = { + number: 9989, + full_name: ".pb.java_mutable", + type: ".pb.JavaMutableFeatures" + }, declaration = { number: 9990, full_name: ".pb.proto1", diff --git a/google/protobuf/timestamp.proto b/google/protobuf/timestamp.proto index fd0bc07..fd308bd 100644 --- a/google/protobuf/timestamp.proto +++ b/google/protobuf/timestamp.proto @@ -131,14 +131,15 @@ option csharp_namespace = "Google.Protobuf.WellKnownTypes"; // ) to obtain a formatter capable of generating timestamps in this format. // message Timestamp { - // Represents seconds of UTC time since Unix epoch - // 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to - // 9999-12-31T23:59:59Z inclusive. + // Represents seconds of UTC time since Unix epoch 1970-01-01T00:00:00Z. Must + // be between -315576000000 and 315576000000 inclusive (which corresponds to + // 0001-01-01T00:00:00Z to 9999-12-31T23:59:59Z). int64 seconds = 1; - // Non-negative fractions of a second at nanosecond resolution. Negative - // second values with fractions must still have non-negative nanos values - // that count forward in time. Must be from 0 to 999,999,999 + // Non-negative fractions of a second at nanosecond resolution. This field is + // the nanosecond portion of the duration, not an alternative to seconds. + // Negative second values with fractions must still have non-negative nanos + // values that count forward in time. Must be between 0 and 999,999,999 // inclusive. int32 nanos = 2; } diff --git a/tendermint/abci/types.proto b/tendermint/abci/types.proto index 78eecce..97a6e6d 100644 --- a/tendermint/abci/types.proto +++ b/tendermint/abci/types.proto @@ -346,10 +346,10 @@ message ResponseVerifyVoteExtension { } message ResponseFinalizeBlock { - // set of block events emmitted as part of executing the block + // set of block events emitted as part of executing the block repeated Event events = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; // the result of executing each transaction including the events - // the particular transction emitted. This should match the order + // the particular transaction emitted. This should match the order // of the transactions delivered in the block itself repeated ExecTxResult tx_results = 2; // a list of updates to the validator set. These will reflect the validator set at current height + 2. diff --git a/tendermint/types/evidence.proto b/tendermint/types/evidence.proto index 1f35049..06f30ec 100644 --- a/tendermint/types/evidence.proto +++ b/tendermint/types/evidence.proto @@ -30,7 +30,7 @@ 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 {