From 167f3f12e2c520bd073884853c2942908e27f979 Mon Sep 17 00:00:00 2001 From: Aaron Craelius Date: Wed, 2 Apr 2025 19:37:19 -0400 Subject: [PATCH] refactor: migrate codec/types to type aliases, remove depinject dep on sdk (#24336) Co-authored-by: Alex | Interchain Labs Co-authored-by: Tyler <48813565+technicallyty@users.noreply.github.com> --- CHANGELOG.md | 1 + client/grpc/cmtservice/query.pb.go | 44 +- codec/types/any.go | 154 +------ codec/types/any.pb.go | 535 ---------------------- codec/types/any_internal_test.go | 67 --- codec/types/any_test.go | 75 --- codec/types/compat.go | 211 +-------- codec/types/compat_test.go | 132 ------ codec/types/doc.go | 6 +- codec/types/interface_registry.go | 59 ++- codec/types/types_test.go | 182 -------- crypto/keyring/record.pb.go | 10 +- crypto/keys/multisig/keys.pb.go | 8 +- depinject/appconfig/v1alpha1/config.pb.go | 8 +- depinject/go.mod | 16 +- depinject/go.sum | 162 +------ proto/buf.gen.gogo.yaml | 2 +- types/abci.pb.go | 38 +- types/tx/signing/signing.pb.go | 16 +- types/tx/tx.pb.go | 46 +- x/auth/types/auth.pb.go | 12 +- x/auth/types/genesis.pb.go | 8 +- x/auth/types/query.pb.go | 26 +- x/authz/authz.pb.go | 10 +- x/authz/tx.pb.go | 6 +- x/evidence/go.mod | 5 +- x/evidence/go.sum | 10 +- x/evidence/types/genesis.pb.go | 8 +- x/evidence/types/query.pb.go | 14 +- x/evidence/types/tx.pb.go | 6 +- x/feegrant/feegrant.pb.go | 12 +- x/feegrant/go.mod | 3 + x/feegrant/go.sum | 2 - x/feegrant/tx.pb.go | 8 +- x/gov/types/v1/gov.pb.go | 8 +- x/gov/types/v1/tx.pb.go | 24 +- x/gov/types/v1beta1/gov.pb.go | 6 +- x/gov/types/v1beta1/tx.pb.go | 12 +- x/group/tx.pb.go | 18 +- x/group/types.pb.go | 10 +- x/nft/nft.pb.go | 14 +- x/staking/types/staking.pb.go | 22 +- x/staking/types/tx.pb.go | 42 +- x/upgrade/go.mod | 5 +- x/upgrade/go.sum | 6 +- x/upgrade/types/upgrade.pb.go | 6 +- 46 files changed, 300 insertions(+), 1775 deletions(-) delete mode 100644 codec/types/any.pb.go delete mode 100644 codec/types/any_internal_test.go delete mode 100644 codec/types/any_test.go delete mode 100644 codec/types/compat_test.go delete mode 100644 codec/types/types_test.go diff --git a/CHANGELOG.md b/CHANGELOG.md index e687165d28..cd60b380fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -71,6 +71,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (gRPC) [#24073](https://github.com/cosmos/cosmos-sdk/pull/24073) Adds error handling for out-of-gas panics in grpc query handlers. * (server) [#24072](https://github.com/cosmos/cosmos-sdk/pull/24072) Return BlockHeader by shallow copy in server Context. * (x/bank) [#24053](https://github.com/cosmos/cosmos-sdk/pull/24053) Resolve a foot-gun by swapping send restrictions check in `InputOutputCoins` before coin deduction. +* (codec/types) [#24336](https://github.com/cosmos/cosmos-sdk/pull/24336) Most types definitions were moved to `github.com/cosmos/gogoproto/types/any` with aliases to these left in `codec/types` so that there should be no breakage to existing code. This allows protobuf generated code to optionally reference the SDK's custom `Any` type without a direct dependency on the SDK. This can be done by changing the `protoc` `M` parameter for `any.proto` to `Mgoogle/protobuf/any.proto=github.com/cosmos/gogoproto/types/any`. ### Bug Fixes diff --git a/client/grpc/cmtservice/query.pb.go b/client/grpc/cmtservice/query.pb.go index 40a4d42cf0..bcfe4b37e6 100644 --- a/client/grpc/cmtservice/query.pb.go +++ b/client/grpc/cmtservice/query.pb.go @@ -7,14 +7,14 @@ import ( context "context" fmt "fmt" p2p "github.com/cometbft/cometbft/proto/tendermint/p2p" - types1 "github.com/cometbft/cometbft/proto/tendermint/types" + types "github.com/cometbft/cometbft/proto/tendermint/types" _ "github.com/cosmos/cosmos-proto" - types "github.com/cosmos/cosmos-sdk/codec/types" query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" + any "github.com/cosmos/gogoproto/types/any" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -261,10 +261,10 @@ func (m *GetLatestValidatorSetResponse) GetPagination() *query.PageResponse { // Validator is the type for the validator-set. type Validator struct { - Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - PubKey *types.Any `protobuf:"bytes,2,opt,name=pub_key,json=pubKey,proto3" json:"pub_key,omitempty"` - VotingPower int64 `protobuf:"varint,3,opt,name=voting_power,json=votingPower,proto3" json:"voting_power,omitempty"` - ProposerPriority int64 `protobuf:"varint,4,opt,name=proposer_priority,json=proposerPriority,proto3" json:"proposer_priority,omitempty"` + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + PubKey *any.Any `protobuf:"bytes,2,opt,name=pub_key,json=pubKey,proto3" json:"pub_key,omitempty"` + VotingPower int64 `protobuf:"varint,3,opt,name=voting_power,json=votingPower,proto3" json:"voting_power,omitempty"` + ProposerPriority int64 `protobuf:"varint,4,opt,name=proposer_priority,json=proposerPriority,proto3" json:"proposer_priority,omitempty"` } func (m *Validator) Reset() { *m = Validator{} } @@ -307,7 +307,7 @@ func (m *Validator) GetAddress() string { return "" } -func (m *Validator) GetPubKey() *types.Any { +func (m *Validator) GetPubKey() *any.Any { if m != nil { return m.PubKey } @@ -375,10 +375,10 @@ func (m *GetBlockByHeightRequest) GetHeight() int64 { // GetBlockByHeightResponse is the response type for the Query/GetBlockByHeight RPC method. type GetBlockByHeightResponse struct { - BlockId *types1.BlockID `protobuf:"bytes,1,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` + BlockId *types.BlockID `protobuf:"bytes,1,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` // Deprecated: please use `sdk_block` instead - Block *types1.Block `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty"` - SdkBlock *Block `protobuf:"bytes,3,opt,name=sdk_block,json=sdkBlock,proto3" json:"sdk_block,omitempty"` + Block *types.Block `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty"` + SdkBlock *Block `protobuf:"bytes,3,opt,name=sdk_block,json=sdkBlock,proto3" json:"sdk_block,omitempty"` } func (m *GetBlockByHeightResponse) Reset() { *m = GetBlockByHeightResponse{} } @@ -414,14 +414,14 @@ func (m *GetBlockByHeightResponse) XXX_DiscardUnknown() { var xxx_messageInfo_GetBlockByHeightResponse proto.InternalMessageInfo -func (m *GetBlockByHeightResponse) GetBlockId() *types1.BlockID { +func (m *GetBlockByHeightResponse) GetBlockId() *types.BlockID { if m != nil { return m.BlockId } return nil } -func (m *GetBlockByHeightResponse) GetBlock() *types1.Block { +func (m *GetBlockByHeightResponse) GetBlock() *types.Block { if m != nil { return m.Block } @@ -474,10 +474,10 @@ var xxx_messageInfo_GetLatestBlockRequest proto.InternalMessageInfo // GetLatestBlockResponse is the response type for the Query/GetLatestBlock RPC method. type GetLatestBlockResponse struct { - BlockId *types1.BlockID `protobuf:"bytes,1,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` + BlockId *types.BlockID `protobuf:"bytes,1,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` // Deprecated: please use `sdk_block` instead - Block *types1.Block `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty"` - SdkBlock *Block `protobuf:"bytes,3,opt,name=sdk_block,json=sdkBlock,proto3" json:"sdk_block,omitempty"` + Block *types.Block `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty"` + SdkBlock *Block `protobuf:"bytes,3,opt,name=sdk_block,json=sdkBlock,proto3" json:"sdk_block,omitempty"` } func (m *GetLatestBlockResponse) Reset() { *m = GetLatestBlockResponse{} } @@ -513,14 +513,14 @@ func (m *GetLatestBlockResponse) XXX_DiscardUnknown() { var xxx_messageInfo_GetLatestBlockResponse proto.InternalMessageInfo -func (m *GetLatestBlockResponse) GetBlockId() *types1.BlockID { +func (m *GetLatestBlockResponse) GetBlockId() *types.BlockID { if m != nil { return m.BlockId } return nil } -func (m *GetLatestBlockResponse) GetBlock() *types1.Block { +func (m *GetLatestBlockResponse) GetBlock() *types.Block { if m != nil { return m.Block } @@ -3425,7 +3425,7 @@ func (m *Validator) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.PubKey == nil { - m.PubKey = &types.Any{} + m.PubKey = &any.Any{} } if err := m.PubKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -3618,7 +3618,7 @@ func (m *GetBlockByHeightResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.BlockId == nil { - m.BlockId = &types1.BlockID{} + m.BlockId = &types.BlockID{} } if err := m.BlockId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -3654,7 +3654,7 @@ func (m *GetBlockByHeightResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Block == nil { - m.Block = &types1.Block{} + m.Block = &types.Block{} } if err := m.Block.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -3826,7 +3826,7 @@ func (m *GetLatestBlockResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.BlockId == nil { - m.BlockId = &types1.BlockID{} + m.BlockId = &types.BlockID{} } if err := m.BlockId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -3862,7 +3862,7 @@ func (m *GetLatestBlockResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Block == nil { - m.Block = &types1.Block{} + m.Block = &types.Block{} } if err := m.Block.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/codec/types/any.go b/codec/types/any.go index 557cda0687..f30bdd5b74 100644 --- a/codec/types/any.go +++ b/codec/types/any.go @@ -1,154 +1,14 @@ package types import ( - fmt "fmt" - - "github.com/cosmos/gogoproto/proto" - protov2 "google.golang.org/protobuf/proto" - - errorsmod "cosmossdk.io/errors" - - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + gogoany "github.com/cosmos/gogoproto/types/any" ) -type Any struct { - // A URL/resource name that uniquely identifies the type of the serialized - // protocol buffer message. This string must contain at least - // one "/" character. The last segment of the URL's path must represent - // the fully qualified name of the type (as in - // `path/google.protobuf.Duration`). The name should be in a canonical form - // (e.g., leading "." is not accepted). - // - // In practice, teams usually precompile into the binary all types that they - // expect it to use in the context of Any. However, for URLs which use the - // scheme `http`, `https`, or no scheme, one can optionally set up a type - // server that maps type URLs to message definitions as follows: - // - // * If no scheme is provided, `https` is assumed. - // * An HTTP GET on the URL must yield a [google.protobuf.Type][] - // value in binary format, or produce an error. - // * Applications are allowed to cache lookup results based on the - // URL, or have them precompiled into a binary to avoid any - // lookup. Therefore, binary compatibility needs to be preserved - // on changes to types. (Use versioned type names to manage - // breaking changes.) - // - // Note: this functionality is not currently available in the official - // protobuf release, and it is not used for type URLs beginning with - // type.googleapis.com. - // - // Schemes other than `http`, `https` (or the empty scheme) might be - // used with implementation specific semantics. +// Any is an alias for github.com/cosmos/gogoproto/types/any.Any. +type Any = gogoany.Any - TypeUrl string `protobuf:"bytes,1,opt,name=type_url,json=typeUrl,proto3" json:"type_url,omitempty"` +// NewAnyWithValue is an alias for github.com/cosmos/gogoproto/types/any.NewAnyWithCacheWithValue. +var NewAnyWithValue = gogoany.NewAnyWithCacheWithValue - // Must be a valid serialized protocol buffer of the above specified type. - Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` - - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` - - cachedValue interface{} - - compat *anyCompat -} - -// NewAnyWithValue constructs a new Any packed with the value provided or -// returns an error if that value couldn't be packed. This also caches -// the packed value so that it can be retrieved from GetCachedValue without -// unmarshaling -func NewAnyWithValue(v proto.Message) (*Any, error) { - if v == nil { - return nil, errorsmod.Wrap(sdkerrors.ErrPackAny, "Expecting non nil value to create a new Any") - } - - var ( - bz []byte - err error - ) - if msg, ok := v.(protov2.Message); ok { - protov2MarshalOpts := protov2.MarshalOptions{Deterministic: true} - bz, err = protov2MarshalOpts.Marshal(msg) - } else { - bz, err = proto.Marshal(v) - } - if err != nil { - return nil, err - } - - return &Any{ - TypeUrl: MsgTypeURL(v), - Value: bz, - cachedValue: v, - }, nil -} - -// UnsafePackAny packs the value x in the Any and instead of returning the error -// in the case of a packing failure, keeps the cached value. This should only -// be used in situations where compatibility is needed with amino. Amino-only -// values can safely be packed using this method when they will only be -// marshaled with amino and not protobuf. -func UnsafePackAny(x interface{}) *Any { - if msg, ok := x.(proto.Message); ok { - any, err := NewAnyWithValue(msg) - if err == nil { - return any - } - } - return &Any{cachedValue: x} -} - -// pack packs the value x in the Any or returns an error. This also caches -// the packed value so that it can be retrieved from GetCachedValue without -// unmarshaling -func (any *Any) pack(x proto.Message) error { - any.TypeUrl = MsgTypeURL(x) - - var ( - bz []byte - err error - ) - if msg, ok := x.(protov2.Message); ok { - protov2MarshalOpts := protov2.MarshalOptions{Deterministic: true} - bz, err = protov2MarshalOpts.Marshal(msg) - } else { - bz, err = proto.Marshal(x) - } - if err != nil { - return err - } - - any.Value = bz - any.cachedValue = x - - return nil -} - -// GetCachedValue returns the cached value from the Any if present -func (any *Any) GetCachedValue() interface{} { - return any.cachedValue -} - -// GoString returns a string representing valid go code to reproduce the current state of -// the struct. -func (any *Any) GoString() string { - if any == nil { - return "nil" - } - extra := "" - if any.XXX_unrecognized != nil { - extra = fmt.Sprintf(",\n XXX_unrecognized: %#v,\n", any.XXX_unrecognized) - } - return fmt.Sprintf("&Any{TypeUrl: %#v,\n Value: %#v%s\n}", - any.TypeUrl, any.Value, extra) -} - -// String implements the stringer interface -func (any *Any) String() string { - if any == nil { - return "nil" - } - return fmt.Sprintf("&Any{TypeUrl:%v,Value:%v,XXX_unrecognized:%v}", - any.TypeUrl, any.Value, any.XXX_unrecognized) -} +// UnsafePackAny is an alias for github.com/cosmos/gogoproto/types/any.UnsafePackAnyWithCache. +var UnsafePackAny = gogoany.UnsafePackAnyWithCache diff --git a/codec/types/any.pb.go b/codec/types/any.pb.go deleted file mode 100644 index 8dc80f3952..0000000000 --- a/codec/types/any.pb.go +++ /dev/null @@ -1,535 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: google/protobuf/any.proto - -package types - -import ( - bytes "bytes" - fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -func (m *Any) Reset() { *m = Any{} } -func (*Any) ProtoMessage() {} -func (*Any) Descriptor() ([]byte, []int) { - return fileDescriptor_b53526c13ae22eb4, []int{0} -} -func (*Any) XXX_WellKnownType() string { return "Any" } -func (m *Any) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Any) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Any.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Any) XXX_Merge(src proto.Message) { - xxx_messageInfo_Any.Merge(m, src) -} -func (m *Any) XXX_Size() int { - return m.Size() -} -func (m *Any) XXX_DiscardUnknown() { - xxx_messageInfo_Any.DiscardUnknown(m) -} - -var xxx_messageInfo_Any proto.InternalMessageInfo - -func (m *Any) GetTypeUrl() string { - if m != nil { - return m.TypeUrl - } - return "" -} - -func (m *Any) GetValue() []byte { - if m != nil { - return m.Value - } - return nil -} - -func (*Any) XXX_MessageName() string { - return "google.protobuf.Any" -} -func init() { -} - -func init() { proto.RegisterFile("google/protobuf/any.proto", fileDescriptor_b53526c13ae22eb4) } - -var fileDescriptor_b53526c13ae22eb4 = []byte{ - // 248 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4c, 0xcf, 0xcf, 0x4f, - 0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0xcc, 0xab, 0xd4, - 0x03, 0x73, 0x84, 0xf8, 0x21, 0x52, 0x7a, 0x30, 0x29, 0x29, 0x91, 0xf4, 0xfc, 0xf4, 0x7c, 0x30, - 0x4f, 0x1f, 0xc4, 0x82, 0x48, 0x28, 0x79, 0x70, 0x31, 0x3b, 0xe6, 0x55, 0x0a, 0x49, 0x72, 0x71, - 0x94, 0x54, 0x16, 0xa4, 0xc6, 0x97, 0x16, 0xe5, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0xb1, - 0x83, 0xf8, 0xa1, 0x45, 0x39, 0x42, 0x22, 0x5c, 0xac, 0x65, 0x89, 0x39, 0xa5, 0xa9, 0x12, 0x4c, - 0x0a, 0x8c, 0x1a, 0x3c, 0x41, 0x10, 0x8e, 0x95, 0xc0, 0x8c, 0x05, 0xf2, 0x0c, 0x1b, 0x16, 0xc8, - 0x33, 0x7c, 0x58, 0x28, 0xcf, 0xd0, 0x70, 0x47, 0x81, 0xc1, 0xa9, 0x99, 0xf1, 0xc6, 0x43, 0x39, - 0x86, 0x0f, 0x0f, 0xe5, 0x18, 0x7f, 0x3c, 0x94, 0x63, 0x6c, 0x78, 0x24, 0xc7, 0xb8, 0xe2, 0x91, - 0x1c, 0xe3, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0xf8, 0xe2, - 0x91, 0x1c, 0xc3, 0x07, 0x90, 0xf8, 0x63, 0x39, 0xc6, 0x03, 0x8f, 0xe5, 0x18, 0x4e, 0x3c, 0x96, - 0x63, 0xe4, 0x12, 0x4e, 0xce, 0xcf, 0xd5, 0x43, 0x73, 0xab, 0x13, 0x87, 0x63, 0x5e, 0x65, 0x00, - 0x88, 0x13, 0xc0, 0x18, 0xc5, 0x0a, 0x72, 0x48, 0xf1, 0x22, 0x26, 0x66, 0xf7, 0x00, 0xa7, 0x55, - 0x4c, 0x72, 0xee, 0x10, 0xa5, 0x01, 0x50, 0xa5, 0x7a, 0xe1, 0xa9, 0x39, 0x39, 0xde, 0x79, 0xf9, - 0xe5, 0x79, 0x21, 0x20, 0x65, 0x49, 0x6c, 0x60, 0x33, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, - 0x4d, 0x91, 0x00, 0xa0, 0x1a, 0x01, 0x00, 0x00, -} - -func (this *Any) Compare(that interface{}) int { - if that == nil { - if this == nil { - return 0 - } - return 1 - } - - that1, ok := that.(*Any) - if !ok { - that2, ok := that.(Any) - if ok { - that1 = &that2 - } else { - return 1 - } - } - if that1 == nil { - if this == nil { - return 0 - } - return 1 - } else if this == nil { - return -1 - } - if this.TypeUrl != that1.TypeUrl { - if this.TypeUrl < that1.TypeUrl { - return -1 - } - return 1 - } - if c := bytes.Compare(this.Value, that1.Value); c != 0 { - return c - } - if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { - return c - } - return 0 -} -func (this *Any) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*Any) - if !ok { - that2, ok := that.(Any) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.TypeUrl != that1.TypeUrl { - return false - } - if !bytes.Equal(this.Value, that1.Value) { - return false - } - if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { - return false - } - return true -} -func (m *Any) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Any) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Any) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - if len(m.Value) > 0 { - i -= len(m.Value) - copy(dAtA[i:], m.Value) - i = encodeVarintAny(dAtA, i, uint64(len(m.Value))) - i-- - dAtA[i] = 0x12 - } - if len(m.TypeUrl) > 0 { - i -= len(m.TypeUrl) - copy(dAtA[i:], m.TypeUrl) - i = encodeVarintAny(dAtA, i, uint64(len(m.TypeUrl))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintAny(dAtA []byte, offset int, v uint64) int { - offset -= sovAny(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func NewPopulatedAny(r randyAny, easy bool) *Any { - this := &Any{} - this.TypeUrl = string(randStringAny(r)) - v1 := r.Intn(100) - this.Value = make([]byte, v1) - for i := 0; i < v1; i++ { - this.Value[i] = byte(r.Intn(256)) - } - if !easy && r.Intn(10) != 0 { - this.XXX_unrecognized = randUnrecognizedAny(r, 3) - } - return this -} - -type randyAny interface { - Float32() float32 - Float64() float64 - Int63() int64 - Int31() int32 - Uint32() uint32 - Intn(n int) int -} - -func randUTF8RuneAny(r randyAny) rune { - ru := r.Intn(62) - if ru < 10 { - return rune(ru + 48) - } else if ru < 36 { - return rune(ru + 55) - } - return rune(ru + 61) -} -func randStringAny(r randyAny) string { - v2 := r.Intn(100) - tmps := make([]rune, v2) - for i := 0; i < v2; i++ { - tmps[i] = randUTF8RuneAny(r) - } - return string(tmps) -} -func randUnrecognizedAny(r randyAny, maxFieldNumber int) (dAtA []byte) { - l := r.Intn(5) - for i := 0; i < l; i++ { - wire := r.Intn(4) - if wire == 3 { - wire = 5 - } - fieldNumber := maxFieldNumber + r.Intn(100) - dAtA = randFieldAny(dAtA, r, fieldNumber, wire) - } - return dAtA -} -func randFieldAny(dAtA []byte, r randyAny, fieldNumber int, wire int) []byte { - key := uint32(fieldNumber)<<3 | uint32(wire) - switch wire { - case 0: - dAtA = encodeVarintPopulateAny(dAtA, uint64(key)) - v3 := r.Int63() - if r.Intn(2) == 0 { - v3 *= -1 - } - dAtA = encodeVarintPopulateAny(dAtA, uint64(v3)) - case 1: - dAtA = encodeVarintPopulateAny(dAtA, uint64(key)) - dAtA = append(dAtA, byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256))) - case 2: - dAtA = encodeVarintPopulateAny(dAtA, uint64(key)) - ll := r.Intn(100) - dAtA = encodeVarintPopulateAny(dAtA, uint64(ll)) - for j := 0; j < ll; j++ { - dAtA = append(dAtA, byte(r.Intn(256))) - } - default: - dAtA = encodeVarintPopulateAny(dAtA, uint64(key)) - dAtA = append(dAtA, byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256))) - } - return dAtA -} -func encodeVarintPopulateAny(dAtA []byte, v uint64) []byte { - for v >= 1<<7 { - dAtA = append(dAtA, uint8(uint64(v)&0x7f|0x80)) - v >>= 7 - } - dAtA = append(dAtA, uint8(v)) - return dAtA -} -func (m *Any) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.TypeUrl) - if l > 0 { - n += 1 + l + sovAny(uint64(l)) - } - l = len(m.Value) - if l > 0 { - n += 1 + l + sovAny(uint64(l)) - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } - return n -} - -func sovAny(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozAny(x uint64) (n int) { - return sovAny(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *Any) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAny - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Any: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Any: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TypeUrl", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAny - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthAny - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthAny - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TypeUrl = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAny - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthAny - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthAny - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Value = append(m.Value[:0], dAtA[iNdEx:postIndex]...) - if m.Value == nil { - m.Value = []byte{} - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipAny(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthAny - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipAny(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowAny - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowAny - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowAny - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthAny - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupAny - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthAny - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthAny = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowAny = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupAny = fmt.Errorf("proto: unexpected end of group") -) diff --git a/codec/types/any_internal_test.go b/codec/types/any_internal_test.go deleted file mode 100644 index 9adab29466..0000000000 --- a/codec/types/any_internal_test.go +++ /dev/null @@ -1,67 +0,0 @@ -package types - -import ( - "testing" - - "github.com/cosmos/gogoproto/proto" - "github.com/stretchr/testify/require" -) - -type Dog struct { - Name string `protobuf:"bytes,1,opt,name=size,proto3" json:"size,omitempty"` -} - -func (d Dog) Greet() string { return d.Name } - -// We implement a minimal proto.Message interface -func (d *Dog) Reset() { d.Name = "" } -func (d *Dog) String() string { return d.Name } -func (d *Dog) ProtoMessage() {} -func (d *Dog) XXX_MessageName() string { return "tests/dog" } - -type Animal interface { - Greet() string -} - -var ( - _ Animal = (*Dog)(nil) - _ proto.Message = (*Dog)(nil) -) - -func TestAnyPackUnpack(t *testing.T) { - registry := NewInterfaceRegistry() - registry.RegisterInterface("Animal", (*Animal)(nil)) - registry.RegisterImplementations( - (*Animal)(nil), - &Dog{}, - ) - - spot := &Dog{Name: "Spot"} - var animal Animal - - // with cache - any, err := NewAnyWithValue(spot) - require.NoError(t, err) - require.Equal(t, spot, any.GetCachedValue()) - err = registry.UnpackAny(any, &animal) - require.NoError(t, err) - require.Equal(t, spot, animal) - - // without cache - any.cachedValue = nil - err = registry.UnpackAny(any, &animal) - require.NoError(t, err) - require.Equal(t, spot, animal) -} - -func TestString(t *testing.T) { - require := require.New(t) - spot := &Dog{Name: "Spot"} - any, err := NewAnyWithValue(spot) - require.NoError(err) - - require.Equal("&Any{TypeUrl:/tests/dog,Value:[10 4 83 112 111 116],XXX_unrecognized:[]}", any.String()) - require.Equal(`&Any{TypeUrl: "/tests/dog", - Value: []byte{0xa, 0x4, 0x53, 0x70, 0x6f, 0x74} -}`, any.GoString()) -} diff --git a/codec/types/any_test.go b/codec/types/any_test.go deleted file mode 100644 index 5e2b29fcca..0000000000 --- a/codec/types/any_test.go +++ /dev/null @@ -1,75 +0,0 @@ -package types_test - -import ( - "fmt" - "runtime" - "testing" - - "github.com/cosmos/gogoproto/proto" - - "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/testutil/testdata" -) - -type errOnMarshal struct { - testdata.Dog -} - -var _ proto.Message = (*errOnMarshal)(nil) - -var errAlways = fmt.Errorf("always erroring") - -func (eom *errOnMarshal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return nil, errAlways -} - -var eom = &errOnMarshal{} - -// Ensure that returning an error doesn't suddenly allocate and waste bytes. -// See https://github.com/cosmos/cosmos-sdk/issues/8537 -func TestNewAnyWithCustomTypeURLWithErrorNoAllocation(t *testing.T) { - // This tests continues to fail inconsistently. - // - // Example: https://github.com/cosmos/cosmos-sdk/pull/9246/checks?check_run_id=2643313958#step:6:118 - // Ref: https://github.com/cosmos/cosmos-sdk/issues/9010 - t.SkipNow() - - // make sure we're not in the middle of a GC. - runtime.GC() - - var ms1, ms2 runtime.MemStats - runtime.ReadMemStats(&ms1) - any, err := types.NewAnyWithValue(eom) - runtime.ReadMemStats(&ms2) - // Ensure that no fresh allocation was made. - if diff := ms2.HeapAlloc - ms1.HeapAlloc; diff > 0 { - t.Errorf("Unexpected allocation of %d bytes", diff) - } - if err == nil { - t.Fatal("err wasn't returned") - } - if any != nil { - t.Fatalf("Unexpectedly got a non-nil Any value: %v", any) - } -} - -var sink interface{} - -func BenchmarkNewAnyWithCustomTypeURLWithErrorReturned(b *testing.B) { - b.ResetTimer() - b.ReportAllocs() - for i := 0; i < b.N; i++ { - any, err := types.NewAnyWithValue(eom) - if err == nil { - b.Fatal("err wasn't returned") - } - if any != nil { - b.Fatalf("Unexpectedly got a non-nil Any value: %v", any) - } - sink = any - } - if sink == nil { - b.Fatal("benchmark didn't run") - } - sink = (interface{})(nil) -} diff --git a/codec/types/compat.go b/codec/types/compat.go index 080ca321c7..968060eddc 100644 --- a/codec/types/compat.go +++ b/codec/types/compat.go @@ -1,210 +1,23 @@ package types import ( - "fmt" - "reflect" - "runtime/debug" - - "github.com/cosmos/gogoproto/jsonpb" - "github.com/cosmos/gogoproto/proto" - amino "github.com/tendermint/go-amino" + gogoany "github.com/cosmos/gogoproto/types/any" ) -type anyCompat struct { - aminoBz []byte - jsonBz []byte - err error -} - +// Deprecated: this is no longer used for anything. var Debug = true -func anyCompatError(errType string, x interface{}) error { - if Debug { - debug.PrintStack() - } - return fmt.Errorf( - "%s marshaling error for %+v, this is likely because "+ - "amino is being used directly (instead of codec.LegacyAmino which is preferred) "+ - "or UnpackInterfacesMessage is not defined for some type which contains "+ - "a protobuf Any either directly or via one of its members. To see a "+ - "stacktrace of where the error is coming from, set the var Debug = true "+ - "in codec/types/compat.go", - errType, x, - ) -} +// AminoUnpacker is an alias for github.com/cosmos/gogoproto/types/any.AminoUnpacker. +type AminoUnpacker = gogoany.AminoUnpacker -func (any Any) MarshalAmino() ([]byte, error) { - ac := any.compat - if ac == nil { - return nil, anyCompatError("amino binary marshal", any) - } - return ac.aminoBz, ac.err -} +// AminoPacker is an alias for github.com/cosmos/gogoproto/types/any.AminoPacker. +type AminoPacker = gogoany.AminoPacker -func (any *Any) UnmarshalAmino(bz []byte) error { - any.compat = &anyCompat{ - aminoBz: bz, - err: nil, - } - return nil -} +// AminoJSONUnpacker is an alias for github.com/cosmos/gogoproto/types/any.AminoJSONUnpacker. +type AminoJSONUnpacker = gogoany.AminoJSONUnpacker -func (any *Any) MarshalJSON() ([]byte, error) { - ac := any.compat - if ac == nil { - return nil, anyCompatError("JSON marshal", any) - } - return ac.jsonBz, ac.err -} +// AminoJSONPacker is an alias for github.com/cosmos/gogoproto/types/any.AminoJSONPacker. +type AminoJSONPacker = gogoany.AminoJSONPacker -func (any *Any) UnmarshalJSON(bz []byte) error { - any.compat = &anyCompat{ - jsonBz: bz, - err: nil, - } - return nil -} - -// AminoUnpacker is an AnyUnpacker provided for backwards compatibility with -// amino for the binary un-marshaling phase -type AminoUnpacker struct { - Cdc *amino.Codec -} - -var _ AnyUnpacker = AminoUnpacker{} - -func (a AminoUnpacker) UnpackAny(any *Any, iface interface{}) error { - ac := any.compat - if ac == nil { - return anyCompatError("amino binary unmarshal", reflect.TypeOf(iface)) - } - err := a.Cdc.UnmarshalBinaryBare(ac.aminoBz, iface) - if err != nil { - return err - } - val := reflect.ValueOf(iface).Elem().Interface() - err = UnpackInterfaces(val, a) - if err != nil { - return err - } - if m, ok := val.(proto.Message); ok { - if err = any.pack(m); err != nil { - return err - } - } else { - any.cachedValue = val - } - - // this is necessary for tests that use reflect.DeepEqual and compare - // proto vs amino marshaled values - any.compat = nil - - return nil -} - -// AminoUnpacker is an AnyUnpacker provided for backwards compatibility with -// amino for the binary marshaling phase -type AminoPacker struct { - Cdc *amino.Codec -} - -var _ AnyUnpacker = AminoPacker{} - -func (a AminoPacker) UnpackAny(any *Any, _ interface{}) error { - err := UnpackInterfaces(any.cachedValue, a) - if err != nil { - return err - } - bz, err := a.Cdc.MarshalBinaryBare(any.cachedValue) - any.compat = &anyCompat{ - aminoBz: bz, - err: err, - } - return err -} - -// AminoUnpacker is an AnyUnpacker provided for backwards compatibility with -// amino for the JSON marshaling phase -type AminoJSONUnpacker struct { - Cdc *amino.Codec -} - -var _ AnyUnpacker = AminoJSONUnpacker{} - -func (a AminoJSONUnpacker) UnpackAny(any *Any, iface interface{}) error { - ac := any.compat - if ac == nil { - return anyCompatError("JSON unmarshal", reflect.TypeOf(iface)) - } - err := a.Cdc.UnmarshalJSON(ac.jsonBz, iface) - if err != nil { - return err - } - val := reflect.ValueOf(iface).Elem().Interface() - err = UnpackInterfaces(val, a) - if err != nil { - return err - } - if m, ok := val.(proto.Message); ok { - if err = any.pack(m); err != nil { - return err - } - } else { - any.cachedValue = val - } - - // this is necessary for tests that use reflect.DeepEqual and compare - // proto vs amino marshaled values - any.compat = nil - - return nil -} - -// AminoUnpacker is an AnyUnpacker provided for backwards compatibility with -// amino for the JSON un-marshaling phase -type AminoJSONPacker struct { - Cdc *amino.Codec -} - -var _ AnyUnpacker = AminoJSONPacker{} - -func (a AminoJSONPacker) UnpackAny(any *Any, _ interface{}) error { - err := UnpackInterfaces(any.cachedValue, a) - if err != nil { - return err - } - bz, err := a.Cdc.MarshalJSON(any.cachedValue) - any.compat = &anyCompat{ - jsonBz: bz, - err: err, - } - return err -} - -// ProtoJSONPacker is an AnyUnpacker provided for compatibility with jsonpb -type ProtoJSONPacker struct { - JSONPBMarshaler *jsonpb.Marshaler -} - -var _ AnyUnpacker = ProtoJSONPacker{} - -func (a ProtoJSONPacker) UnpackAny(any *Any, _ interface{}) error { - if any == nil { - return nil - } - - if any.cachedValue != nil { - err := UnpackInterfaces(any.cachedValue, a) - if err != nil { - return err - } - } - - bz, err := a.JSONPBMarshaler.MarshalToString(any) - any.compat = &anyCompat{ - jsonBz: []byte(bz), - err: err, - } - - return err -} +// ProtoUnpacker is an alias for github.com/cosmos/gogoproto/types/any.ProtoJSONPacker. +type ProtoJSONPacker = gogoany.ProtoJSONPacker diff --git a/codec/types/compat_test.go b/codec/types/compat_test.go deleted file mode 100644 index 56cb32e82c..0000000000 --- a/codec/types/compat_test.go +++ /dev/null @@ -1,132 +0,0 @@ -package types_test - -import ( - "testing" - - "github.com/stretchr/testify/suite" - amino "github.com/tendermint/go-amino" - - "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/testutil/testdata" -) - -type TypeWithInterface struct { - Animal testdata.Animal `json:"animal"` - X int64 `json:"x,omitempty"` -} - -type Suite struct { - suite.Suite - cdc *amino.Codec - a TypeWithInterface - b testdata.HasAnimal - spot *testdata.Dog -} - -func (s *Suite) SetupTest() { - s.cdc = amino.NewCodec() - s.cdc.RegisterInterface((*testdata.Animal)(nil), nil) - s.cdc.RegisterConcrete(&testdata.Dog{}, "testdata/Dog", nil) - - s.spot = &testdata.Dog{Size_: "small", Name: "Spot"} - s.a = TypeWithInterface{Animal: s.spot} - - any, err := types.NewAnyWithValue(s.spot) - s.Require().NoError(err) - s.b = testdata.HasAnimal{Animal: any} -} - -func (s *Suite) TestAminoBinary() { - bz, err := s.cdc.MarshalBinaryBare(s.a) - s.Require().NoError(err) - - // expect plain amino marshal to fail - _, err = s.cdc.MarshalBinaryBare(s.b) - s.Require().Error(err) - - // expect unpack interfaces before amino marshal to succeed - err = types.UnpackInterfaces(s.b, types.AminoPacker{Cdc: s.cdc}) - s.Require().NoError(err) - bz2, err := s.cdc.MarshalBinaryBare(s.b) - s.Require().NoError(err) - s.Require().Equal(bz, bz2) - - var c testdata.HasAnimal - err = s.cdc.UnmarshalBinaryBare(bz, &c) - s.Require().NoError(err) - err = types.UnpackInterfaces(c, types.AminoUnpacker{Cdc: s.cdc}) - s.Require().NoError(err) - s.Require().Equal(s.spot, c.Animal.GetCachedValue()) -} - -func (s *Suite) TestAminoJSON() { - bz, err := s.cdc.MarshalJSON(s.a) - s.Require().NoError(err) - - // expect plain amino marshal to fail - _, err = s.cdc.MarshalJSON(s.b) - s.Require().Error(err) - - // expect unpack interfaces before amino marshal to succeed - err = types.UnpackInterfaces(s.b, types.AminoJSONPacker{Cdc: s.cdc}) - s.Require().NoError(err) - bz2, err := s.cdc.MarshalJSON(s.b) - s.Require().NoError(err) - s.Require().Equal(string(bz), string(bz2)) - - var c testdata.HasAnimal - err = s.cdc.UnmarshalJSON(bz, &c) - s.Require().NoError(err) - err = types.UnpackInterfaces(c, types.AminoJSONUnpacker{Cdc: s.cdc}) - s.Require().NoError(err) - s.Require().Equal(s.spot, c.Animal.GetCachedValue()) -} - -func (s *Suite) TestNested() { - s.cdc.RegisterInterface((*testdata.HasAnimalI)(nil), nil) - s.cdc.RegisterInterface((*testdata.HasHasAnimalI)(nil), nil) - s.cdc.RegisterConcrete(&testdata.HasAnimal{}, "testdata/HasAnimal", nil) - s.cdc.RegisterConcrete(&testdata.HasHasAnimal{}, "testdata/HasHasAnimal", nil) - s.cdc.RegisterConcrete(&testdata.HasHasHasAnimal{}, "testdata/HasHasHasAnimal", nil) - - any, err := types.NewAnyWithValue(&s.b) - s.Require().NoError(err) - hha := testdata.HasHasAnimal{HasAnimal: any} - any2, err := types.NewAnyWithValue(&hha) - s.Require().NoError(err) - hhha := testdata.HasHasHasAnimal{HasHasAnimal: any2} - - // marshal - err = types.UnpackInterfaces(hhha, types.AminoPacker{Cdc: s.cdc}) - s.Require().NoError(err) - bz, err := s.cdc.MarshalBinaryBare(hhha) - s.Require().NoError(err) - - // unmarshal - var hhha2 testdata.HasHasHasAnimal - err = s.cdc.UnmarshalBinaryBare(bz, &hhha2) - s.Require().NoError(err) - err = types.UnpackInterfaces(hhha2, types.AminoUnpacker{Cdc: s.cdc}) - s.Require().NoError(err) - - s.Require().Equal(s.spot, hhha2.TheHasHasAnimal().TheHasAnimal().TheAnimal()) - - // json marshal - err = types.UnpackInterfaces(hhha, types.AminoJSONPacker{Cdc: s.cdc}) - s.Require().NoError(err) - jsonBz, err := s.cdc.MarshalJSON(hhha) - s.Require().NoError(err) - - // json unmarshal - var hhha3 testdata.HasHasHasAnimal - err = s.cdc.UnmarshalJSON(jsonBz, &hhha3) - s.Require().NoError(err) - err = types.UnpackInterfaces(hhha3, types.AminoJSONUnpacker{Cdc: s.cdc}) - s.Require().NoError(err) - - s.Require().Equal(s.spot, hhha3.TheHasHasAnimal().TheHasAnimal().TheAnimal()) -} - -func TestSuite(t *testing.T) { - suite.Run(t, &Suite{}) -} diff --git a/codec/types/doc.go b/codec/types/doc.go index 9f89f0c912..db72b96ab7 100644 --- a/codec/types/doc.go +++ b/codec/types/doc.go @@ -1,6 +1,6 @@ /* -Package types defines a custom wrapper for google.protobuf.Any which supports -cached values as well as InterfaceRegistry which keeps track of types which can -be used with Any for both security and introspection +Package types defines the InterfaceRegistry type as well as +aliases for types that now live in the github.com/cosmos/gogoproto/types/any package +for backwards compatibility with legacy code. */ package types diff --git a/codec/types/interface_registry.go b/codec/types/interface_registry.go index 93fbca7c88..ffb891664d 100644 --- a/codec/types/interface_registry.go +++ b/codec/types/interface_registry.go @@ -7,6 +7,7 @@ import ( "github.com/cosmos/gogoproto/jsonpb" "github.com/cosmos/gogoproto/proto" + gogoprotoany "github.com/cosmos/gogoproto/types/any" "google.golang.org/protobuf/reflect/protodesc" "google.golang.org/protobuf/reflect/protoreflect" @@ -24,23 +25,24 @@ var ( MaxUnpackAnyRecursionDepth = 10 ) -// AnyUnpacker is an interface which allows safely unpacking types packed -// in Any's against a whitelist of registered types -type AnyUnpacker interface { - // UnpackAny unpacks the value in any to the interface pointer passed in as - // iface. Note that the type in any must have been registered in the - // underlying whitelist registry as a concrete type for that interface - // Ex: - // var msg sdk.Msg - // err := cdc.UnpackAny(any, &msg) - // ... - UnpackAny(any *Any, iface interface{}) error +// AnyUnpacker is an alias for github.com/cosmos/gogoproto/types/any.AnyUnpacker. +type AnyUnpacker = gogoprotoany.AnyUnpacker + +// UnpackInterfaces is a convenience function that calls UnpackInterfaces +// on x if x implements UnpackInterfacesMessage +func UnpackInterfaces(x interface{}, unpacker gogoprotoany.AnyUnpacker) error { + if msg, ok := x.(gogoprotoany.UnpackInterfacesMessage); ok { + return msg.UnpackInterfaces(unpacker) + } + return nil } +var protoMessageType = reflect.TypeOf((*proto.Message)(nil)).Elem() + // InterfaceRegistry provides a mechanism for registering interfaces and // implementations that can be safely unpacked from Any type InterfaceRegistry interface { - AnyUnpacker + gogoprotoany.AnyUnpacker jsonpb.AnyResolver // RegisterInterface associates protoName as the public name for the @@ -107,7 +109,7 @@ type UnpackInterfacesMessage interface { // } // return nil // } - UnpackInterfaces(unpacker AnyUnpacker) error + UnpackInterfaces(unpacker gogoprotoany.AnyUnpacker) error } type interfaceRegistry struct { @@ -315,10 +317,10 @@ func (r statefulUnpacker) cloneForRecursion() *statefulUnpacker { // UnpackAny deserializes a protobuf Any message into the provided interface, ensuring the interface is a pointer. // It applies stateful constraints such as max depth and call limits, and unpacks interfaces if required. func (r *statefulUnpacker) UnpackAny(any *Any, iface interface{}) error { - if r.maxDepth == 0 { + if r.maxDepth <= 0 { return errors.New("max depth exceeded") } - if r.maxCalls.count == 0 { + if r.maxCalls.count <= 0 { return errors.New("call limit exceeded") } // here we gracefully handle the case in which `any` itself is `nil`, which may occur in message decoding @@ -335,12 +337,12 @@ func (r *statefulUnpacker) UnpackAny(any *Any, iface interface{}) error { rv := reflect.ValueOf(iface) if rv.Kind() != reflect.Ptr { - return fmt.Errorf("UnpackAny expects a pointer") + return errors.New("UnpackAny expects a pointer") } rt := rv.Elem().Type() - cachedValue := any.cachedValue + cachedValue := any.GetCachedValue() if cachedValue != nil { if reflect.TypeOf(cachedValue).AssignableTo(rt) { rv.Elem().Set(reflect.ValueOf(cachedValue)) @@ -358,11 +360,13 @@ func (r *statefulUnpacker) UnpackAny(any *Any, iface interface{}) error { return fmt.Errorf("no concrete type registered for type URL %s against interface %T", any.TypeUrl, iface) } - msg, ok := reflect.New(typ.Elem()).Interface().(proto.Message) - if !ok { - return fmt.Errorf("can't proto unmarshal %T", msg) + // Firstly check if the type implements proto.Message to avoid + // unnecessary invocations to reflect.New + if !typ.Implements(protoMessageType) { + return fmt.Errorf("can't proto unmarshal %T", typ) } + msg := reflect.New(typ.Elem()).Interface().(proto.Message) err := proto.Unmarshal(any.Value, msg) if err != nil { return err @@ -375,8 +379,12 @@ func (r *statefulUnpacker) UnpackAny(any *Any, iface interface{}) error { rv.Elem().Set(reflect.ValueOf(msg)) - any.cachedValue = msg + newAnyWithCache, err := NewAnyWithValue(msg) + if err != nil { + return err + } + *any = *newAnyWithCache return nil } @@ -403,15 +411,6 @@ func (registry *interfaceRegistry) SigningContext() *signing.Context { func (registry *interfaceRegistry) mustEmbedInterfaceRegistry() {} -// UnpackInterfaces is a convenience function that calls UnpackInterfaces -// on x if x implements UnpackInterfacesMessage -func UnpackInterfaces(x interface{}, unpacker AnyUnpacker) error { - if msg, ok := x.(UnpackInterfacesMessage); ok { - return msg.UnpackInterfaces(unpacker) - } - return nil -} - type failingAddressCodec struct{} func (f failingAddressCodec) StringToBytes(string) ([]byte, error) { diff --git a/codec/types/types_test.go b/codec/types/types_test.go deleted file mode 100644 index dddacfe18b..0000000000 --- a/codec/types/types_test.go +++ /dev/null @@ -1,182 +0,0 @@ -package types_test - -import ( - "strings" - "testing" - - "github.com/cosmos/gogoproto/jsonpb" - "github.com/cosmos/gogoproto/proto" - "github.com/stretchr/testify/require" - - "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/testutil/testdata" -) - -func TestAnyPackUnpack(t *testing.T) { - registry := testdata.NewTestInterfaceRegistry() - - spot := &testdata.Dog{Name: "Spot"} - var animal testdata.Animal - - // with cache - any, err := types.NewAnyWithValue(spot) - require.NoError(t, err) - require.Equal(t, spot, any.GetCachedValue()) - err = registry.UnpackAny(any, &animal) - require.NoError(t, err) - require.Equal(t, spot, animal) -} - -type TestI interface { - DoSomething() -} - -// A struct that has the same typeURL as testdata.Dog, but is actually another -// concrete type. -type FakeDog struct{} - -var ( - _ proto.Message = &FakeDog{} - _ testdata.Animal = &FakeDog{} -) - -// dummy implementation of proto.Message and testdata.Animal -func (dog FakeDog) Reset() {} -func (dog FakeDog) String() string { return "fakedog" } -func (dog FakeDog) ProtoMessage() {} -func (dog FakeDog) XXX_MessageName() string { return proto.MessageName(&testdata.Dog{}) } -func (dog FakeDog) Greet() string { return "fakedog" } - -func TestRegister(t *testing.T) { - registry := types.NewInterfaceRegistry() - registry.RegisterInterface("Animal", (*testdata.Animal)(nil)) - registry.RegisterInterface("TestI", (*TestI)(nil)) - - // Happy path. - require.NotPanics(t, func() { - registry.RegisterImplementations((*testdata.Animal)(nil), &testdata.Dog{}) - }) - - // testdata.Dog doesn't implement TestI - require.Panics(t, func() { - registry.RegisterImplementations((*TestI)(nil), &testdata.Dog{}) - }) - - // nil proto message - require.Panics(t, func() { - registry.RegisterImplementations((*TestI)(nil), nil) - }) - - // Not an interface. - require.Panics(t, func() { - registry.RegisterInterface("not_an_interface", (*testdata.Dog)(nil)) - }) - - // Duplicate registration with same concrete type. - require.NotPanics(t, func() { - registry.RegisterImplementations((*testdata.Animal)(nil), &testdata.Dog{}) - }) - - // Duplicate registration with different concrete type on same typeURL. - require.PanicsWithError( - t, - "concrete type *testdata.Dog has already been registered under typeURL /testpb.Dog, cannot register *types_test.FakeDog under same typeURL. "+ - "This usually means that there are conflicting modules registering different concrete types for a same interface implementation", - func() { - registry.RegisterImplementations((*testdata.Animal)(nil), &FakeDog{}) - }, - ) -} - -func TestUnpackInterfaces(t *testing.T) { - registry := testdata.NewTestInterfaceRegistry() - - spot := &testdata.Dog{Name: "Spot"} - any, err := types.NewAnyWithValue(spot) - require.NoError(t, err) - - hasAny := testdata.HasAnimal{ - Animal: any, - X: 1, - } - bz, err := hasAny.Marshal() - require.NoError(t, err) - - var hasAny2 testdata.HasAnimal - err = hasAny2.Unmarshal(bz) - require.NoError(t, err) - - err = types.UnpackInterfaces(hasAny2, registry) - require.NoError(t, err) - - require.Equal(t, spot, hasAny2.Animal.GetCachedValue()) -} - -func TestNested(t *testing.T) { - registry := testdata.NewTestInterfaceRegistry() - - spot := &testdata.Dog{Name: "Spot"} - any, err := types.NewAnyWithValue(spot) - require.NoError(t, err) - - ha := &testdata.HasAnimal{Animal: any} - any2, err := types.NewAnyWithValue(ha) - require.NoError(t, err) - - hha := &testdata.HasHasAnimal{HasAnimal: any2} - any3, err := types.NewAnyWithValue(hha) - require.NoError(t, err) - - hhha := testdata.HasHasHasAnimal{HasHasAnimal: any3} - - // marshal - bz, err := hhha.Marshal() - require.NoError(t, err) - - // unmarshal - var hhha2 testdata.HasHasHasAnimal - err = hhha2.Unmarshal(bz) - require.NoError(t, err) - err = types.UnpackInterfaces(hhha2, registry) - require.NoError(t, err) - - require.Equal(t, spot, hhha2.TheHasHasAnimal().TheHasAnimal().TheAnimal()) -} - -func TestAny_ProtoJSON(t *testing.T) { - spot := &testdata.Dog{Name: "Spot"} - any, err := types.NewAnyWithValue(spot) - require.NoError(t, err) - - jm := &jsonpb.Marshaler{} - json, err := jm.MarshalToString(any) - require.NoError(t, err) - require.Equal(t, "{\"@type\":\"/testpb.Dog\",\"name\":\"Spot\"}", json) - - registry := testdata.NewTestInterfaceRegistry() - jum := &jsonpb.Unmarshaler{} - var any2 types.Any - err = jum.Unmarshal(strings.NewReader(json), &any2) - require.NoError(t, err) - var animal testdata.Animal - err = registry.UnpackAny(&any2, &animal) - require.NoError(t, err) - require.Equal(t, spot, animal) - - ha := &testdata.HasAnimal{ - Animal: any, - } - err = ha.UnpackInterfaces(types.ProtoJSONPacker{JSONPBMarshaler: jm}) - require.NoError(t, err) - json, err = jm.MarshalToString(ha) - require.NoError(t, err) - require.Equal(t, "{\"animal\":{\"@type\":\"/testpb.Dog\",\"name\":\"Spot\"}}", json) - - require.NoError(t, err) - var ha2 testdata.HasAnimal - err = jum.Unmarshal(strings.NewReader(json), &ha2) - require.NoError(t, err) - err = ha2.UnpackInterfaces(registry) - require.NoError(t, err) - require.Equal(t, spot, ha2.Animal.GetCachedValue()) -} diff --git a/crypto/keyring/record.pb.go b/crypto/keyring/record.pb.go index 081b456bea..1af36b46c3 100644 --- a/crypto/keyring/record.pb.go +++ b/crypto/keyring/record.pb.go @@ -5,9 +5,9 @@ package keyring import ( fmt "fmt" - types "github.com/cosmos/cosmos-sdk/codec/types" hd "github.com/cosmos/cosmos-sdk/crypto/hd" _ "github.com/cosmos/gogoproto/gogoproto" + any "github.com/cosmos/gogoproto/types/any" proto "github.com/golang/protobuf/proto" io "io" math "math" @@ -30,7 +30,7 @@ type Record struct { // name represents a name of Record Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // pub_key represents a public key in any format - PubKey *types.Any `protobuf:"bytes,2,opt,name=pub_key,json=pubKey,proto3" json:"pub_key,omitempty"` + PubKey *any.Any `protobuf:"bytes,2,opt,name=pub_key,json=pubKey,proto3" json:"pub_key,omitempty"` // Record contains one of the following items // // Types that are valid to be assigned to Item: @@ -146,7 +146,7 @@ func (*Record) XXX_OneofWrappers() []interface{} { // Item is a keyring item stored in a keyring backend. // Local item type Record_Local struct { - PrivKey *types.Any `protobuf:"bytes,1,opt,name=priv_key,json=privKey,proto3" json:"priv_key,omitempty"` + PrivKey *any.Any `protobuf:"bytes,1,opt,name=priv_key,json=privKey,proto3" json:"priv_key,omitempty"` } func (m *Record_Local) Reset() { *m = Record_Local{} } @@ -807,7 +807,7 @@ func (m *Record) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.PubKey == nil { - m.PubKey = &types.Any{} + m.PubKey = &any.Any{} } if err := m.PubKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1033,7 +1033,7 @@ func (m *Record_Local) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.PrivKey == nil { - m.PrivKey = &types.Any{} + m.PrivKey = &any.Any{} } if err := m.PrivKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/crypto/keys/multisig/keys.pb.go b/crypto/keys/multisig/keys.pb.go index b181232634..b66ca1df3e 100644 --- a/crypto/keys/multisig/keys.pb.go +++ b/crypto/keys/multisig/keys.pb.go @@ -5,10 +5,10 @@ package multisig import ( fmt "fmt" - types "github.com/cosmos/cosmos-sdk/codec/types" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" + any "github.com/cosmos/gogoproto/types/any" io "io" math "math" math_bits "math/bits" @@ -29,8 +29,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // which nests multiple public keys and a threshold, // it uses legacy amino address rules. type LegacyAminoPubKey struct { - Threshold uint32 `protobuf:"varint,1,opt,name=threshold,proto3" json:"threshold,omitempty"` - PubKeys []*types.Any `protobuf:"bytes,2,rep,name=public_keys,json=publicKeys,proto3" json:"public_keys,omitempty"` + Threshold uint32 `protobuf:"varint,1,opt,name=threshold,proto3" json:"threshold,omitempty"` + PubKeys []*any.Any `protobuf:"bytes,2,rep,name=public_keys,json=publicKeys,proto3" json:"public_keys,omitempty"` } func (m *LegacyAminoPubKey) Reset() { *m = LegacyAminoPubKey{} } @@ -250,7 +250,7 @@ func (m *LegacyAminoPubKey) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.PubKeys = append(m.PubKeys, &types.Any{}) + m.PubKeys = append(m.PubKeys, &any.Any{}) if err := m.PubKeys[len(m.PubKeys)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/depinject/appconfig/v1alpha1/config.pb.go b/depinject/appconfig/v1alpha1/config.pb.go index af7197e220..838f6cf8fe 100644 --- a/depinject/appconfig/v1alpha1/config.pb.go +++ b/depinject/appconfig/v1alpha1/config.pb.go @@ -5,8 +5,8 @@ package v1alpha1 import ( fmt "fmt" - types "github.com/cosmos/cosmos-sdk/codec/types" proto "github.com/cosmos/gogoproto/proto" + any "github.com/cosmos/gogoproto/types/any" io "io" math "math" math_bits "math/bits" @@ -101,7 +101,7 @@ type ModuleConfig struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // config is the config object for the module. Module config messages should // define a ModuleDescriptor using the cosmos.app.v1alpha1.is_module extension. - Config *types.Any `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"` + Config *any.Any `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"` // golang_bindings specifies explicit interface to implementation type bindings which // depinject uses to resolve interface inputs to provider functions. The scope of this // field's configuration is module specific. @@ -148,7 +148,7 @@ func (m *ModuleConfig) GetName() string { return "" } -func (m *ModuleConfig) GetConfig() *types.Any { +func (m *ModuleConfig) GetConfig() *any.Any { if m != nil { return m.Config } @@ -681,7 +681,7 @@ func (m *ModuleConfig) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Config == nil { - m.Config = &types.Any{} + m.Config = &any.Any{} } if err := m.Config.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/depinject/go.mod b/depinject/go.mod index 4e4c48e2ab..7c3a8b89b5 100644 --- a/depinject/go.mod +++ b/depinject/go.mod @@ -4,7 +4,6 @@ go 1.23.0 require ( github.com/cosmos/cosmos-proto v1.0.0-beta.5 - github.com/cosmos/cosmos-sdk v0.53.0-rc.1 github.com/cosmos/gogoproto v1.7.0 github.com/stretchr/testify v1.10.0 google.golang.org/grpc v1.71.1 @@ -14,27 +13,18 @@ require ( ) require ( - cosmossdk.io/api v0.9.0 // indirect - cosmossdk.io/core v0.11.3 // indirect - cosmossdk.io/errors v1.0.2 // indirect - cosmossdk.io/x/tx v0.14.0-rc.1 // indirect - github.com/cometbft/cometbft v0.38.17 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/go-cmp v0.7.0 // indirect - github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect - github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect - github.com/pkg/errors v0.9.1 // indirect + github.com/kr/pretty v0.3.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/sasha-s/go-deadlock v0.3.5 // indirect + github.com/rogpeppe/go-internal v1.14.1 // indirect github.com/tendermint/go-amino v0.16.0 // indirect - golang.org/x/crypto v0.36.0 // indirect golang.org/x/net v0.38.0 // indirect golang.org/x/sys v0.31.0 // indirect golang.org/x/text v0.23.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/depinject/go.sum b/depinject/go.sum index c0d0ceda22..8cee97596d 100644 --- a/depinject/go.sum +++ b/depinject/go.sum @@ -1,185 +1,41 @@ -cosmossdk.io/api v0.9.0 h1:QYs9APeSlDNGbsBOBFjp3jXgGd4hnEPnnku3+W3tT4Y= -cosmossdk.io/api v0.9.0/go.mod h1:pLkU/NSqYHWxyN7XftVt8iD7oldKJzqMZgzeiOmT2nk= -cosmossdk.io/collections v0.4.0 h1:PFmwj2W8szgpD5nOd8GWH6AbYNi1f2J6akWXJ7P5t9s= -cosmossdk.io/collections v0.4.0/go.mod h1:oa5lUING2dP+gdDquow+QjlF45eL1t4TJDypgGd+tv0= -cosmossdk.io/core v0.11.3 h1:mei+MVDJOwIjIniaKelE3jPDqShCc/F4LkNNHh+4yfo= -cosmossdk.io/core v0.11.3/go.mod h1:9rL4RE1uDt5AJ4Tg55sYyHWXA16VmpHgbe0PbJc6N2Y= -cosmossdk.io/errors v1.0.2 h1:wcYiJz08HThbWxd/L4jObeLaLySopyyuUFB5w4AGpCo= -cosmossdk.io/errors v1.0.2/go.mod h1:0rjgiHkftRYPj//3DrD6y8hcm40HcPv/dR4R/4efr0k= -cosmossdk.io/log v1.5.1 h1:wLwiYXmfrort/O+j6EkjF+HvbdrRQd+4cYCPKFSm+zM= -cosmossdk.io/log v1.5.1/go.mod h1:5cXXBvfBkR2/BcXmosdCSLXllvgSjphrrDVdfVRmBGM= -cosmossdk.io/math v1.5.1 h1:c6zo52nBRlqOeSIIQrn/zbxwcNwhaLjTMRn6e4vD7uc= -cosmossdk.io/math v1.5.1/go.mod h1:ToembcWID/wR94cucsMD+2gq6xrlBBOfWcGwC7ZdwZA= -cosmossdk.io/store v1.1.2 h1:3HOZG8+CuThREKv6cn3WSohAc6yccxO3hLzwK6rBC7o= -cosmossdk.io/store v1.1.2/go.mod h1:60rAGzTHevGm592kFhiUVkNC9w7gooSEn5iUBPzHQ6A= -cosmossdk.io/x/tx v0.14.0-rc.1 h1:EEYTknUALt7PEK7b3Q8RVDQ2vDA5A+DGFlEvVcUWjqA= -cosmossdk.io/x/tx v0.14.0-rc.1/go.mod h1:MKYHaI9c1PVM3Qns4c/7PfdbO4OaGvtaP9BmAbv8APo= -github.com/DataDog/zstd v1.5.6 h1:LbEglqepa/ipmmQJUDnSsfvA8e8IStVcGaFWDuxvGOY= -github.com/DataDog/zstd v1.5.6/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= -github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= -github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/btcsuite/btcd/btcutil v1.1.6 h1:zFL2+c3Lb9gEgqKNzowKUPQNb8jV7v5Oaodi/AYFd6c= -github.com/btcsuite/btcd/btcutil v1.1.6/go.mod h1:9dFymx8HpuLqBnsPELrImQeTQfKBQqzqGbbV3jK55aE= -github.com/bytedance/sonic v1.13.1 h1:Jyd5CIvdFnkOWuKXr+wm4Nyk2h0yAFsr8ucJgEasO3g= -github.com/bytedance/sonic v1.13.1/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4= -github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY= -github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= -github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= -github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4= -github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= -github.com/cockroachdb/apd/v3 v3.2.1 h1:U+8j7t0axsIgvQUqthuNm82HIrYXodOV2iWLWtEaIwg= -github.com/cockroachdb/apd/v3 v3.2.1/go.mod h1:klXJcjp+FffLTHlhIG69tezTDvdP065naDsHzKhYSqc= -github.com/cockroachdb/errors v1.11.3 h1:5bA+k2Y6r+oz/6Z/RFlNeVCesGARKuC6YymtcDrbC/I= -github.com/cockroachdb/errors v1.11.3/go.mod h1:m4UIW4CDjx+R5cybPsNrRbreomiFqt8o1h1wUVazSd8= -github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce h1:giXvy4KSc/6g/esnpM7Geqxka4WSqI1SZc7sMJFd3y4= -github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce/go.mod h1:9/y3cnZ5GKakj/H4y9r9GTjCvAFta7KLgSHPJJYc52M= -github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= -github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v1.1.2 h1:CUh2IPtR4swHlEj48Rhfzw6l/d0qA31fItcIszQVIsA= -github.com/cockroachdb/pebble v1.1.2/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU= -github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= -github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= -github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= -github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= -github.com/cometbft/cometbft v0.38.17 h1:FkrQNbAjiFqXydeAO81FUzriL4Bz0abYxN/eOHrQGOk= -github.com/cometbft/cometbft v0.38.17/go.mod h1:5l0SkgeLRXi6bBfQuevXjKqML1jjfJJlvI1Ulp02/o4= -github.com/cometbft/cometbft-db v0.14.1 h1:SxoamPghqICBAIcGpleHbmoPqy+crij/++eZz3DlerQ= -github.com/cometbft/cometbft-db v0.14.1/go.mod h1:KHP1YghilyGV/xjD5DP3+2hyigWx0WTp9X+0Gnx0RxQ= -github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= -github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= -github.com/cosmos/cosmos-db v1.1.1 h1:FezFSU37AlBC8S98NlSagL76oqBRWq/prTPvFcEJNCM= -github.com/cosmos/cosmos-db v1.1.1/go.mod h1:AghjcIPqdhSLP/2Z0yha5xPH3nLnskz81pBx3tcVSAw= github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA= github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec= -github.com/cosmos/cosmos-sdk v0.53.0-rc.1 h1:unAOo/WSUbbm8kD4q17vP+lvgL3OMJN0d7IkTah8a+o= -github.com/cosmos/cosmos-sdk v0.53.0-rc.1/go.mod h1:5atb8PhhFQ/JwwNOo/BEtczPFqdh3CcCwl/nDzQtjIE= github.com/cosmos/gogoproto v1.7.0 h1:79USr0oyXAbxg3rspGh/m4SWNyoz/GLaAh0QlCe2fro= github.com/cosmos/gogoproto v1.7.0/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0= -github.com/cosmos/ics23/go v0.11.0 h1:jk5skjT0TqX5e5QJbEnwXIS2yI2vnmLOgpQPeM5RtnU= -github.com/cosmos/ics23/go v0.11.0/go.mod h1:A8OjxPE67hHST4Icw94hOxxFEJMBG031xIGF/JHNIY0= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/decred/dcrd/crypto/blake256 v1.1.0 h1:zPMNGQCm0g4QTY27fOCorQW7EryeQ/U0x++OzVrdms8= -github.com/decred/dcrd/crypto/blake256 v1.1.0/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvwDRwnI3hwNaAHRnc= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= -github.com/dgraph-io/badger/v4 v4.2.0 h1:kJrlajbXXL9DFTNuhhu9yCx7JJa4qpYWxtE8BzuWsEs= -github.com/dgraph-io/badger/v4 v4.2.0/go.mod h1:qfCqhPoWDFJRx1gp5QwwyGo8xk1lbHUxvK9nK0OGAak= -github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8= -github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= -github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= -github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -github.com/getsentry/sentry-go v0.27.0 h1:Pv98CIbtB3LkMWmXi4Joa5OOcwbmnX88sF5qbK3r3Ps= -github.com/getsentry/sentry-go v0.27.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= -github.com/go-kit/kit v0.13.0 h1:OoneCcHKHQ03LfBpoQCUfCluwd2Vt3ohz+kvbJneZAU= -github.com/go-kit/kit v0.13.0/go.mod h1:phqEHMMUbyrCFCTgH48JueqrM3md2HcAZ8N3XE4FKDg= -github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= -github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= -github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= -github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/glog v1.2.4 h1:CNNw5U8lSiiBk7druxtSHHTsRWcxKoac6kZKm2peBBc= -github.com/golang/glog v1.2.4/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= -github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= -github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= -github.com/google/flatbuffers v1.12.1 h1:MVlul7pQNoDzWRLTw5imwYsl+usrS1TXG2H4jg6ImGw= -github.com/google/flatbuffers v1.12.1/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= 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/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= -github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-metrics v0.5.4 h1:8mmPiIJkTPPEbAiV97IxdAGNdRdaWwVap1BU6elejKY= -github.com/hashicorp/go-metrics v0.5.4/go.mod h1:CG5yz4NZ/AI/aQt9Ucm/vdBnbh7fvmv4lxZ350i+QQI= -github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= -github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= -github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= -github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= -github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= -github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U= -github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ= -github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= -github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= -github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE= -github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= 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= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/linxGnu/grocksdb v1.8.14 h1:HTgyYalNwBSG/1qCQUIott44wU5b2Y9Kr3z7SK5OfGQ= -github.com/linxGnu/grocksdb v1.8.14/go.mod h1:QYiYypR2d4v63Wj1adOOfzglnoII0gLj3PNh4fZkcFA= -github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= -github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= -github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= -github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= -github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a h1:dlRvE5fWabOchtH7znfiFCcOvmIYgOeAS5ifBXBlh9Q= -github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a/go.mod h1:hVoHR2EVESiICEMbg137etN/Lx+lSrHPTD39Z/uE+2s= -github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 h1:Dx7Ovyv/SFnMFw3fD4oEoeorXc6saIiQ23LrGLth0Gw= -github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk= -github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg= -github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= -github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA98k= -github.com/prometheus/common v0.63.0/go.mod h1:VVFF/fBIoToEnWRVkYoXEkq3R3paCoxG9PXP74SnV18= -github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= -github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= -github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY= -github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ= -github.com/sasha-s/go-deadlock v0.3.5 h1:tNCOEEDG6tBqrNDOX35j/7hL5FcFViG6awUGROb2NsU= -github.com/sasha-s/go-deadlock v0.3.5/go.mod h1:bugP6EGbdGYObIlx7pUZtWqlvo8k9H6vCBBsiChJQ5U= -github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y= -github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= -github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo= -github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0= -github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= -github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= 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.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs= -github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= -github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= -go.etcd.io/bbolt v1.4.0-alpha.0.0.20240404170359-43604f3112c5 h1:qxen9oVGzDdIRP6ejyAJc760RwW4SnVDiTYTzwnXuxo= -go.etcd.io/bbolt v1.4.0-alpha.0.0.20240404170359-43604f3112c5/go.mod h1:eW0HG9/oHQhvRCvb1/pIXW4cOvtDqeQK+XSi3TnwaXY= -go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= -go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -golang.org/x/arch v0.15.0 h1:QtOrQd0bTUnhNVNndMpLHNWrDmYzZ2KDqSrEymqInZw= -golang.org/x/arch v0.15.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE= -golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= -golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= -golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw= -golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= @@ -190,10 +46,6 @@ golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 h1:ToEetK57OidYuqD4Q5w+vfEnPvPpuTwedCNVohYJfNk= -google.golang.org/genproto v0.0.0-20241118233622-e639e219e697/go.mod h1:JJrvXBWRZaFMxBufik1a4RpFw4HhgVtBBWQeQgUj2cc= -google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 h1:hE3bRWtU6uceqlh4fhrSnUyjKHMKB9KrTLLG+bc0ddM= -google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463/go.mod h1:U90ffi8eUL9MwPcrJylN5+Mk2v3vuPDptd5yyNUiRR8= google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 h1:e0AIkUUhxyBKh6ssZNrAMeqhA7RKUj42346d1y02i2g= google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= @@ -207,7 +59,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q= gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA= -pgregory.net/rapid v1.2.0 h1:keKAYRcjm+e1F0oAuU5F5+YPAWcyxNNRK2wud503Gnk= -pgregory.net/rapid v1.2.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/proto/buf.gen.gogo.yaml b/proto/buf.gen.gogo.yaml index 9c8ba0a4b1..db36231d0c 100644 --- a/proto/buf.gen.gogo.yaml +++ b/proto/buf.gen.gogo.yaml @@ -2,7 +2,7 @@ version: v1 plugins: - name: gocosmos out: .. - opt: plugins=grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types + opt: plugins=grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/gogoproto/types/any - name: grpc-gateway out: .. opt: logtostderr=true,allow_colon_final_segments=true diff --git a/types/abci.pb.go b/types/abci.pb.go index 4c6d690fd8..a583754498 100644 --- a/types/abci.pb.go +++ b/types/abci.pb.go @@ -5,12 +5,12 @@ package types import ( fmt "fmt" - types1 "github.com/cometbft/cometbft/abci/types" - types2 "github.com/cometbft/cometbft/proto/tendermint/types" + types "github.com/cometbft/cometbft/abci/types" + types1 "github.com/cometbft/cometbft/proto/tendermint/types" _ "github.com/cosmos/cosmos-proto" - types "github.com/cosmos/cosmos-sdk/codec/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" + any "github.com/cosmos/gogoproto/types/any" io "io" math "math" math_bits "math/bits" @@ -54,7 +54,7 @@ type TxResponse struct { // Amount of gas consumed by transaction. GasUsed int64 `protobuf:"varint,10,opt,name=gas_used,json=gasUsed,proto3" json:"gas_used,omitempty"` // The request transaction bytes. - Tx *types.Any `protobuf:"bytes,11,opt,name=tx,proto3" json:"tx,omitempty"` + Tx *any.Any `protobuf:"bytes,11,opt,name=tx,proto3" json:"tx,omitempty"` // Time of the previous block. For heights > 1, it's the weighted median of // the timestamps of the valid votes in the block.LastCommit. For height == 1, // it's genesis time. @@ -63,7 +63,7 @@ type TxResponse struct { // these events include those emitted by processing all the messages and those // emitted from the ante. Whereas Logs contains the events, with // additional metadata, emitted only by processing the messages. - Events []types1.Event `protobuf:"bytes,13,rep,name=events,proto3" json:"events"` + Events []types.Event `protobuf:"bytes,13,rep,name=events,proto3" json:"events"` } func (m *TxResponse) Reset() { *m = TxResponse{} } @@ -331,9 +331,9 @@ type Result struct { Log string `protobuf:"bytes,2,opt,name=log,proto3" json:"log,omitempty"` // Events contains a slice of Event objects that were emitted during message // or handler execution. - Events []types1.Event `protobuf:"bytes,3,rep,name=events,proto3" json:"events"` + Events []types.Event `protobuf:"bytes,3,rep,name=events,proto3" json:"events"` // msg_responses contains the Msg handler responses type packed in Anys. - MsgResponses []*types.Any `protobuf:"bytes,4,rep,name=msg_responses,json=msgResponses,proto3" json:"msg_responses,omitempty"` + MsgResponses []*any.Any `protobuf:"bytes,4,rep,name=msg_responses,json=msgResponses,proto3" json:"msg_responses,omitempty"` } func (m *Result) Reset() { *m = Result{} } @@ -475,7 +475,7 @@ type TxMsgData struct { // data field is deprecated and not populated. Data []*MsgData `protobuf:"bytes,1,rep,name=data,proto3" json:"data,omitempty"` // Deprecated: Do not use. // msg_responses contains the Msg handler responses packed into Anys. - MsgResponses []*types.Any `protobuf:"bytes,2,rep,name=msg_responses,json=msgResponses,proto3" json:"msg_responses,omitempty"` + MsgResponses []*any.Any `protobuf:"bytes,2,rep,name=msg_responses,json=msgResponses,proto3" json:"msg_responses,omitempty"` } func (m *TxMsgData) Reset() { *m = TxMsgData{} } @@ -518,7 +518,7 @@ func (m *TxMsgData) GetData() []*MsgData { return nil } -func (m *TxMsgData) GetMsgResponses() []*types.Any { +func (m *TxMsgData) GetMsgResponses() []*any.Any { if m != nil { return m.MsgResponses } @@ -628,7 +628,7 @@ type SearchBlocksResult struct { // Max count blocks per page Limit int64 `protobuf:"varint,5,opt,name=limit,proto3" json:"limit,omitempty"` // List of blocks in current page - Blocks []*types2.Block `protobuf:"bytes,6,rep,name=blocks,proto3" json:"blocks,omitempty"` + Blocks []*types1.Block `protobuf:"bytes,6,rep,name=blocks,proto3" json:"blocks,omitempty"` } func (m *SearchBlocksResult) Reset() { *m = SearchBlocksResult{} } @@ -698,7 +698,7 @@ func (m *SearchBlocksResult) GetLimit() int64 { return 0 } -func (m *SearchBlocksResult) GetBlocks() []*types2.Block { +func (m *SearchBlocksResult) GetBlocks() []*types1.Block { if m != nil { return m.Blocks } @@ -1748,7 +1748,7 @@ func (this *TxMsgData) String() string { repeatedStringForData += "}" repeatedStringForMsgResponses := "[]*Any{" for _, f := range this.MsgResponses { - repeatedStringForMsgResponses += strings.Replace(fmt.Sprintf("%v", f), "Any", "types.Any", 1) + "," + repeatedStringForMsgResponses += strings.Replace(fmt.Sprintf("%v", f), "Any", "any.Any", 1) + "," } repeatedStringForMsgResponses += "}" s := strings.Join([]string{`&TxMsgData{`, @@ -1784,7 +1784,7 @@ func (this *SearchBlocksResult) String() string { } repeatedStringForBlocks := "[]*Block{" for _, f := range this.Blocks { - repeatedStringForBlocks += strings.Replace(fmt.Sprintf("%v", f), "Block", "types2.Block", 1) + "," + repeatedStringForBlocks += strings.Replace(fmt.Sprintf("%v", f), "Block", "types1.Block", 1) + "," } repeatedStringForBlocks += "}" s := strings.Join([]string{`&SearchBlocksResult{`, @@ -2135,7 +2135,7 @@ func (m *TxResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Tx == nil { - m.Tx = &types.Any{} + m.Tx = &any.Any{} } if err := m.Tx.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -2202,7 +2202,7 @@ func (m *TxResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Events = append(m.Events, types1.Event{}) + m.Events = append(m.Events, types.Event{}) if err := m.Events[len(m.Events)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2805,7 +2805,7 @@ func (m *Result) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Events = append(m.Events, types1.Event{}) + m.Events = append(m.Events, types.Event{}) if err := m.Events[len(m.Events)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2839,7 +2839,7 @@ func (m *Result) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.MsgResponses = append(m.MsgResponses, &types.Any{}) + m.MsgResponses = append(m.MsgResponses, &any.Any{}) if err := m.MsgResponses[len(m.MsgResponses)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3192,7 +3192,7 @@ func (m *TxMsgData) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.MsgResponses = append(m.MsgResponses, &types.Any{}) + m.MsgResponses = append(m.MsgResponses, &any.Any{}) if err := m.MsgResponses[len(m.MsgResponses)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3550,7 +3550,7 @@ func (m *SearchBlocksResult) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Blocks = append(m.Blocks, &types2.Block{}) + m.Blocks = append(m.Blocks, &types1.Block{}) if err := m.Blocks[len(m.Blocks)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/types/tx/signing/signing.pb.go b/types/tx/signing/signing.pb.go index 6266b113ec..49309d311d 100644 --- a/types/tx/signing/signing.pb.go +++ b/types/tx/signing/signing.pb.go @@ -5,9 +5,9 @@ package signing import ( fmt "fmt" - types "github.com/cosmos/cosmos-sdk/codec/types" - types1 "github.com/cosmos/cosmos-sdk/crypto/types" + types "github.com/cosmos/cosmos-sdk/crypto/types" proto "github.com/cosmos/gogoproto/proto" + any "github.com/cosmos/gogoproto/types/any" io "io" math "math" math_bits "math/bits" @@ -147,7 +147,7 @@ func (m *SignatureDescriptors) GetSignatures() []*SignatureDescriptor { // clients. type SignatureDescriptor struct { // public_key is the public key of the signer - PublicKey *types.Any `protobuf:"bytes,1,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` + PublicKey *any.Any `protobuf:"bytes,1,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` Data *SignatureDescriptor_Data `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` // sequence is the sequence of the account, which describes the // number of committed transactions signed by a given address. It is used to prevent @@ -188,7 +188,7 @@ func (m *SignatureDescriptor) XXX_DiscardUnknown() { var xxx_messageInfo_SignatureDescriptor proto.InternalMessageInfo -func (m *SignatureDescriptor) GetPublicKey() *types.Any { +func (m *SignatureDescriptor) GetPublicKey() *any.Any { if m != nil { return m.PublicKey } @@ -356,7 +356,7 @@ func (m *SignatureDescriptor_Data_Single) GetSignature() []byte { // Multi is the signature data for a multisig public key type SignatureDescriptor_Data_Multi struct { // bitarray specifies which keys within the multisig are signing - Bitarray *types1.CompactBitArray `protobuf:"bytes,1,opt,name=bitarray,proto3" json:"bitarray,omitempty"` + Bitarray *types.CompactBitArray `protobuf:"bytes,1,opt,name=bitarray,proto3" json:"bitarray,omitempty"` // signatures is the signatures of the multi-signature Signatures []*SignatureDescriptor_Data `protobuf:"bytes,2,rep,name=signatures,proto3" json:"signatures,omitempty"` } @@ -394,7 +394,7 @@ func (m *SignatureDescriptor_Data_Multi) XXX_DiscardUnknown() { var xxx_messageInfo_SignatureDescriptor_Data_Multi proto.InternalMessageInfo -func (m *SignatureDescriptor_Data_Multi) GetBitarray() *types1.CompactBitArray { +func (m *SignatureDescriptor_Data_Multi) GetBitarray() *types.CompactBitArray { if m != nil { return m.Bitarray } @@ -974,7 +974,7 @@ func (m *SignatureDescriptor) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.PublicKey == nil { - m.PublicKey = &types.Any{} + m.PublicKey = &any.Any{} } if err := m.PublicKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1338,7 +1338,7 @@ func (m *SignatureDescriptor_Data_Multi) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Bitarray == nil { - m.Bitarray = &types1.CompactBitArray{} + m.Bitarray = &types.CompactBitArray{} } if err := m.Bitarray.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/types/tx/tx.pb.go b/types/tx/tx.pb.go index 29c7b8b363..18f5074030 100644 --- a/types/tx/tx.pb.go +++ b/types/tx/tx.pb.go @@ -6,15 +6,15 @@ package tx import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" - types "github.com/cosmos/cosmos-sdk/codec/types" - types1 "github.com/cosmos/cosmos-sdk/crypto/types" + types "github.com/cosmos/cosmos-sdk/crypto/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - types2 "github.com/cosmos/cosmos-sdk/types" + types1 "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" signing "github.com/cosmos/cosmos-sdk/types/tx/signing" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + any "github.com/cosmos/gogoproto/types/any" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" @@ -257,7 +257,7 @@ type SignDocDirectAux struct { // representation in TxRaw. BodyBytes []byte `protobuf:"bytes,1,opt,name=body_bytes,json=bodyBytes,proto3" json:"body_bytes,omitempty"` // public_key is the public key of the signing account. - PublicKey *types.Any `protobuf:"bytes,2,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` + PublicKey *any.Any `protobuf:"bytes,2,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` // chain_id is the identifier of the chain this transaction targets. // It prevents signed transactions from being used on another chain by an // attacker. @@ -310,7 +310,7 @@ func (m *SignDocDirectAux) GetBodyBytes() []byte { return nil } -func (m *SignDocDirectAux) GetPublicKey() *types.Any { +func (m *SignDocDirectAux) GetPublicKey() *any.Any { if m != nil { return m.PublicKey } @@ -355,7 +355,7 @@ type TxBody struct { // By convention, the first required signer (usually from the first message) // is referred to as the primary signer and pays the fee for the whole // transaction. - Messages []*types.Any `protobuf:"bytes,1,rep,name=messages,proto3" json:"messages,omitempty"` + Messages []*any.Any `protobuf:"bytes,1,rep,name=messages,proto3" json:"messages,omitempty"` // memo is any arbitrary note/comment to be added to the transaction. // WARNING: in clients, any publicly exposed text should not be called memo, // but should be called `note` instead (see @@ -384,11 +384,11 @@ type TxBody struct { // extension_options are arbitrary options that can be added by chains // when the default options are not sufficient. If any of these are present // and can't be handled, the transaction will be rejected - ExtensionOptions []*types.Any `protobuf:"bytes,1023,rep,name=extension_options,json=extensionOptions,proto3" json:"extension_options,omitempty"` + ExtensionOptions []*any.Any `protobuf:"bytes,1023,rep,name=extension_options,json=extensionOptions,proto3" json:"extension_options,omitempty"` // extension_options are arbitrary options that can be added by chains // when the default options are not sufficient. If any of these are present // and can't be handled, they will be ignored - NonCriticalExtensionOptions []*types.Any `protobuf:"bytes,2047,rep,name=non_critical_extension_options,json=nonCriticalExtensionOptions,proto3" json:"non_critical_extension_options,omitempty"` + NonCriticalExtensionOptions []*any.Any `protobuf:"bytes,2047,rep,name=non_critical_extension_options,json=nonCriticalExtensionOptions,proto3" json:"non_critical_extension_options,omitempty"` } func (m *TxBody) Reset() { *m = TxBody{} } @@ -424,7 +424,7 @@ func (m *TxBody) XXX_DiscardUnknown() { var xxx_messageInfo_TxBody proto.InternalMessageInfo -func (m *TxBody) GetMessages() []*types.Any { +func (m *TxBody) GetMessages() []*any.Any { if m != nil { return m.Messages } @@ -459,14 +459,14 @@ func (m *TxBody) GetTimeoutTimestamp() *time.Time { return nil } -func (m *TxBody) GetExtensionOptions() []*types.Any { +func (m *TxBody) GetExtensionOptions() []*any.Any { if m != nil { return m.ExtensionOptions } return nil } -func (m *TxBody) GetNonCriticalExtensionOptions() []*types.Any { +func (m *TxBody) GetNonCriticalExtensionOptions() []*any.Any { if m != nil { return m.NonCriticalExtensionOptions } @@ -554,7 +554,7 @@ type SignerInfo struct { // public_key is the public key of the signer. It is optional for accounts // that already exist in state. If unset, the verifier can use the required \ // signer address for this position and lookup the public key. - PublicKey *types.Any `protobuf:"bytes,1,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` + PublicKey *any.Any `protobuf:"bytes,1,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` // mode_info describes the signing mode of the signer and is a nested // structure to support nested multisig pubkey's ModeInfo *ModeInfo `protobuf:"bytes,2,opt,name=mode_info,json=modeInfo,proto3" json:"mode_info,omitempty"` @@ -597,7 +597,7 @@ func (m *SignerInfo) XXX_DiscardUnknown() { var xxx_messageInfo_SignerInfo proto.InternalMessageInfo -func (m *SignerInfo) GetPublicKey() *types.Any { +func (m *SignerInfo) GetPublicKey() *any.Any { if m != nil { return m.PublicKey } @@ -759,7 +759,7 @@ func (m *ModeInfo_Single) GetMode() signing.SignMode { // Multi is the mode info for a multisig public key type ModeInfo_Multi struct { // bitarray specifies which keys within the multisig are signing - Bitarray *types1.CompactBitArray `protobuf:"bytes,1,opt,name=bitarray,proto3" json:"bitarray,omitempty"` + Bitarray *types.CompactBitArray `protobuf:"bytes,1,opt,name=bitarray,proto3" json:"bitarray,omitempty"` // mode_infos is the corresponding modes of the signers of the multisig // which could include nested multisig public keys ModeInfos []*ModeInfo `protobuf:"bytes,2,rep,name=mode_infos,json=modeInfos,proto3" json:"mode_infos,omitempty"` @@ -798,7 +798,7 @@ func (m *ModeInfo_Multi) XXX_DiscardUnknown() { var xxx_messageInfo_ModeInfo_Multi proto.InternalMessageInfo -func (m *ModeInfo_Multi) GetBitarray() *types1.CompactBitArray { +func (m *ModeInfo_Multi) GetBitarray() *types.CompactBitArray { if m != nil { return m.Bitarray } @@ -2771,7 +2771,7 @@ func (m *SignDocDirectAux) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.PublicKey == nil { - m.PublicKey = &types.Any{} + m.PublicKey = &any.Any{} } if err := m.PublicKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -2962,7 +2962,7 @@ func (m *TxBody) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Messages = append(m.Messages, &types.Any{}) + m.Messages = append(m.Messages, &any.Any{}) if err := m.Messages[len(m.Messages)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3103,7 +3103,7 @@ func (m *TxBody) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ExtensionOptions = append(m.ExtensionOptions, &types.Any{}) + m.ExtensionOptions = append(m.ExtensionOptions, &any.Any{}) if err := m.ExtensionOptions[len(m.ExtensionOptions)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3137,7 +3137,7 @@ func (m *TxBody) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.NonCriticalExtensionOptions = append(m.NonCriticalExtensionOptions, &types.Any{}) + m.NonCriticalExtensionOptions = append(m.NonCriticalExtensionOptions, &any.Any{}) if err := m.NonCriticalExtensionOptions[len(m.NonCriticalExtensionOptions)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3378,7 +3378,7 @@ func (m *SignerInfo) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.PublicKey == nil { - m.PublicKey = &types.Any{} + m.PublicKey = &any.Any{} } if err := m.PublicKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -3708,7 +3708,7 @@ func (m *ModeInfo_Multi) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Bitarray == nil { - m.Bitarray = &types1.CompactBitArray{} + m.Bitarray = &types.CompactBitArray{} } if err := m.Bitarray.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -3827,7 +3827,7 @@ func (m *Fee) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Amount = append(m.Amount, types2.Coin{}) + m.Amount = append(m.Amount, types1.Coin{}) if err := m.Amount[len(m.Amount)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3994,7 +3994,7 @@ func (m *Tip) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Amount = append(m.Amount, types2.Coin{}) + m.Amount = append(m.Amount, types1.Coin{}) if err := m.Amount[len(m.Amount)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/auth/types/auth.pb.go b/x/auth/types/auth.pb.go index 2098006a78..d1802682a1 100644 --- a/x/auth/types/auth.pb.go +++ b/x/auth/types/auth.pb.go @@ -6,10 +6,10 @@ package types import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" - types "github.com/cosmos/cosmos-sdk/codec/types" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" + any "github.com/cosmos/gogoproto/types/any" io "io" math "math" math_bits "math/bits" @@ -30,10 +30,10 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // for basic account functionality. Any custom account type should extend this // type for additional functionality (e.g. vesting). type BaseAccount struct { - Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - PubKey *types.Any `protobuf:"bytes,2,opt,name=pub_key,json=pubKey,proto3" json:"public_key,omitempty"` - AccountNumber uint64 `protobuf:"varint,3,opt,name=account_number,json=accountNumber,proto3" json:"account_number,omitempty"` - Sequence uint64 `protobuf:"varint,4,opt,name=sequence,proto3" json:"sequence,omitempty"` + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + PubKey *any.Any `protobuf:"bytes,2,opt,name=pub_key,json=pubKey,proto3" json:"public_key,omitempty"` + AccountNumber uint64 `protobuf:"varint,3,opt,name=account_number,json=accountNumber,proto3" json:"account_number,omitempty"` + Sequence uint64 `protobuf:"varint,4,opt,name=sequence,proto3" json:"sequence,omitempty"` } func (m *BaseAccount) Reset() { *m = BaseAccount{} } @@ -725,7 +725,7 @@ func (m *BaseAccount) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.PubKey == nil { - m.PubKey = &types.Any{} + m.PubKey = &any.Any{} } if err := m.PubKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/x/auth/types/genesis.pb.go b/x/auth/types/genesis.pb.go index 6ebdec9814..533149395e 100644 --- a/x/auth/types/genesis.pb.go +++ b/x/auth/types/genesis.pb.go @@ -5,10 +5,10 @@ package types import ( fmt "fmt" - types "github.com/cosmos/cosmos-sdk/codec/types" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" + any "github.com/cosmos/gogoproto/types/any" io "io" math "math" math_bits "math/bits" @@ -30,7 +30,7 @@ type GenesisState struct { // params defines all the parameters of the module. Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` // accounts are the accounts present at genesis. - Accounts []*types.Any `protobuf:"bytes,2,rep,name=accounts,proto3" json:"accounts,omitempty"` + Accounts []*any.Any `protobuf:"bytes,2,rep,name=accounts,proto3" json:"accounts,omitempty"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -73,7 +73,7 @@ func (m *GenesisState) GetParams() Params { return Params{} } -func (m *GenesisState) GetAccounts() []*types.Any { +func (m *GenesisState) GetAccounts() []*any.Any { if m != nil { return m.Accounts } @@ -279,7 +279,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Accounts = append(m.Accounts, &types.Any{}) + m.Accounts = append(m.Accounts, &any.Any{}) if err := m.Accounts[len(m.Accounts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/auth/types/query.pb.go b/x/auth/types/query.pb.go index fd4fa2c0c9..62343caebb 100644 --- a/x/auth/types/query.pb.go +++ b/x/auth/types/query.pb.go @@ -7,11 +7,11 @@ import ( context "context" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - types "github.com/cosmos/cosmos-sdk/codec/types" query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" + any "github.com/cosmos/gogoproto/types/any" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -81,7 +81,7 @@ func (m *QueryAccountsRequest) GetPagination() *query.PageRequest { // QueryAccountsResponse is the response type for the Query/Accounts RPC method. type QueryAccountsResponse struct { // accounts are the existing accounts - Accounts []*types.Any `protobuf:"bytes,1,rep,name=accounts,proto3" json:"accounts,omitempty"` + Accounts []*any.Any `protobuf:"bytes,1,rep,name=accounts,proto3" json:"accounts,omitempty"` // pagination defines the pagination in the response. Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -119,7 +119,7 @@ func (m *QueryAccountsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryAccountsResponse proto.InternalMessageInfo -func (m *QueryAccountsResponse) GetAccounts() []*types.Any { +func (m *QueryAccountsResponse) GetAccounts() []*any.Any { if m != nil { return m.Accounts } @@ -175,7 +175,7 @@ var xxx_messageInfo_QueryAccountRequest proto.InternalMessageInfo // QueryAccountResponse is the response type for the Query/Account RPC method. type QueryAccountResponse struct { // account defines the account of the corresponding address. - Account *types.Any `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"` + Account *any.Any `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"` } func (m *QueryAccountResponse) Reset() { *m = QueryAccountResponse{} } @@ -211,7 +211,7 @@ func (m *QueryAccountResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryAccountResponse proto.InternalMessageInfo -func (m *QueryAccountResponse) GetAccount() *types.Any { +func (m *QueryAccountResponse) GetAccount() *any.Any { if m != nil { return m.Account } @@ -340,7 +340,7 @@ var xxx_messageInfo_QueryModuleAccountsRequest proto.InternalMessageInfo // QueryModuleAccountsResponse is the response type for the Query/ModuleAccounts RPC method. type QueryModuleAccountsResponse struct { - Accounts []*types.Any `protobuf:"bytes,1,rep,name=accounts,proto3" json:"accounts,omitempty"` + Accounts []*any.Any `protobuf:"bytes,1,rep,name=accounts,proto3" json:"accounts,omitempty"` } func (m *QueryModuleAccountsResponse) Reset() { *m = QueryModuleAccountsResponse{} } @@ -376,7 +376,7 @@ func (m *QueryModuleAccountsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryModuleAccountsResponse proto.InternalMessageInfo -func (m *QueryModuleAccountsResponse) GetAccounts() []*types.Any { +func (m *QueryModuleAccountsResponse) GetAccounts() []*any.Any { if m != nil { return m.Accounts } @@ -430,7 +430,7 @@ func (m *QueryModuleAccountByNameRequest) GetName() string { // QueryModuleAccountByNameResponse is the response type for the Query/ModuleAccountByName RPC method. type QueryModuleAccountByNameResponse struct { - Account *types.Any `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"` + Account *any.Any `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"` } func (m *QueryModuleAccountByNameResponse) Reset() { *m = QueryModuleAccountByNameResponse{} } @@ -466,7 +466,7 @@ func (m *QueryModuleAccountByNameResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryModuleAccountByNameResponse proto.InternalMessageInfo -func (m *QueryModuleAccountByNameResponse) GetAccount() *types.Any { +func (m *QueryModuleAccountByNameResponse) GetAccount() *any.Any { if m != nil { return m.Account } @@ -2512,7 +2512,7 @@ func (m *QueryAccountsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Accounts = append(m.Accounts, &types.Any{}) + m.Accounts = append(m.Accounts, &any.Any{}) if err := m.Accounts[len(m.Accounts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2715,7 +2715,7 @@ func (m *QueryAccountResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Account == nil { - m.Account = &types.Any{} + m.Account = &any.Any{} } if err := m.Account.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -2983,7 +2983,7 @@ func (m *QueryModuleAccountsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Accounts = append(m.Accounts, &types.Any{}) + m.Accounts = append(m.Accounts, &any.Any{}) if err := m.Accounts[len(m.Accounts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3150,7 +3150,7 @@ func (m *QueryModuleAccountByNameResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Account == nil { - m.Account = &types.Any{} + m.Account = &any.Any{} } if err := m.Account.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/x/authz/authz.pb.go b/x/authz/authz.pb.go index 2b5bf359cb..db7174b1c5 100644 --- a/x/authz/authz.pb.go +++ b/x/authz/authz.pb.go @@ -6,11 +6,11 @@ package authz import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" - types "github.com/cosmos/cosmos-sdk/codec/types" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + any "github.com/cosmos/gogoproto/types/any" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" @@ -73,7 +73,7 @@ var xxx_messageInfo_GenericAuthorization proto.InternalMessageInfo // Grant gives permissions to execute // the provide method with expiration time. type Grant struct { - Authorization *types.Any `protobuf:"bytes,1,opt,name=authorization,proto3" json:"authorization,omitempty"` + Authorization *any.Any `protobuf:"bytes,1,opt,name=authorization,proto3" json:"authorization,omitempty"` // time when the grant will expire and will be pruned. If null, then the grant // doesn't have a time expiration (other conditions in `authorization` // may apply to invalidate the grant) @@ -118,7 +118,7 @@ var xxx_messageInfo_Grant proto.InternalMessageInfo type GrantAuthorization struct { Granter string `protobuf:"bytes,1,opt,name=granter,proto3" json:"granter,omitempty"` Grantee string `protobuf:"bytes,2,opt,name=grantee,proto3" json:"grantee,omitempty"` - Authorization *types.Any `protobuf:"bytes,3,opt,name=authorization,proto3" json:"authorization,omitempty"` + Authorization *any.Any `protobuf:"bytes,3,opt,name=authorization,proto3" json:"authorization,omitempty"` Expiration *time.Time `protobuf:"bytes,4,opt,name=expiration,proto3,stdtime" json:"expiration,omitempty"` } @@ -629,7 +629,7 @@ func (m *Grant) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Authorization == nil { - m.Authorization = &types.Any{} + m.Authorization = &any.Any{} } if err := m.Authorization.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -815,7 +815,7 @@ func (m *GrantAuthorization) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Authorization == nil { - m.Authorization = &types.Any{} + m.Authorization = &any.Any{} } if err := m.Authorization.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/x/authz/tx.pb.go b/x/authz/tx.pb.go index d27d3521cd..d7236e5e50 100644 --- a/x/authz/tx.pb.go +++ b/x/authz/tx.pb.go @@ -7,12 +7,12 @@ import ( context "context" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - types "github.com/cosmos/cosmos-sdk/codec/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" + any "github.com/cosmos/gogoproto/types/any" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -118,7 +118,7 @@ type MsgExec struct { // Execute Msg. // The x/authz will try to find a grant matching (msg.signers[0], grantee, MsgTypeURL(msg)) // triple and validate it. - Msgs []*types.Any `protobuf:"bytes,2,rep,name=msgs,proto3" json:"msgs,omitempty"` + Msgs []*any.Any `protobuf:"bytes,2,rep,name=msgs,proto3" json:"msgs,omitempty"` } func (m *MsgExec) Reset() { *m = MsgExec{} } @@ -1100,7 +1100,7 @@ func (m *MsgExec) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Msgs = append(m.Msgs, &types.Any{}) + m.Msgs = append(m.Msgs, &any.Any{}) if err := m.Msgs[len(m.Msgs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/evidence/go.mod b/x/evidence/go.mod index 4e01808441..cd352272dd 100644 --- a/x/evidence/go.mod +++ b/x/evidence/go.mod @@ -6,7 +6,7 @@ require ( cosmossdk.io/api v0.9.0 cosmossdk.io/collections v1.2.0 cosmossdk.io/core v0.11.3 - cosmossdk.io/depinject v1.1.0 + cosmossdk.io/depinject v1.2.0-rc.1 cosmossdk.io/errors v1.0.2 cosmossdk.io/log v1.5.1 cosmossdk.io/math v1.5.2 @@ -159,3 +159,6 @@ require ( pgregory.net/rapid v1.2.0 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) + +// Temporary replace until the next 0.53 tag +replace github.com/cosmos/cosmos-sdk => ../.. diff --git a/x/evidence/go.sum b/x/evidence/go.sum index 00272b045e..a0b4a2c304 100644 --- a/x/evidence/go.sum +++ b/x/evidence/go.sum @@ -6,16 +6,16 @@ cosmossdk.io/collections v1.2.0 h1:IesfVG8G/+FYCMVMP01frS/Cw99Omk5vBh3cHbO01Gg= cosmossdk.io/collections v1.2.0/go.mod h1:4NkMoYw6qRA8fnSH/yn1D/MOutr8qyQnwsO50Mz9ItU= cosmossdk.io/core v0.11.3 h1:mei+MVDJOwIjIniaKelE3jPDqShCc/F4LkNNHh+4yfo= cosmossdk.io/core v0.11.3/go.mod h1:9rL4RE1uDt5AJ4Tg55sYyHWXA16VmpHgbe0PbJc6N2Y= -cosmossdk.io/depinject v1.1.0 h1:wLan7LG35VM7Yo6ov0jId3RHWCGRhe8E8bsuARorl5E= -cosmossdk.io/depinject v1.1.0/go.mod h1:kkI5H9jCGHeKeYWXTqYdruogYrEeWvBQCw1Pj4/eCFI= +cosmossdk.io/depinject v1.2.0-rc.1 h1:Q7qfs+j8MuFPpogx4ohiSXmFvw0Ns2wcBAYU8wIZRbg= +cosmossdk.io/depinject v1.2.0-rc.1/go.mod h1:SMffgggZXkCAbLbJ65pHELkB1Z6cpFbY4CNohGojAz4= cosmossdk.io/errors v1.0.2 h1:wcYiJz08HThbWxd/L4jObeLaLySopyyuUFB5w4AGpCo= cosmossdk.io/errors v1.0.2/go.mod h1:0rjgiHkftRYPj//3DrD6y8hcm40HcPv/dR4R/4efr0k= cosmossdk.io/log v1.5.1 h1:wLwiYXmfrort/O+j6EkjF+HvbdrRQd+4cYCPKFSm+zM= cosmossdk.io/log v1.5.1/go.mod h1:5cXXBvfBkR2/BcXmosdCSLXllvgSjphrrDVdfVRmBGM= -cosmossdk.io/schema v1.0.0 h1:/diH4XJjpV1JQwuIozwr+A4uFuuwanFdnw2kKeiXwwQ= -cosmossdk.io/schema v1.0.0/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ= cosmossdk.io/math v1.5.2 h1:PIhyy1JzmgPA712ewaYRjs+Hhh0iNuM8+fH18WPSejU= cosmossdk.io/math v1.5.2/go.mod h1:ToembcWID/wR94cucsMD+2gq6xrlBBOfWcGwC7ZdwZA= +cosmossdk.io/schema v1.0.0 h1:/diH4XJjpV1JQwuIozwr+A4uFuuwanFdnw2kKeiXwwQ= +cosmossdk.io/schema v1.0.0/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ= cosmossdk.io/store v1.1.2 h1:3HOZG8+CuThREKv6cn3WSohAc6yccxO3hLzwK6rBC7o= cosmossdk.io/store v1.1.2/go.mod h1:60rAGzTHevGm592kFhiUVkNC9w7gooSEn5iUBPzHQ6A= cosmossdk.io/x/tx v0.14.0-rc.1 h1:EEYTknUALt7PEK7b3Q8RVDQ2vDA5A+DGFlEvVcUWjqA= @@ -149,8 +149,6 @@ github.com/cosmos/cosmos-db v1.1.1 h1:FezFSU37AlBC8S98NlSagL76oqBRWq/prTPvFcEJNC github.com/cosmos/cosmos-db v1.1.1/go.mod h1:AghjcIPqdhSLP/2Z0yha5xPH3nLnskz81pBx3tcVSAw= github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA= github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec= -github.com/cosmos/cosmos-sdk v0.53.0-rc.1 h1:unAOo/WSUbbm8kD4q17vP+lvgL3OMJN0d7IkTah8a+o= -github.com/cosmos/cosmos-sdk v0.53.0-rc.1/go.mod h1:5atb8PhhFQ/JwwNOo/BEtczPFqdh3CcCwl/nDzQtjIE= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= diff --git a/x/evidence/types/genesis.pb.go b/x/evidence/types/genesis.pb.go index 38de45a6dc..dddbba2e8f 100644 --- a/x/evidence/types/genesis.pb.go +++ b/x/evidence/types/genesis.pb.go @@ -5,8 +5,8 @@ package types import ( fmt "fmt" - types "github.com/cosmos/cosmos-sdk/codec/types" proto "github.com/cosmos/gogoproto/proto" + any "github.com/cosmos/gogoproto/types/any" io "io" math "math" math_bits "math/bits" @@ -26,7 +26,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // GenesisState defines the evidence module's genesis state. type GenesisState struct { // evidence defines all the evidence at genesis. - Evidence []*types.Any `protobuf:"bytes,1,rep,name=evidence,proto3" json:"evidence,omitempty"` + Evidence []*any.Any `protobuf:"bytes,1,rep,name=evidence,proto3" json:"evidence,omitempty"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -62,7 +62,7 @@ func (m *GenesisState) XXX_DiscardUnknown() { var xxx_messageInfo_GenesisState proto.InternalMessageInfo -func (m *GenesisState) GetEvidence() []*types.Any { +func (m *GenesisState) GetEvidence() []*any.Any { if m != nil { return m.Evidence } @@ -220,7 +220,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Evidence = append(m.Evidence, &types.Any{}) + m.Evidence = append(m.Evidence, &any.Any{}) if err := m.Evidence[len(m.Evidence)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/evidence/types/query.pb.go b/x/evidence/types/query.pb.go index c79728d986..ad2bb934a4 100644 --- a/x/evidence/types/query.pb.go +++ b/x/evidence/types/query.pb.go @@ -7,10 +7,10 @@ import ( context "context" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - types "github.com/cosmos/cosmos-sdk/codec/types" query "github.com/cosmos/cosmos-sdk/types/query" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" + any "github.com/cosmos/gogoproto/types/any" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -91,7 +91,7 @@ func (m *QueryEvidenceRequest) GetHash() string { // QueryEvidenceResponse is the response type for the Query/Evidence RPC method. type QueryEvidenceResponse struct { // evidence returns the requested evidence. - Evidence *types.Any `protobuf:"bytes,1,opt,name=evidence,proto3" json:"evidence,omitempty"` + Evidence *any.Any `protobuf:"bytes,1,opt,name=evidence,proto3" json:"evidence,omitempty"` } func (m *QueryEvidenceResponse) Reset() { *m = QueryEvidenceResponse{} } @@ -127,7 +127,7 @@ func (m *QueryEvidenceResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryEvidenceResponse proto.InternalMessageInfo -func (m *QueryEvidenceResponse) GetEvidence() *types.Any { +func (m *QueryEvidenceResponse) GetEvidence() *any.Any { if m != nil { return m.Evidence } @@ -185,7 +185,7 @@ func (m *QueryAllEvidenceRequest) GetPagination() *query.PageRequest { // method. type QueryAllEvidenceResponse struct { // evidence returns all evidences. - Evidence []*types.Any `protobuf:"bytes,1,rep,name=evidence,proto3" json:"evidence,omitempty"` + Evidence []*any.Any `protobuf:"bytes,1,rep,name=evidence,proto3" json:"evidence,omitempty"` // pagination defines the pagination in the response. Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -223,7 +223,7 @@ func (m *QueryAllEvidenceResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryAllEvidenceResponse proto.InternalMessageInfo -func (m *QueryAllEvidenceResponse) GetEvidence() []*types.Any { +func (m *QueryAllEvidenceResponse) GetEvidence() []*any.Any { if m != nil { return m.Evidence } @@ -812,7 +812,7 @@ func (m *QueryEvidenceResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Evidence == nil { - m.Evidence = &types.Any{} + m.Evidence = &any.Any{} } if err := m.Evidence.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -983,7 +983,7 @@ func (m *QueryAllEvidenceResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Evidence = append(m.Evidence, &types.Any{}) + m.Evidence = append(m.Evidence, &any.Any{}) if err := m.Evidence[len(m.Evidence)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/evidence/types/tx.pb.go b/x/evidence/types/tx.pb.go index 661e5ba5ab..ee2f9721cf 100644 --- a/x/evidence/types/tx.pb.go +++ b/x/evidence/types/tx.pb.go @@ -8,12 +8,12 @@ import ( context "context" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - types "github.com/cosmos/cosmos-sdk/codec/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" + any "github.com/cosmos/gogoproto/types/any" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -39,7 +39,7 @@ type MsgSubmitEvidence struct { // submitter is the signer account address of evidence. Submitter string `protobuf:"bytes,1,opt,name=submitter,proto3" json:"submitter,omitempty"` // evidence defines the evidence of misbehavior. - Evidence *types.Any `protobuf:"bytes,2,opt,name=evidence,proto3" json:"evidence,omitempty"` + Evidence *any.Any `protobuf:"bytes,2,opt,name=evidence,proto3" json:"evidence,omitempty"` } func (m *MsgSubmitEvidence) Reset() { *m = MsgSubmitEvidence{} } @@ -476,7 +476,7 @@ func (m *MsgSubmitEvidence) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Evidence == nil { - m.Evidence = &types.Any{} + m.Evidence = &any.Any{} } if err := m.Evidence.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/x/feegrant/feegrant.pb.go b/x/feegrant/feegrant.pb.go index b30f725c8a..6c0a332334 100644 --- a/x/feegrant/feegrant.pb.go +++ b/x/feegrant/feegrant.pb.go @@ -6,13 +6,13 @@ package feegrant import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" - types1 "github.com/cosmos/cosmos-sdk/codec/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + any "github.com/cosmos/gogoproto/types/any" _ "google.golang.org/protobuf/types/known/durationpb" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" @@ -181,7 +181,7 @@ func (m *PeriodicAllowance) GetPeriodReset() time.Time { // AllowedMsgAllowance creates allowance only for specified message types. type AllowedMsgAllowance struct { // allowance can be any of basic and periodic fee allowance. - Allowance *types1.Any `protobuf:"bytes,1,opt,name=allowance,proto3" json:"allowance,omitempty"` + Allowance *any.Any `protobuf:"bytes,1,opt,name=allowance,proto3" json:"allowance,omitempty"` // allowed_messages are the messages for which the grantee has the access. AllowedMessages []string `protobuf:"bytes,2,rep,name=allowed_messages,json=allowedMessages,proto3" json:"allowed_messages,omitempty"` } @@ -226,7 +226,7 @@ type Grant struct { // grantee is the address of the user being granted an allowance of another user's funds. Grantee string `protobuf:"bytes,2,opt,name=grantee,proto3" json:"grantee,omitempty"` // allowance can be any of basic, periodic, allowed fee allowance. - Allowance *types1.Any `protobuf:"bytes,3,opt,name=allowance,proto3" json:"allowance,omitempty"` + Allowance *any.Any `protobuf:"bytes,3,opt,name=allowance,proto3" json:"allowance,omitempty"` } func (m *Grant) Reset() { *m = Grant{} } @@ -276,7 +276,7 @@ func (m *Grant) GetGrantee() string { return "" } -func (m *Grant) GetAllowance() *types1.Any { +func (m *Grant) GetAllowance() *any.Any { if m != nil { return m.Allowance } @@ -1056,7 +1056,7 @@ func (m *AllowedMsgAllowance) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Allowance == nil { - m.Allowance = &types1.Any{} + m.Allowance = &any.Any{} } if err := m.Allowance.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1238,7 +1238,7 @@ func (m *Grant) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Allowance == nil { - m.Allowance = &types1.Any{} + m.Allowance = &any.Any{} } if err := m.Allowance.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/x/feegrant/go.mod b/x/feegrant/go.mod index 386c20b16b..08078d4911 100644 --- a/x/feegrant/go.mod +++ b/x/feegrant/go.mod @@ -160,3 +160,6 @@ require ( pgregory.net/rapid v1.2.0 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) + +// Temporary replace until the next 0.53 tag +replace github.com/cosmos/cosmos-sdk => ../.. diff --git a/x/feegrant/go.sum b/x/feegrant/go.sum index 96cc2ff5b4..5569d5c3e2 100644 --- a/x/feegrant/go.sum +++ b/x/feegrant/go.sum @@ -153,8 +153,6 @@ github.com/cosmos/cosmos-db v1.1.1 h1:FezFSU37AlBC8S98NlSagL76oqBRWq/prTPvFcEJNC github.com/cosmos/cosmos-db v1.1.1/go.mod h1:AghjcIPqdhSLP/2Z0yha5xPH3nLnskz81pBx3tcVSAw= github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA= github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec= -github.com/cosmos/cosmos-sdk v0.53.0-rc.2 h1:KdQRIp6z/hQK9VppPU1exuXobLLwhrrRIrAOlzzaIf0= -github.com/cosmos/cosmos-sdk v0.53.0-rc.2/go.mod h1:GCGPg/EJ9FCygDZ8yHxuq3aM577FC706LpXwl2LbXKQ= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= diff --git a/x/feegrant/tx.pb.go b/x/feegrant/tx.pb.go index 93c5fbc894..1e86dbe068 100644 --- a/x/feegrant/tx.pb.go +++ b/x/feegrant/tx.pb.go @@ -7,11 +7,11 @@ import ( context "context" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - types "github.com/cosmos/cosmos-sdk/codec/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" + any "github.com/cosmos/gogoproto/types/any" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -39,7 +39,7 @@ type MsgGrantAllowance struct { // grantee is the address of the user being granted an allowance of another user's funds. Grantee string `protobuf:"bytes,2,opt,name=grantee,proto3" json:"grantee,omitempty"` // allowance can be any of basic, periodic, allowed fee allowance. - Allowance *types.Any `protobuf:"bytes,3,opt,name=allowance,proto3" json:"allowance,omitempty"` + Allowance *any.Any `protobuf:"bytes,3,opt,name=allowance,proto3" json:"allowance,omitempty"` } func (m *MsgGrantAllowance) Reset() { *m = MsgGrantAllowance{} } @@ -89,7 +89,7 @@ func (m *MsgGrantAllowance) GetGrantee() string { return "" } -func (m *MsgGrantAllowance) GetAllowance() *types.Any { +func (m *MsgGrantAllowance) GetAllowance() *any.Any { if m != nil { return m.Allowance } @@ -926,7 +926,7 @@ func (m *MsgGrantAllowance) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Allowance == nil { - m.Allowance = &types.Any{} + m.Allowance = &any.Any{} } if err := m.Allowance.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/x/gov/types/v1/gov.pb.go b/x/gov/types/v1/gov.pb.go index dd5dffc18c..e1e6c238c9 100644 --- a/x/gov/types/v1/gov.pb.go +++ b/x/gov/types/v1/gov.pb.go @@ -6,12 +6,12 @@ package v1 import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" - types1 "github.com/cosmos/cosmos-sdk/codec/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + any "github.com/cosmos/gogoproto/types/any" _ "google.golang.org/protobuf/types/known/durationpb" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" @@ -246,7 +246,7 @@ type Proposal struct { // id defines the unique id of the proposal. Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` // messages are the arbitrary messages to be executed if the proposal passes. - Messages []*types1.Any `protobuf:"bytes,2,rep,name=messages,proto3" json:"messages,omitempty"` + Messages []*any.Any `protobuf:"bytes,2,rep,name=messages,proto3" json:"messages,omitempty"` // status defines the proposal status. Status ProposalStatus `protobuf:"varint,3,opt,name=status,proto3,enum=cosmos.gov.v1.ProposalStatus" json:"status,omitempty"` // final_tally_result is the final tally result of the proposal. When @@ -319,7 +319,7 @@ func (m *Proposal) GetId() uint64 { return 0 } -func (m *Proposal) GetMessages() []*types1.Any { +func (m *Proposal) GetMessages() []*any.Any { if m != nil { return m.Messages } @@ -2297,7 +2297,7 @@ func (m *Proposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Messages = append(m.Messages, &types1.Any{}) + m.Messages = append(m.Messages, &any.Any{}) if err := m.Messages[len(m.Messages)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/gov/types/v1/tx.pb.go b/x/gov/types/v1/tx.pb.go index 6f3ee68669..2f8ea811bd 100644 --- a/x/gov/types/v1/tx.pb.go +++ b/x/gov/types/v1/tx.pb.go @@ -7,15 +7,15 @@ import ( context "context" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - types "github.com/cosmos/cosmos-sdk/codec/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - types1 "github.com/cosmos/cosmos-sdk/types" + types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + any "github.com/cosmos/gogoproto/types/any" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -42,7 +42,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // proposal Content. type MsgSubmitProposal struct { // messages are the arbitrary messages to be executed if proposal passes. - Messages []*types.Any `protobuf:"bytes,1,rep,name=messages,proto3" json:"messages,omitempty"` + Messages []*any.Any `protobuf:"bytes,1,rep,name=messages,proto3" json:"messages,omitempty"` // initial_deposit is the deposit value that must be paid at proposal submission. InitialDeposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=initial_deposit,json=initialDeposit,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"initial_deposit"` // proposer is the account address of the proposer. @@ -90,7 +90,7 @@ func (m *MsgSubmitProposal) XXX_DiscardUnknown() { var xxx_messageInfo_MsgSubmitProposal proto.InternalMessageInfo -func (m *MsgSubmitProposal) GetMessages() []*types.Any { +func (m *MsgSubmitProposal) GetMessages() []*any.Any { if m != nil { return m.Messages } @@ -189,7 +189,7 @@ func (m *MsgSubmitProposalResponse) GetProposalId() uint64 { // This ensures backwards compatibility with v1beta1.MsgSubmitProposal. type MsgExecLegacyContent struct { // content is the proposal's content. - Content *types.Any `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"` + Content *any.Any `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"` // authority must be the gov module address. Authority string `protobuf:"bytes,2,opt,name=authority,proto3" json:"authority,omitempty"` } @@ -227,7 +227,7 @@ func (m *MsgExecLegacyContent) XXX_DiscardUnknown() { var xxx_messageInfo_MsgExecLegacyContent proto.InternalMessageInfo -func (m *MsgExecLegacyContent) GetContent() *types.Any { +func (m *MsgExecLegacyContent) GetContent() *any.Any { if m != nil { return m.Content } @@ -505,7 +505,7 @@ type MsgDeposit struct { // depositor defines the deposit addresses from the proposals. Depositor string `protobuf:"bytes,2,opt,name=depositor,proto3" json:"depositor,omitempty"` // amount to be deposited by depositor. - Amount []types1.Coin `protobuf:"bytes,3,rep,name=amount,proto3" json:"amount"` + Amount []types.Coin `protobuf:"bytes,3,rep,name=amount,proto3" json:"amount"` } func (m *MsgDeposit) Reset() { *m = MsgDeposit{} } @@ -555,7 +555,7 @@ func (m *MsgDeposit) GetDepositor() string { return "" } -func (m *MsgDeposit) GetAmount() []types1.Coin { +func (m *MsgDeposit) GetAmount() []types.Coin { if m != nil { return m.Amount } @@ -2074,7 +2074,7 @@ func (m *MsgSubmitProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Messages = append(m.Messages, &types.Any{}) + m.Messages = append(m.Messages, &any.Any{}) if err := m.Messages[len(m.Messages)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2108,7 +2108,7 @@ func (m *MsgSubmitProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.InitialDeposit = append(m.InitialDeposit, types1.Coin{}) + m.InitialDeposit = append(m.InitialDeposit, types.Coin{}) if err := m.InitialDeposit[len(m.InitialDeposit)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2410,7 +2410,7 @@ func (m *MsgExecLegacyContent) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Content == nil { - m.Content = &types.Any{} + m.Content = &any.Any{} } if err := m.Content.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -3047,7 +3047,7 @@ func (m *MsgDeposit) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Amount = append(m.Amount, types1.Coin{}) + m.Amount = append(m.Amount, types.Coin{}) if err := m.Amount[len(m.Amount)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/gov/types/v1beta1/gov.pb.go b/x/gov/types/v1beta1/gov.pb.go index 683180c1e4..1a1c3ab51d 100644 --- a/x/gov/types/v1beta1/gov.pb.go +++ b/x/gov/types/v1beta1/gov.pb.go @@ -7,13 +7,13 @@ import ( cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - types1 "github.com/cosmos/cosmos-sdk/codec/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + any "github.com/cosmos/gogoproto/types/any" _ "google.golang.org/protobuf/types/known/durationpb" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" @@ -255,7 +255,7 @@ type Proposal struct { // proposal_id defines the unique id of the proposal. ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id,omitempty"` // content is the proposal's content. - Content *types1.Any `protobuf:"bytes,2,opt,name=content,proto3" json:"content,omitempty"` + Content *any.Any `protobuf:"bytes,2,opt,name=content,proto3" json:"content,omitempty"` // status defines the proposal status. Status ProposalStatus `protobuf:"varint,3,opt,name=status,proto3,enum=cosmos.gov.v1beta1.ProposalStatus" json:"status,omitempty"` // final_tally_result is the final tally result of the proposal. When @@ -1840,7 +1840,7 @@ func (m *Proposal) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Content == nil { - m.Content = &types1.Any{} + m.Content = &any.Any{} } if err := m.Content.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/x/gov/types/v1beta1/tx.pb.go b/x/gov/types/v1beta1/tx.pb.go index 2ac98f3537..f405e2732c 100644 --- a/x/gov/types/v1beta1/tx.pb.go +++ b/x/gov/types/v1beta1/tx.pb.go @@ -7,14 +7,14 @@ import ( context "context" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - types "github.com/cosmos/cosmos-sdk/codec/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - types1 "github.com/cosmos/cosmos-sdk/types" + types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" + any "github.com/cosmos/gogoproto/types/any" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -38,7 +38,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // proposal Content. type MsgSubmitProposal struct { // content is the proposal's content. - Content *types.Any `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"` + Content *any.Any `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"` // initial_deposit is the deposit value that must be paid at proposal submission. InitialDeposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=initial_deposit,json=initialDeposit,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"initial_deposit"` // proposer is the account address of the proposer. @@ -1119,7 +1119,7 @@ func (m *MsgSubmitProposal) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Content == nil { - m.Content = &types.Any{} + m.Content = &any.Any{} } if err := m.Content.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1154,7 +1154,7 @@ func (m *MsgSubmitProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.InitialDeposit = append(m.InitialDeposit, types1.Coin{}) + m.InitialDeposit = append(m.InitialDeposit, types.Coin{}) if err := m.InitialDeposit[len(m.InitialDeposit)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1745,7 +1745,7 @@ func (m *MsgDeposit) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Amount = append(m.Amount, types1.Coin{}) + m.Amount = append(m.Amount, types.Coin{}) if err := m.Amount[len(m.Amount)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/group/tx.pb.go b/x/group/tx.pb.go index a86cad086e..1ab818df7d 100644 --- a/x/group/tx.pb.go +++ b/x/group/tx.pb.go @@ -7,12 +7,12 @@ import ( context "context" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - types "github.com/cosmos/cosmos-sdk/codec/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" + any "github.com/cosmos/gogoproto/types/any" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -487,7 +487,7 @@ type MsgCreateGroupPolicy struct { // metadata is any arbitrary metadata attached to the group policy. Metadata string `protobuf:"bytes,3,opt,name=metadata,proto3" json:"metadata,omitempty"` // decision_policy specifies the group policy's decision policy. - DecisionPolicy *types.Any `protobuf:"bytes,4,opt,name=decision_policy,json=decisionPolicy,proto3" json:"decision_policy,omitempty"` + DecisionPolicy *any.Any `protobuf:"bytes,4,opt,name=decision_policy,json=decisionPolicy,proto3" json:"decision_policy,omitempty"` } func (m *MsgCreateGroupPolicy) Reset() { *m = MsgCreateGroupPolicy{} } @@ -684,7 +684,7 @@ type MsgCreateGroupWithPolicy struct { // and group policy admin. GroupPolicyAsAdmin bool `protobuf:"varint,5,opt,name=group_policy_as_admin,json=groupPolicyAsAdmin,proto3" json:"group_policy_as_admin,omitempty"` // decision_policy specifies the group policy's decision policy. - DecisionPolicy *types.Any `protobuf:"bytes,6,opt,name=decision_policy,json=decisionPolicy,proto3" json:"decision_policy,omitempty"` + DecisionPolicy *any.Any `protobuf:"bytes,6,opt,name=decision_policy,json=decisionPolicy,proto3" json:"decision_policy,omitempty"` } func (m *MsgCreateGroupWithPolicy) Reset() { *m = MsgCreateGroupWithPolicy{} } @@ -782,7 +782,7 @@ type MsgUpdateGroupPolicyDecisionPolicy struct { // group_policy_address is the account address of group policy. GroupPolicyAddress string `protobuf:"bytes,2,opt,name=group_policy_address,json=groupPolicyAddress,proto3" json:"group_policy_address,omitempty"` // decision_policy is the updated group policy's decision policy. - DecisionPolicy *types.Any `protobuf:"bytes,3,opt,name=decision_policy,json=decisionPolicy,proto3" json:"decision_policy,omitempty"` + DecisionPolicy *any.Any `protobuf:"bytes,3,opt,name=decision_policy,json=decisionPolicy,proto3" json:"decision_policy,omitempty"` } func (m *MsgUpdateGroupPolicyDecisionPolicy) Reset() { *m = MsgUpdateGroupPolicyDecisionPolicy{} } @@ -970,7 +970,7 @@ type MsgSubmitProposal struct { // metadata is any arbitrary metadata attached to the proposal. Metadata string `protobuf:"bytes,3,opt,name=metadata,proto3" json:"metadata,omitempty"` // messages is a list of `sdk.Msg`s that will be executed if the proposal passes. - Messages []*types.Any `protobuf:"bytes,4,rep,name=messages,proto3" json:"messages,omitempty"` + Messages []*any.Any `protobuf:"bytes,4,rep,name=messages,proto3" json:"messages,omitempty"` // exec defines the mode of execution of the proposal, // whether it should be executed immediately on creation or not. // If so, proposers signatures are considered as Yes votes. @@ -4611,7 +4611,7 @@ func (m *MsgCreateGroupPolicy) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.DecisionPolicy == nil { - m.DecisionPolicy = &types.Any{} + m.DecisionPolicy = &any.Any{} } if err := m.DecisionPolicy.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -5125,7 +5125,7 @@ func (m *MsgCreateGroupWithPolicy) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.DecisionPolicy == nil { - m.DecisionPolicy = &types.Any{} + m.DecisionPolicy = &any.Any{} } if err := m.DecisionPolicy.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -5376,7 +5376,7 @@ func (m *MsgUpdateGroupPolicyDecisionPolicy) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.DecisionPolicy == nil { - m.DecisionPolicy = &types.Any{} + m.DecisionPolicy = &any.Any{} } if err := m.DecisionPolicy.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -5803,7 +5803,7 @@ func (m *MsgSubmitProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Messages = append(m.Messages, &types.Any{}) + m.Messages = append(m.Messages, &any.Any{}) if err := m.Messages[len(m.Messages)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/group/types.pb.go b/x/group/types.pb.go index 91e2f0165c..6b65a5ecc3 100644 --- a/x/group/types.pb.go +++ b/x/group/types.pb.go @@ -6,11 +6,11 @@ package group import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" - types "github.com/cosmos/cosmos-sdk/codec/types" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + any "github.com/cosmos/gogoproto/types/any" _ "google.golang.org/protobuf/types/known/durationpb" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" @@ -650,7 +650,7 @@ type GroupPolicyInfo struct { // would create a different result on a running proposal. Version uint64 `protobuf:"varint,5,opt,name=version,proto3" json:"version,omitempty"` // decision_policy specifies the group policy's decision policy. - DecisionPolicy *types.Any `protobuf:"bytes,6,opt,name=decision_policy,json=decisionPolicy,proto3" json:"decision_policy,omitempty"` + DecisionPolicy *any.Any `protobuf:"bytes,6,opt,name=decision_policy,json=decisionPolicy,proto3" json:"decision_policy,omitempty"` // created_at is a timestamp specifying when a group policy was created. CreatedAt time.Time `protobuf:"bytes,7,opt,name=created_at,json=createdAt,proto3,stdtime" json:"created_at"` } @@ -729,7 +729,7 @@ type Proposal struct { // executor_result is the final result of the proposal execution. Initial value is NotRun. ExecutorResult ProposalExecutorResult `protobuf:"varint,11,opt,name=executor_result,json=executorResult,proto3,enum=cosmos.group.v1.ProposalExecutorResult" json:"executor_result,omitempty"` // messages is a list of `sdk.Msg`s that will be executed if the proposal passes. - Messages []*types.Any `protobuf:"bytes,12,rep,name=messages,proto3" json:"messages,omitempty"` + Messages []*any.Any `protobuf:"bytes,12,rep,name=messages,proto3" json:"messages,omitempty"` // title is the title of the proposal Title string `protobuf:"bytes,13,opt,name=title,proto3" json:"title,omitempty"` // summary is a short summary of the proposal @@ -3161,7 +3161,7 @@ func (m *GroupPolicyInfo) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.DecisionPolicy == nil { - m.DecisionPolicy = &types.Any{} + m.DecisionPolicy = &any.Any{} } if err := m.DecisionPolicy.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -3569,7 +3569,7 @@ func (m *Proposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Messages = append(m.Messages, &types.Any{}) + m.Messages = append(m.Messages, &any.Any{}) if err := m.Messages[len(m.Messages)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/nft/nft.pb.go b/x/nft/nft.pb.go index ff696d7aca..3c51d2dcf6 100644 --- a/x/nft/nft.pb.go +++ b/x/nft/nft.pb.go @@ -5,8 +5,8 @@ package nft import ( fmt "fmt" - types "github.com/cosmos/cosmos-sdk/codec/types" proto "github.com/cosmos/gogoproto/proto" + any "github.com/cosmos/gogoproto/types/any" io "io" math "math" math_bits "math/bits" @@ -38,7 +38,7 @@ type Class struct { // uri_hash is a hash of the document pointed by uri. Optional UriHash string `protobuf:"bytes,6,opt,name=uri_hash,json=uriHash,proto3" json:"uri_hash,omitempty"` // data is the app specific metadata of the NFT class. Optional - Data *types.Any `protobuf:"bytes,7,opt,name=data,proto3" json:"data,omitempty"` + Data *any.Any `protobuf:"bytes,7,opt,name=data,proto3" json:"data,omitempty"` } func (m *Class) Reset() { *m = Class{} } @@ -116,7 +116,7 @@ func (m *Class) GetUriHash() string { return "" } -func (m *Class) GetData() *types.Any { +func (m *Class) GetData() *any.Any { if m != nil { return m.Data } @@ -134,7 +134,7 @@ type NFT struct { // uri_hash is a hash of the document pointed by uri UriHash string `protobuf:"bytes,4,opt,name=uri_hash,json=uriHash,proto3" json:"uri_hash,omitempty"` // data is an app specific data of the NFT. Optional - Data *types.Any `protobuf:"bytes,10,opt,name=data,proto3" json:"data,omitempty"` + Data *any.Any `protobuf:"bytes,10,opt,name=data,proto3" json:"data,omitempty"` } func (m *NFT) Reset() { *m = NFT{} } @@ -198,7 +198,7 @@ func (m *NFT) GetUriHash() string { return "" } -func (m *NFT) GetData() *types.Any { +func (m *NFT) GetData() *any.Any { if m != nil { return m.Data } @@ -710,7 +710,7 @@ func (m *Class) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Data == nil { - m.Data = &types.Any{} + m.Data = &any.Any{} } if err := m.Data.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -924,7 +924,7 @@ func (m *NFT) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Data == nil { - m.Data = &types.Any{} + m.Data = &any.Any{} } if err := m.Data.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/x/staking/types/staking.pb.go b/x/staking/types/staking.pb.go index 2163b9b698..170eabf05e 100644 --- a/x/staking/types/staking.pb.go +++ b/x/staking/types/staking.pb.go @@ -8,17 +8,17 @@ import ( compress_gzip "compress/gzip" cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" - types3 "github.com/cometbft/cometbft/abci/types" + types2 "github.com/cometbft/cometbft/abci/types" types "github.com/cometbft/cometbft/proto/tendermint/types" _ "github.com/cosmos/cosmos-proto" - types1 "github.com/cosmos/cosmos-sdk/codec/types" - types2 "github.com/cosmos/cosmos-sdk/types" + types1 "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" github_com_cosmos_gogoproto_proto "github.com/cosmos/gogoproto/proto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_protoc_gen_gogo_descriptor "github.com/cosmos/gogoproto/protoc-gen-gogo/descriptor" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + any "github.com/cosmos/gogoproto/types/any" _ "google.golang.org/protobuf/types/known/durationpb" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" @@ -350,7 +350,7 @@ type Validator struct { // operator_address defines the address of the validator's operator; bech encoded in JSON. OperatorAddress string `protobuf:"bytes,1,opt,name=operator_address,json=operatorAddress,proto3" json:"operator_address,omitempty"` // consensus_pubkey is the consensus public key of the validator, as a Protobuf Any. - ConsensusPubkey *types1.Any `protobuf:"bytes,2,opt,name=consensus_pubkey,json=consensusPubkey,proto3" json:"consensus_pubkey,omitempty"` + ConsensusPubkey *any.Any `protobuf:"bytes,2,opt,name=consensus_pubkey,json=consensusPubkey,proto3" json:"consensus_pubkey,omitempty"` // jailed defined whether the validator has been jailed from bonded status or not. Jailed bool `protobuf:"varint,3,opt,name=jailed,proto3" json:"jailed,omitempty"` // status is the validator status (bonded/unbonding/unbonded). @@ -1004,7 +1004,7 @@ func (m *Params) GetBondDenom() string { // balance in addition to shares which is more suitable for client responses. type DelegationResponse struct { Delegation Delegation `protobuf:"bytes,1,opt,name=delegation,proto3" json:"delegation"` - Balance types2.Coin `protobuf:"bytes,2,opt,name=balance,proto3" json:"balance"` + Balance types1.Coin `protobuf:"bytes,2,opt,name=balance,proto3" json:"balance"` } func (m *DelegationResponse) Reset() { *m = DelegationResponse{} } @@ -1047,11 +1047,11 @@ func (m *DelegationResponse) GetDelegation() Delegation { return Delegation{} } -func (m *DelegationResponse) GetBalance() types2.Coin { +func (m *DelegationResponse) GetBalance() types1.Coin { if m != nil { return m.Balance } - return types2.Coin{} + return types1.Coin{} } // RedelegationEntryResponse is equivalent to a RedelegationEntry except that it @@ -1200,7 +1200,7 @@ var xxx_messageInfo_Pool proto.InternalMessageInfo // ValidatorUpdates defines an array of abci.ValidatorUpdate objects. // TODO: explore moving this to proto/cosmos/base to separate modules from tendermint dependence type ValidatorUpdates struct { - Updates []types3.ValidatorUpdate `protobuf:"bytes,1,rep,name=updates,proto3" json:"updates"` + Updates []types2.ValidatorUpdate `protobuf:"bytes,1,rep,name=updates,proto3" json:"updates"` } func (m *ValidatorUpdates) Reset() { *m = ValidatorUpdates{} } @@ -1236,7 +1236,7 @@ func (m *ValidatorUpdates) XXX_DiscardUnknown() { var xxx_messageInfo_ValidatorUpdates proto.InternalMessageInfo -func (m *ValidatorUpdates) GetUpdates() []types3.ValidatorUpdate { +func (m *ValidatorUpdates) GetUpdates() []types2.ValidatorUpdate { if m != nil { return m.Updates } @@ -4686,7 +4686,7 @@ func (m *Validator) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.ConsensusPubkey == nil { - m.ConsensusPubkey = &types1.Any{} + m.ConsensusPubkey = &any.Any{} } if err := m.ConsensusPubkey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -7201,7 +7201,7 @@ func (m *ValidatorUpdates) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Updates = append(m.Updates, types3.ValidatorUpdate{}) + m.Updates = append(m.Updates, types2.ValidatorUpdate{}) if err := m.Updates[len(m.Updates)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/staking/types/tx.pb.go b/x/staking/types/tx.pb.go index 665f5a8f40..92d9a38849 100644 --- a/x/staking/types/tx.pb.go +++ b/x/staking/types/tx.pb.go @@ -8,14 +8,14 @@ import ( cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - types "github.com/cosmos/cosmos-sdk/codec/types" - types1 "github.com/cosmos/cosmos-sdk/types" + types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + any "github.com/cosmos/gogoproto/types/any" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -46,10 +46,10 @@ type MsgCreateValidator struct { // Deprecated: Use of Delegator Address in MsgCreateValidator is deprecated. // The validator address bytes and delegator address bytes refer to the same account while creating validator (defer // only in bech32 notation). - DelegatorAddress string `protobuf:"bytes,4,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` // Deprecated: Do not use. - ValidatorAddress string `protobuf:"bytes,5,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` - Pubkey *types.Any `protobuf:"bytes,6,opt,name=pubkey,proto3" json:"pubkey,omitempty"` - Value types1.Coin `protobuf:"bytes,7,opt,name=value,proto3" json:"value"` + DelegatorAddress string `protobuf:"bytes,4,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` // Deprecated: Do not use. + ValidatorAddress string `protobuf:"bytes,5,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` + Pubkey *any.Any `protobuf:"bytes,6,opt,name=pubkey,proto3" json:"pubkey,omitempty"` + Value types.Coin `protobuf:"bytes,7,opt,name=value,proto3" json:"value"` } func (m *MsgCreateValidator) Reset() { *m = MsgCreateValidator{} } @@ -207,9 +207,9 @@ var xxx_messageInfo_MsgEditValidatorResponse proto.InternalMessageInfo // MsgDelegate defines a SDK message for performing a delegation of coins // from a delegator to a validator. type MsgDelegate struct { - DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` - ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` - Amount types1.Coin `protobuf:"bytes,3,opt,name=amount,proto3" json:"amount"` + DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` + ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` + Amount types.Coin `protobuf:"bytes,3,opt,name=amount,proto3" json:"amount"` } func (m *MsgDelegate) Reset() { *m = MsgDelegate{} } @@ -285,10 +285,10 @@ var xxx_messageInfo_MsgDelegateResponse proto.InternalMessageInfo // MsgBeginRedelegate defines a SDK message for performing a redelegation // of coins from a delegator and source validator to a destination validator. type MsgBeginRedelegate struct { - DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` - ValidatorSrcAddress string `protobuf:"bytes,2,opt,name=validator_src_address,json=validatorSrcAddress,proto3" json:"validator_src_address,omitempty"` - ValidatorDstAddress string `protobuf:"bytes,3,opt,name=validator_dst_address,json=validatorDstAddress,proto3" json:"validator_dst_address,omitempty"` - Amount types1.Coin `protobuf:"bytes,4,opt,name=amount,proto3" json:"amount"` + DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` + ValidatorSrcAddress string `protobuf:"bytes,2,opt,name=validator_src_address,json=validatorSrcAddress,proto3" json:"validator_src_address,omitempty"` + ValidatorDstAddress string `protobuf:"bytes,3,opt,name=validator_dst_address,json=validatorDstAddress,proto3" json:"validator_dst_address,omitempty"` + Amount types.Coin `protobuf:"bytes,4,opt,name=amount,proto3" json:"amount"` } func (m *MsgBeginRedelegate) Reset() { *m = MsgBeginRedelegate{} } @@ -372,9 +372,9 @@ func (m *MsgBeginRedelegateResponse) GetCompletionTime() time.Time { // MsgUndelegate defines a SDK message for performing an undelegation from a // delegate and a validator. type MsgUndelegate struct { - DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` - ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` - Amount types1.Coin `protobuf:"bytes,3,opt,name=amount,proto3" json:"amount"` + DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` + ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` + Amount types.Coin `protobuf:"bytes,3,opt,name=amount,proto3" json:"amount"` } func (m *MsgUndelegate) Reset() { *m = MsgUndelegate{} } @@ -414,7 +414,7 @@ var xxx_messageInfo_MsgUndelegate proto.InternalMessageInfo type MsgUndelegateResponse struct { CompletionTime time.Time `protobuf:"bytes,1,opt,name=completion_time,json=completionTime,proto3,stdtime" json:"completion_time"` // amount returns the amount of undelegated coins - Amount types1.Coin `protobuf:"bytes,2,opt,name=amount,proto3" json:"amount"` + Amount types.Coin `protobuf:"bytes,2,opt,name=amount,proto3" json:"amount"` } func (m *MsgUndelegateResponse) Reset() { *m = MsgUndelegateResponse{} } @@ -457,11 +457,11 @@ func (m *MsgUndelegateResponse) GetCompletionTime() time.Time { return time.Time{} } -func (m *MsgUndelegateResponse) GetAmount() types1.Coin { +func (m *MsgUndelegateResponse) GetAmount() types.Coin { if m != nil { return m.Amount } - return types1.Coin{} + return types.Coin{} } // MsgCancelUnbondingDelegation defines the SDK message for performing a cancel unbonding delegation for delegator @@ -469,7 +469,7 @@ type MsgCancelUnbondingDelegation struct { DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` // amount is always less than or equal to unbonding delegation entry balance - Amount types1.Coin `protobuf:"bytes,3,opt,name=amount,proto3" json:"amount"` + Amount types.Coin `protobuf:"bytes,3,opt,name=amount,proto3" json:"amount"` // creation_height is the height which the unbonding took place. CreationHeight int64 `protobuf:"varint,4,opt,name=creation_height,json=creationHeight,proto3" json:"creation_height,omitempty"` } @@ -2097,7 +2097,7 @@ func (m *MsgCreateValidator) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Pubkey == nil { - m.Pubkey = &types.Any{} + m.Pubkey = &any.Any{} } if err := m.Pubkey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/x/upgrade/go.mod b/x/upgrade/go.mod index db34d4e983..6ff509a1b1 100644 --- a/x/upgrade/go.mod +++ b/x/upgrade/go.mod @@ -5,7 +5,7 @@ go 1.23.2 require ( cosmossdk.io/api v0.9.0 cosmossdk.io/core v0.11.3 - cosmossdk.io/depinject v1.1.0 + cosmossdk.io/depinject v1.2.0-rc.1 cosmossdk.io/errors v1.0.2 cosmossdk.io/log v1.5.1 cosmossdk.io/store v1.1.2 @@ -207,3 +207,6 @@ require ( // Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities. // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 replace github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.1 + +// Temporary replace until the next 0.53 tag +replace github.com/cosmos/cosmos-sdk => ../.. diff --git a/x/upgrade/go.sum b/x/upgrade/go.sum index cb61981a7e..cee8605dcc 100644 --- a/x/upgrade/go.sum +++ b/x/upgrade/go.sum @@ -620,8 +620,8 @@ cosmossdk.io/collections v1.2.0 h1:IesfVG8G/+FYCMVMP01frS/Cw99Omk5vBh3cHbO01Gg= cosmossdk.io/collections v1.2.0/go.mod h1:4NkMoYw6qRA8fnSH/yn1D/MOutr8qyQnwsO50Mz9ItU= cosmossdk.io/core v0.11.3 h1:mei+MVDJOwIjIniaKelE3jPDqShCc/F4LkNNHh+4yfo= cosmossdk.io/core v0.11.3/go.mod h1:9rL4RE1uDt5AJ4Tg55sYyHWXA16VmpHgbe0PbJc6N2Y= -cosmossdk.io/depinject v1.1.0 h1:wLan7LG35VM7Yo6ov0jId3RHWCGRhe8E8bsuARorl5E= -cosmossdk.io/depinject v1.1.0/go.mod h1:kkI5H9jCGHeKeYWXTqYdruogYrEeWvBQCw1Pj4/eCFI= +cosmossdk.io/depinject v1.2.0-rc.1 h1:Q7qfs+j8MuFPpogx4ohiSXmFvw0Ns2wcBAYU8wIZRbg= +cosmossdk.io/depinject v1.2.0-rc.1/go.mod h1:SMffgggZXkCAbLbJ65pHELkB1Z6cpFbY4CNohGojAz4= cosmossdk.io/errors v1.0.2 h1:wcYiJz08HThbWxd/L4jObeLaLySopyyuUFB5w4AGpCo= cosmossdk.io/errors v1.0.2/go.mod h1:0rjgiHkftRYPj//3DrD6y8hcm40HcPv/dR4R/4efr0k= cosmossdk.io/log v1.5.1 h1:wLwiYXmfrort/O+j6EkjF+HvbdrRQd+4cYCPKFSm+zM= @@ -811,8 +811,6 @@ github.com/cosmos/cosmos-db v1.1.1 h1:FezFSU37AlBC8S98NlSagL76oqBRWq/prTPvFcEJNC github.com/cosmos/cosmos-db v1.1.1/go.mod h1:AghjcIPqdhSLP/2Z0yha5xPH3nLnskz81pBx3tcVSAw= github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA= github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec= -github.com/cosmos/cosmos-sdk v0.53.0-rc.1 h1:unAOo/WSUbbm8kD4q17vP+lvgL3OMJN0d7IkTah8a+o= -github.com/cosmos/cosmos-sdk v0.53.0-rc.1/go.mod h1:5atb8PhhFQ/JwwNOo/BEtczPFqdh3CcCwl/nDzQtjIE= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= diff --git a/x/upgrade/types/upgrade.pb.go b/x/upgrade/types/upgrade.pb.go index 5f2756882b..3123881959 100644 --- a/x/upgrade/types/upgrade.pb.go +++ b/x/upgrade/types/upgrade.pb.go @@ -6,11 +6,11 @@ package types import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" - types "github.com/cosmos/cosmos-sdk/codec/types" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + any "github.com/cosmos/gogoproto/types/any" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" @@ -52,7 +52,7 @@ type Plan struct { // Deprecated: UpgradedClientState field has been deprecated. IBC upgrade logic has been // moved to the IBC module in the sub module 02-client. // If this field is not empty, an error will be thrown. - UpgradedClientState *types.Any `protobuf:"bytes,5,opt,name=upgraded_client_state,json=upgradedClientState,proto3" json:"upgraded_client_state,omitempty"` // Deprecated: Do not use. + UpgradedClientState *any.Any `protobuf:"bytes,5,opt,name=upgraded_client_state,json=upgradedClientState,proto3" json:"upgraded_client_state,omitempty"` // Deprecated: Do not use. } func (m *Plan) Reset() { *m = Plan{} } @@ -843,7 +843,7 @@ func (m *Plan) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.UpgradedClientState == nil { - m.UpgradedClientState = &types.Any{} + m.UpgradedClientState = &any.Any{} } if err := m.UpgradedClientState.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err