From 62b0b26d0cb54b47921999662e70baa3b5a8ac67 Mon Sep 17 00:00:00 2001 From: Marko Date: Fri, 10 May 2024 12:23:22 +0200 Subject: [PATCH] chore: migrate sdk.Msg to transaction.type (#20273) Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Hieu Vu <72878483+hieuvubk@users.noreply.github.com> --- .../store/streaming/abci/grpc.pulsar.go | 89 +++++++---------- .../store/streaming/abci/grpc_grpc.pb.go | 6 -- .../store/v1beta1/commit_info.pulsar.go | 66 +++++-------- api/cosmos/store/v1beta1/listening.pulsar.go | 95 ++++++++----------- core/app/app.go | 6 +- core/header/service_test.go | 1 - core/transaction/transaction.go | 8 +- proto/cosmos/store/streaming/abci/grpc.proto | 26 +---- proto/cosmos/store/v1beta1/commit_info.proto | 13 --- proto/cosmos/store/v1beta1/listening.proto | 8 -- server/v2/stf/core_branch_service_test.go | 5 +- server/v2/stf/core_header_service.go | 4 +- server/v2/stf/go.mod | 1 + server/v2/stf/go.sum | 13 +++ server/v2/stf/mock/tx.go | 27 +++--- server/v2/stf/stf.go | 28 +++--- server/v2/stf/stf_test.go | 6 +- store/rootmulti/store.go | 6 +- store/snapshots/types/snapshot.pb.go | 78 +++++++-------- store/streaming/abci/grpc.pb.go | 82 ++++++---------- store/types/commit_info.pb.go | 60 +++++------- store/types/listening.pb.go | 63 +++++------- store/types/store.go | 2 +- testutil/x/counter/types/codec.go | 4 +- types/codec.go | 4 +- types/tx_msg.go | 5 +- x/accounts/testing/counter/counter.go | 4 +- x/accounts/utils_test.go | 4 +- x/auth/tx/config_test.go | 4 +- x/auth/types/codec.go | 3 +- x/auth/types/msgs.go | 9 +- x/auth/vesting/types/codec.go | 3 +- x/auth/vesting/types/msgs.go | 8 +- x/authz/codec.go | 4 +- x/authz/keeper/keeper.go | 4 +- x/bank/types/codec.go | 4 +- x/bank/types/msgs.go | 8 +- x/circuit/types/codec.go | 4 +- x/consensus/types/codec.go | 4 +- x/crisis/types/codec.go | 4 +- x/distribution/types/codec.go | 4 +- x/evidence/types/codec.go | 4 +- x/feegrant/codec.go | 4 +- x/gov/keeper/msg_server.go | 6 +- x/gov/types/v1/codec.go | 4 +- x/gov/types/v1beta1/codec.go | 4 +- x/group/codec.go | 4 +- x/group/keeper/msg_server.go | 4 +- x/mint/types/codec.go | 4 +- x/nft/codec.go | 4 +- x/protocolpool/types/codec.go | 4 +- x/slashing/types/codec.go | 4 +- x/staking/types/codec.go | 4 +- x/staking/types/msg.go | 15 +-- x/upgrade/types/codec.go | 4 +- 55 files changed, 358 insertions(+), 488 deletions(-) diff --git a/api/cosmos/store/streaming/abci/grpc.pulsar.go b/api/cosmos/store/streaming/abci/grpc.pulsar.go index 0508a001c5..f640de9740 100644 --- a/api/cosmos/store/streaming/abci/grpc.pulsar.go +++ b/api/cosmos/store/streaming/abci/grpc.pulsar.go @@ -1875,11 +1875,6 @@ const ( ) // ListenEndBlockRequest is the request type for the ListenEndBlock RPC method -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -// -// Deprecated: Do not use. type ListenFinalizeBlockRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1924,11 +1919,6 @@ func (x *ListenFinalizeBlockRequest) GetRes() *v1.FinalizeBlockResponse { } // ListenEndBlockResponse is the response type for the ListenEndBlock RPC method -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -// -// Deprecated: Do not use. type ListenFinalizeBlockResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1956,11 +1946,6 @@ func (*ListenFinalizeBlockResponse) Descriptor() ([]byte, []int) { } // ListenCommitRequest is the request type for the ListenCommit RPC method -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -// -// Deprecated: Do not use. type ListenCommitRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -2015,11 +2000,6 @@ func (x *ListenCommitRequest) GetChangeSet() []*v1beta1.StoreKVPair { } // ListenCommitResponse is the response type for the ListenCommit RPC method -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -// -// Deprecated: Do not use. type ListenCommitResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -2057,7 +2037,7 @@ var file_cosmos_store_streaming_abci_grpc_proto_rawDesc = []byte{ 0x61, 0x62, 0x63, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x24, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, - 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x95, 0x01, 0x0a, 0x1a, 0x4c, 0x69, + 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x91, 0x01, 0x0a, 0x1a, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x03, 0x72, 0x65, 0x71, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, @@ -2066,23 +2046,22 @@ var file_cosmos_store_streaming_abci_grpc_proto_rawDesc = []byte{ 0x65, 0x71, 0x12, 0x39, 0x0a, 0x03, 0x72, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x03, 0x72, 0x65, 0x73, 0x3a, 0x02, 0x18, - 0x01, 0x22, 0x21, 0x0a, 0x1b, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x46, 0x69, 0x6e, 0x61, 0x6c, - 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x3a, 0x02, 0x18, 0x01, 0x22, 0xb2, 0x01, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x43, - 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x0c, - 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, - 0x32, 0x0a, 0x03, 0x72, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x63, - 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, - 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x03, - 0x72, 0x65, 0x73, 0x12, 0x40, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x73, 0x65, - 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, - 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x53, - 0x74, 0x6f, 0x72, 0x65, 0x4b, 0x56, 0x50, 0x61, 0x69, 0x72, 0x52, 0x09, 0x63, 0x68, 0x61, 0x6e, - 0x67, 0x65, 0x53, 0x65, 0x74, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x1a, 0x0a, 0x14, 0x4c, 0x69, 0x73, - 0x74, 0x65, 0x6e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x3a, 0x02, 0x18, 0x01, 0x32, 0x9a, 0x02, 0x0a, 0x13, 0x41, 0x42, 0x43, 0x49, 0x4c, 0x69, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x03, 0x72, 0x65, 0x73, 0x22, 0x1d, 0x0a, + 0x1b, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, + 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xae, 0x01, 0x0a, + 0x13, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, + 0x6b, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x32, 0x0a, 0x03, 0x72, 0x65, 0x73, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, + 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x03, 0x72, 0x65, 0x73, 0x12, 0x40, 0x0a, 0x0a, 0x63, + 0x68, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x21, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x76, + 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x4b, 0x56, 0x50, 0x61, + 0x69, 0x72, 0x52, 0x09, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x65, 0x74, 0x22, 0x16, 0x0a, + 0x14, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0x95, 0x02, 0x0a, 0x13, 0x41, 0x42, 0x43, 0x49, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x88, 0x01, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x37, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x73, @@ -2099,23 +2078,23 @@ var file_cosmos_store_streaming_abci_grpc_proto_rawDesc = []byte{ 0x6d, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x31, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x43, - 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x03, 0x88, - 0x02, 0x01, 0x42, 0xea, 0x01, 0x0a, 0x1f, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, - 0x73, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, - 0x67, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x42, 0x09, 0x47, 0x72, 0x70, 0x63, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x50, 0x01, 0x5a, 0x2c, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, - 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x73, 0x74, 0x6f, - 0x72, 0x65, 0x2f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x2f, 0x61, 0x62, 0x63, - 0x69, 0xa2, 0x02, 0x04, 0x43, 0x53, 0x53, 0x41, 0xaa, 0x02, 0x1b, 0x43, 0x6f, 0x73, 0x6d, 0x6f, - 0x73, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, - 0x67, 0x2e, 0x41, 0x62, 0x63, 0x69, 0xca, 0x02, 0x1b, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, - 0x53, 0x74, 0x6f, 0x72, 0x65, 0x5c, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x5c, - 0x41, 0x62, 0x63, 0x69, 0xe2, 0x02, 0x27, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x53, 0x74, - 0x6f, 0x72, 0x65, 0x5c, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x5c, 0x41, 0x62, - 0x63, 0x69, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, - 0x1e, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x3a, 0x3a, - 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x3a, 0x3a, 0x41, 0x62, 0x63, 0x69, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0xea, 0x01, + 0x0a, 0x1f, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74, 0x6f, + 0x72, 0x65, 0x2e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x2e, 0x61, 0x62, 0x63, + 0x69, 0x42, 0x09, 0x47, 0x72, 0x70, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2c, + 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, + 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x73, 0x74, + 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x2f, 0x61, 0x62, 0x63, 0x69, 0xa2, 0x02, 0x04, 0x43, + 0x53, 0x53, 0x41, 0xaa, 0x02, 0x1b, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x53, 0x74, 0x6f, + 0x72, 0x65, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x2e, 0x41, 0x62, 0x63, + 0x69, 0xca, 0x02, 0x1b, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x53, 0x74, 0x6f, 0x72, 0x65, + 0x5c, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x5c, 0x41, 0x62, 0x63, 0x69, 0xe2, + 0x02, 0x27, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x5c, 0x53, + 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x5c, 0x41, 0x62, 0x63, 0x69, 0x5c, 0x47, 0x50, + 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x1e, 0x43, 0x6f, 0x73, 0x6d, + 0x6f, 0x73, 0x3a, 0x3a, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x3a, 0x3a, 0x53, 0x74, 0x72, 0x65, 0x61, + 0x6d, 0x69, 0x6e, 0x67, 0x3a, 0x3a, 0x41, 0x62, 0x63, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/api/cosmos/store/streaming/abci/grpc_grpc.pb.go b/api/cosmos/store/streaming/abci/grpc_grpc.pb.go index 6bd4aea9d9..0e8380033b 100644 --- a/api/cosmos/store/streaming/abci/grpc_grpc.pb.go +++ b/api/cosmos/store/streaming/abci/grpc_grpc.pb.go @@ -26,8 +26,6 @@ const ( // ABCIListenerServiceClient is the client API for ABCIListenerService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. -// -// Deprecated: Do not use. type ABCIListenerServiceClient interface { // ListenFinalizeBlock is the corresponding endpoint for // ABCIListener.ListenEndBlock @@ -40,7 +38,6 @@ type aBCIListenerServiceClient struct { cc grpc.ClientConnInterface } -// Deprecated: Do not use. func NewABCIListenerServiceClient(cc grpc.ClientConnInterface) ABCIListenerServiceClient { return &aBCIListenerServiceClient{cc} } @@ -66,8 +63,6 @@ func (c *aBCIListenerServiceClient) ListenCommit(ctx context.Context, in *Listen // ABCIListenerServiceServer is the server API for ABCIListenerService service. // All implementations must embed UnimplementedABCIListenerServiceServer // for forward compatibility -// -// Deprecated: Do not use. type ABCIListenerServiceServer interface { // ListenFinalizeBlock is the corresponding endpoint for // ABCIListener.ListenEndBlock @@ -96,7 +91,6 @@ type UnsafeABCIListenerServiceServer interface { mustEmbedUnimplementedABCIListenerServiceServer() } -// Deprecated: Do not use. func RegisterABCIListenerServiceServer(s grpc.ServiceRegistrar, srv ABCIListenerServiceServer) { s.RegisterService(&ABCIListenerService_ServiceDesc, srv) } diff --git a/api/cosmos/store/v1beta1/commit_info.pulsar.go b/api/cosmos/store/v1beta1/commit_info.pulsar.go index e1afa8c4e8..c3fb16e6a2 100644 --- a/api/cosmos/store/v1beta1/commit_info.pulsar.go +++ b/api/cosmos/store/v1beta1/commit_info.pulsar.go @@ -1619,11 +1619,6 @@ const ( // CommitInfo defines commit information used by the multi-store when committing // a version/height. -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -// -// Deprecated: Do not use. type CommitInfo struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1677,11 +1672,6 @@ func (x *CommitInfo) GetTimestamp() *timestamppb.Timestamp { // StoreInfo defines store-specific commit information. It contains a reference // between a store name and the commit ID. -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -// -// Deprecated: Do not use. type StoreInfo struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1727,11 +1717,6 @@ func (x *StoreInfo) GetCommitId() *CommitID { // CommitID defines the commitment information when a specific store is // committed. -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -// -// Deprecated: Do not use. type CommitID struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1785,7 +1770,7 @@ var file_cosmos_store_v1beta1_commit_info_proto_rawDesc = []byte{ 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb6, 0x01, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb2, 0x01, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x46, 0x0a, 0x0b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x73, 0x18, 0x02, 0x20, @@ -1796,32 +1781,31 @@ var file_cosmos_store_v1beta1_commit_info_proto_rawDesc = []byte{ 0x61, 0x6d, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x08, 0xc8, 0xde, 0x1f, 0x00, 0x90, 0xdf, 0x1f, 0x01, 0x52, - 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x66, - 0x0a, 0x09, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, - 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, - 0x41, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74, 0x6f, 0x72, - 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, - 0x49, 0x44, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, - 0x49, 0x64, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x40, 0x0a, 0x08, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, - 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, - 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, - 0x3a, 0x06, 0x18, 0x01, 0x98, 0xa0, 0x1f, 0x00, 0x42, 0xd1, 0x01, 0x0a, 0x18, 0x63, 0x6f, 0x6d, + 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x62, 0x0a, 0x09, 0x53, 0x74, + 0x6f, 0x72, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x41, 0x0a, 0x09, 0x63, + 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x31, - 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x0f, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x49, 0x6e, 0x66, - 0x6f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, - 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, - 0x73, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, - 0x73, 0x74, 0x6f, 0x72, 0x65, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x43, - 0x53, 0x58, 0xaa, 0x02, 0x14, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x53, 0x74, 0x6f, 0x72, - 0x65, 0x2e, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x14, 0x43, 0x6f, 0x73, 0x6d, - 0x6f, 0x73, 0x5c, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x5c, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, - 0xe2, 0x02, 0x20, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x5c, - 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, - 0x61, 0x74, 0x61, 0xea, 0x02, 0x16, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x53, 0x74, - 0x6f, 0x72, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x49, 0x44, 0x42, 0x04, + 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x49, 0x64, 0x22, 0x3e, + 0x0a, 0x08, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x76, 0x65, 0x72, + 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x3a, 0x04, 0x98, 0xa0, 0x1f, 0x00, 0x42, 0xd1, + 0x01, 0x0a, 0x18, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74, + 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x0f, 0x43, 0x6f, 0x6d, + 0x6d, 0x69, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, + 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, + 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x31, + 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x76, 0x31, 0x62, 0x65, 0x74, + 0x61, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x53, 0x58, 0xaa, 0x02, 0x14, 0x43, 0x6f, 0x73, 0x6d, 0x6f, + 0x73, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, + 0x02, 0x14, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x5c, 0x56, + 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x20, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, + 0x53, 0x74, 0x6f, 0x72, 0x65, 0x5c, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, + 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x16, 0x43, 0x6f, 0x73, 0x6d, + 0x6f, 0x73, 0x3a, 0x3a, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x65, 0x74, + 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/cosmos/store/v1beta1/listening.pulsar.go b/api/cosmos/store/v1beta1/listening.pulsar.go index 778eaa71bc..1c18e3982d 100644 --- a/api/cosmos/store/v1beta1/listening.pulsar.go +++ b/api/cosmos/store/v1beta1/listening.pulsar.go @@ -1229,11 +1229,6 @@ const ( // StoreKVPair is a KVStore KVPair used for listening to state changes (Sets and // Deletes) It optionally includes the StoreKey for the originating KVStore and // a Boolean flag to distinguish between Sets and Deletes -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -// -// Deprecated: Do not use. type StoreKVPair struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1295,11 +1290,6 @@ func (x *StoreKVPair) GetValue() []byte { // BlockMetadata contains all the abci event data of a block // the file streamer dump them into files together with the state changes. -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -// -// Deprecated: Do not use. type BlockMetadata struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1361,49 +1351,48 @@ var file_cosmos_store_v1beta1_listening_proto_rawDesc = []byte{ 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x61, 0x62, 0x63, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x81, 0x01, 0x0a, 0x0b, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x4b, - 0x56, 0x50, 0x61, 0x69, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x5f, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x4b, - 0x65, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x06, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, - 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3a, 0x15, 0x18, 0x01, 0xd2, 0xb4, 0x2d, 0x0f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, - 0x2d, 0x73, 0x64, 0x6b, 0x20, 0x30, 0x2e, 0x34, 0x33, 0x22, 0xbb, 0x02, 0x0a, 0x0d, 0x42, 0x6c, - 0x6f, 0x63, 0x6b, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x49, 0x0a, 0x0f, 0x72, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, - 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x0e, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x5c, 0x0a, 0x16, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x5f, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, - 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x14, - 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, - 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x5f, 0x0a, 0x17, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x5f, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, - 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, - 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, - 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x15, - 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, - 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x3a, 0x02, 0x18, 0x01, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x4a, - 0x04, 0x08, 0x02, 0x10, 0x03, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x4a, 0x04, 0x08, 0x04, 0x10, - 0x05, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x42, 0xd0, 0x01, 0x0a, 0x18, 0x63, 0x6f, 0x6d, 0x2e, - 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x62, - 0x65, 0x74, 0x61, 0x31, 0x42, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x69, 0x6e, 0x67, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, - 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, - 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x73, 0x74, - 0x6f, 0x72, 0x65, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x53, 0x58, - 0xaa, 0x02, 0x14, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x2e, - 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x14, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, - 0x5c, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x5c, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, - 0x20, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x5c, 0x56, 0x31, - 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, - 0x61, 0xea, 0x02, 0x16, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x53, 0x74, 0x6f, 0x72, - 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x7f, 0x0a, 0x0b, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x4b, 0x56, + 0x50, 0x61, 0x69, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x5f, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x4b, 0x65, + 0x79, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x06, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3a, 0x13, 0xd2, 0xb4, 0x2d, 0x0f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, + 0x6b, 0x20, 0x30, 0x2e, 0x34, 0x33, 0x22, 0xb7, 0x02, 0x0a, 0x0d, 0x42, 0x6c, 0x6f, 0x63, 0x6b, + 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x49, 0x0a, 0x0f, 0x72, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, + 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x52, 0x0e, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x6d, + 0x6d, 0x69, 0x74, 0x12, 0x5c, 0x0a, 0x16, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x66, + 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, + 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, + 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x14, 0x72, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, + 0x6b, 0x12, 0x5f, 0x0a, 0x17, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x66, 0x69, + 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x08, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, + 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, + 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x15, 0x72, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, + 0x63, 0x6b, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x4a, 0x04, + 0x08, 0x03, 0x10, 0x04, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, + 0x42, 0xd0, 0x01, 0x0a, 0x18, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, + 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x0e, 0x4c, + 0x69, 0x73, 0x74, 0x65, 0x6e, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, + 0x32, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, + 0x69, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x76, + 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x76, 0x31, 0x62, 0x65, + 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x53, 0x58, 0xaa, 0x02, 0x14, 0x43, 0x6f, 0x73, 0x6d, + 0x6f, 0x73, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, + 0xca, 0x02, 0x14, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x5c, + 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x20, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, + 0x5c, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x5c, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, + 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x16, 0x43, 0x6f, 0x73, + 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x65, + 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/core/app/app.go b/core/app/app.go index 055587d5d7..e77b11dd14 100644 --- a/core/app/app.go +++ b/core/app/app.go @@ -26,12 +26,12 @@ type BlockRequest[T any] struct { ChainId string AppHash []byte Txs []T - ConsensusMessages []transaction.Type + ConsensusMessages []transaction.Msg } type BlockResponse struct { Apphash []byte - ConsensusMessagesResponse []transaction.Type + ConsensusMessagesResponse []transaction.Msg ValidatorUpdates []appmodulev2.ValidatorUpdate PreBlockEvents []event.Event BeginBlockEvents []event.Event @@ -54,7 +54,7 @@ type ResponseInitChain struct { type TxResult struct { Events []event.Event - Resp []transaction.Type + Resp []transaction.Msg Error error Code uint32 Data []byte diff --git a/core/header/service_test.go b/core/header/service_test.go index 5aff568628..c658de33ec 100644 --- a/core/header/service_test.go +++ b/core/header/service_test.go @@ -52,5 +52,4 @@ func TestInfo_FromBytes(t *testing.T) { require.Equal(t, time.Date(2024, time.January, 1, 0, 0, 0, 0, time.UTC), info.Time) require.Equal(t, []byte{0x26, 0xb0, 0xb8, 0x3e, 0x72, 0x81, 0xbe, 0x3b, 0x11, 0x76, 0x58, 0xb6, 0xf2, 0x63, 0x6d, 0x3, 0x68, 0xca, 0xd3, 0xd7, 0x4f, 0x22, 0x24, 0x34, 0x28, 0xf5, 0x40, 0x1a, 0x4b, 0x70, 0x89, 0x7e}, info.AppHash) require.Equal(t, "test-chain", info.ChainID) - } diff --git a/core/transaction/transaction.go b/core/transaction/transaction.go index 2f6b8ca991..c6cca1865e 100644 --- a/core/transaction/transaction.go +++ b/core/transaction/transaction.go @@ -1,11 +1,11 @@ package transaction import ( - "google.golang.org/protobuf/proto" + "github.com/cosmos/gogoproto/proto" ) type ( - Type = proto.Message + Msg = proto.Message Identity = []byte ) @@ -18,9 +18,9 @@ type Codec[T Tx] interface { type Tx interface { // Hash returns the unique identifier for the Tx. - Hash() [32]byte // TODO evaluate if 32 bytes is the right size & benchmark overhead of hashing instead of using identifier + Hash() [32]byte // GetMessages returns the list of state transitions of the Tx. - GetMessages() ([]Type, error) + GetMessages() []Msg // GetSenders returns the tx state transition sender. GetSenders() ([]Identity, error) // TODO reduce this to a single identity if accepted // GetGasLimit returns the gas limit of the tx. Must return math.MaxUint64 for infinite gas diff --git a/proto/cosmos/store/streaming/abci/grpc.proto b/proto/cosmos/store/streaming/abci/grpc.proto index f7382e053b..ed77c4c0fb 100644 --- a/proto/cosmos/store/streaming/abci/grpc.proto +++ b/proto/cosmos/store/streaming/abci/grpc.proto @@ -8,30 +8,17 @@ import "cosmos/store/v1beta1/listening.proto"; option go_package = "cosmossdk.io/store/streaming/abci"; // ListenEndBlockRequest is the request type for the ListenEndBlock RPC method -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. message ListenFinalizeBlockRequest { - option deprecated = true; cometbft.abci.v1.FinalizeBlockRequest req = 1; cometbft.abci.v1.FinalizeBlockResponse res = 2; } // ListenEndBlockResponse is the response type for the ListenEndBlock RPC method -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -message ListenFinalizeBlockResponse { - option deprecated = true; -} +message ListenFinalizeBlockResponse {} // ListenCommitRequest is the request type for the ListenCommit RPC method -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. message ListenCommitRequest { - option deprecated = true; // explicitly pass in block height as ResponseCommit does not contain this // info @@ -41,19 +28,10 @@ message ListenCommitRequest { } // ListenCommitResponse is the response type for the ListenCommit RPC method -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -message ListenCommitResponse { - option deprecated = true; -} +message ListenCommitResponse {} // ABCIListenerService is the service for the BaseApp ABCIListener interface -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. service ABCIListenerService { - option deprecated = true; // ListenFinalizeBlock is the corresponding endpoint for // ABCIListener.ListenEndBlock diff --git a/proto/cosmos/store/v1beta1/commit_info.proto b/proto/cosmos/store/v1beta1/commit_info.proto index 6729310f23..36410eb8ef 100644 --- a/proto/cosmos/store/v1beta1/commit_info.proto +++ b/proto/cosmos/store/v1beta1/commit_info.proto @@ -8,12 +8,7 @@ option go_package = "cosmossdk.io/store/types"; // CommitInfo defines commit information used by the multi-store when committing // a version/height. -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. message CommitInfo { - option deprecated = true; - int64 version = 1; repeated StoreInfo store_infos = 2 [(gogoproto.nullable) = false]; google.protobuf.Timestamp timestamp = 3 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; @@ -22,22 +17,14 @@ message CommitInfo { // StoreInfo defines store-specific commit information. It contains a reference // between a store name and the commit ID. // -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. message StoreInfo { - option deprecated = true; - string name = 1; CommitID commit_id = 2 [(gogoproto.nullable) = false]; } // CommitID defines the commitment information when a specific store is // committed. -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. message CommitID { - option deprecated = true; option (gogoproto.goproto_stringer) = false; int64 version = 1; diff --git a/proto/cosmos/store/v1beta1/listening.proto b/proto/cosmos/store/v1beta1/listening.proto index f0f4a7509f..93a932ef45 100644 --- a/proto/cosmos/store/v1beta1/listening.proto +++ b/proto/cosmos/store/v1beta1/listening.proto @@ -9,12 +9,8 @@ option go_package = "cosmossdk.io/store/types"; // StoreKVPair is a KVStore KVPair used for listening to state changes (Sets and // Deletes) It optionally includes the StoreKey for the originating KVStore and // a Boolean flag to distinguish between Sets and Deletes -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. message StoreKVPair { option (cosmos_proto.message_added_in) = "cosmos-sdk 0.43"; - option deprecated = true; 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 @@ -24,11 +20,7 @@ message StoreKVPair { // BlockMetadata contains all the abci event data of a block // the file streamer dump them into files together with the state changes. -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. message BlockMetadata { - option deprecated = true; cometbft.abci.v1.CommitResponse response_commit = 6; cometbft.abci.v1.FinalizeBlockRequest request_finalize_block = 7; diff --git a/server/v2/stf/core_branch_service_test.go b/server/v2/stf/core_branch_service_test.go index 6eee158137..722f2ac7f3 100644 --- a/server/v2/stf/core_branch_service_test.go +++ b/server/v2/stf/core_branch_service_test.go @@ -5,17 +5,18 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/require" + appmodulev2 "cosmossdk.io/core/appmodule/v2" "cosmossdk.io/core/transaction" "cosmossdk.io/server/v2/stf/branch" "cosmossdk.io/server/v2/stf/gas" "cosmossdk.io/server/v2/stf/mock" - "github.com/stretchr/testify/require" ) func TestBranchService(t *testing.T) { s := &STF[mock.Tx]{ - handleMsg: func(ctx context.Context, msg transaction.Type) (msgResp transaction.Type, err error) { + handleMsg: func(ctx context.Context, msg transaction.Msg) (msgResp transaction.Msg, err error) { kvSet(t, ctx, "exec") return nil, nil }, diff --git a/server/v2/stf/core_header_service.go b/server/v2/stf/core_header_service.go index 730ce7e406..1931c28a6a 100644 --- a/server/v2/stf/core_header_service.go +++ b/server/v2/stf/core_header_service.go @@ -8,9 +8,7 @@ import ( var _ header.Service = (*HeaderService)(nil) -type HeaderService struct { - getHeader func() (header.Info, error) -} +type HeaderService struct{} func (h HeaderService) HeaderInfo(ctx context.Context) header.Info { return ctx.(*executionContext).headerInfo diff --git a/server/v2/stf/go.mod b/server/v2/stf/go.mod index df89b22bea..476efd2d4e 100644 --- a/server/v2/stf/go.mod +++ b/server/v2/stf/go.mod @@ -23,6 +23,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/zerolog v1.32.0 // indirect + github.com/tendermint/go-amino v0.16.0 // indirect golang.org/x/sys v0.19.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/server/v2/stf/go.sum b/server/v2/stf/go.sum index e1d82724ba..1c5cf46c14 100644 --- a/server/v2/stf/go.sum +++ b/server/v2/stf/go.sum @@ -3,11 +3,16 @@ cosmossdk.io/log v1.3.1/go.mod h1:2/dIomt8mKdk6vl3OWJcPk2be3pGOS8OQaLUM/3/tCM= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cosmos/gogoproto v1.4.12 h1:vB6Lbe/rtnYGjQuFxkPiPYiCybqFT8QvLipDZP8JpFE= github.com/cosmos/gogoproto v1.4.12/go.mod h1:LnZob1bXRdUoqMMtwYlcR3wjiElmlC+FkjaZRv1/eLY= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -28,17 +33,25 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0= github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= +github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI= github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/server/v2/stf/mock/tx.go b/server/v2/stf/mock/tx.go index aacca5d47e..e530a9050a 100644 --- a/server/v2/stf/mock/tx.go +++ b/server/v2/stf/mock/tx.go @@ -5,7 +5,7 @@ import ( "encoding/json" "errors" - "google.golang.org/protobuf/types/known/anypb" + gogoproto "github.com/cosmos/gogoproto/types" "cosmossdk.io/core/transaction" ) @@ -14,7 +14,7 @@ var _ transaction.Tx = Tx{} type Tx struct { Sender []byte - Msg transaction.Type + Msg transaction.Msg GasLimit uint64 } @@ -22,11 +22,8 @@ func (t Tx) Hash() [32]byte { return sha256.Sum256(t.Bytes()) } -func (t Tx) GetMessages() ([]transaction.Type, error) { - if t.Msg == nil { - return nil, errors.New("messages not available or are nil") - } - return []transaction.Type{t.Msg}, nil +func (t Tx) GetMessages() []transaction.Msg { + return []transaction.Msg{t.Msg} } func (t Tx) GetSenders() ([]transaction.Identity, error) { @@ -41,14 +38,14 @@ func (t Tx) GetGasLimit() (uint64, error) { } type encodedTx struct { - Sender []byte `json:"sender"` - Msg *anypb.Any `json:"message"` - GasLimit uint64 `json:"gas_limit"` + Sender []byte `json:"sender"` + Msg *gogoproto.Any `json:"message"` + GasLimit uint64 `json:"gas_limit"` } func (t Tx) Bytes() []byte { v2Msg := t.Msg - msg, err := anypb.New(v2Msg) + msg, err := gogoproto.MarshalAny(v2Msg) if err != nil { panic(err) } @@ -69,8 +66,8 @@ func (t *Tx) Decode(b []byte) { if err != nil { panic(err) } - msg, err := rawTx.Msg.UnmarshalNew() - if err != nil { + var msg transaction.Msg + if err := gogoproto.UnmarshalAny(rawTx.Msg, msg); err != nil { panic(err) } t.Msg = msg @@ -84,8 +81,8 @@ func (t *Tx) DecodeJSON(b []byte) { if err != nil { panic(err) } - msg, err := rawTx.Msg.UnmarshalNew() - if err != nil { + var msg transaction.Msg + if err := gogoproto.UnmarshalAny(rawTx.Msg, msg); err != nil { panic(err) } t.Msg = msg diff --git a/server/v2/stf/stf.go b/server/v2/stf/stf.go index e47829005b..6601bf9fbf 100644 --- a/server/v2/stf/stf.go +++ b/server/v2/stf/stf.go @@ -20,8 +20,8 @@ import ( // STF is a struct that manages the state transition component of the app. type STF[T transaction.Tx] struct { logger log.Logger - handleMsg func(ctx context.Context, msg transaction.Type) (transaction.Type, error) - handleQuery func(ctx context.Context, req transaction.Type) (transaction.Type, error) + handleMsg func(ctx context.Context, msg transaction.Msg) (transaction.Msg, error) + handleQuery func(ctx context.Context, req transaction.Msg) (transaction.Msg, error) doPreBlock func(ctx context.Context, txs []T) error doBeginBlock func(ctx context.Context) error @@ -38,8 +38,8 @@ type STF[T transaction.Tx] struct { // NewSTF returns a new STF instance. func NewSTF[T transaction.Tx]( - handleMsg func(ctx context.Context, msg transaction.Type) (transaction.Type, error), - handleQuery func(ctx context.Context, req transaction.Type) (transaction.Type, error), + handleMsg func(ctx context.Context, msg transaction.Msg) (transaction.Msg, error), + handleQuery func(ctx context.Context, req transaction.Msg) (transaction.Msg, error), doPreBlock func(ctx context.Context, txs []T) error, doBeginBlock func(ctx context.Context) error, doEndBlock func(ctx context.Context) error, @@ -229,7 +229,7 @@ func (s STF[T]) execTx( tx T, execMode corecontext.ExecMode, hi header.Info, -) ([]transaction.Type, uint64, []event.Event, error) { +) ([]transaction.Msg, uint64, []event.Event, error) { execState := s.branchFn(state) msgsResp, gasUsed, runTxMsgsEvents, txErr := s.runTxMsgs(ctx, execState, gasLimit, tx, execMode, hi) @@ -285,16 +285,16 @@ func (s STF[T]) runTxMsgs( tx T, execMode corecontext.ExecMode, hi header.Info, -) ([]transaction.Type, uint64, []event.Event, error) { +) ([]transaction.Msg, uint64, []event.Event, error) { txSenders, err := tx.GetSenders() if err != nil { return nil, 0, nil, err } - msgs, err := tx.GetMessages() + msgs := tx.GetMessages() if err != nil { return nil, 0, nil, err } - msgResps := make([]transaction.Type, len(msgs)) + msgResps := make([]transaction.Msg, len(msgs)) execCtx := s.makeContext(ctx, nil, state, execMode) execCtx.setHeaderInfo(hi) @@ -333,9 +333,9 @@ func (s STF[T]) preBlock( func (s STF[T]) runConsensusMessages( ctx *executionContext, - messages []transaction.Type, -) ([]transaction.Type, error) { - responses := make([]transaction.Type, len(messages)) + messages []transaction.Msg, +) ([]transaction.Msg, error) { + responses := make([]transaction.Msg, len(messages)) for i := range messages { resp, err := s.handleMsg(ctx, messages[i]) if err != nil { @@ -477,8 +477,8 @@ func (s STF[T]) Query( ctx context.Context, state store.ReaderMap, gasLimit uint64, - req transaction.Type, -) (transaction.Type, error) { + req transaction.Msg, +) (transaction.Msg, error) { queryState := s.branchFn(state) hi, err := s.getHeaderInfo(queryState) if err != nil { @@ -490,7 +490,7 @@ func (s STF[T]) Query( return s.handleQuery(queryCtx, req) } -func (s STF[T]) Message(ctx context.Context, msg transaction.Type) (response transaction.Type, err error) { +func (s STF[T]) Message(ctx context.Context, msg transaction.Msg) (response transaction.Msg, err error) { return s.handleMsg(ctx, msg) } diff --git a/server/v2/stf/stf_test.go b/server/v2/stf/stf_test.go index 66a833c0e2..9e030dd52c 100644 --- a/server/v2/stf/stf_test.go +++ b/server/v2/stf/stf_test.go @@ -31,7 +31,7 @@ func TestSTF(t *testing.T) { sum := sha256.Sum256([]byte("test-hash")) s := &STF[mock.Tx]{ - handleMsg: func(ctx context.Context, msg transaction.Type) (msgResp transaction.Type, err error) { + handleMsg: func(ctx context.Context, msg transaction.Msg) (msgResp transaction.Msg, err error) { kvSet(t, ctx, "exec") return nil, nil }, @@ -124,7 +124,7 @@ func TestSTF(t *testing.T) { t.Run("fail exec tx", func(t *testing.T) { // update the stf to fail on the handler s := s.clone() - s.handleMsg = func(ctx context.Context, msg transaction.Type) (msgResp transaction.Type, err error) { + s.handleMsg = func(ctx context.Context, msg transaction.Msg) (msgResp transaction.Msg, err error) { return nil, fmt.Errorf("failure") } @@ -167,7 +167,7 @@ func TestSTF(t *testing.T) { t.Run("tx failed and post tx failed", func(t *testing.T) { s := s.clone() - s.handleMsg = func(ctx context.Context, msg transaction.Type) (msgResp transaction.Type, err error) { + s.handleMsg = func(ctx context.Context, msg transaction.Msg) (msgResp transaction.Msg, err error) { return nil, fmt.Errorf("exec failure") } s.postTxExec = func(ctx context.Context, tx mock.Tx, success bool) error { return fmt.Errorf("post tx failure") } diff --git a/store/rootmulti/store.go b/store/rootmulti/store.go index 092a8abd04..0a9b52d593 100644 --- a/store/rootmulti/store.go +++ b/store/rootmulti/store.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" "io" - "math" // nolint:typecheck // this is used, false positive + "math" "sort" "strings" "sync" @@ -830,7 +830,7 @@ func (rs *Store) Snapshot(height uint64, protoWriter protoio.Writer) error { keys := keysFromStoreKeyMap(rs.stores) for _, key := range keys { switch store := rs.GetCommitKVStore(key).(type) { - case *iavl.Store: // nolint:typecheck // ignore linting issues in v1 + case *iavl.Store: stores = append(stores, namedStore{name: key.Name(), Store: store}) case *transient.Store, *mem.Store: // Non-persisted stores shouldn't be snapshotted @@ -850,7 +850,7 @@ func (rs *Store) Snapshot(height uint64, protoWriter protoio.Writer) error { // are demarcated by new SnapshotStore items. for _, store := range stores { rs.logger.Debug("starting snapshot", "store", store.name, "height", height) - exporter, err := store.Export(int64(height)) // nolint:typecheck // ignore linting issues in v1 + exporter, err := store.Export(int64(height)) if err != nil { rs.logger.Error("snapshot failed; exporter error", "store", store.name, "err", err) return err diff --git a/store/snapshots/types/snapshot.pb.go b/store/snapshots/types/snapshot.pb.go index 686e11905a..e81660c459 100644 --- a/store/snapshots/types/snapshot.pb.go +++ b/store/snapshots/types/snapshot.pb.go @@ -5,6 +5,7 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" io "io" @@ -146,8 +147,6 @@ func (m *Metadata) GetChunkHashes() [][]byte { } // SnapshotItem is an item contained in a rootmulti.Store snapshot. -// -// Since: cosmos-sdk 0.46 type SnapshotItem struct { // item is the specific type of snapshot item. // @@ -263,8 +262,6 @@ func (*SnapshotItem) XXX_OneofWrappers() []interface{} { } // SnapshotStoreItem contains metadata about a snapshotted store. -// -// Since: cosmos-sdk 0.46 type SnapshotStoreItem struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` } @@ -310,8 +307,6 @@ func (m *SnapshotStoreItem) GetName() string { } // SnapshotIAVLItem is an exported IAVL node. -// -// Since: cosmos-sdk 0.46 type SnapshotIAVLItem struct { Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` @@ -383,8 +378,6 @@ func (m *SnapshotIAVLItem) GetHeight() int32 { } // SnapshotExtensionMeta contains metadata about an external snapshotter. -// -// Since: cosmos-sdk 0.46 type SnapshotExtensionMeta struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Format uint32 `protobuf:"varint,2,opt,name=format,proto3" json:"format,omitempty"` @@ -438,8 +431,6 @@ func (m *SnapshotExtensionMeta) GetFormat() uint32 { } // SnapshotExtensionPayload contains payloads of an external snapshotter. -// -// Since: cosmos-sdk 0.46 type SnapshotExtensionPayload struct { Payload []byte `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"` } @@ -499,38 +490,41 @@ func init() { } var fileDescriptor_3d5cca1aa5b69183 = []byte{ - // 496 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x41, 0x6f, 0xd3, 0x30, - 0x14, 0x8e, 0xd7, 0xb4, 0x74, 0x2f, 0x41, 0xea, 0xac, 0x81, 0x02, 0x87, 0x2c, 0x84, 0x03, 0x91, - 0x80, 0x94, 0x65, 0x1c, 0xb9, 0x50, 0x98, 0x94, 0x09, 0x90, 0x26, 0x4f, 0xe2, 0xc0, 0x65, 0xf2, - 0x56, 0xd3, 0x44, 0x6d, 0xe2, 0xaa, 0xf6, 0x22, 0xfa, 0x2f, 0xf8, 0x23, 0xfc, 0x8f, 0x1d, 0x77, - 0xe4, 0x34, 0x50, 0xfb, 0x47, 0x90, 0xed, 0x26, 0xa0, 0x6d, 0x45, 0xdb, 0xed, 0x7d, 0x2f, 0xdf, - 0xf7, 0xf9, 0xf9, 0xcb, 0x33, 0x44, 0xa7, 0x5c, 0x14, 0x5c, 0xf4, 0x85, 0xe4, 0x33, 0xd6, 0x17, - 0x25, 0x9d, 0x8a, 0x8c, 0x4b, 0xd1, 0xaf, 0x76, 0x1b, 0x10, 0x4f, 0x67, 0x5c, 0x72, 0xfc, 0xc8, - 0x30, 0x63, 0xcd, 0x8c, 0x1b, 0x66, 0x5c, 0xed, 0x3e, 0xde, 0x1e, 0xf1, 0x11, 0xd7, 0xac, 0xbe, - 0xaa, 0x8c, 0x20, 0xfc, 0x81, 0xa0, 0x7b, 0xb4, 0xa2, 0xe1, 0x87, 0xd0, 0xc9, 0x58, 0x3e, 0xca, - 0xa4, 0x87, 0x02, 0x14, 0xd9, 0x64, 0x85, 0x54, 0xff, 0x2b, 0x9f, 0x15, 0x54, 0x7a, 0x1b, 0x01, - 0x8a, 0xee, 0x93, 0x15, 0x52, 0xfd, 0xd3, 0xec, 0xac, 0x1c, 0x0b, 0xaf, 0x65, 0xfa, 0x06, 0x61, - 0x0c, 0x76, 0x46, 0x45, 0xe6, 0xd9, 0x01, 0x8a, 0x5c, 0xa2, 0x6b, 0xbc, 0x0f, 0xdd, 0x82, 0x49, - 0x3a, 0xa4, 0x92, 0x7a, 0xed, 0x00, 0x45, 0x4e, 0xf2, 0x34, 0x5e, 0x3b, 0x6c, 0xfc, 0x69, 0x45, - 0x1d, 0xd8, 0xe7, 0x97, 0x3b, 0x16, 0x69, 0xa4, 0xe1, 0x4b, 0xe8, 0xd6, 0xdf, 0xf0, 0x13, 0x70, - 0xf5, 0x81, 0xc7, 0xea, 0x00, 0x26, 0x3c, 0x14, 0xb4, 0x22, 0x97, 0x38, 0xba, 0x97, 0xea, 0x56, - 0xf8, 0x6b, 0x03, 0xdc, 0xfa, 0x7a, 0x07, 0x92, 0x15, 0xf8, 0x3d, 0xb4, 0xf5, 0x71, 0xfa, 0x86, - 0x4e, 0xf2, 0xe2, 0x3f, 0x33, 0xd4, 0xba, 0x23, 0xf5, 0x49, 0x89, 0x53, 0x8b, 0x18, 0x31, 0xfe, - 0x00, 0x76, 0x4e, 0xab, 0x89, 0x8e, 0xc3, 0x49, 0x9e, 0xdf, 0xc2, 0xe4, 0xe0, 0xed, 0xe7, 0x8f, - 0xca, 0x63, 0xd0, 0x5d, 0x5c, 0xee, 0xd8, 0x0a, 0xa5, 0x16, 0xd1, 0x26, 0xf8, 0x10, 0x36, 0xd9, - 0x37, 0xc9, 0x4a, 0x91, 0xf3, 0x52, 0x07, 0xe9, 0x24, 0xaf, 0x6e, 0xe1, 0xb8, 0x5f, 0x6b, 0x54, - 0x1e, 0xa9, 0x45, 0xfe, 0x9a, 0xe0, 0x13, 0xd8, 0x6a, 0xc0, 0xf1, 0x94, 0xce, 0x27, 0x9c, 0x0e, - 0xf5, 0xcf, 0x70, 0x92, 0xbd, 0xbb, 0x38, 0x1f, 0x1a, 0x69, 0x6a, 0x91, 0x1e, 0xbb, 0xd2, 0x1b, - 0x74, 0xc0, 0xce, 0x25, 0x2b, 0xc2, 0x67, 0xb0, 0x75, 0x2d, 0x28, 0xb5, 0x00, 0x25, 0x2d, 0x4c, - 0xc8, 0x9b, 0x44, 0xd7, 0xe1, 0x04, 0x7a, 0x57, 0xc3, 0xc0, 0x3d, 0x68, 0x8d, 0xd9, 0x5c, 0xd3, - 0x5c, 0xa2, 0x4a, 0xbc, 0x0d, 0xed, 0x8a, 0x4e, 0xce, 0x98, 0x8e, 0xd6, 0x25, 0x06, 0x60, 0x0f, - 0xee, 0x55, 0x6c, 0xd6, 0x04, 0xd4, 0x22, 0x35, 0xfc, 0x67, 0x65, 0xd5, 0xfd, 0xda, 0xf5, 0xca, - 0x86, 0xef, 0xe0, 0xc1, 0x8d, 0x41, 0xdd, 0x34, 0xda, 0xba, 0xfd, 0x0e, 0x5f, 0x83, 0xb7, 0x2e, - 0x13, 0x35, 0x52, 0x9d, 0xac, 0x19, 0xbf, 0x86, 0x83, 0x37, 0xe7, 0x0b, 0x1f, 0x5d, 0x2c, 0x7c, - 0xf4, 0x7b, 0xe1, 0xa3, 0xef, 0x4b, 0xdf, 0xba, 0x58, 0xfa, 0xd6, 0xcf, 0xa5, 0x6f, 0x7d, 0x09, - 0x4d, 0xf6, 0x62, 0x38, 0x8e, 0x73, 0x7e, 0xed, 0x35, 0xcb, 0xf9, 0x94, 0x89, 0x93, 0x8e, 0x7e, - 0x97, 0x7b, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xef, 0xe9, 0x8e, 0x10, 0xf4, 0x03, 0x00, 0x00, + // 538 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x41, 0x6f, 0xd3, 0x3c, + 0x18, 0x8e, 0xd7, 0xb4, 0x5f, 0xf7, 0x26, 0x9f, 0xe8, 0xcc, 0x40, 0x61, 0x87, 0x2c, 0x84, 0x4b, + 0x24, 0x68, 0xba, 0x75, 0x88, 0x03, 0xda, 0x85, 0x8a, 0x49, 0xad, 0x00, 0x69, 0xf2, 0x24, 0x84, + 0xb8, 0x54, 0xde, 0x6a, 0x9a, 0xaa, 0x4d, 0x5d, 0xd5, 0x5e, 0x45, 0x8f, 0xfc, 0x03, 0xfe, 0x08, + 0x37, 0x7e, 0xc4, 0x8e, 0x13, 0x27, 0x4e, 0x13, 0x6a, 0xff, 0x02, 0x3f, 0x00, 0xd9, 0x4e, 0x0a, + 0xda, 0x52, 0x34, 0x6e, 0xef, 0xf3, 0xfa, 0x79, 0x1e, 0xfb, 0x7d, 0xec, 0x04, 0xa2, 0x33, 0x2e, + 0x52, 0x2e, 0x1a, 0x42, 0xf2, 0x29, 0x6b, 0x88, 0x31, 0x9d, 0x88, 0x84, 0x4b, 0xd1, 0x98, 0xed, + 0xaf, 0x40, 0x3c, 0x99, 0x72, 0xc9, 0xf1, 0x03, 0xc3, 0x8c, 0x35, 0x33, 0x5e, 0x31, 0xe3, 0xd9, + 0xfe, 0xce, 0x76, 0x9f, 0xf7, 0xb9, 0x66, 0x35, 0x54, 0x65, 0x04, 0x3b, 0x99, 0xa0, 0x6b, 0x16, + 0x32, 0xb5, 0x06, 0xe1, 0x17, 0x04, 0xd5, 0x93, 0xcc, 0x01, 0xdf, 0x87, 0x4a, 0xc2, 0x06, 0xfd, + 0x44, 0x7a, 0x28, 0x40, 0x91, 0x4d, 0x32, 0xa4, 0xfa, 0x1f, 0xf8, 0x34, 0xa5, 0xd2, 0xdb, 0x08, + 0x50, 0xf4, 0x3f, 0xc9, 0x90, 0xea, 0x9f, 0x25, 0xe7, 0xe3, 0xa1, 0xf0, 0x4a, 0xa6, 0x6f, 0x10, + 0xc6, 0x60, 0x27, 0x54, 0x24, 0x9e, 0x1d, 0xa0, 0xc8, 0x25, 0xba, 0xc6, 0x47, 0x50, 0x4d, 0x99, + 0xa4, 0x3d, 0x2a, 0xa9, 0x57, 0x0e, 0x50, 0xe4, 0x34, 0x1f, 0xc5, 0x6b, 0xe7, 0x88, 0xdf, 0x64, + 0xd4, 0x96, 0x7d, 0x71, 0xb5, 0x6b, 0x91, 0x95, 0x34, 0xac, 0x43, 0x35, 0x5f, 0xc3, 0x0f, 0xc1, + 0xd5, 0x1b, 0x76, 0xd5, 0x06, 0x4c, 0x78, 0x28, 0x28, 0x45, 0x2e, 0x71, 0x74, 0xaf, 0xad, 0x5b, + 0xe1, 0xcf, 0x0d, 0x70, 0xf3, 0xf1, 0x3a, 0x92, 0xa5, 0xf8, 0x25, 0x94, 0xf5, 0x76, 0x7a, 0x42, + 0xa7, 0xf9, 0xe4, 0x2f, 0x67, 0xc8, 0x75, 0x27, 0x6a, 0x49, 0x89, 0xdb, 0x16, 0x31, 0x62, 0xfc, + 0x0a, 0xec, 0x01, 0x9d, 0x8d, 0x74, 0x1c, 0x4e, 0xf3, 0xf1, 0x2d, 0x4c, 0x3a, 0x2f, 0xde, 0xbe, + 0x56, 0x1e, 0xad, 0xea, 0xe2, 0x6a, 0xd7, 0x56, 0xa8, 0x6d, 0x11, 0x6d, 0x82, 0x8f, 0x61, 0x93, + 0x7d, 0x94, 0x6c, 0x2c, 0x06, 0x7c, 0xac, 0x83, 0x74, 0x9a, 0x7b, 0xb7, 0x70, 0x3c, 0xca, 0x35, + 0x2a, 0x8f, 0xb6, 0x45, 0x7e, 0x9b, 0xe0, 0x53, 0xd8, 0x5a, 0x81, 0xee, 0x84, 0xce, 0x47, 0x9c, + 0xf6, 0xf4, 0x65, 0x38, 0xcd, 0x83, 0x7f, 0x71, 0x3e, 0x36, 0xd2, 0xb6, 0x45, 0x6a, 0xec, 0x5a, + 0xef, 0xf9, 0xdd, 0x6f, 0x5f, 0xeb, 0x77, 0x8c, 0x57, 0x5d, 0xf4, 0x86, 0xc1, 0x5e, 0xfc, 0xf4, + 0x59, 0xab, 0x02, 0xf6, 0x40, 0xb2, 0x34, 0x3c, 0x84, 0xad, 0x1b, 0xe9, 0xa9, 0x57, 0x31, 0xa6, + 0xa9, 0x49, 0x7e, 0x93, 0xe8, 0xba, 0xd0, 0x25, 0xfc, 0x84, 0xa0, 0x76, 0x3d, 0x37, 0x5c, 0x83, + 0xd2, 0x90, 0xcd, 0xb5, 0xd8, 0x25, 0xaa, 0xc4, 0xdb, 0x50, 0x9e, 0xd1, 0xd1, 0x39, 0xd3, 0xb7, + 0xe0, 0x12, 0x03, 0xb0, 0x07, 0xff, 0xcd, 0xd8, 0x74, 0x95, 0x65, 0x89, 0xe4, 0xf0, 0x8f, 0xd7, + 0xad, 0xa2, 0x28, 0xe7, 0xaf, 0xbb, 0xf8, 0x0c, 0xef, 0xe0, 0x5e, 0x61, 0xd0, 0x45, 0x53, 0xac, + 0xfb, 0x3e, 0x8a, 0x9d, 0x3b, 0xe0, 0xad, 0x0b, 0x5a, 0x1d, 0x3e, 0xbf, 0x2e, 0x33, 0x68, 0x0e, + 0x8b, 0xe3, 0x3e, 0xbc, 0x58, 0xf8, 0xe8, 0x72, 0xe1, 0xa3, 0x1f, 0x0b, 0x1f, 0x7d, 0x5e, 0xfa, + 0xd6, 0xe5, 0xd2, 0xb7, 0xbe, 0x2f, 0x7d, 0xeb, 0x7d, 0x68, 0xa8, 0xa2, 0x37, 0x8c, 0x07, 0xfc, + 0xc6, 0x2f, 0x45, 0xce, 0x27, 0x4c, 0x9c, 0x56, 0xf4, 0x1f, 0xe0, 0xe0, 0x57, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x57, 0xe2, 0xd5, 0x36, 0x79, 0x04, 0x00, 0x00, } func (m *Snapshot) Marshal() (dAtA []byte, err error) { diff --git a/store/streaming/abci/grpc.pb.go b/store/streaming/abci/grpc.pb.go index 80fdce2581..b9a8e7622c 100644 --- a/store/streaming/abci/grpc.pb.go +++ b/store/streaming/abci/grpc.pb.go @@ -30,11 +30,6 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // ListenEndBlockRequest is the request type for the ListenEndBlock RPC method -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -// -// Deprecated: Do not use. type ListenFinalizeBlockRequest struct { Req *v1.FinalizeBlockRequest `protobuf:"bytes,1,opt,name=req,proto3" json:"req,omitempty"` Res *v1.FinalizeBlockResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` @@ -88,11 +83,6 @@ func (m *ListenFinalizeBlockRequest) GetRes() *v1.FinalizeBlockResponse { } // ListenEndBlockResponse is the response type for the ListenEndBlock RPC method -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -// -// Deprecated: Do not use. type ListenFinalizeBlockResponse struct { } @@ -130,11 +120,6 @@ func (m *ListenFinalizeBlockResponse) XXX_DiscardUnknown() { var xxx_messageInfo_ListenFinalizeBlockResponse proto.InternalMessageInfo // ListenCommitRequest is the request type for the ListenCommit RPC method -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -// -// Deprecated: Do not use. type ListenCommitRequest struct { // explicitly pass in block height as ResponseCommit does not contain this // info @@ -198,11 +183,6 @@ func (m *ListenCommitRequest) GetChangeSet() []*types.StoreKVPair { } // ListenCommitResponse is the response type for the ListenCommit RPC method -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -// -// Deprecated: Do not use. type ListenCommitResponse struct { } @@ -251,34 +231,33 @@ func init() { } var fileDescriptor_7b98083eb9315fb6 = []byte{ - // 420 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xbf, 0xae, 0xd3, 0x30, - 0x14, 0x87, 0xeb, 0x44, 0x42, 0xc2, 0xbd, 0x93, 0x2f, 0x43, 0x94, 0x8b, 0xa2, 0xa6, 0x42, 0xa5, - 0x93, 0x43, 0xc2, 0x40, 0x81, 0x05, 0x5a, 0x09, 0x81, 0x60, 0x40, 0xa9, 0xc4, 0xc0, 0x52, 0x25, - 0xe1, 0x90, 0x5a, 0x6d, 0xe2, 0xd4, 0x36, 0x91, 0xe0, 0x09, 0x3a, 0xb2, 0xb0, 0xf0, 0x18, 0x3c, - 0x05, 0x63, 0x47, 0x46, 0xd4, 0xbe, 0x08, 0x8a, 0x4d, 0x4b, 0x23, 0xca, 0x9f, 0x8e, 0x39, 0xfa, - 0x7d, 0xe7, 0x7c, 0xf6, 0x71, 0xf0, 0x20, 0xe3, 0xb2, 0xe0, 0x32, 0x90, 0x8a, 0x0b, 0x08, 0xa4, - 0x12, 0x90, 0x14, 0xac, 0xcc, 0x83, 0x24, 0xcd, 0x58, 0x90, 0x8b, 0x2a, 0xa3, 0x95, 0xe0, 0x8a, - 0x93, 0x2b, 0x93, 0xa3, 0x3a, 0x47, 0x0f, 0x39, 0xda, 0xe4, 0xdc, 0x9b, 0x19, 0x2f, 0x40, 0xa5, - 0x6f, 0x95, 0xc1, 0xea, 0x30, 0x50, 0xef, 0x2b, 0x90, 0x06, 0x75, 0x6f, 0xb5, 0x46, 0xd4, 0x61, - 0x0a, 0x2a, 0x09, 0x83, 0x25, 0x93, 0x0a, 0xca, 0xa6, 0x85, 0x4e, 0xf5, 0x3f, 0x21, 0xec, 0xbe, - 0xd0, 0xb5, 0x27, 0xac, 0x4c, 0x96, 0xec, 0x03, 0x8c, 0x97, 0x3c, 0x5b, 0xc4, 0xb0, 0x7a, 0x07, - 0x52, 0x91, 0x11, 0xb6, 0x05, 0xac, 0x1c, 0xd4, 0x43, 0xc3, 0x6e, 0x34, 0xa0, 0xfb, 0x81, 0x7a, - 0x3e, 0xad, 0x43, 0x7a, 0x0a, 0x8a, 0x1b, 0x84, 0xdc, 0x6f, 0x48, 0xe9, 0x58, 0x9a, 0xbc, 0xfd, - 0x4f, 0x52, 0x56, 0xbc, 0x94, 0xd0, 0xa0, 0xf2, 0x81, 0xe5, 0xa0, 0xbe, 0x8f, 0xaf, 0x4e, 0x6a, - 0x99, 0x9c, 0x8e, 0x7c, 0x41, 0xf8, 0xd2, 0x64, 0x26, 0xbc, 0x28, 0x98, 0xda, 0x3b, 0xfb, 0xf8, - 0x22, 0x6d, 0xc2, 0xb3, 0x39, 0xb0, 0x7c, 0xae, 0xb4, 0xbc, 0x1d, 0x77, 0x75, 0xed, 0xa9, 0x2e, - 0x91, 0xe8, 0x58, 0xae, 0xf7, 0xbb, 0xdc, 0xbe, 0xe1, 0x91, 0x15, 0x79, 0x84, 0x71, 0x36, 0x4f, - 0xca, 0x1c, 0x66, 0x12, 0x94, 0x63, 0xf7, 0xec, 0x61, 0x37, 0xf2, 0x69, 0x6b, 0x3f, 0x3f, 0x2f, - 0x99, 0x4e, 0x9b, 0xaf, 0xe7, 0xaf, 0x5e, 0x26, 0x4c, 0xc4, 0xd7, 0x0d, 0x34, 0x05, 0xa5, 0xa5, - 0x5d, 0x7c, 0xa3, 0xed, 0xfc, 0xeb, 0x40, 0xd1, 0x67, 0x0b, 0x5f, 0x3e, 0x1e, 0x4f, 0x9e, 0x99, - 0x00, 0x88, 0x29, 0x88, 0x9a, 0x65, 0x40, 0xd6, 0x87, 0x83, 0xb6, 0x2e, 0x83, 0xdc, 0xa3, 0x7f, - 0x79, 0x1d, 0xf4, 0xcf, 0x5b, 0x75, 0x47, 0xe7, 0x83, 0x46, 0x93, 0x48, 0x7c, 0x71, 0xac, 0x4f, - 0xee, 0xfc, 0x47, 0xa7, 0xd6, 0x76, 0xdc, 0xf0, 0x0c, 0xc2, 0x0c, 0x75, 0xed, 0xb5, 0x85, 0xc6, - 0x0f, 0xbf, 0x6e, 0x3d, 0xb4, 0xd9, 0x7a, 0xe8, 0xfb, 0xd6, 0x43, 0x1f, 0x77, 0x5e, 0x67, 0xb3, - 0xf3, 0x3a, 0xdf, 0x76, 0x5e, 0xe7, 0xb5, 0x6f, 0x1a, 0xca, 0x37, 0x0b, 0xca, 0xf8, 0xc9, 0x3f, - 0x2a, 0xbd, 0xa6, 0x1f, 0xfb, 0xdd, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x72, 0x60, 0x15, 0x1c, - 0x77, 0x03, 0x00, 0x00, + // 414 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x4f, 0x8f, 0xd2, 0x40, + 0x18, 0xc6, 0x29, 0x4d, 0x4c, 0x1c, 0x38, 0x0d, 0xc6, 0x90, 0xa2, 0x0d, 0x34, 0x06, 0x39, 0x4d, + 0x6d, 0x3d, 0x88, 0xf1, 0xa2, 0x90, 0x18, 0x8d, 0x1e, 0x4c, 0x49, 0x3c, 0x78, 0x21, 0x6d, 0x7d, + 0x2d, 0x13, 0x68, 0xa7, 0xcc, 0x8c, 0x4d, 0xf4, 0x13, 0x78, 0x74, 0x0f, 0xfb, 0x35, 0xf6, 0x73, + 0xec, 0x91, 0xe3, 0x1e, 0x37, 0xf0, 0x45, 0x36, 0x9d, 0x59, 0x08, 0xcd, 0xb2, 0x7f, 0x38, 0xf6, + 0x9d, 0xe7, 0xf7, 0xbc, 0x4f, 0xe7, 0x7d, 0x07, 0xf5, 0x63, 0x26, 0x52, 0x26, 0x5c, 0x21, 0x19, + 0x07, 0x57, 0x48, 0x0e, 0x61, 0x4a, 0xb3, 0xc4, 0x0d, 0xa3, 0x98, 0xba, 0x09, 0xcf, 0x63, 0x92, + 0x73, 0x26, 0x19, 0xee, 0x68, 0x1d, 0x51, 0x3a, 0xb2, 0xd3, 0x91, 0x52, 0x67, 0x3d, 0x8b, 0x59, + 0x0a, 0x32, 0xfa, 0x25, 0x35, 0x56, 0x78, 0xae, 0xfc, 0x93, 0x83, 0xd0, 0xa8, 0xf5, 0xa2, 0xd2, + 0xa2, 0xf0, 0x22, 0x90, 0xa1, 0xe7, 0x2e, 0xa8, 0x90, 0x90, 0x95, 0x16, 0x4a, 0xe5, 0x9c, 0x18, + 0xc8, 0xfa, 0xaa, 0x6a, 0x1f, 0x69, 0x16, 0x2e, 0xe8, 0x5f, 0x18, 0x2d, 0x58, 0x3c, 0x0f, 0x60, + 0xf9, 0x1b, 0x84, 0xc4, 0x43, 0x64, 0x72, 0x58, 0xb6, 0x8d, 0xae, 0x31, 0x68, 0xf8, 0x7d, 0xb2, + 0x6d, 0xa8, 0xfa, 0x93, 0xc2, 0x23, 0x87, 0xa0, 0xa0, 0x44, 0xf0, 0xdb, 0x92, 0x14, 0xed, 0xba, + 0x22, 0x5f, 0xde, 0x4b, 0x8a, 0x9c, 0x65, 0x02, 0x4a, 0x54, 0x38, 0xcf, 0x51, 0xe7, 0x60, 0x24, + 0xad, 0x71, 0xce, 0x0c, 0xd4, 0xd2, 0xe7, 0x63, 0x96, 0xa6, 0x54, 0x6e, 0xb3, 0xf6, 0x50, 0x33, + 0x2a, 0x85, 0xd3, 0x19, 0xd0, 0x64, 0x26, 0x55, 0x68, 0x33, 0x68, 0xa8, 0xda, 0x27, 0x55, 0xc2, + 0xfe, 0x7e, 0xa8, 0xee, 0xcd, 0x50, 0x5b, 0xc3, 0xbd, 0x34, 0xf8, 0x3d, 0x42, 0xf1, 0x2c, 0xcc, + 0x12, 0x98, 0x0a, 0x90, 0x6d, 0xb3, 0x6b, 0x0e, 0x1a, 0x7e, 0x8f, 0x54, 0xe6, 0x72, 0x7d, 0xb9, + 0x64, 0x52, 0x7e, 0x7d, 0xf9, 0xfe, 0x2d, 0xa4, 0x3c, 0x78, 0xac, 0xa1, 0x09, 0x48, 0xe7, 0x29, + 0x7a, 0x52, 0xcd, 0xab, 0xed, 0xfd, 0xd3, 0x3a, 0x6a, 0x7d, 0x18, 0x8d, 0x3f, 0xeb, 0x43, 0xe0, + 0x13, 0xe0, 0x05, 0x8d, 0x01, 0xff, 0xdb, 0xfd, 0x60, 0xe5, 0x02, 0xf0, 0x1b, 0x72, 0xc7, 0x36, + 0x90, 0xdb, 0xa7, 0x68, 0x0d, 0x8f, 0x07, 0x75, 0x44, 0x2c, 0x50, 0x73, 0x3f, 0x3a, 0x7e, 0xf5, + 0x00, 0xa7, 0xca, 0x54, 0x2c, 0xef, 0x08, 0x42, 0x37, 0x1d, 0xbd, 0x3b, 0x5f, 0xdb, 0xc6, 0x6a, + 0x6d, 0x1b, 0x97, 0x6b, 0xdb, 0xf8, 0xbf, 0xb1, 0x6b, 0xab, 0x8d, 0x5d, 0xbb, 0xd8, 0xd8, 0xb5, + 0x1f, 0x3d, 0xed, 0x25, 0x7e, 0xce, 0x09, 0x65, 0x07, 0x1f, 0x4f, 0xf4, 0x48, 0xed, 0xf5, 0xeb, + 0xab, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb7, 0xf4, 0x63, 0xc3, 0x62, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -292,8 +271,6 @@ const _ = grpc.SupportPackageIsVersion4 // ABCIListenerServiceClient is the client API for ABCIListenerService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -// -// Deprecated: Do not use. type ABCIListenerServiceClient interface { // ListenFinalizeBlock is the corresponding endpoint for // ABCIListener.ListenEndBlock @@ -306,7 +283,6 @@ type aBCIListenerServiceClient struct { cc grpc1.ClientConn } -// Deprecated: Do not use. func NewABCIListenerServiceClient(cc grpc1.ClientConn) ABCIListenerServiceClient { return &aBCIListenerServiceClient{cc} } @@ -330,8 +306,6 @@ func (c *aBCIListenerServiceClient) ListenCommit(ctx context.Context, in *Listen } // ABCIListenerServiceServer is the server API for ABCIListenerService service. -// -// Deprecated: Do not use. type ABCIListenerServiceServer interface { // ListenFinalizeBlock is the corresponding endpoint for // ABCIListener.ListenEndBlock @@ -340,7 +314,6 @@ type ABCIListenerServiceServer interface { ListenCommit(context.Context, *ListenCommitRequest) (*ListenCommitResponse, error) } -// Deprecated: Do not use. // UnimplementedABCIListenerServiceServer can be embedded to have forward compatible implementations. type UnimplementedABCIListenerServiceServer struct { } @@ -352,7 +325,6 @@ func (*UnimplementedABCIListenerServiceServer) ListenCommit(ctx context.Context, return nil, status.Errorf(codes.Unimplemented, "method ListenCommit not implemented") } -// Deprecated: Do not use. func RegisterABCIListenerServiceServer(s grpc1.Server, srv ABCIListenerServiceServer) { s.RegisterService(&_ABCIListenerService_serviceDesc, srv) } diff --git a/store/types/commit_info.pb.go b/store/types/commit_info.pb.go index 8be43a1172..81220a79c2 100644 --- a/store/types/commit_info.pb.go +++ b/store/types/commit_info.pb.go @@ -29,11 +29,6 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // CommitInfo defines commit information used by the multi-store when committing // a version/height. -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -// -// Deprecated: Do not use. type CommitInfo struct { Version int64 `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"` StoreInfos []StoreInfo `protobuf:"bytes,2,rep,name=store_infos,json=storeInfos,proto3" json:"store_infos"` @@ -96,11 +91,6 @@ func (m *CommitInfo) GetTimestamp() time.Time { // StoreInfo defines store-specific commit information. It contains a reference // between a store name and the commit ID. -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -// -// Deprecated: Do not use. type StoreInfo struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` CommitId CommitID `protobuf:"bytes,2,opt,name=commit_id,json=commitId,proto3" json:"commit_id"` @@ -155,11 +145,6 @@ func (m *StoreInfo) GetCommitId() CommitID { // CommitID defines the commitment information when a specific store is // committed. -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -// -// Deprecated: Do not use. type CommitID struct { Version int64 `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"` Hash []byte `protobuf:"bytes,2,opt,name=hash,proto3" json:"hash,omitempty"` @@ -222,29 +207,28 @@ func init() { } var fileDescriptor_5f8c656cdef8c524 = []byte{ - // 341 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xb1, 0x6e, 0xf2, 0x30, - 0x10, 0xc7, 0x63, 0x40, 0x7c, 0xc4, 0x7c, 0x93, 0xc5, 0x60, 0x31, 0x38, 0x88, 0xa1, 0x62, 0x72, - 0x04, 0xdd, 0x98, 0xda, 0xb4, 0xaa, 0xc4, 0x9a, 0x76, 0xea, 0x52, 0x05, 0x70, 0x42, 0xd4, 0x26, - 0x87, 0xb0, 0x8b, 0xd4, 0xb7, 0x60, 0xec, 0xd8, 0xa7, 0xe8, 0x33, 0x30, 0x32, 0x76, 0x6a, 0x2b, - 0x78, 0x91, 0x2a, 0x97, 0x98, 0x2e, 0xa8, 0xdb, 0x5d, 0xf2, 0xbb, 0xfb, 0xff, 0x72, 0xa1, 0x67, - 0x33, 0xd0, 0x19, 0x68, 0x5f, 0x1b, 0x58, 0x29, 0x7f, 0x3d, 0x9c, 0x2a, 0x13, 0x0d, 0xfd, 0x19, - 0x64, 0x59, 0x6a, 0x1e, 0xd2, 0x3c, 0x06, 0xb9, 0x5c, 0x81, 0x01, 0xd6, 0x29, 0x39, 0x89, 0x9c, - 0xac, 0xb8, 0x6e, 0x27, 0x81, 0x04, 0x10, 0xf0, 0x8b, 0xaa, 0x64, 0xbb, 0x5e, 0x02, 0x90, 0x3c, - 0x29, 0x1f, 0xbb, 0xe9, 0x73, 0xec, 0x9b, 0x34, 0x53, 0xda, 0x44, 0xd9, 0xb2, 0x04, 0xfa, 0xef, - 0x84, 0xd2, 0x2b, 0x8c, 0x98, 0xe4, 0x31, 0x30, 0x4e, 0xff, 0xad, 0xd5, 0x4a, 0xa7, 0x90, 0x73, - 0xd2, 0x23, 0x83, 0x7a, 0x68, 0x5b, 0x76, 0x43, 0xdb, 0x18, 0x88, 0x26, 0x9a, 0xd7, 0x7a, 0xf5, - 0x41, 0x7b, 0xe4, 0xc9, 0x53, 0x2e, 0xf2, 0xb6, 0xe8, 0x8a, 0x7d, 0x41, 0x63, 0xfb, 0xe9, 0x39, - 0x21, 0xd5, 0xf6, 0x81, 0x66, 0x01, 0x75, 0x8f, 0x0e, 0xbc, 0xde, 0x23, 0x83, 0xf6, 0xa8, 0x2b, - 0x4b, 0x4b, 0x69, 0x2d, 0xe5, 0x9d, 0x25, 0x82, 0x56, 0xb1, 0x60, 0xf3, 0xe5, 0x91, 0xf0, 0x77, - 0x6c, 0x5c, 0xe3, 0xa4, 0x1f, 0x53, 0xf7, 0x18, 0xc3, 0x18, 0x6d, 0xe4, 0x51, 0xa6, 0xd0, 0xd9, - 0x0d, 0xb1, 0x66, 0x97, 0xd4, 0xb5, 0xb7, 0x9b, 0xf3, 0x1a, 0x06, 0x89, 0xd3, 0xba, 0xd5, 0xf7, - 0x5f, 0x57, 0xb6, 0xad, 0x72, 0x6c, 0x32, 0xc7, 0x9c, 0x0b, 0xda, 0xb2, 0xef, 0xff, 0xb8, 0x0e, - 0xa3, 0x8d, 0x45, 0xa4, 0x17, 0x98, 0xf3, 0x3f, 0xc4, 0x7a, 0xdc, 0x7c, 0x7d, 0xf3, 0x1c, 0x4e, - 0x82, 0xd1, 0x76, 0x2f, 0xc8, 0x6e, 0x2f, 0xc8, 0xf7, 0x5e, 0x90, 0xcd, 0x41, 0x38, 0xbb, 0x83, - 0x70, 0x3e, 0x0e, 0xc2, 0xb9, 0xe7, 0xa5, 0x8e, 0x9e, 0x3f, 0xca, 0x14, 0xaa, 0xff, 0x6e, 0x5e, - 0x96, 0x4a, 0x4f, 0x9b, 0x78, 0x8a, 0xf3, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd4, 0xbe, 0x34, - 0x30, 0x14, 0x02, 0x00, 0x00, + // 336 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xb1, 0x4e, 0xf2, 0x50, + 0x14, 0xc7, 0x7b, 0xa1, 0xf9, 0x3e, 0x7a, 0x70, 0xba, 0x61, 0x68, 0x18, 0x6e, 0x09, 0x83, 0x61, + 0xba, 0x0d, 0xb8, 0x39, 0x98, 0x58, 0x8d, 0x09, 0x6b, 0x75, 0x72, 0x31, 0x2d, 0x5c, 0x4a, 0xa3, + 0xed, 0x21, 0xdc, 0x2b, 0x89, 0x6f, 0xc1, 0xe8, 0xe8, 0x33, 0xf8, 0x14, 0x8c, 0x8c, 0x4e, 0x6a, + 0xe0, 0x45, 0x4c, 0x4f, 0x5b, 0x5c, 0x88, 0xdb, 0x39, 0xed, 0xef, 0x9c, 0xff, 0xaf, 0xa7, 0x70, + 0x3a, 0x41, 0x9d, 0xa1, 0xf6, 0xb5, 0xc1, 0xa5, 0xf2, 0x57, 0xc3, 0x58, 0x99, 0x68, 0xe8, 0x4f, + 0x30, 0xcb, 0x52, 0xf3, 0x90, 0xe6, 0x33, 0x94, 0x8b, 0x25, 0x1a, 0xe4, 0x9d, 0x92, 0x93, 0xc4, + 0xc9, 0x8a, 0xeb, 0x76, 0x12, 0x4c, 0x90, 0x00, 0xbf, 0xa8, 0x4a, 0xb6, 0xeb, 0x25, 0x88, 0xc9, + 0x93, 0xf2, 0xa9, 0x8b, 0x9f, 0x67, 0xbe, 0x49, 0x33, 0xa5, 0x4d, 0x94, 0x2d, 0x4a, 0xa0, 0xff, + 0xce, 0x00, 0xae, 0x28, 0x62, 0x9c, 0xcf, 0x90, 0xbb, 0xf0, 0x7f, 0xa5, 0x96, 0x3a, 0xc5, 0xdc, + 0x65, 0x3d, 0x36, 0x68, 0x86, 0x75, 0xcb, 0x6f, 0xa0, 0x4d, 0x81, 0x64, 0xa2, 0xdd, 0x46, 0xaf, + 0x39, 0x68, 0x8f, 0x3c, 0x79, 0xcc, 0x45, 0xde, 0x16, 0x5d, 0xb1, 0x2f, 0xb0, 0x37, 0x9f, 0x9e, + 0x15, 0x82, 0xae, 0x1f, 0x68, 0x1e, 0x80, 0x73, 0x70, 0x70, 0x9b, 0x3d, 0x36, 0x68, 0x8f, 0xba, + 0xb2, 0xb4, 0x94, 0xb5, 0xa5, 0xbc, 0xab, 0x89, 0xa0, 0x55, 0x2c, 0x58, 0x7f, 0x79, 0x2c, 0xfc, + 0x1d, 0xeb, 0xc7, 0xe0, 0x1c, 0x22, 0x38, 0x07, 0x3b, 0x8f, 0x32, 0x45, 0xbe, 0x4e, 0x48, 0x35, + 0xbf, 0x04, 0xa7, 0xbe, 0xdb, 0xd4, 0x6d, 0x50, 0x88, 0x38, 0xae, 0x5a, 0x7d, 0xfb, 0x75, 0x65, + 0xda, 0x2a, 0xc7, 0xc6, 0xd3, 0xfe, 0x05, 0xb4, 0xea, 0x77, 0x7f, 0x5c, 0x85, 0x83, 0x3d, 0x8f, + 0xf4, 0x9c, 0x32, 0x4e, 0x42, 0xaa, 0xcf, 0xed, 0xd7, 0x37, 0xcf, 0x0a, 0x46, 0x9b, 0x9d, 0x60, + 0xdb, 0x9d, 0x60, 0xdf, 0x3b, 0xc1, 0xd6, 0x7b, 0x61, 0x6d, 0xf7, 0xc2, 0xfa, 0xd8, 0x0b, 0xeb, + 0xde, 0x2d, 0x45, 0xf4, 0xf4, 0x51, 0xa6, 0x58, 0xfd, 0x6d, 0xf3, 0xb2, 0x50, 0x3a, 0xfe, 0x47, + 0x07, 0x38, 0xfb, 0x09, 0x00, 0x00, 0xff, 0xff, 0x67, 0xb7, 0x0d, 0x59, 0x0a, 0x02, 0x00, 0x00, } func (m *CommitInfo) Marshal() (dAtA []byte, err error) { diff --git a/store/types/listening.pb.go b/store/types/listening.pb.go index 6ad75bda75..1821ca474a 100644 --- a/store/types/listening.pb.go +++ b/store/types/listening.pb.go @@ -27,11 +27,6 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // StoreKVPair is a KVStore KVPair used for listening to state changes (Sets and // Deletes) It optionally includes the StoreKey for the originating KVStore and // a Boolean flag to distinguish between Sets and Deletes -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -// -// Deprecated: Do not use. type StoreKVPair struct { StoreKey string `protobuf:"bytes,1,opt,name=store_key,json=storeKey,proto3" json:"store_key,omitempty"` Delete bool `protobuf:"varint,2,opt,name=delete,proto3" json:"delete,omitempty"` @@ -102,11 +97,6 @@ func (m *StoreKVPair) GetValue() []byte { // BlockMetadata contains all the abci event data of a block // the file streamer dump them into files together with the state changes. -// -// Deprecated: Store v1 is deprecated as of v0.50.x, please use Store v2 types -// instead. -// -// Deprecated: Do not use. type BlockMetadata struct { ResponseCommit *v1.CommitResponse `protobuf:"bytes,6,opt,name=response_commit,json=responseCommit,proto3" json:"response_commit,omitempty"` RequestFinalizeBlock *v1.FinalizeBlockRequest `protobuf:"bytes,7,opt,name=request_finalize_block,json=requestFinalizeBlock,proto3" json:"request_finalize_block,omitempty"` @@ -177,34 +167,33 @@ func init() { } var fileDescriptor_b6caeb9d7b7c7c10 = []byte{ - // 422 bytes of a gzipped FileDescriptorProto + // 416 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x41, 0x6f, 0xd3, 0x30, - 0x14, 0xc7, 0xeb, 0x34, 0x2d, 0x9e, 0x07, 0x2c, 0xb2, 0xba, 0x61, 0x06, 0x8a, 0xa2, 0x09, 0x41, - 0x2f, 0x73, 0xe8, 0xc6, 0x69, 0xc7, 0x21, 0x21, 0x91, 0x09, 0x09, 0x05, 0x89, 0x03, 0x42, 0x8a, - 0x9c, 0xf4, 0x0d, 0x59, 0x4d, 0xeb, 0x12, 0x7b, 0x91, 0xca, 0x8d, 0x6f, 0xc0, 0x87, 0xe1, 0xc6, - 0x17, 0xe0, 0x38, 0x71, 0xe2, 0x88, 0xda, 0x2f, 0x82, 0x62, 0xbb, 0x48, 0x83, 0x03, 0xb7, 0xfc, - 0xdf, 0xfb, 0xff, 0x7f, 0x7e, 0x8e, 0x1f, 0x79, 0x54, 0x29, 0x3d, 0x57, 0x3a, 0xd5, 0x46, 0x35, - 0x90, 0xb6, 0x93, 0x12, 0x8c, 0x98, 0xa4, 0xb5, 0xd4, 0x06, 0x16, 0x72, 0xf1, 0x81, 0x2f, 0x1b, - 0x65, 0x14, 0x1d, 0x39, 0x17, 0xb7, 0x2e, 0xee, 0x5d, 0x87, 0x0f, 0x2b, 0x35, 0x07, 0x53, 0x5e, - 0x9a, 0x54, 0x94, 0x95, 0x4c, 0xdb, 0x49, 0x6a, 0x56, 0x4b, 0xd0, 0x2e, 0x73, 0x78, 0xdf, 0x65, - 0x0a, 0xab, 0x52, 0x0f, 0xb0, 0xe2, 0xe8, 0x33, 0x22, 0xbb, 0x6f, 0x3a, 0xd4, 0xc5, 0xdb, 0xd7, - 0x42, 0x36, 0xf4, 0x01, 0xd9, 0xb1, 0xe4, 0x62, 0x06, 0x2b, 0x86, 0x12, 0x34, 0xde, 0xc9, 0xb1, - 0x2d, 0x5c, 0xc0, 0x8a, 0x1e, 0x90, 0xe1, 0x14, 0x6a, 0x30, 0xc0, 0x82, 0x04, 0x8d, 0x71, 0xee, - 0x15, 0x8d, 0x48, 0xbf, 0xb3, 0xf7, 0x13, 0x34, 0xbe, 0x9d, 0x77, 0x9f, 0x74, 0x44, 0x06, 0xad, - 0xa8, 0xaf, 0x80, 0x85, 0xb6, 0xe6, 0xc4, 0xd9, 0xfe, 0x8f, 0xaf, 0xc7, 0x7b, 0xee, 0xf8, 0x63, - 0x3d, 0x9d, 0x25, 0x4f, 0xf9, 0xb3, 0x53, 0x86, 0x8e, 0xbe, 0x05, 0xe4, 0xce, 0x79, 0xad, 0xaa, - 0xd9, 0x2b, 0x30, 0x62, 0x2a, 0x8c, 0xa0, 0x2f, 0xc9, 0x5e, 0x03, 0x7a, 0xa9, 0x16, 0x1a, 0x8a, - 0x4a, 0xcd, 0xe7, 0xd2, 0xb0, 0x61, 0x82, 0xc6, 0xbb, 0x27, 0x09, 0xdf, 0x5e, 0x94, 0x77, 0x17, - 0xe5, 0xed, 0x84, 0x3f, 0xb7, 0xfd, 0xdc, 0xdb, 0xf3, 0xbb, 0xdb, 0xa0, 0xab, 0xd3, 0xf7, 0xe4, - 0xa0, 0x81, 0x8f, 0x57, 0xa0, 0x4d, 0x71, 0x29, 0x17, 0xa2, 0x96, 0x9f, 0xa0, 0x28, 0xbb, 0xc3, - 0xd8, 0x2d, 0x4b, 0x7c, 0xfc, 0x2f, 0xf1, 0x85, 0xf7, 0xd9, 0x99, 0x72, 0x17, 0xce, 0x47, 0x9e, - 0x72, 0xa3, 0x49, 0x0b, 0x72, 0xef, 0xcf, 0xa0, 0x7f, 0xe1, 0xb1, 0xc5, 0x3f, 0xf9, 0x2f, 0xde, - 0xcf, 0xbd, 0xbf, 0xe5, 0xdc, 0x68, 0x9f, 0x05, 0x0c, 0x65, 0x21, 0x46, 0x51, 0x90, 0x85, 0x38, - 0x88, 0xfa, 0x59, 0x88, 0xfb, 0x51, 0x98, 0x85, 0x38, 0x8c, 0x06, 0x59, 0x88, 0x07, 0xd1, 0xf0, - 0xfc, 0xe4, 0xfb, 0x3a, 0x46, 0xd7, 0xeb, 0x18, 0xfd, 0x5a, 0xc7, 0xe8, 0xcb, 0x26, 0xee, 0x5d, - 0x6f, 0xe2, 0xde, 0xcf, 0x4d, 0xdc, 0x7b, 0xc7, 0xdc, 0xaf, 0xd6, 0xd3, 0x19, 0x97, 0xca, 0xaf, - 0x95, 0x5d, 0x8b, 0x72, 0x68, 0x1f, 0xff, 0xf4, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x34, 0xf5, - 0x9f, 0x9b, 0x73, 0x02, 0x00, 0x00, + 0x14, 0xc7, 0xeb, 0xd6, 0x2d, 0x9e, 0x07, 0x2c, 0x32, 0x65, 0x84, 0x81, 0xa2, 0x68, 0x42, 0xd0, + 0xcb, 0x1c, 0xba, 0x71, 0xe2, 0x38, 0x24, 0x24, 0x32, 0x21, 0xa1, 0x20, 0x71, 0x40, 0x48, 0x91, + 0x93, 0xbe, 0x21, 0xab, 0x69, 0x5c, 0x62, 0x2f, 0x52, 0xb9, 0xf0, 0x15, 0xf8, 0x30, 0x48, 0x7c, + 0x05, 0x8e, 0x13, 0x27, 0x8e, 0xa8, 0xfd, 0x22, 0x28, 0xb6, 0x8b, 0x34, 0x38, 0xec, 0x96, 0xff, + 0x7b, 0xff, 0xff, 0xcf, 0xcf, 0xf1, 0xa3, 0x8f, 0x4a, 0xa5, 0x17, 0x4a, 0x27, 0xda, 0xa8, 0x06, + 0x92, 0x76, 0x5a, 0x80, 0x11, 0xd3, 0xa4, 0x92, 0xda, 0x40, 0x2d, 0xeb, 0x8f, 0x7c, 0xd9, 0x28, + 0xa3, 0xd8, 0xd8, 0xb9, 0xb8, 0x75, 0x71, 0xef, 0x3a, 0x78, 0x58, 0xaa, 0x05, 0x98, 0xe2, 0xdc, + 0x24, 0xa2, 0x28, 0x65, 0xd2, 0x4e, 0x13, 0xb3, 0x5a, 0x82, 0x76, 0x99, 0x83, 0xfb, 0x2e, 0x93, + 0x5b, 0x95, 0x78, 0x80, 0x15, 0x87, 0x5f, 0xe8, 0xee, 0xdb, 0x8e, 0x74, 0xf6, 0xee, 0x8d, 0x90, + 0x0d, 0x7b, 0x40, 0x77, 0x2c, 0x38, 0x9f, 0xc3, 0x2a, 0x44, 0x31, 0x9a, 0xec, 0x64, 0xc4, 0x16, + 0xce, 0x60, 0xc5, 0xf6, 0xe9, 0x68, 0x06, 0x15, 0x18, 0x08, 0xfb, 0x31, 0x9a, 0x90, 0xcc, 0x2b, + 0x16, 0xd0, 0x41, 0x67, 0x1f, 0xc4, 0x68, 0x72, 0x33, 0xeb, 0x3e, 0xd9, 0x98, 0x0e, 0x5b, 0x51, + 0x5d, 0x40, 0x88, 0x6d, 0xcd, 0x89, 0xe7, 0x77, 0x7e, 0x7e, 0x3b, 0xda, 0x73, 0xa7, 0x1f, 0xe9, + 0xd9, 0x3c, 0x7e, 0xca, 0x9f, 0x9d, 0x1c, 0x7e, 0xef, 0xd3, 0x5b, 0xa7, 0x95, 0x2a, 0xe7, 0xaf, + 0xc1, 0x88, 0x99, 0x30, 0x82, 0xbd, 0xa2, 0x7b, 0x0d, 0xe8, 0xa5, 0xaa, 0x35, 0xe4, 0xa5, 0x5a, + 0x2c, 0xa4, 0x09, 0x47, 0x31, 0x9a, 0xec, 0x1e, 0xc7, 0x7c, 0x7b, 0x4b, 0xde, 0xdd, 0x92, 0xb7, + 0x53, 0xfe, 0xc2, 0xf6, 0x33, 0x6f, 0xcf, 0x6e, 0x6f, 0x83, 0xae, 0xce, 0x3e, 0xd0, 0xfd, 0x06, + 0x3e, 0x5d, 0x80, 0x36, 0xf9, 0xb9, 0xac, 0x45, 0x25, 0x3f, 0x43, 0x5e, 0x74, 0x87, 0x85, 0x37, + 0x2c, 0xf1, 0xf1, 0xff, 0xc4, 0x97, 0xde, 0x67, 0x67, 0xca, 0x5c, 0x38, 0x1b, 0x7b, 0xca, 0x95, + 0x26, 0xcb, 0xe9, 0xbd, 0xbf, 0x83, 0xfe, 0x83, 0x27, 0x16, 0xff, 0xe4, 0x5a, 0xbc, 0x9f, 0xfb, + 0xee, 0x96, 0x73, 0xa5, 0x9d, 0x62, 0x82, 0x82, 0x7e, 0x8a, 0x49, 0x3f, 0x18, 0xa4, 0x98, 0x0c, + 0x02, 0x9c, 0x62, 0x82, 0x83, 0x61, 0x8a, 0xc9, 0x30, 0x18, 0x9d, 0x1e, 0xff, 0x58, 0x47, 0xe8, + 0x72, 0x1d, 0xa1, 0xdf, 0xeb, 0x08, 0x7d, 0xdd, 0x44, 0xbd, 0xcb, 0x4d, 0xd4, 0xfb, 0xb5, 0x89, + 0x7a, 0xef, 0x43, 0xf7, 0x93, 0xf5, 0x6c, 0xce, 0xa5, 0xf2, 0xfb, 0x64, 0xf7, 0xa1, 0x18, 0xd9, + 0x57, 0x3f, 0xf9, 0x13, 0x00, 0x00, 0xff, 0xff, 0x98, 0x9f, 0x12, 0x13, 0x6c, 0x02, 0x00, 0x00, } func (m *StoreKVPair) Marshal() (dAtA []byte, err error) { diff --git a/store/types/store.go b/store/types/store.go index 835d5b29ff..6c773f2807 100644 --- a/store/types/store.go +++ b/store/types/store.go @@ -4,12 +4,12 @@ import ( "fmt" "io" + crypto "github.com/cometbft/cometbft/api/cometbft/crypto/v1" dbm "github.com/cosmos/cosmos-db" "cosmossdk.io/store/metrics" pruningtypes "cosmossdk.io/store/pruning/types" snapshottypes "cosmossdk.io/store/snapshots/types" - crypto "github.com/cometbft/cometbft/api/cometbft/crypto/v1" ) type Store interface { diff --git a/testutil/x/counter/types/codec.go b/testutil/x/counter/types/codec.go index d7b68a29fe..5ee46356ef 100644 --- a/testutil/x/counter/types/codec.go +++ b/testutil/x/counter/types/codec.go @@ -2,14 +2,14 @@ package types import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) func RegisterInterfaces(registrar registry.InterfaceRegistrar) { registrar.RegisterImplementations( - (*sdk.Msg)(nil), + (*coretransaction.Msg)(nil), &MsgIncreaseCounter{}, ) diff --git a/types/codec.go b/types/codec.go index 69202d488f..7cad97227b 100644 --- a/types/codec.go +++ b/types/codec.go @@ -1,6 +1,8 @@ package types import ( + coretransaction "cosmossdk.io/core/transaction" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/types" ) @@ -12,7 +14,7 @@ const ( // RegisterLegacyAminoCodec registers the sdk message type. func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { - cdc.RegisterInterface((*Msg)(nil), nil) + cdc.RegisterInterface((*coretransaction.Msg)(nil), nil) cdc.RegisterInterface((*Tx)(nil), nil) } diff --git a/types/tx_msg.go b/types/tx_msg.go index 2425091c9c..deeb6a7d1e 100644 --- a/types/tx_msg.go +++ b/types/tx_msg.go @@ -5,9 +5,10 @@ import ( "fmt" "strings" - "github.com/cosmos/gogoproto/proto" protov2 "google.golang.org/protobuf/proto" + coretransaction "cosmossdk.io/core/transaction" + "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" @@ -15,7 +16,7 @@ import ( type ( // Msg defines the interface a transaction message needed to fulfill. - Msg = proto.Message + Msg = coretransaction.Msg // LegacyMsg defines the interface a transaction message needed to fulfill up through // v0.47. diff --git a/x/accounts/testing/counter/counter.go b/x/accounts/testing/counter/counter.go index 028f1b4083..33ed5128f6 100644 --- a/x/accounts/testing/counter/counter.go +++ b/x/accounts/testing/counter/counter.go @@ -117,7 +117,9 @@ func (a Account) TestDependencies(ctx context.Context, _ *counterv1.MsgTestDepen // test gas meter gm := a.gs.GasMeter(ctx) gasBefore := gm.Limit() - gm.Remaining() - gm.Consume(10, "test") + if err := gm.Consume(10, "test"); err != nil { + return nil, err + } gasAfter := gm.Limit() - gm.Remaining() // test funds diff --git a/x/accounts/utils_test.go b/x/accounts/utils_test.go index 837b9b8ccf..3b07c7686f 100644 --- a/x/accounts/utils_test.go +++ b/x/accounts/utils_test.go @@ -14,6 +14,7 @@ import ( "cosmossdk.io/collections/colltest" "cosmossdk.io/core/address" "cosmossdk.io/core/event" + coretransaction "cosmossdk.io/core/transaction" "cosmossdk.io/log" "cosmossdk.io/x/accounts/internal/implementation" "cosmossdk.io/x/tx/signing" @@ -22,7 +23,6 @@ import ( "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/runtime" - sdk "github.com/cosmos/cosmos-sdk/types" ) var _ address.Codec = (*addressCodec)(nil) @@ -63,7 +63,7 @@ func newKeeper(t *testing.T, accounts ...implementation.AccountCreatorFunc) (Kee queryRouter := baseapp.NewGRPCQueryRouter() queryRouter.SetInterfaceRegistry(ir) - ir.RegisterImplementations((*sdk.Msg)(nil), + ir.RegisterImplementations((*coretransaction.Msg)(nil), &bankv1beta1.MsgSend{}, &bankv1beta1.MsgBurn{}, &bankv1beta1.MsgSetSendEnabled{}, diff --git a/x/auth/tx/config_test.go b/x/auth/tx/config_test.go index 888bf0eda5..05d63eb2ae 100644 --- a/x/auth/tx/config_test.go +++ b/x/auth/tx/config_test.go @@ -7,6 +7,7 @@ import ( "github.com/stretchr/testify/suite" _ "cosmossdk.io/api/cosmos/crypto/secp256k1" + coretransaction "cosmossdk.io/core/transaction" "cosmossdk.io/x/auth/tx" txtestutil "cosmossdk.io/x/auth/tx/testutil" "cosmossdk.io/x/tx/signing" @@ -15,13 +16,12 @@ import ( "github.com/cosmos/cosmos-sdk/codec/testutil" "github.com/cosmos/cosmos-sdk/std" "github.com/cosmos/cosmos-sdk/testutil/testdata" - sdk "github.com/cosmos/cosmos-sdk/types" ) func TestGenerator(t *testing.T) { interfaceRegistry := testutil.CodecOptions{}.NewInterfaceRegistry() std.RegisterInterfaces(interfaceRegistry) - interfaceRegistry.RegisterImplementations((*sdk.Msg)(nil), &testdata.TestMsg{}) + interfaceRegistry.RegisterImplementations((*coretransaction.Msg)(nil), &testdata.TestMsg{}) protoCodec := codec.NewProtoCodec(interfaceRegistry) signingCtx := protoCodec.InterfaceRegistry().SigningContext() suite.Run(t, txtestutil.NewTxConfigTestSuite(tx.NewTxConfig(protoCodec, signingCtx.AddressCodec(), signingCtx.ValidatorAddressCodec(), tx.DefaultSignModes))) diff --git a/x/auth/types/codec.go b/x/auth/types/codec.go index 08accef30a..d4d59a6a84 100644 --- a/x/auth/types/codec.go +++ b/x/auth/types/codec.go @@ -2,6 +2,7 @@ package types import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" "cosmossdk.io/x/auth/migrations/legacytx" "github.com/cosmos/cosmos-sdk/codec" @@ -56,7 +57,7 @@ func RegisterInterfaces(registrar registry.InterfaceRegistrar) { &ModuleCredential{}, ) - registrar.RegisterImplementations((*sdk.Msg)(nil), + registrar.RegisterImplementations((*coretransaction.Msg)(nil), &MsgUpdateParams{}, &MsgNonAtomicExec{}, ) diff --git a/x/auth/types/msgs.go b/x/auth/types/msgs.go index 6900aab977..e9dd36fd62 100644 --- a/x/auth/types/msgs.go +++ b/x/auth/types/msgs.go @@ -1,15 +1,16 @@ package types import ( - sdk "github.com/cosmos/cosmos-sdk/types" + coretransaction "cosmossdk.io/core/transaction" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) // GetMessages returns the cache values from the MsgNonAtomicExec.Msgs if present. -func (msg MsgNonAtomicExec) GetMessages() ([]sdk.Msg, error) { - msgs := make([]sdk.Msg, len(msg.Msgs)) +func (msg MsgNonAtomicExec) GetMessages() ([]coretransaction.Msg, error) { + msgs := make([]coretransaction.Msg, len(msg.Msgs)) for i, msgAny := range msg.Msgs { - msg, ok := msgAny.GetCachedValue().(sdk.Msg) + msg, ok := msgAny.GetCachedValue().(coretransaction.Msg) if !ok { return nil, sdkerrors.ErrInvalidRequest.Wrapf("messages contains %T which is not a sdk.Msg", msgAny) } diff --git a/x/auth/vesting/types/codec.go b/x/auth/vesting/types/codec.go index 118d075d92..c415488afd 100644 --- a/x/auth/vesting/types/codec.go +++ b/x/auth/vesting/types/codec.go @@ -2,6 +2,7 @@ package types import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" authtypes "cosmossdk.io/x/auth/types" "cosmossdk.io/x/auth/vesting/exported" @@ -56,7 +57,7 @@ func RegisterInterfaces(registrar registry.InterfaceRegistrar) { ) registrar.RegisterImplementations( - (*sdk.Msg)(nil), + (*coretransaction.Msg)(nil), &MsgCreateVestingAccount{}, &MsgCreatePermanentLockedAccount{}, ) diff --git a/x/auth/vesting/types/msgs.go b/x/auth/vesting/types/msgs.go index 296fa88459..a718bd04e9 100644 --- a/x/auth/vesting/types/msgs.go +++ b/x/auth/vesting/types/msgs.go @@ -1,13 +1,15 @@ package types import ( + coretransaction "cosmossdk.io/core/transaction" + sdk "github.com/cosmos/cosmos-sdk/types" ) var ( - _ sdk.Msg = &MsgCreateVestingAccount{} - _ sdk.Msg = &MsgCreatePermanentLockedAccount{} - _ sdk.Msg = &MsgCreatePeriodicVestingAccount{} + _ coretransaction.Msg = &MsgCreateVestingAccount{} + _ coretransaction.Msg = &MsgCreatePermanentLockedAccount{} + _ coretransaction.Msg = &MsgCreatePeriodicVestingAccount{} ) // NewMsgCreateVestingAccount returns a reference to a new MsgCreateVestingAccount. diff --git a/x/authz/codec.go b/x/authz/codec.go index a82c67ce43..18e65dbb4c 100644 --- a/x/authz/codec.go +++ b/x/authz/codec.go @@ -2,12 +2,12 @@ package authz import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" bank "cosmossdk.io/x/bank/types" staking "cosmossdk.io/x/staking/types" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) @@ -24,7 +24,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { // RegisterInterfaces registers the interfaces types with the interface registry func RegisterInterfaces(registrar registry.InterfaceRegistrar) { - registrar.RegisterImplementations((*sdk.Msg)(nil), + registrar.RegisterImplementations((*coretransaction.Msg)(nil), &MsgGrant{}, &MsgRevoke{}, &MsgExec{}, diff --git a/x/authz/keeper/keeper.go b/x/authz/keeper/keeper.go index 1079629709..2d9b39db49 100644 --- a/x/authz/keeper/keeper.go +++ b/x/authz/keeper/keeper.go @@ -435,7 +435,9 @@ func (k Keeper) removeFromGrantQueue(ctx context.Context, grantKey []byte, grant queueItems := queueItem.MsgTypeUrls for index, typeURL := range queueItems { - k.GasService.GasMeter(ctx).Consume(gasCostPerIteration, "grant queue") + if err := k.GasService.GasMeter(ctx).Consume(gasCostPerIteration, "grant queue"); err != nil { + return err + } if typeURL == msgType { end := len(queueItem.MsgTypeUrls) - 1 diff --git a/x/bank/types/codec.go b/x/bank/types/codec.go index e63d77e583..500fb979b4 100644 --- a/x/bank/types/codec.go +++ b/x/bank/types/codec.go @@ -2,10 +2,10 @@ package types import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) @@ -22,7 +22,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { } func RegisterInterfaces(registrar registry.InterfaceRegistrar) { - registrar.RegisterImplementations((*sdk.Msg)(nil), + registrar.RegisterImplementations((*coretransaction.Msg)(nil), &MsgSend{}, &MsgMultiSend{}, &MsgUpdateParams{}, diff --git a/x/bank/types/msgs.go b/x/bank/types/msgs.go index 9cda2bd45f..e24487aa33 100644 --- a/x/bank/types/msgs.go +++ b/x/bank/types/msgs.go @@ -1,13 +1,15 @@ package types import ( + coretransaction "cosmossdk.io/core/transaction" + sdk "github.com/cosmos/cosmos-sdk/types" ) var ( - _ sdk.Msg = &MsgSend{} - _ sdk.Msg = &MsgMultiSend{} - _ sdk.Msg = &MsgUpdateParams{} + _ coretransaction.Msg = &MsgSend{} + _ coretransaction.Msg = &MsgMultiSend{} + _ coretransaction.Msg = &MsgUpdateParams{} ) // NewMsgSend - construct a msg to send coins from one account to another. diff --git a/x/circuit/types/codec.go b/x/circuit/types/codec.go index 0a7c6f415d..e199098096 100644 --- a/x/circuit/types/codec.go +++ b/x/circuit/types/codec.go @@ -2,14 +2,14 @@ package types import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) // RegisterInterfaces registers the interfaces types with the interface registry. func RegisterInterfaces(registrar registry.InterfaceRegistrar) { - registrar.RegisterImplementations((*sdk.Msg)(nil), + registrar.RegisterImplementations((*coretransaction.Msg)(nil), &MsgAuthorizeCircuitBreaker{}, &MsgResetCircuitBreaker{}, &MsgTripCircuitBreaker{}, diff --git a/x/consensus/types/codec.go b/x/consensus/types/codec.go index 756ea4319f..069b198a5b 100644 --- a/x/consensus/types/codec.go +++ b/x/consensus/types/codec.go @@ -2,16 +2,16 @@ package types import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) func RegisterInterfaces(registrar registry.InterfaceRegistrar) { registrar.RegisterImplementations( - (*sdk.Msg)(nil), + (*coretransaction.Msg)(nil), &MsgUpdateParams{}, ) diff --git a/x/crisis/types/codec.go b/x/crisis/types/codec.go index 039a0cb21d..82a8803053 100644 --- a/x/crisis/types/codec.go +++ b/x/crisis/types/codec.go @@ -2,10 +2,10 @@ package types import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) @@ -18,7 +18,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { // RegisterInterfaces registers the interfaces types with the Interface Registry. func RegisterInterfaces(registrar registry.InterfaceRegistrar) { - registrar.RegisterImplementations((*sdk.Msg)(nil), + registrar.RegisterImplementations((*coretransaction.Msg)(nil), &MsgVerifyInvariant{}, &MsgUpdateParams{}, ) diff --git a/x/distribution/types/codec.go b/x/distribution/types/codec.go index 0f47ec68a3..d40ee6db22 100644 --- a/x/distribution/types/codec.go +++ b/x/distribution/types/codec.go @@ -2,10 +2,10 @@ package types import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) @@ -24,7 +24,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { func RegisterInterfaces(registrar registry.InterfaceRegistrar) { registrar.RegisterImplementations( - (*sdk.Msg)(nil), + (*coretransaction.Msg)(nil), &MsgWithdrawDelegatorReward{}, &MsgWithdrawValidatorCommission{}, &MsgSetWithdrawAddress{}, diff --git a/x/evidence/types/codec.go b/x/evidence/types/codec.go index cb827d9074..fe592cba9b 100644 --- a/x/evidence/types/codec.go +++ b/x/evidence/types/codec.go @@ -2,11 +2,11 @@ package types import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" "cosmossdk.io/x/evidence/exported" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) @@ -20,7 +20,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { // RegisterInterfaces registers the interfaces types with the interface registry. func RegisterInterfaces(registrar registry.InterfaceRegistrar) { - registrar.RegisterImplementations((*sdk.Msg)(nil), &MsgSubmitEvidence{}) + registrar.RegisterImplementations((*coretransaction.Msg)(nil), &MsgSubmitEvidence{}) registrar.RegisterInterface( "cosmos.evidence.v1beta1.Evidence", (*exported.Evidence)(nil), diff --git a/x/feegrant/codec.go b/x/feegrant/codec.go index 09083ba23e..d5da542a11 100644 --- a/x/feegrant/codec.go +++ b/x/feegrant/codec.go @@ -2,10 +2,10 @@ package feegrant import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) @@ -23,7 +23,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { // RegisterInterfaces registers the interfaces types with the interface registry func RegisterInterfaces(registrar registry.InterfaceRegistrar) { - registrar.RegisterImplementations((*sdk.Msg)(nil), + registrar.RegisterImplementations((*coretransaction.Msg)(nil), &MsgGrantAllowance{}, &MsgRevokeAllowance{}, ) diff --git a/x/gov/keeper/msg_server.go b/x/gov/keeper/msg_server.go index fd05d4a29b..4178a4dc55 100644 --- a/x/gov/keeper/msg_server.go +++ b/x/gov/keeper/msg_server.go @@ -97,10 +97,12 @@ func (k msgServer) SubmitProposal(ctx context.Context, msg *v1.MsgSubmitProposal } // ref: https://github.com/cosmos/cosmos-sdk/issues/9683 - k.GasService.GasMeter(ctx).Consume( + if err := k.GasService.GasMeter(ctx).Consume( 3*k.GasService.GasConfig(ctx).WriteCostPerByte*uint64(len(bytes)), "submit proposal", - ) + ); err != nil { + return nil, err + } votingStarted, err := k.Keeper.AddDeposit(ctx, proposal.Id, proposer, msg.GetInitialDeposit()) if err != nil { diff --git a/x/gov/types/v1/codec.go b/x/gov/types/v1/codec.go index 33ea00178e..767b1276bb 100644 --- a/x/gov/types/v1/codec.go +++ b/x/gov/types/v1/codec.go @@ -2,10 +2,10 @@ package v1 import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) @@ -25,7 +25,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { // RegisterInterfaces registers the interfaces types with the Interface Registry. func RegisterInterfaces(registrar registry.InterfaceRegistrar) { - registrar.RegisterImplementations((*sdk.Msg)(nil), + registrar.RegisterImplementations((*coretransaction.Msg)(nil), &MsgSubmitProposal{}, &MsgSubmitMultipleChoiceProposal{}, &MsgVote{}, diff --git a/x/gov/types/v1beta1/codec.go b/x/gov/types/v1beta1/codec.go index 37197b80aa..aebb575ce2 100644 --- a/x/gov/types/v1beta1/codec.go +++ b/x/gov/types/v1beta1/codec.go @@ -2,10 +2,10 @@ package v1beta1 import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) @@ -22,7 +22,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { // RegisterInterfaces registers the interfaces types with the Interface Registry. func RegisterInterfaces(registrar registry.InterfaceRegistrar) { - registrar.RegisterImplementations((*sdk.Msg)(nil), + registrar.RegisterImplementations((*coretransaction.Msg)(nil), &MsgSubmitProposal{}, &MsgVote{}, &MsgVoteWeighted{}, diff --git a/x/group/codec.go b/x/group/codec.go index 3cce8f4ed6..19b2d7c027 100644 --- a/x/group/codec.go +++ b/x/group/codec.go @@ -2,10 +2,10 @@ package group import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" codectypes "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) @@ -35,7 +35,7 @@ func RegisterLegacyAminoCodec(cdc *codectypes.LegacyAmino) { // RegisterInterfaces registers the interfaces types with the interface registry. func RegisterInterfaces(registrar registry.InterfaceRegistrar) { - registrar.RegisterImplementations((*sdk.Msg)(nil), + registrar.RegisterImplementations((*coretransaction.Msg)(nil), &MsgCreateGroup{}, &MsgUpdateGroupMembers{}, &MsgUpdateGroupAdmin{}, diff --git a/x/group/keeper/msg_server.go b/x/group/keeper/msg_server.go index f861cd111c..0f7d3eeade 100644 --- a/x/group/keeper/msg_server.go +++ b/x/group/keeper/msg_server.go @@ -631,7 +631,9 @@ func (k Keeper) SubmitProposal(ctx context.Context, msg *group.MsgSubmitProposal if msg.Exec == group.Exec_EXEC_TRY { // Consider proposers as Yes votes for _, proposer := range msg.Proposers { - k.GasService.GasMeter(ctx).Consume(gasCostPerIteration, "vote on proposal") + if err := k.GasService.GasMeter(ctx).Consume(gasCostPerIteration, "vote on proposal"); err != nil { + return &group.MsgSubmitProposalResponse{ProposalId: id}, errorsmod.Wrapf(err, "the proposal was created but failed on vote for voter %s", proposer) + } _, err = k.Vote(ctx, &group.MsgVote{ ProposalId: id, Voter: proposer, diff --git a/x/mint/types/codec.go b/x/mint/types/codec.go index 245733f2b0..c492772d05 100644 --- a/x/mint/types/codec.go +++ b/x/mint/types/codec.go @@ -2,10 +2,10 @@ package types import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) @@ -18,7 +18,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { // RegisterInterfaces registers the interfaces types with the interface registry. func RegisterInterfaces(registrar registry.InterfaceRegistrar) { registrar.RegisterImplementations( - (*sdk.Msg)(nil), + (*coretransaction.Msg)(nil), &MsgUpdateParams{}, ) diff --git a/x/nft/codec.go b/x/nft/codec.go index e7c13ad7c9..d78c22c39c 100644 --- a/x/nft/codec.go +++ b/x/nft/codec.go @@ -2,14 +2,14 @@ package nft import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) // RegisterInterfaces registers the interfaces types with the interface registry. func RegisterInterfaces(registrar registry.InterfaceRegistrar) { - registrar.RegisterImplementations((*sdk.Msg)(nil), + registrar.RegisterImplementations((*coretransaction.Msg)(nil), &MsgSend{}, ) msgservice.RegisterMsgServiceDesc(registrar, &_Msg_serviceDesc) diff --git a/x/protocolpool/types/codec.go b/x/protocolpool/types/codec.go index 7249c8a719..f40c6cdba9 100644 --- a/x/protocolpool/types/codec.go +++ b/x/protocolpool/types/codec.go @@ -2,14 +2,14 @@ package types import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) func RegisterInterfaces(registrar registry.InterfaceRegistrar) { registrar.RegisterImplementations( - (*sdk.Msg)(nil), + (*coretransaction.Msg)(nil), &MsgFundCommunityPool{}, &MsgCommunityPoolSpend{}, &MsgSubmitBudgetProposal{}, diff --git a/x/slashing/types/codec.go b/x/slashing/types/codec.go index c852734a29..18eb7aa2f4 100644 --- a/x/slashing/types/codec.go +++ b/x/slashing/types/codec.go @@ -2,10 +2,10 @@ package types import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) @@ -18,7 +18,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { // RegisterInterfaces registers the interfaces types with the Interface Registry. func RegisterInterfaces(registrar registry.InterfaceRegistrar) { - registrar.RegisterImplementations((*sdk.Msg)(nil), + registrar.RegisterImplementations((*coretransaction.Msg)(nil), &MsgUnjail{}, &MsgUpdateParams{}, ) diff --git a/x/staking/types/codec.go b/x/staking/types/codec.go index cbb527b980..922a069e91 100644 --- a/x/staking/types/codec.go +++ b/x/staking/types/codec.go @@ -2,10 +2,10 @@ package types import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) @@ -30,7 +30,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { // RegisterInterfaces registers the x/staking interfaces types with the interface registry func RegisterInterfaces(registrar registry.InterfaceRegistrar) { - registrar.RegisterImplementations((*sdk.Msg)(nil), + registrar.RegisterImplementations((*coretransaction.Msg)(nil), &MsgCreateValidator{}, &MsgEditValidator{}, &MsgDelegate{}, diff --git a/x/staking/types/msg.go b/x/staking/types/msg.go index 683d8495a6..3effad961f 100644 --- a/x/staking/types/msg.go +++ b/x/staking/types/msg.go @@ -2,6 +2,7 @@ package types import ( "cosmossdk.io/core/address" + coretransaction "cosmossdk.io/core/transaction" errorsmod "cosmossdk.io/errors" "cosmossdk.io/math" @@ -12,14 +13,14 @@ import ( ) var ( - _ sdk.Msg = &MsgCreateValidator{} + _ coretransaction.Msg = &MsgCreateValidator{} _ codectypes.UnpackInterfacesMessage = (*MsgCreateValidator)(nil) - _ sdk.Msg = &MsgEditValidator{} - _ sdk.Msg = &MsgDelegate{} - _ sdk.Msg = &MsgUndelegate{} - _ sdk.Msg = &MsgBeginRedelegate{} - _ sdk.Msg = &MsgCancelUnbondingDelegation{} - _ sdk.Msg = &MsgUpdateParams{} + _ coretransaction.Msg = &MsgEditValidator{} + _ coretransaction.Msg = &MsgDelegate{} + _ coretransaction.Msg = &MsgUndelegate{} + _ coretransaction.Msg = &MsgBeginRedelegate{} + _ coretransaction.Msg = &MsgCancelUnbondingDelegation{} + _ coretransaction.Msg = &MsgUpdateParams{} ) // NewMsgCreateValidator creates a new MsgCreateValidator instance. diff --git a/x/upgrade/types/codec.go b/x/upgrade/types/codec.go index c29e42c6c5..98bec26aa4 100644 --- a/x/upgrade/types/codec.go +++ b/x/upgrade/types/codec.go @@ -2,10 +2,10 @@ package types import ( "cosmossdk.io/core/registry" + coretransaction "cosmossdk.io/core/transaction" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) @@ -20,7 +20,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { // RegisterInterfaces registers the interfaces types with the Interface Registry. func RegisterInterfaces(registrar registry.InterfaceRegistrar) { - registrar.RegisterImplementations((*sdk.Msg)(nil), + registrar.RegisterImplementations((*coretransaction.Msg)(nil), &MsgSoftwareUpgrade{}, &MsgCancelUpgrade{}, )