From 7be17857b10457c67cbf66a49e13a9751eb10e8e Mon Sep 17 00:00:00 2001 From: Damian Nolan Date: Thu, 7 Sep 2023 12:26:19 +0200 Subject: [PATCH] chore: remove GetSignBytes from 29-fee and transfer msgs (#4570) --- modules/apps/29-fee/types/fee.pb.go | 67 ++++++++-------- modules/apps/29-fee/types/msgs.go | 47 +---------- modules/apps/29-fee/types/msgs_test.go | 31 -------- modules/apps/29-fee/types/tx.pb.go | 88 +++++++++++---------- modules/apps/transfer/types/msgs.go | 26 +----- modules/apps/transfer/types/msgs_test.go | 17 ---- modules/apps/transfer/types/tx.pb.go | 79 +++++++++--------- proto/ibc/applications/fee/v1/fee.proto | 24 ++++-- proto/ibc/applications/fee/v1/tx.proto | 5 ++ proto/ibc/applications/transfer/v1/tx.proto | 4 +- 10 files changed, 154 insertions(+), 234 deletions(-) diff --git a/modules/apps/29-fee/types/fee.pb.go b/modules/apps/29-fee/types/fee.pb.go index 7bdce36e9a3..a60d42d78ae 100644 --- a/modules/apps/29-fee/types/fee.pb.go +++ b/modules/apps/29-fee/types/fee.pb.go @@ -8,6 +8,7 @@ import ( 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/msgservice" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" types1 "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" @@ -266,38 +267,40 @@ func init() { func init() { proto.RegisterFile("ibc/applications/fee/v1/fee.proto", fileDescriptor_cb3319f1af2a53e5) } var fileDescriptor_cb3319f1af2a53e5 = []byte{ - // 490 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x31, 0x6f, 0xd3, 0x40, - 0x14, 0xc7, 0xe3, 0x04, 0xb5, 0xcd, 0x45, 0x30, 0x98, 0x4a, 0x2d, 0x11, 0xb8, 0xc5, 0x12, 0x52, - 0x84, 0x94, 0x3b, 0x12, 0x40, 0x02, 0x26, 0x08, 0x52, 0xa4, 0x4c, 0xa0, 0x2c, 0x48, 0x2c, 0xd5, - 0xf9, 0xee, 0xd9, 0x3d, 0xc5, 0xf6, 0x59, 0x3e, 0x27, 0x52, 0x57, 0x3e, 0x01, 0x2b, 0x33, 0x1b, - 0x13, 0x5f, 0x81, 0xad, 0x63, 0x47, 0x26, 0x40, 0xc9, 0xc0, 0xd7, 0x40, 0xef, 0x7c, 0x58, 0x55, - 0x51, 0x17, 0x94, 0xc9, 0xf7, 0xee, 0xee, 0xfd, 0x7f, 0x7f, 0xbf, 0x77, 0x8f, 0xdc, 0x57, 0x91, - 0x60, 0xbc, 0x28, 0x52, 0x25, 0x78, 0xa5, 0x74, 0x6e, 0x58, 0x0c, 0xc0, 0x56, 0x23, 0xfc, 0xd0, - 0xa2, 0xd4, 0x95, 0xf6, 0x0f, 0x54, 0x24, 0xe8, 0xe5, 0x2b, 0x14, 0xcf, 0x56, 0xa3, 0x7e, 0x20, - 0xb4, 0xc9, 0xb4, 0x61, 0x11, 0x37, 0x98, 0x12, 0x41, 0xc5, 0x47, 0x4c, 0x68, 0x95, 0xd7, 0x89, - 0xfd, 0xfd, 0x44, 0x27, 0xda, 0x2e, 0x19, 0xae, 0xdc, 0xae, 0x25, 0x0a, 0x5d, 0x02, 0x13, 0xa7, - 0x3c, 0xcf, 0x21, 0x45, 0x9a, 0x5b, 0xba, 0x2b, 0x07, 0x4e, 0x38, 0x33, 0x09, 0x1e, 0x66, 0x26, - 0xa9, 0x0f, 0xc2, 0x6f, 0x6d, 0xd2, 0x99, 0x02, 0xf8, 0x31, 0xd9, 0x2b, 0x41, 0xac, 0x4e, 0x62, - 0x80, 0x43, 0xef, 0xb8, 0x33, 0xe8, 0x8d, 0xef, 0xd0, 0x3a, 0x87, 0xa2, 0x19, 0xea, 0xcc, 0xd0, - 0xd7, 0x5a, 0xe5, 0x93, 0x47, 0xe7, 0x3f, 0x8e, 0x5a, 0x5f, 0x7e, 0x1e, 0x0d, 0x12, 0x55, 0x9d, - 0x2e, 0x23, 0x2a, 0x74, 0xc6, 0x1c, 0xa0, 0xfe, 0x0c, 0x8d, 0x5c, 0xb0, 0xea, 0xac, 0x00, 0x63, - 0x13, 0xcc, 0x7c, 0x17, 0xc5, 0x91, 0x23, 0xc9, 0x2e, 0x17, 0x0b, 0x8b, 0x69, 0x6f, 0x1f, 0xb3, - 0xc3, 0xc5, 0x02, 0x29, 0x29, 0xe9, 0x55, 0x2a, 0x03, 0xbd, 0xac, 0x2c, 0xa9, 0xb3, 0x7d, 0x12, - 0x71, 0xfa, 0x53, 0x80, 0xf0, 0x93, 0x47, 0xba, 0x6f, 0xb9, 0x58, 0x00, 0x46, 0xfe, 0x13, 0xd2, - 0xa9, 0x8b, 0xe8, 0x0d, 0x7a, 0xe3, 0xbb, 0xf4, 0x9a, 0x56, 0xd3, 0x29, 0xc0, 0xe4, 0x06, 0x62, - 0xe7, 0x78, 0xdd, 0x7f, 0x40, 0x6e, 0x95, 0x10, 0x2f, 0x73, 0x79, 0xc2, 0xa5, 0x2c, 0xc1, 0x98, - 0xc3, 0xf6, 0xb1, 0x37, 0xe8, 0xce, 0x6f, 0xd6, 0xbb, 0xaf, 0xea, 0x4d, 0xbf, 0x8f, 0x6d, 0x4a, - 0xf9, 0x19, 0x94, 0xc6, 0xfe, 0x55, 0x77, 0xde, 0xc4, 0x2f, 0x6e, 0x7f, 0xf8, 0xfd, 0xf5, 0xe1, - 0x15, 0x95, 0xf0, 0x1d, 0x21, 0x8d, 0x35, 0xe3, 0xcf, 0x48, 0xaf, 0xb0, 0x11, 0x96, 0xc5, 0xb8, - 0x46, 0x87, 0xd7, 0x7a, 0x6c, 0x32, 0x9d, 0x53, 0x52, 0x34, 0x52, 0xe1, 0x67, 0x8f, 0xec, 0xcf, - 0x24, 0xe4, 0x95, 0x8a, 0x15, 0xc8, 0x4b, 0x8c, 0x97, 0xa4, 0xeb, 0x18, 0x4a, 0xba, 0x2a, 0xdc, - 0xb3, 0x04, 0x7c, 0xa1, 0xf4, 0xef, 0xb3, 0x6c, 0xd4, 0x67, 0xd2, 0x89, 0xef, 0x15, 0x2e, 0xbe, - 0xea, 0xb2, 0xfd, 0xff, 0x2e, 0x27, 0x6f, 0xce, 0xd7, 0x81, 0x77, 0xb1, 0x0e, 0xbc, 0x5f, 0xeb, - 0xc0, 0xfb, 0xb8, 0x09, 0x5a, 0x17, 0x9b, 0xa0, 0xf5, 0x7d, 0x13, 0xb4, 0xde, 0x3f, 0xfd, 0xb7, - 0xd5, 0x2a, 0x12, 0xc3, 0x44, 0xb3, 0xd5, 0x33, 0x96, 0x69, 0xb9, 0x4c, 0xc1, 0xe0, 0x18, 0x1b, - 0x36, 0x7e, 0x3e, 0xc4, 0x09, 0xb6, 0xdd, 0x8f, 0x76, 0xec, 0xd8, 0x3c, 0xfe, 0x13, 0x00, 0x00, - 0xff, 0xff, 0x0e, 0x40, 0x01, 0xf4, 0xe6, 0x03, 0x00, 0x00, + // 518 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x31, 0x6f, 0xd3, 0x40, + 0x14, 0xc7, 0xe3, 0x04, 0xb5, 0xcd, 0x05, 0x90, 0x30, 0x95, 0x5a, 0x2a, 0x70, 0x8b, 0x25, 0xa4, + 0xa8, 0x52, 0xee, 0x94, 0x00, 0x12, 0x30, 0xd1, 0x20, 0x45, 0xca, 0x04, 0xca, 0x82, 0xc4, 0x12, + 0x9d, 0xcf, 0x2f, 0xee, 0x29, 0xb6, 0xcf, 0xf2, 0xd9, 0x41, 0x19, 0x58, 0xf8, 0x04, 0xac, 0xb0, + 0xb2, 0x31, 0xf5, 0x63, 0x74, 0xec, 0xc8, 0x04, 0x28, 0x19, 0xfa, 0x05, 0xf8, 0x00, 0xe8, 0x9d, + 0x0f, 0xab, 0x2a, 0xea, 0xc2, 0xd0, 0xc5, 0x77, 0xef, 0xde, 0xbb, 0xf7, 0xfb, 0xdf, 0xbb, 0xe7, + 0x23, 0x0f, 0x65, 0x20, 0x18, 0xcf, 0xb2, 0x58, 0x0a, 0x5e, 0x48, 0x95, 0x6a, 0x36, 0x03, 0x60, + 0x8b, 0x3e, 0x0e, 0x34, 0xcb, 0x55, 0xa1, 0xdc, 0x1d, 0x19, 0x08, 0x7a, 0x31, 0x84, 0xa2, 0x6f, + 0xd1, 0xdf, 0xbb, 0xc3, 0x13, 0x99, 0x2a, 0x66, 0xbe, 0x55, 0xec, 0x9e, 0x27, 0x94, 0x4e, 0x94, + 0x66, 0x01, 0xd7, 0x98, 0x25, 0x80, 0x82, 0xf7, 0x99, 0x50, 0x32, 0xb5, 0xfe, 0xed, 0x48, 0x45, + 0xca, 0x4c, 0x19, 0xce, 0xec, 0xaa, 0x11, 0x21, 0x54, 0x0e, 0x4c, 0x1c, 0xf3, 0x34, 0x85, 0x18, + 0x05, 0xd8, 0xa9, 0x0d, 0xd9, 0xb1, 0x89, 0x13, 0x1d, 0xa1, 0x33, 0xd1, 0x51, 0xe5, 0xf0, 0x7f, + 0x37, 0x49, 0x6b, 0x04, 0xe0, 0xbe, 0x27, 0x5b, 0x39, 0x88, 0xc5, 0x74, 0x06, 0xb0, 0xeb, 0x1c, + 0xb4, 0xba, 0x9d, 0xc1, 0x3d, 0x5a, 0xed, 0xa1, 0x28, 0x86, 0x5a, 0x31, 0xf4, 0x95, 0x92, 0xe9, + 0xf0, 0xe8, 0xf4, 0xc7, 0x7e, 0xe3, 0xdb, 0xcf, 0xfd, 0x6e, 0x24, 0x8b, 0xe3, 0x32, 0xa0, 0x42, + 0x25, 0xcc, 0x02, 0xaa, 0xa1, 0xa7, 0xc3, 0x39, 0x2b, 0x96, 0x19, 0x68, 0xb3, 0x41, 0x7f, 0x39, + 0x3f, 0x39, 0xbc, 0x19, 0x43, 0xc4, 0xc5, 0x72, 0x8a, 0xc7, 0xd1, 0x93, 0x4d, 0xa4, 0x21, 0xb8, + 0x24, 0x9b, 0x5c, 0xcc, 0x0d, 0xb7, 0x79, 0x0d, 0xdc, 0x0d, 0x2e, 0xe6, 0x88, 0xfd, 0x40, 0x3a, + 0x85, 0x4c, 0x40, 0x95, 0x85, 0x41, 0xb7, 0xae, 0x01, 0x4d, 0x2c, 0x70, 0x04, 0xe0, 0x7f, 0x76, + 0x48, 0xfb, 0x0d, 0x17, 0x73, 0x40, 0xcb, 0x7d, 0x42, 0x5a, 0x55, 0xdd, 0x9d, 0x6e, 0x67, 0x70, + 0x9f, 0x5e, 0xd1, 0x30, 0x74, 0x04, 0x30, 0xbc, 0x81, 0x3a, 0x26, 0x18, 0xee, 0x3e, 0x22, 0xb7, + 0x73, 0x98, 0x95, 0x69, 0x38, 0xe5, 0x61, 0x98, 0x83, 0xd6, 0xbb, 0xcd, 0x03, 0xa7, 0xdb, 0x9e, + 0xdc, 0xaa, 0x56, 0x8f, 0xaa, 0x45, 0x77, 0x0f, 0x6f, 0x36, 0xe6, 0x4b, 0xc8, 0xb5, 0x39, 0x66, + 0x7b, 0x52, 0xdb, 0x2f, 0xee, 0x7e, 0x3c, 0x3f, 0x39, 0xbc, 0x94, 0xc5, 0x7f, 0x4b, 0x48, 0x2d, + 0x4d, 0xbb, 0x63, 0xd2, 0xc9, 0x8c, 0x85, 0x75, 0xd2, 0xb6, 0x37, 0xfc, 0x2b, 0x35, 0xd6, 0x3b, + 0xad, 0x52, 0x92, 0xd5, 0xa9, 0xfc, 0xaf, 0x0e, 0xd9, 0x1e, 0x87, 0x90, 0x16, 0x72, 0x26, 0x21, + 0xbc, 0xc0, 0x78, 0x49, 0xda, 0x96, 0x21, 0x43, 0x5b, 0x85, 0x07, 0x86, 0x80, 0x4d, 0x4d, 0xff, + 0x76, 0x72, 0x9d, 0x7d, 0x1c, 0xda, 0xe4, 0x5b, 0x99, 0xb5, 0x2f, 0xab, 0x6c, 0xfe, 0xbf, 0xca, + 0xe1, 0xeb, 0xd3, 0x95, 0xe7, 0x9c, 0xad, 0x3c, 0xe7, 0xd7, 0xca, 0x73, 0x3e, 0xad, 0xbd, 0xc6, + 0xd9, 0xda, 0x6b, 0x7c, 0x5f, 0x7b, 0x8d, 0x77, 0x4f, 0xff, 0xbd, 0x7b, 0x19, 0x88, 0x5e, 0xa4, + 0xd8, 0xe2, 0x19, 0x4b, 0x54, 0x58, 0xc6, 0xa0, 0xf1, 0x31, 0xd0, 0x6c, 0xf0, 0xbc, 0x87, 0xef, + 0x80, 0x69, 0x87, 0x60, 0xc3, 0xfc, 0x69, 0x8f, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xa2, 0x53, + 0x6e, 0x63, 0x2c, 0x04, 0x00, 0x00, } func (m *Fee) Marshal() (dAtA []byte, err error) { diff --git a/modules/apps/29-fee/types/msgs.go b/modules/apps/29-fee/types/msgs.go index 57690173269..665b6a5ccc0 100644 --- a/modules/apps/29-fee/types/msgs.go +++ b/modules/apps/29-fee/types/msgs.go @@ -6,26 +6,17 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - legacytx "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" host "github.com/cosmos/ibc-go/v8/modules/core/24-host" ibcerrors "github.com/cosmos/ibc-go/v8/modules/core/errors" ) -// msg types -const ( - TypeMsgPayPacketFee = "payPacketFee" - TypeMsgPayPacketFeeAsync = "payPacketFeeAsync" -) - var ( - _ sdk.Msg = (*MsgRegisterPayee)(nil) - _ sdk.Msg = (*MsgRegisterCounterpartyPayee)(nil) - _ sdk.Msg = (*MsgPayPacketFee)(nil) - _ sdk.Msg = (*MsgPayPacketFeeAsync)(nil) - _ legacytx.LegacyMsg = (*MsgPayPacketFee)(nil) - _ legacytx.LegacyMsg = (*MsgPayPacketFeeAsync)(nil) + _ sdk.Msg = (*MsgRegisterPayee)(nil) + _ sdk.Msg = (*MsgRegisterCounterpartyPayee)(nil) + _ sdk.Msg = (*MsgPayPacketFee)(nil) + _ sdk.Msg = (*MsgPayPacketFeeAsync)(nil) ) // NewMsgRegisterPayee creates a new instance of MsgRegisterPayee @@ -162,21 +153,6 @@ func (msg MsgPayPacketFee) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{signer} } -// Type implements legacytx.LegacyMsg -func (MsgPayPacketFee) Type() string { - return TypeMsgPayPacketFee -} - -// Route implements legacytx.LegacyMsg -func (MsgPayPacketFee) Route() string { - return RouterKey -} - -// GetSignBytes implements legacytx.LegacyMsg -func (msg MsgPayPacketFee) GetSignBytes() []byte { - return sdk.MustSortJSON(amino.MustMarshalJSON(&msg)) -} - // NewMsgPayPacketAsync creates a new instance of MsgPayPacketFee func NewMsgPayPacketFeeAsync(packetID channeltypes.PacketId, packetFee PacketFee) *MsgPayPacketFeeAsync { return &MsgPayPacketFeeAsync{ @@ -203,18 +179,3 @@ func (msg MsgPayPacketFeeAsync) GetSigners() []sdk.AccAddress { } return []sdk.AccAddress{signer} } - -// Type implements legacytx.LegacyMsg -func (MsgPayPacketFeeAsync) Type() string { - return TypeMsgPayPacketFeeAsync -} - -// Route implements legacytx.LegacyMsg -func (MsgPayPacketFeeAsync) Route() string { - return RouterKey -} - -// GetSignBytes implements legacytx.LegacyMsg -func (msg MsgPayPacketFeeAsync) GetSignBytes() []byte { - return sdk.MustSortJSON(amino.MustMarshalJSON(&msg)) -} diff --git a/modules/apps/29-fee/types/msgs_test.go b/modules/apps/29-fee/types/msgs_test.go index adee3def072..1029744e77b 100644 --- a/modules/apps/29-fee/types/msgs_test.go +++ b/modules/apps/29-fee/types/msgs_test.go @@ -234,20 +234,6 @@ func TestPayPacketFeeGetSigners(t *testing.T) { require.Equal(t, []sdk.AccAddress{refundAddr}, msg.GetSigners()) } -func TestMsgPayPacketFeeRoute(t *testing.T) { - var msg types.MsgPayPacketFee - require.Equal(t, types.RouterKey, msg.Route()) -} - -func TestMsgPayPacketFeeGetSignBytes(t *testing.T) { - fee := types.NewFee(defaultRecvFee, defaultAckFee, defaultTimeoutFee) - msg := types.NewMsgPayPacketFee(fee, ibctesting.MockFeePort, ibctesting.FirstChannelID, defaultAccAddress, nil) - - require.NotPanics(t, func() { - _ = msg.GetSignBytes() - }) -} - func TestMsgPayPacketFeeAsyncValidation(t *testing.T) { var msg *types.MsgPayPacketFeeAsync @@ -382,20 +368,3 @@ func TestPayPacketFeeAsyncGetSigners(t *testing.T) { require.Equal(t, []sdk.AccAddress{refundAddr}, msg.GetSigners()) } - -func TestMsgPayPacketFeeAsyncRoute(t *testing.T) { - var msg types.MsgPayPacketFeeAsync - require.Equal(t, types.RouterKey, msg.Route()) -} - -func TestMsgPayPacketFeeAsyncGetSignBytes(t *testing.T) { - packetID := channeltypes.NewPacketID(ibctesting.MockFeePort, ibctesting.FirstChannelID, 1) - fee := types.NewFee(defaultRecvFee, defaultAckFee, defaultTimeoutFee) - packetFee := types.NewPacketFee(fee, defaultAccAddress, nil) - - msg := types.NewMsgPayPacketFeeAsync(packetID, packetFee) - - require.NotPanics(t, func() { - _ = msg.GetSignBytes() - }) -} diff --git a/modules/apps/29-fee/types/tx.pb.go b/modules/apps/29-fee/types/tx.pb.go index 32cd5b37849..ab62f474390 100644 --- a/modules/apps/29-fee/types/tx.pb.go +++ b/modules/apps/29-fee/types/tx.pb.go @@ -7,6 +7,7 @@ import ( context "context" fmt "fmt" _ "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" @@ -373,48 +374,51 @@ func init() { func init() { proto.RegisterFile("ibc/applications/fee/v1/tx.proto", fileDescriptor_05c93128649f1b96) } var fileDescriptor_05c93128649f1b96 = []byte{ - // 649 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0x8d, 0x9b, 0x7e, 0x65, 0x5a, 0x68, 0xbb, 0x54, 0x24, 0xb5, 0x5a, 0xb7, 0x58, 0x15, 0x2a, - 0x95, 0x62, 0x93, 0x40, 0x25, 0xa8, 0x84, 0x04, 0xad, 0x54, 0xd4, 0x43, 0x45, 0x94, 0x23, 0x97, - 0xca, 0xd9, 0x4c, 0x5d, 0x43, 0xec, 0xb5, 0xbc, 0x4e, 0x84, 0x6f, 0x88, 0x13, 0x07, 0x0e, 0xf0, - 0x0f, 0xf8, 0x09, 0xe5, 0xc2, 0x6f, 0xe8, 0xb1, 0x47, 0x4e, 0x15, 0x6a, 0x0f, 0xfd, 0x07, 0x9c, - 0xd1, 0xda, 0x6b, 0xcb, 0x4d, 0x48, 0x15, 0x90, 0xb8, 0x65, 0xf6, 0xbd, 0x7d, 0x33, 0xef, 0x65, - 0xbc, 0xb0, 0xe6, 0xb4, 0xa8, 0x69, 0xf9, 0x7e, 0xc7, 0xa1, 0x56, 0xe8, 0x30, 0x8f, 0x9b, 0x47, - 0x88, 0x66, 0xaf, 0x66, 0x86, 0xef, 0x0c, 0x3f, 0x60, 0x21, 0x23, 0x65, 0xa7, 0x45, 0x8d, 0x3c, - 0xc3, 0x38, 0x42, 0x34, 0x7a, 0x35, 0x75, 0xd1, 0x66, 0x36, 0x8b, 0x39, 0xa6, 0xf8, 0x95, 0xd0, - 0xd5, 0x7b, 0xc3, 0x04, 0xc5, 0xad, 0x1c, 0x85, 0xb2, 0x00, 0x4d, 0x7a, 0x6c, 0x79, 0x1e, 0x76, - 0x04, 0x2c, 0x7f, 0x4a, 0x4a, 0x99, 0x32, 0xee, 0x32, 0x6e, 0xba, 0xdc, 0x16, 0xa0, 0xcb, 0xed, - 0x04, 0xd0, 0x3f, 0x29, 0x30, 0x7f, 0xc0, 0xed, 0x26, 0xda, 0x0e, 0x0f, 0x31, 0x68, 0x58, 0x11, - 0x22, 0x29, 0xc3, 0x94, 0xcf, 0x82, 0xf0, 0xd0, 0x69, 0x57, 0x94, 0x35, 0x65, 0xa3, 0xd4, 0x9c, - 0x14, 0xe5, 0x7e, 0x9b, 0xac, 0x00, 0x48, 0x5d, 0x81, 0x8d, 0xc5, 0x58, 0x49, 0x9e, 0xec, 0xb7, - 0x49, 0x05, 0xa6, 0x02, 0xec, 0x58, 0x11, 0x06, 0x95, 0x62, 0x8c, 0xa5, 0x25, 0x59, 0x84, 0x09, - 0x5f, 0x48, 0x57, 0xc6, 0xe3, 0xf3, 0xa4, 0xd8, 0x9e, 0xff, 0xf8, 0x75, 0xb5, 0xf0, 0xe1, 0xea, - 0x64, 0x33, 0xe5, 0xe9, 0x2a, 0x54, 0xfa, 0xa7, 0x69, 0x22, 0xf7, 0x99, 0xc7, 0x51, 0xff, 0xa6, - 0xc0, 0x72, 0x0e, 0xdc, 0x65, 0x5d, 0x2f, 0xc4, 0xc0, 0xb7, 0x82, 0x30, 0xfa, 0x5f, 0x63, 0x57, - 0x81, 0xd0, 0x5c, 0x9b, 0xc3, 0xbc, 0x87, 0x05, 0xda, 0x3f, 0xc0, 0x1f, 0xfc, 0xdc, 0x87, 0xf5, - 0x9b, 0x46, 0xce, 0xbc, 0x9d, 0x2b, 0x30, 0x77, 0xc0, 0xed, 0x86, 0x15, 0x35, 0x2c, 0xfa, 0x16, - 0xc3, 0x3d, 0x44, 0xf2, 0x18, 0x8a, 0x47, 0x88, 0xb1, 0x95, 0x99, 0xfa, 0xb2, 0x31, 0x64, 0x6d, - 0x8c, 0x3d, 0xc4, 0x9d, 0xf1, 0xd3, 0xf3, 0xd5, 0x42, 0x53, 0xd0, 0xc9, 0x3a, 0xdc, 0xe6, 0xac, - 0x1b, 0x50, 0x3c, 0x4c, 0xb3, 0x48, 0xfc, 0xce, 0x26, 0xa7, 0x8d, 0x24, 0x91, 0x4d, 0x58, 0x90, - 0xac, 0x5c, 0x30, 0x89, 0xf9, 0xb9, 0x04, 0xd8, 0xcd, 0xe2, 0xb9, 0x0b, 0x93, 0xdc, 0xb1, 0x3d, - 0x0c, 0xa4, 0x71, 0x59, 0x11, 0x15, 0xa6, 0xa5, 0x4d, 0x5e, 0x99, 0x58, 0x2b, 0x6e, 0x94, 0x9a, - 0x59, 0xbd, 0x3d, 0x97, 0x26, 0x21, 0xc9, 0xfa, 0x12, 0x94, 0xfb, 0xfc, 0x65, 0xde, 0xbf, 0x2b, - 0xb0, 0xd8, 0x87, 0xbd, 0xe0, 0x91, 0x47, 0xc9, 0x73, 0x28, 0xf9, 0xf1, 0x49, 0xfa, 0x8f, 0xce, - 0xd4, 0x57, 0xe2, 0x18, 0xc4, 0xae, 0x1b, 0xe9, 0x82, 0xf7, 0x6a, 0x46, 0x72, 0x6f, 0xbf, 0x2d, - 0x73, 0x98, 0xf6, 0x65, 0x4d, 0x5e, 0x02, 0x48, 0x05, 0x91, 0xe4, 0x58, 0x2c, 0xa1, 0x0f, 0x4d, - 0x32, 0x6b, 0x2f, 0x75, 0x64, 0xf7, 0x3d, 0xc4, 0xed, 0x3b, 0xa9, 0x9f, 0x9c, 0x9e, 0xae, 0xc5, - 0xfb, 0x38, 0x30, 0x77, 0x6a, 0xac, 0xfe, 0xab, 0x08, 0xc5, 0x03, 0x6e, 0x13, 0x17, 0x6e, 0x5d, - 0xff, 0xbe, 0x1e, 0x0c, 0x1d, 0xa1, 0x7f, 0xf9, 0xd5, 0xda, 0xc8, 0xd4, 0xb4, 0x2d, 0xf9, 0xa2, - 0xc0, 0xd2, 0xf0, 0x8f, 0x64, 0x6b, 0x14, 0xc1, 0x81, 0x6b, 0xea, 0xb3, 0x7f, 0xba, 0x96, 0xcd, - 0xf4, 0x06, 0x66, 0xaf, 0xed, 0xf6, 0xc6, 0x4d, 0x72, 0x79, 0xa6, 0xfa, 0x70, 0x54, 0x66, 0xd6, - 0x2b, 0x82, 0x85, 0xc1, 0x5d, 0xaa, 0x8e, 0x2a, 0x13, 0xd3, 0xd5, 0xad, 0xbf, 0xa2, 0xa7, 0xad, - 0xd5, 0x89, 0xf7, 0x57, 0x27, 0x9b, 0xca, 0xce, 0xab, 0xd3, 0x0b, 0x4d, 0x39, 0xbb, 0xd0, 0x94, - 0x9f, 0x17, 0x9a, 0xf2, 0xf9, 0x52, 0x2b, 0x9c, 0x5d, 0x6a, 0x85, 0x1f, 0x97, 0x5a, 0xe1, 0xf5, - 0x96, 0xed, 0x84, 0xc7, 0xdd, 0x96, 0x41, 0x99, 0x6b, 0xca, 0x27, 0xd9, 0x69, 0xd1, 0xaa, 0xcd, - 0xcc, 0xde, 0x13, 0xd3, 0x65, 0xed, 0x6e, 0x07, 0xb9, 0x78, 0xed, 0xb9, 0x59, 0x7f, 0x5a, 0x15, - 0x0f, 0x7d, 0x18, 0xf9, 0xc8, 0x5b, 0x93, 0xf1, 0x63, 0xfd, 0xe8, 0x77, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x8b, 0xf8, 0x6c, 0x49, 0x5e, 0x06, 0x00, 0x00, + // 695 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x6e, 0xd3, 0x40, + 0x10, 0x8e, 0x9b, 0xfe, 0x65, 0x5a, 0x28, 0xb1, 0x2a, 0x92, 0x9a, 0x36, 0x2d, 0x56, 0x05, 0x25, + 0x52, 0xec, 0x26, 0x50, 0x01, 0x11, 0x48, 0xd0, 0x4a, 0x45, 0x3d, 0x54, 0x44, 0x39, 0x72, 0xa9, + 0x1c, 0x67, 0xea, 0x9a, 0xc6, 0x5e, 0xcb, 0xeb, 0x44, 0xf8, 0x86, 0x38, 0x21, 0x4e, 0xf0, 0x06, + 0x3c, 0x00, 0x87, 0x3e, 0x46, 0x8f, 0x3d, 0x22, 0x24, 0x10, 0x6a, 0x0f, 0x7d, 0x03, 0x6e, 0x48, + 0x68, 0xd7, 0x6b, 0xcb, 0x4d, 0x9a, 0x2a, 0x20, 0x71, 0xb1, 0x3c, 0x33, 0xdf, 0x7e, 0x33, 0xdf, + 0xa7, 0x1d, 0x2d, 0xac, 0xd8, 0x2d, 0x53, 0x37, 0x3c, 0xaf, 0x63, 0x9b, 0x46, 0x60, 0x13, 0x97, + 0xea, 0xfb, 0x88, 0x7a, 0xaf, 0xaa, 0x07, 0x6f, 0x34, 0xcf, 0x27, 0x01, 0x91, 0x0b, 0x76, 0xcb, + 0xd4, 0xd2, 0x08, 0x6d, 0x1f, 0x51, 0xeb, 0x55, 0x95, 0xbc, 0xe1, 0xd8, 0x2e, 0xd1, 0xf9, 0x37, + 0xc2, 0x2a, 0xf3, 0x16, 0xb1, 0x08, 0xff, 0xd5, 0xd9, 0x9f, 0xc8, 0xde, 0x1e, 0xd6, 0x83, 0x11, + 0xa5, 0x20, 0x26, 0xf1, 0x51, 0x37, 0x0f, 0x0c, 0xd7, 0xc5, 0x0e, 0x2b, 0x8b, 0x5f, 0x01, 0x29, + 0x98, 0x84, 0x3a, 0x84, 0xea, 0x0e, 0xb5, 0x58, 0xd1, 0xa1, 0x56, 0x54, 0x50, 0xbf, 0x48, 0x70, + 0x63, 0x97, 0x5a, 0x4d, 0xb4, 0x6c, 0x1a, 0xa0, 0xdf, 0x30, 0x42, 0x44, 0xb9, 0x00, 0x53, 0x1e, + 0xf1, 0x83, 0x3d, 0xbb, 0x5d, 0x94, 0x56, 0xa4, 0xb5, 0x5c, 0x73, 0x92, 0x85, 0x3b, 0x6d, 0x79, + 0x09, 0x40, 0xf0, 0xb2, 0xda, 0x18, 0xaf, 0xe5, 0x44, 0x66, 0xa7, 0x2d, 0x17, 0x61, 0xca, 0xc7, + 0x8e, 0x11, 0xa2, 0x5f, 0xcc, 0xf2, 0x5a, 0x1c, 0xca, 0xf3, 0x30, 0xe1, 0x31, 0xea, 0xe2, 0x38, + 0xcf, 0x47, 0x41, 0x7d, 0xfd, 0xfd, 0xe7, 0xe5, 0xcc, 0xbb, 0xf3, 0xa3, 0x72, 0x8c, 0xfb, 0x70, + 0x7e, 0x54, 0xbe, 0x15, 0x8d, 0x5a, 0xa1, 0xed, 0x43, 0xbd, 0x7f, 0x32, 0x55, 0x81, 0x62, 0x7f, + 0xae, 0x89, 0xd4, 0x23, 0x2e, 0x45, 0xf5, 0xbb, 0x04, 0x8b, 0xa9, 0xe2, 0x16, 0xe9, 0xba, 0x01, + 0xfa, 0x9e, 0xe1, 0x07, 0xe1, 0xff, 0x92, 0x55, 0x01, 0xd9, 0x4c, 0xb5, 0xd9, 0x4b, 0x6b, 0xcc, + 0x9b, 0xfd, 0x03, 0xd4, 0x9f, 0x5c, 0xa6, 0xf7, 0xee, 0xe5, 0x7a, 0x07, 0xc6, 0x57, 0xef, 0xc0, + 0xea, 0x55, 0xf5, 0xc4, 0x87, 0xdf, 0x12, 0xcc, 0xed, 0x52, 0xab, 0x61, 0x84, 0x0d, 0xc3, 0x3c, + 0xc4, 0x60, 0x1b, 0x51, 0x7e, 0x00, 0xd9, 0x7d, 0x44, 0x2e, 0x7b, 0xa6, 0xb6, 0xa8, 0x0d, 0xb9, + 0x95, 0xda, 0x36, 0xe2, 0xe6, 0xf8, 0xf1, 0x8f, 0xe5, 0x4c, 0x93, 0xc1, 0xe5, 0x55, 0xb8, 0x4e, + 0x49, 0xd7, 0x37, 0x71, 0x2f, 0xf6, 0x2d, 0xf2, 0x66, 0x36, 0xca, 0x36, 0x22, 0xf7, 0xca, 0x90, + 0x17, 0xa8, 0x94, 0x89, 0x91, 0x51, 0x73, 0x51, 0x61, 0x2b, 0xb1, 0xf2, 0x26, 0x4c, 0x52, 0xdb, + 0x72, 0xd1, 0x17, 0x26, 0x89, 0x48, 0x56, 0x60, 0x5a, 0x58, 0x42, 0x8b, 0x13, 0x2b, 0xd9, 0xb5, + 0x5c, 0x33, 0x89, 0xeb, 0x5a, 0xec, 0x9a, 0x00, 0x33, 0xd3, 0x94, 0x8b, 0xa6, 0xa5, 0xb5, 0xaa, + 0x0b, 0x50, 0xe8, 0x4b, 0x25, 0xd6, 0x7c, 0x93, 0x60, 0xbe, 0xaf, 0xf6, 0x9c, 0x86, 0xae, 0x29, + 0x3f, 0x83, 0x9c, 0xc7, 0x33, 0xf1, 0xe5, 0x98, 0xa9, 0x2d, 0x71, 0x97, 0xd8, 0x5a, 0x69, 0xf1, + 0x2e, 0xf5, 0xaa, 0x5a, 0x74, 0x6e, 0xa7, 0x2d, 0x6c, 0x9a, 0xf6, 0x44, 0x2c, 0xbf, 0x00, 0x10, + 0x0c, 0xcc, 0xe8, 0x31, 0x4e, 0xa1, 0x0e, 0x35, 0x3a, 0x69, 0x2f, 0x78, 0x44, 0xf7, 0x6d, 0xc4, + 0xfa, 0xc3, 0x58, 0x6e, 0x8a, 0x8f, 0x49, 0x5e, 0x1e, 0x2e, 0x99, 0x6b, 0x50, 0x4b, 0xfc, 0xfa, + 0x0f, 0xe4, 0x63, 0xf1, 0xb5, 0x5f, 0x59, 0xc8, 0xee, 0x52, 0x4b, 0x76, 0xe0, 0xda, 0xc5, 0x75, + 0xbf, 0x37, 0x74, 0xcc, 0xfe, 0x5d, 0x53, 0xaa, 0x23, 0x43, 0xe3, 0xb6, 0xf2, 0x27, 0x09, 0x16, + 0x86, 0xef, 0xe4, 0xc6, 0x28, 0x84, 0x03, 0xc7, 0x94, 0xa7, 0xff, 0x74, 0x2c, 0x99, 0xe9, 0x35, + 0xcc, 0x5e, 0x58, 0x8f, 0xb5, 0xab, 0xe8, 0xd2, 0x48, 0x65, 0x7d, 0x54, 0x64, 0xd2, 0x2b, 0x84, + 0xfc, 0xe0, 0x7d, 0xab, 0x8c, 0x4a, 0xc3, 0xe1, 0xca, 0xc6, 0x5f, 0xc1, 0xe3, 0xd6, 0xca, 0xc4, + 0xdb, 0xf3, 0xa3, 0xb2, 0xb4, 0xf9, 0xf2, 0xf8, 0xb4, 0x24, 0x9d, 0x9c, 0x96, 0xa4, 0x9f, 0xa7, + 0x25, 0xe9, 0xe3, 0x59, 0x29, 0x73, 0x72, 0x56, 0xca, 0x7c, 0x3d, 0x2b, 0x65, 0x5e, 0x6d, 0x58, + 0x76, 0x70, 0xd0, 0x6d, 0x69, 0x26, 0x71, 0x74, 0xf1, 0x42, 0xd8, 0x2d, 0xb3, 0x62, 0x11, 0xbd, + 0xf7, 0x48, 0x77, 0x48, 0xbb, 0xdb, 0x41, 0xca, 0x1e, 0x1f, 0xaa, 0xd7, 0x1e, 0x57, 0xd8, 0xbb, + 0x13, 0x84, 0x1e, 0xd2, 0xd6, 0x24, 0x7f, 0x3b, 0xee, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0xa0, + 0xae, 0xb3, 0x04, 0x00, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/apps/transfer/types/msgs.go b/modules/apps/transfer/types/msgs.go index 35c68b50379..0cfa61f1bba 100644 --- a/modules/apps/transfer/types/msgs.go +++ b/modules/apps/transfer/types/msgs.go @@ -6,22 +6,15 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - legacytx "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" host "github.com/cosmos/ibc-go/v8/modules/core/24-host" ibcerrors "github.com/cosmos/ibc-go/v8/modules/core/errors" ) -// msg types -const ( - TypeMsgTransfer = "transfer" -) - var ( - _ sdk.Msg = (*MsgUpdateParams)(nil) - _ sdk.Msg = (*MsgTransfer)(nil) - _ legacytx.LegacyMsg = (*MsgTransfer)(nil) + _ sdk.Msg = (*MsgUpdateParams)(nil) + _ sdk.Msg = (*MsgTransfer)(nil) ) // NewMsgUpdateParams creates a new MsgUpdateParams instance @@ -71,16 +64,6 @@ func NewMsgTransfer( } } -// Type implements legacytx.LegacyMsg -func (MsgTransfer) Type() string { - return TypeMsgTransfer -} - -// Route implements legacytx.LegacyMsg -func (MsgTransfer) Route() string { - return RouterKey -} - // ValidateBasic performs a basic check of the MsgTransfer fields. // NOTE: timeout height or timestamp values can be 0 to disable the timeout. // NOTE: The recipient addresses format is not validated as the format defined by @@ -109,11 +92,6 @@ func (msg MsgTransfer) ValidateBasic() error { return ValidateIBCDenom(msg.Token.Denom) } -// GetSignBytes implements legacytx.LegacyMsg -func (msg MsgTransfer) GetSignBytes() []byte { - return sdk.MustSortJSON(amino.MustMarshalJSON(&msg)) -} - // GetSigners implements sdk.Msg func (msg MsgTransfer) GetSigners() []sdk.AccAddress { signer, err := sdk.AccAddressFromBech32(msg.Sender) diff --git a/modules/apps/transfer/types/msgs_test.go b/modules/apps/transfer/types/msgs_test.go index 47f7d28a91e..9ecac27a903 100644 --- a/modules/apps/transfer/types/msgs_test.go +++ b/modules/apps/transfer/types/msgs_test.go @@ -1,7 +1,6 @@ package types_test import ( - "fmt" "testing" "github.com/stretchr/testify/require" @@ -46,22 +45,6 @@ var ( timeoutHeight = clienttypes.NewHeight(0, 10) ) -// TestMsgTransferRoute tests Route for MsgTransfer -func TestMsgTransferRoute(t *testing.T) { - msg := types.NewMsgTransfer(validPort, validChannel, coin, sender, receiver, timeoutHeight, 0, "") - - require.Equal(t, types.RouterKey, msg.Route()) -} - -func TestMsgTransferGetSignBytes(t *testing.T) { - msg := types.NewMsgTransfer(validPort, validChannel, coin, sender, receiver, timeoutHeight, 0, "") - expected := fmt.Sprintf(`{"type":"cosmos-sdk/MsgTransfer","value":{"receiver":"%s","sender":"%s","source_channel":"testchannel","source_port":"testportid","timeout_height":{"revision_height":"10"},"token":{"amount":"100","denom":"atom"}}}`, receiver, sender) - require.NotPanics(t, func() { - res := msg.GetSignBytes() - require.Equal(t, expected, string(res)) - }) -} - // TestMsgTransferValidation tests ValidateBasic for MsgTransfer func TestMsgTransferValidation(t *testing.T) { testCases := []struct { diff --git a/modules/apps/transfer/types/tx.pb.go b/modules/apps/transfer/types/tx.pb.go index 2e5777434e8..14b4b9815d6 100644 --- a/modules/apps/transfer/types/tx.pb.go +++ b/modules/apps/transfer/types/tx.pb.go @@ -8,6 +8,7 @@ import ( fmt "fmt" 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" @@ -220,44 +221,46 @@ func init() { } var fileDescriptor_7401ed9bed2f8e09 = []byte{ - // 582 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x41, 0x4f, 0xd4, 0x40, - 0x14, 0xde, 0xc2, 0xb2, 0xe2, 0xac, 0x80, 0x8e, 0x46, 0x4a, 0x63, 0xba, 0x64, 0x23, 0x09, 0x42, - 0x98, 0x49, 0x31, 0x04, 0xc3, 0x11, 0x0e, 0x7a, 0x21, 0xc1, 0x0d, 0x5e, 0xbc, 0x90, 0x76, 0x78, - 0x76, 0x27, 0x6e, 0x67, 0xea, 0xcc, 0x6c, 0xa3, 0x17, 0x63, 0x3c, 0x79, 0xf4, 0x27, 0xf8, 0x13, - 0xf8, 0x19, 0x1c, 0x39, 0x9a, 0x98, 0x18, 0x03, 0x07, 0x2e, 0xfe, 0x08, 0xd3, 0xe9, 0x74, 0x53, - 0x3d, 0xac, 0x7a, 0xea, 0xcc, 0x7b, 0xdf, 0xfb, 0xde, 0xf7, 0xbe, 0xe9, 0x43, 0x6b, 0x3c, 0x61, - 0x34, 0xce, 0xf3, 0x11, 0x67, 0xb1, 0xe1, 0x52, 0x68, 0x6a, 0x54, 0x2c, 0xf4, 0x2b, 0x50, 0xb4, - 0x88, 0xa8, 0x79, 0x4b, 0x72, 0x25, 0x8d, 0xc4, 0x0f, 0x78, 0xc2, 0x48, 0x13, 0x46, 0x6a, 0x18, - 0x29, 0xa2, 0xe0, 0x5e, 0x2a, 0x53, 0x69, 0x81, 0xb4, 0x3c, 0x55, 0x35, 0xc1, 0x32, 0x93, 0x3a, - 0x93, 0x9a, 0x66, 0x3a, 0x2d, 0xb9, 0x32, 0x9d, 0xba, 0x44, 0xe8, 0x12, 0x49, 0xac, 0x81, 0x16, - 0x51, 0x02, 0x26, 0x8e, 0x28, 0x93, 0x5c, 0xb8, 0x7c, 0xaf, 0xd4, 0xc4, 0xa4, 0x02, 0xca, 0x46, - 0x1c, 0x84, 0x29, 0xab, 0xab, 0x93, 0x03, 0x6c, 0x4e, 0x17, 0x5d, 0x2b, 0xb3, 0xe0, 0xfe, 0xb7, - 0x19, 0xd4, 0x3d, 0xd4, 0xe9, 0xb1, 0x8b, 0xe2, 0x1e, 0xea, 0x6a, 0x39, 0x56, 0x0c, 0x4e, 0x72, - 0xa9, 0x8c, 0xef, 0xad, 0x7a, 0xeb, 0x37, 0x07, 0xa8, 0x0a, 0x1d, 0x49, 0x65, 0xf0, 0x1a, 0x5a, - 0x74, 0x00, 0x36, 0x8c, 0x85, 0x80, 0x91, 0x3f, 0x63, 0x31, 0x0b, 0x55, 0xf4, 0xa0, 0x0a, 0xe2, - 0x1d, 0x34, 0x67, 0xe4, 0x6b, 0x10, 0xfe, 0xec, 0xaa, 0xb7, 0xde, 0xdd, 0x5e, 0x21, 0xd5, 0x54, - 0xa4, 0x9c, 0x8a, 0xb8, 0xa9, 0xc8, 0x81, 0xe4, 0x62, 0xbf, 0x7d, 0xfe, 0xbd, 0xd7, 0x1a, 0x54, - 0x68, 0x7c, 0x1f, 0x75, 0x34, 0x88, 0x53, 0x50, 0x7e, 0xdb, 0xb2, 0xba, 0x1b, 0x0e, 0xd0, 0xbc, - 0x02, 0x06, 0xbc, 0x00, 0xe5, 0xcf, 0xd9, 0xcc, 0xe4, 0x8e, 0x9f, 0xa2, 0x45, 0xc3, 0x33, 0x90, - 0x63, 0x73, 0x32, 0x04, 0x9e, 0x0e, 0x8d, 0xdf, 0xb1, 0x3d, 0x03, 0x52, 0x3e, 0x4b, 0xe9, 0x14, - 0x71, 0xfe, 0x14, 0x11, 0x79, 0x66, 0x11, 0xae, 0xe9, 0x82, 0xab, 0xab, 0x82, 0x78, 0x13, 0xdd, - 0xa9, 0x89, 0xca, 0xaf, 0x36, 0x71, 0x96, 0xfb, 0x37, 0x56, 0xbd, 0xf5, 0xf6, 0xe0, 0xb6, 0x4b, - 0x1c, 0xd7, 0x71, 0x8c, 0x51, 0x3b, 0x83, 0x4c, 0xfa, 0xf3, 0x56, 0x8d, 0x3d, 0xef, 0x2d, 0x7d, - 0xfa, 0xd2, 0x6b, 0x7d, 0xbc, 0x3e, 0xdb, 0x70, 0xb2, 0xfb, 0xbb, 0xe8, 0x6e, 0xc3, 0xdc, 0x01, - 0xe8, 0x5c, 0x0a, 0x0d, 0xe5, 0x34, 0x1a, 0xde, 0x8c, 0x41, 0x30, 0xb0, 0x0e, 0xb7, 0x07, 0x93, - 0xfb, 0x5e, 0xbb, 0xe4, 0xe8, 0xbf, 0x47, 0x4b, 0x87, 0x3a, 0x7d, 0x91, 0x9f, 0xc6, 0x06, 0x8e, - 0x62, 0x15, 0x67, 0xda, 0x5a, 0xc3, 0x53, 0x01, 0xca, 0x3d, 0x8a, 0xbb, 0xe1, 0x7d, 0xd4, 0xc9, - 0x2d, 0xc2, 0x3e, 0x44, 0x77, 0xfb, 0x21, 0x99, 0xf6, 0x37, 0x92, 0x8a, 0xcd, 0x19, 0xe0, 0x2a, - 0x9b, 0xc2, 0x2d, 0x69, 0x7f, 0x05, 0x2d, 0xff, 0xd1, 0xbf, 0x16, 0xbf, 0xfd, 0xd3, 0x43, 0xb3, - 0x87, 0x3a, 0xc5, 0x43, 0x34, 0x3f, 0xf9, 0x6b, 0x1e, 0x4d, 0xef, 0xd9, 0xf0, 0x20, 0x88, 0xfe, - 0x19, 0x3a, 0xb1, 0xcb, 0xa0, 0x5b, 0xbf, 0x39, 0xb1, 0xf5, 0x57, 0x8a, 0x26, 0x3c, 0xd8, 0xf9, - 0x2f, 0x78, 0xdd, 0x35, 0x98, 0xfb, 0x70, 0x7d, 0xb6, 0xe1, 0xed, 0x3f, 0x3f, 0xbf, 0x0c, 0xbd, - 0x8b, 0xcb, 0xd0, 0xfb, 0x71, 0x19, 0x7a, 0x9f, 0xaf, 0xc2, 0xd6, 0xc5, 0x55, 0xd8, 0xfa, 0x7a, - 0x15, 0xb6, 0x5e, 0xee, 0xa6, 0xdc, 0x0c, 0xc7, 0x09, 0x61, 0x32, 0xa3, 0x6e, 0x67, 0x79, 0xc2, - 0xb6, 0x52, 0x49, 0x8b, 0x27, 0x34, 0x93, 0xa7, 0xe3, 0x11, 0xe8, 0x72, 0x0f, 0x1b, 0xfb, 0x67, - 0xde, 0xe5, 0xa0, 0x93, 0x8e, 0x5d, 0xbd, 0xc7, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x90, 0x9d, - 0xa7, 0xd6, 0x5e, 0x04, 0x00, 0x00, + // 623 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xcf, 0x4f, 0x13, 0x4f, + 0x14, 0xef, 0x7e, 0x29, 0xfd, 0xe2, 0x54, 0x40, 0x56, 0x02, 0xcb, 0xc6, 0x6c, 0x49, 0x23, 0x09, + 0x96, 0x30, 0x93, 0x62, 0x0c, 0x86, 0x63, 0x89, 0xd1, 0x0b, 0x09, 0x36, 0x78, 0xf1, 0x42, 0x76, + 0xa7, 0xcf, 0xed, 0x84, 0xee, 0xcc, 0x3a, 0x33, 0x6d, 0xe4, 0x62, 0x8c, 0x07, 0x63, 0x3c, 0x79, + 0xf6, 0xe4, 0x9f, 0xd0, 0x3f, 0x83, 0x23, 0x47, 0x4f, 0xc6, 0xc0, 0xa1, 0x17, 0xff, 0x08, 0x33, + 0xb3, 0xd3, 0x5a, 0x3d, 0x54, 0xbd, 0xec, 0xbe, 0x1f, 0x9f, 0xf7, 0xeb, 0xf3, 0xe6, 0xa1, 0x2d, + 0x96, 0x50, 0x12, 0xe7, 0x79, 0x8f, 0xd1, 0x58, 0x33, 0xc1, 0x15, 0xd1, 0x32, 0xe6, 0xea, 0x05, + 0x48, 0x32, 0x68, 0x12, 0xfd, 0x0a, 0xe7, 0x52, 0x68, 0xe1, 0xdf, 0x61, 0x09, 0xc5, 0xd3, 0x30, + 0x3c, 0x86, 0xe1, 0x41, 0x33, 0x5c, 0x89, 0x33, 0xc6, 0x05, 0xb1, 0xdf, 0x22, 0x20, 0x5c, 0x4d, + 0x45, 0x2a, 0xac, 0x48, 0x8c, 0xe4, 0xac, 0xeb, 0x54, 0xa8, 0x4c, 0x28, 0x92, 0xa9, 0xd4, 0xa4, + 0xcf, 0x54, 0xea, 0x1c, 0x91, 0x73, 0x24, 0xb1, 0x02, 0x32, 0x68, 0x26, 0xa0, 0xe3, 0x26, 0xa1, + 0x82, 0x71, 0xe7, 0xaf, 0x99, 0x36, 0xa9, 0x90, 0x40, 0x68, 0x8f, 0x01, 0xd7, 0x26, 0xba, 0x90, + 0x1c, 0x60, 0x67, 0xf6, 0x1c, 0xe3, 0x66, 0x2d, 0xb8, 0xfe, 0x6e, 0x0e, 0x55, 0x8f, 0x54, 0x7a, + 0xe2, 0xac, 0x7e, 0x0d, 0x55, 0x95, 0xe8, 0x4b, 0x0a, 0xa7, 0xb9, 0x90, 0x3a, 0xf0, 0x36, 0xbd, + 0xed, 0x1b, 0x6d, 0x54, 0x98, 0x8e, 0x85, 0xd4, 0xfe, 0x16, 0x5a, 0x72, 0x00, 0xda, 0x8d, 0x39, + 0x87, 0x5e, 0xf0, 0x9f, 0xc5, 0x2c, 0x16, 0xd6, 0xc3, 0xc2, 0xe8, 0x3f, 0x42, 0xf3, 0x5a, 0x9c, + 0x01, 0x0f, 0xe6, 0x36, 0xbd, 0xed, 0xea, 0xde, 0x06, 0x2e, 0xa6, 0xc2, 0x66, 0x2a, 0xec, 0xa6, + 0xc2, 0x87, 0x82, 0xf1, 0xd6, 0xea, 0xc5, 0xd7, 0x5a, 0xe9, 0xd3, 0x68, 0xd8, 0xa8, 0xf6, 0x20, + 0x8d, 0xe9, 0xf9, 0xa9, 0x99, 0xb5, 0x5d, 0x44, 0xfb, 0x6b, 0xa8, 0xa2, 0x80, 0x77, 0x40, 0x06, + 0x65, 0x5b, 0xc5, 0x69, 0x7e, 0x88, 0x16, 0x24, 0x50, 0x60, 0x03, 0x90, 0xc1, 0xbc, 0xf5, 0x4c, + 0x74, 0xff, 0x31, 0x5a, 0xd2, 0x2c, 0x03, 0xd1, 0xd7, 0xa7, 0x5d, 0x60, 0x69, 0x57, 0x07, 0x15, + 0xdb, 0x43, 0x88, 0xcd, 0xe6, 0x0c, 0x73, 0xd8, 0xf1, 0x35, 0x68, 0xe2, 0x27, 0x16, 0xd1, 0x2a, + 0x9b, 0x26, 0xda, 0x8b, 0x2e, 0xae, 0x30, 0xfa, 0x3b, 0x68, 0x65, 0x9c, 0xc8, 0xfc, 0x95, 0x8e, + 0xb3, 0x3c, 0xf8, 0x7f, 0xd3, 0xdb, 0x2e, 0xb7, 0x6f, 0x39, 0xc7, 0xc9, 0xd8, 0xee, 0xfb, 0xa8, + 0x9c, 0x41, 0x26, 0x82, 0x05, 0xdb, 0x8d, 0x95, 0x0f, 0x1a, 0xef, 0x3f, 0xd7, 0x4a, 0x6f, 0x47, + 0xc3, 0x86, 0x6b, 0xfb, 0xc3, 0x68, 0xd8, 0x58, 0x2b, 0x88, 0xd8, 0x55, 0x9d, 0x33, 0x32, 0x45, + 0x7c, 0x7d, 0x1f, 0xdd, 0x9e, 0x52, 0xdb, 0xa0, 0x72, 0xc1, 0x15, 0x98, 0x41, 0x15, 0xbc, 0xec, + 0x03, 0xa7, 0x60, 0x97, 0x51, 0x6e, 0x4f, 0xf4, 0x83, 0xb2, 0x49, 0x5f, 0x7f, 0x8d, 0x96, 0x8f, + 0x54, 0xfa, 0x2c, 0xef, 0xc4, 0x1a, 0x8e, 0x63, 0x19, 0x67, 0xca, 0xb2, 0xc6, 0x52, 0x0e, 0xd2, + 0xed, 0xcf, 0x69, 0x7e, 0x0b, 0x55, 0x72, 0x8b, 0xb0, 0x3b, 0xab, 0xee, 0xdd, 0xc5, 0xb3, 0xde, + 0x32, 0x2e, 0xb2, 0x39, 0x6e, 0x5c, 0xe4, 0xc1, 0xf2, 0xcf, 0x99, 0x6c, 0xd2, 0xfa, 0x06, 0x5a, + 0xff, 0xad, 0xfe, 0xb8, 0xf9, 0xbd, 0xef, 0x1e, 0x9a, 0x3b, 0x52, 0xa9, 0xdf, 0x45, 0x0b, 0x93, + 0x07, 0x76, 0x6f, 0x76, 0xcd, 0x29, 0x0e, 0xc2, 0xe6, 0x5f, 0x43, 0x27, 0x74, 0x69, 0x74, 0xf3, + 0x17, 0x26, 0x76, 0xff, 0x98, 0x62, 0x1a, 0x1e, 0x3e, 0xf8, 0x27, 0xf8, 0xb8, 0x6a, 0x38, 0xff, + 0x66, 0x34, 0x6c, 0x78, 0xad, 0xa7, 0x17, 0x57, 0x91, 0x77, 0x79, 0x15, 0x79, 0xdf, 0xae, 0x22, + 0xef, 0xe3, 0x75, 0x54, 0xba, 0xbc, 0x8e, 0x4a, 0x5f, 0xae, 0xa3, 0xd2, 0xf3, 0xfd, 0x94, 0xe9, + 0x6e, 0x3f, 0xc1, 0x54, 0x64, 0xc4, 0x9d, 0x37, 0x4b, 0xe8, 0x6e, 0x2a, 0xc8, 0xe0, 0x21, 0xc9, + 0x44, 0xa7, 0xdf, 0x03, 0x65, 0x4e, 0x76, 0xea, 0x54, 0xf5, 0x79, 0x0e, 0x2a, 0xa9, 0xd8, 0x2b, + 0xbd, 0xff, 0x23, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xab, 0xc5, 0x1e, 0x9c, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/ibc/applications/fee/v1/fee.proto b/proto/ibc/applications/fee/v1/fee.proto index bf9f892340c..867e884551d 100644 --- a/proto/ibc/applications/fee/v1/fee.proto +++ b/proto/ibc/applications/fee/v1/fee.proto @@ -4,6 +4,7 @@ package ibc.applications.fee.v1; option go_package = "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/types"; +import "amino/amino.proto"; import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; import "ibc/core/channel/v1/channel.proto"; @@ -12,14 +13,25 @@ import "cosmos/msg/v1/msg.proto"; // Fee defines the ICS29 receive, acknowledgement and timeout fees message Fee { // the packet receive fee - repeated cosmos.base.v1beta1.Coin recv_fee = 1 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + repeated cosmos.base.v1beta1.Coin recv_fee = 1 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", + (amino.encoding) = "legacy_coins" + ]; + // the packet acknowledgement fee - repeated cosmos.base.v1beta1.Coin ack_fee = 2 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + repeated cosmos.base.v1beta1.Coin ack_fee = 2 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", + (amino.encoding) = "legacy_coins" + ]; + // the packet timeout fee - repeated cosmos.base.v1beta1.Coin timeout_fee = 3 - [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + repeated cosmos.base.v1beta1.Coin timeout_fee = 3 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", + (amino.encoding) = "legacy_coins" + ]; } // PacketFee contains ICS29 relayer fees, refund address and optional list of permitted relayers diff --git a/proto/ibc/applications/fee/v1/tx.proto b/proto/ibc/applications/fee/v1/tx.proto index b80034e30cc..cc037aed2e2 100644 --- a/proto/ibc/applications/fee/v1/tx.proto +++ b/proto/ibc/applications/fee/v1/tx.proto @@ -4,6 +4,7 @@ package ibc.applications.fee.v1; option go_package = "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/types"; +import "amino/amino.proto"; import "gogoproto/gogo.proto"; import "ibc/applications/fee/v1/fee.proto"; import "ibc/core/channel/v1/channel.proto"; @@ -42,6 +43,7 @@ service Msg { // MsgRegisterPayee defines the request type for the RegisterPayee rpc message MsgRegisterPayee { + option (amino.name) = "cosmos-sdk/MsgRegisterPayee"; option (cosmos.msg.v1.signer) = "relayer"; option (gogoproto.goproto_getters) = false; @@ -61,6 +63,7 @@ message MsgRegisterPayeeResponse {} // MsgRegisterCounterpartyPayee defines the request type for the RegisterCounterpartyPayee rpc message MsgRegisterCounterpartyPayee { + option (amino.name) = "cosmos-sdk/MsgRegisterCounterpartyPayee"; option (cosmos.msg.v1.signer) = "relayer"; option (gogoproto.goproto_getters) = false; @@ -82,6 +85,7 @@ message MsgRegisterCounterpartyPayeeResponse {} // This Msg can be used to pay for a packet at the next sequence send & should be combined with the Msg that will be // paid for message MsgPayPacketFee { + option (amino.name) = "cosmos-sdk/MsgPayPacketFee"; option (cosmos.msg.v1.signer) = "signer"; option (gogoproto.goproto_getters) = false; @@ -104,6 +108,7 @@ message MsgPayPacketFeeResponse {} // MsgPayPacketFeeAsync defines the request type for the PayPacketFeeAsync rpc // This Msg can be used to pay for a packet at a specified sequence (instead of the next sequence send) message MsgPayPacketFeeAsync { + option (amino.name) = "cosmos-sdk/MsgPayPacketFeeAsync"; option (cosmos.msg.v1.signer) = "packet_fee"; option (gogoproto.goproto_getters) = false; diff --git a/proto/ibc/applications/transfer/v1/tx.proto b/proto/ibc/applications/transfer/v1/tx.proto index 215f7422646..c2ca39977c8 100644 --- a/proto/ibc/applications/transfer/v1/tx.proto +++ b/proto/ibc/applications/transfer/v1/tx.proto @@ -4,6 +4,7 @@ package ibc.applications.transfer.v1; option go_package = "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"; +import "amino/amino.proto"; import "gogoproto/gogo.proto"; import "cosmos/msg/v1/msg.proto"; import "cosmos/base/v1beta1/coin.proto"; @@ -25,6 +26,7 @@ service Msg { // ICS20 enabled chains. See ICS Spec here: // https://github.com/cosmos/ibc/tree/master/spec/app/ics-020-fungible-token-transfer#data-structures message MsgTransfer { + option (amino.name) = "cosmos-sdk/MsgTransfer"; option (cosmos.msg.v1.signer) = "sender"; option (gogoproto.goproto_getters) = false; @@ -34,7 +36,7 @@ message MsgTransfer { // the channel by which the packet will be sent string source_channel = 2; // the tokens to be transferred - cosmos.base.v1beta1.Coin token = 3 [(gogoproto.nullable) = false]; + cosmos.base.v1beta1.Coin token = 3 [(gogoproto.nullable) = false, (amino.encoding) = "legacy_coin"]; // the sender address string sender = 4; // the recipient address on the destination chain