From 6e638e30a1bb2266fbd58ae5c2e5e1b41bcd9cd3 Mon Sep 17 00:00:00 2001
From: Damian Nolan <damiannolan@gmail.com>
Date: Tue, 5 Sep 2023 10:34:02 +0200
Subject: [PATCH 1/5] chore: remove GetSignBytes from 29-fee and transfer msgs

---
 modules/apps/29-fee/types/msgs.go        | 21 ++++-----------------
 modules/apps/29-fee/types/msgs_test.go   | 21 ---------------------
 modules/apps/transfer/types/msgs.go      | 11 ++---------
 modules/apps/transfer/types/msgs_test.go | 10 ----------
 4 files changed, 6 insertions(+), 57 deletions(-)

diff --git a/modules/apps/29-fee/types/msgs.go b/modules/apps/29-fee/types/msgs.go
index d76358af5ff..68fabdf999a 100644
--- a/modules/apps/29-fee/types/msgs.go
+++ b/modules/apps/29-fee/types/msgs.go
@@ -6,7 +6,6 @@ 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/v7/modules/core/04-channel/types"
 	host "github.com/cosmos/ibc-go/v7/modules/core/24-host"
@@ -20,12 +19,10 @@ const (
 )
 
 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
@@ -172,11 +169,6 @@ 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{
@@ -213,8 +205,3 @@ func (MsgPayPacketFeeAsync) Type() string {
 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 fee8c236522..4b1a7646309 100644
--- a/modules/apps/29-fee/types/msgs_test.go
+++ b/modules/apps/29-fee/types/msgs_test.go
@@ -239,15 +239,6 @@ func TestMsgPayPacketFeeRoute(t *testing.T) {
 	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
 
@@ -387,15 +378,3 @@ 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/transfer/types/msgs.go b/modules/apps/transfer/types/msgs.go
index cd51a33e696..95a1c1cc1ed 100644
--- a/modules/apps/transfer/types/msgs.go
+++ b/modules/apps/transfer/types/msgs.go
@@ -6,7 +6,6 @@ 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/v7/modules/core/02-client/types"
 	host "github.com/cosmos/ibc-go/v7/modules/core/24-host"
@@ -19,9 +18,8 @@ const (
 )
 
 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
@@ -109,11 +107,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 2004645a9f4..c9d3b5240ef 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"
@@ -53,15 +52,6 @@ func TestMsgTransferRoute(t *testing.T) {
 	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 {

From be2e7bae73ae07ca37800dd97029e490a030b8d7 Mon Sep 17 00:00:00 2001
From: Damian Nolan <damiannolan@gmail.com>
Date: Tue, 5 Sep 2023 11:26:11 +0200
Subject: [PATCH 2/5] chore: rm Type() and Route() legacy methods

---
 modules/apps/29-fee/types/msgs.go        | 26 ------------------------
 modules/apps/29-fee/types/msgs_test.go   | 10 ---------
 modules/apps/transfer/types/msgs.go      | 15 --------------
 modules/apps/transfer/types/msgs_test.go |  7 -------
 4 files changed, 58 deletions(-)

diff --git a/modules/apps/29-fee/types/msgs.go b/modules/apps/29-fee/types/msgs.go
index 68fabdf999a..039b4789a8b 100644
--- a/modules/apps/29-fee/types/msgs.go
+++ b/modules/apps/29-fee/types/msgs.go
@@ -12,12 +12,6 @@ import (
 	ibcerrors "github.com/cosmos/ibc-go/v7/modules/core/errors"
 )
 
-// msg types
-const (
-	TypeMsgPayPacketFee      = "payPacketFee"
-	TypeMsgPayPacketFeeAsync = "payPacketFeeAsync"
-)
-
 var (
 	_ sdk.Msg = (*MsgRegisterPayee)(nil)
 	_ sdk.Msg = (*MsgRegisterCounterpartyPayee)(nil)
@@ -159,16 +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
-}
-
 // NewMsgPayPacketAsync creates a new instance of MsgPayPacketFee
 func NewMsgPayPacketFeeAsync(packetID channeltypes.PacketId, packetFee PacketFee) *MsgPayPacketFeeAsync {
 	return &MsgPayPacketFeeAsync{
@@ -195,13 +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
-}
diff --git a/modules/apps/29-fee/types/msgs_test.go b/modules/apps/29-fee/types/msgs_test.go
index 4b1a7646309..a1f43966dd2 100644
--- a/modules/apps/29-fee/types/msgs_test.go
+++ b/modules/apps/29-fee/types/msgs_test.go
@@ -234,11 +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 TestMsgPayPacketFeeAsyncValidation(t *testing.T) {
 	var msg *types.MsgPayPacketFeeAsync
 
@@ -373,8 +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())
-}
diff --git a/modules/apps/transfer/types/msgs.go b/modules/apps/transfer/types/msgs.go
index 95a1c1cc1ed..3f2f0266aab 100644
--- a/modules/apps/transfer/types/msgs.go
+++ b/modules/apps/transfer/types/msgs.go
@@ -12,11 +12,6 @@ import (
 	ibcerrors "github.com/cosmos/ibc-go/v7/modules/core/errors"
 )
 
-// msg types
-const (
-	TypeMsgTransfer = "transfer"
-)
-
 var (
 	_ sdk.Msg = (*MsgUpdateParams)(nil)
 	_ sdk.Msg = (*MsgTransfer)(nil)
@@ -69,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
diff --git a/modules/apps/transfer/types/msgs_test.go b/modules/apps/transfer/types/msgs_test.go
index c9d3b5240ef..70fed50f7d0 100644
--- a/modules/apps/transfer/types/msgs_test.go
+++ b/modules/apps/transfer/types/msgs_test.go
@@ -45,13 +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())
-}
-
 // TestMsgTransferValidation tests ValidateBasic for MsgTransfer
 func TestMsgTransferValidation(t *testing.T) {
 	testCases := []struct {

From d0dd623c7a374ce9e4f11a39af98809553fcbc51 Mon Sep 17 00:00:00 2001
From: Damian Nolan <damiannolan@gmail.com>
Date: Tue, 5 Sep 2023 16:07:07 +0200
Subject: [PATCH 3/5] chore: adding amino name annotations to proto msgs

---
 modules/apps/29-fee/types/tx.pb.go          | 87 +++++++++++----------
 modules/apps/transfer/types/tx.pb.go        | 78 +++++++++---------
 proto/ibc/applications/fee/v1/tx.proto      |  3 +
 proto/ibc/applications/transfer/v1/tx.proto |  2 +
 4 files changed, 90 insertions(+), 80 deletions(-)

diff --git a/modules/apps/29-fee/types/tx.pb.go b/modules/apps/29-fee/types/tx.pb.go
index 356f00e7491..1982ede2a34 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,50 @@ 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, 0x85, 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, 0x35, 0x34, 0x60, 0x80, 0x5e, 0x06, 0x00, 0x00,
+	// 675 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4f, 0x6f, 0xd3, 0x4e,
+	0x10, 0x8d, 0x9b, 0xfe, 0xcb, 0xb4, 0xbf, 0x5f, 0x9b, 0x55, 0x45, 0x52, 0xab, 0x75, 0x43, 0x54,
+	0xa1, 0x36, 0x52, 0x6c, 0x12, 0xa8, 0x10, 0x95, 0x90, 0xa0, 0x95, 0x8a, 0x7a, 0xa8, 0x88, 0x72,
+	0xe4, 0x52, 0x39, 0x9b, 0xa9, 0x6b, 0x88, 0xbd, 0x96, 0xd7, 0x89, 0xf0, 0x0d, 0x71, 0x42, 0x88,
+	0x03, 0x7c, 0x03, 0x3e, 0x42, 0xf9, 0x16, 0x3d, 0x70, 0xe8, 0x91, 0x13, 0x42, 0xed, 0xa1, 0x47,
+	0x6e, 0x9c, 0xd1, 0xda, 0x6b, 0xcb, 0x4d, 0x49, 0x15, 0x90, 0xb8, 0x44, 0x9e, 0x99, 0xb7, 0x6f,
+	0xe6, 0xbd, 0xcc, 0xda, 0x50, 0xb1, 0x3b, 0xd4, 0x30, 0x3d, 0xaf, 0x67, 0x53, 0x33, 0xb0, 0x99,
+	0xcb, 0x8d, 0x23, 0x44, 0x63, 0xd0, 0x30, 0x82, 0x57, 0xba, 0xe7, 0xb3, 0x80, 0x91, 0x92, 0xdd,
+	0xa1, 0x7a, 0x16, 0xa1, 0x1f, 0x21, 0xea, 0x83, 0x86, 0x5a, 0x34, 0x1d, 0xdb, 0x65, 0x46, 0xf4,
+	0x1b, 0x63, 0xd5, 0x25, 0x8b, 0x59, 0x2c, 0x7a, 0x34, 0xc4, 0x93, 0xcc, 0xde, 0x1e, 0xd5, 0x43,
+	0x10, 0x65, 0x20, 0x94, 0xf9, 0x68, 0xd0, 0x63, 0xd3, 0x75, 0xb1, 0x27, 0xca, 0xf2, 0x51, 0x42,
+	0x4a, 0x94, 0x71, 0x87, 0x71, 0xc3, 0xe1, 0x96, 0x28, 0x3a, 0xdc, 0x8a, 0x0b, 0xd5, 0xf7, 0x0a,
+	0x2c, 0x1e, 0x70, 0xab, 0x8d, 0x96, 0xcd, 0x03, 0xf4, 0x5b, 0x66, 0x88, 0x48, 0x4a, 0x30, 0xe3,
+	0x31, 0x3f, 0x38, 0xb4, 0xbb, 0x65, 0xa5, 0xa2, 0x6c, 0x14, 0xda, 0xd3, 0x22, 0xdc, 0xef, 0x92,
+	0x55, 0x00, 0xc9, 0x2b, 0x6a, 0x13, 0x51, 0xad, 0x20, 0x33, 0xfb, 0x5d, 0x52, 0x86, 0x19, 0x1f,
+	0x7b, 0x66, 0x88, 0x7e, 0x39, 0x1f, 0xd5, 0x92, 0x90, 0x2c, 0xc1, 0x94, 0x27, 0xa8, 0xcb, 0x93,
+	0x51, 0x3e, 0x0e, 0xb6, 0x17, 0xdf, 0x7e, 0x5a, 0xcb, 0xbd, 0xb9, 0x3c, 0xa9, 0x25, 0xb8, 0xaa,
+	0x0a, 0xe5, 0xe1, 0x69, 0xda, 0xc8, 0x3d, 0xe6, 0x72, 0xac, 0x7e, 0x56, 0x60, 0x25, 0x53, 0xdc,
+	0x65, 0x7d, 0x37, 0x40, 0xdf, 0x33, 0xfd, 0x20, 0xfc, 0x57, 0x63, 0xd7, 0x81, 0xd0, 0x4c, 0x9b,
+	0xc3, 0xac, 0x86, 0x22, 0x1d, 0x1e, 0xe0, 0x37, 0x7a, 0xee, 0xc0, 0xfa, 0x4d, 0x23, 0xa7, 0xda,
+	0x7e, 0x28, 0xb0, 0x70, 0xc0, 0xad, 0x96, 0x19, 0xb6, 0x4c, 0xfa, 0x12, 0x83, 0x3d, 0x44, 0x72,
+	0x1f, 0xf2, 0x47, 0x88, 0x91, 0x94, 0xb9, 0xe6, 0x8a, 0x3e, 0x62, 0x93, 0xf4, 0x3d, 0xc4, 0x9d,
+	0xc9, 0xd3, 0x6f, 0x6b, 0xb9, 0xb6, 0x80, 0x93, 0x75, 0xf8, 0x9f, 0xb3, 0xbe, 0x4f, 0xf1, 0x30,
+	0xf1, 0x22, 0xd6, 0x3b, 0x1f, 0x67, 0x5b, 0xb1, 0x23, 0x35, 0x28, 0x4a, 0x54, 0xc6, 0x98, 0x58,
+	0xfc, 0x42, 0x5c, 0xd8, 0x4d, 0xed, 0xb9, 0x05, 0xd3, 0xdc, 0xb6, 0x5c, 0xf4, 0xa5, 0x70, 0x19,
+	0x11, 0x15, 0x66, 0xa5, 0x4c, 0x5e, 0x9e, 0xaa, 0xe4, 0x37, 0x0a, 0xed, 0x34, 0xde, 0xae, 0x24,
+	0x4e, 0x48, 0xf0, 0xbb, 0xcb, 0x93, 0xda, 0xbc, 0x97, 0x51, 0x57, 0x5d, 0x86, 0xd2, 0x90, 0xe0,
+	0xd4, 0x8c, 0x2f, 0x0a, 0x2c, 0x0d, 0xd5, 0x9e, 0xf0, 0xd0, 0xa5, 0xe4, 0x31, 0x14, 0xbc, 0x28,
+	0x93, 0xfc, 0xc5, 0x73, 0xcd, 0xd5, 0xc8, 0x17, 0xb1, 0xfc, 0x7a, 0xb2, 0xf1, 0x83, 0x86, 0x1e,
+	0x9f, 0xdb, 0xef, 0x4a, 0x63, 0x66, 0x3d, 0x19, 0x93, 0xa7, 0x00, 0x92, 0x41, 0x58, 0x3b, 0x11,
+	0x51, 0x54, 0x47, 0x5a, 0x9b, 0xb6, 0x97, 0x3c, 0xb2, 0xfb, 0x1e, 0xe2, 0xf6, 0x66, 0x22, 0x30,
+	0xc3, 0x27, 0x44, 0x16, 0xbd, 0xe1, 0xa9, 0xab, 0x5a, 0xb4, 0xb6, 0xd7, 0xd4, 0x24, 0x72, 0x9b,
+	0x3f, 0xf3, 0x90, 0x3f, 0xe0, 0x16, 0x71, 0xe0, 0xbf, 0xab, 0xd7, 0x70, 0x73, 0xe4, 0x60, 0xc3,
+	0x77, 0x44, 0x6d, 0x8c, 0x0d, 0x4d, 0xda, 0x92, 0x8f, 0x0a, 0x2c, 0x8f, 0xbe, 0x4b, 0x5b, 0xe3,
+	0x10, 0x5e, 0x3b, 0xa6, 0x3e, 0xfa, 0xab, 0x63, 0xe9, 0x4c, 0x2f, 0x60, 0xfe, 0xca, 0x15, 0xd8,
+	0xb8, 0x89, 0x2e, 0x8b, 0x54, 0xef, 0x8e, 0x8b, 0x4c, 0x7b, 0x85, 0x50, 0xbc, 0xbe, 0x61, 0xf5,
+	0x71, 0x69, 0x22, 0xb8, 0xba, 0xf5, 0x47, 0xf0, 0xa4, 0xb5, 0x3a, 0xf5, 0xfa, 0xf2, 0xa4, 0xa6,
+	0xec, 0x3c, 0x3b, 0x3d, 0xd7, 0x94, 0xb3, 0x73, 0x4d, 0xf9, 0x7e, 0xae, 0x29, 0x1f, 0x2e, 0xb4,
+	0xdc, 0xd9, 0x85, 0x96, 0xfb, 0x7a, 0xa1, 0xe5, 0x9e, 0x6f, 0x59, 0x76, 0x70, 0xdc, 0xef, 0xe8,
+	0x94, 0x39, 0x86, 0x7c, 0x73, 0xdb, 0x1d, 0x5a, 0xb7, 0x98, 0x31, 0x78, 0x60, 0x38, 0xac, 0xdb,
+	0xef, 0x21, 0x17, 0x1f, 0x05, 0x6e, 0x34, 0x1f, 0xd6, 0xc5, 0xf7, 0x20, 0x08, 0x3d, 0xe4, 0x9d,
+	0xe9, 0xe8, 0x9d, 0x7e, 0xef, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x94, 0xc4, 0x79, 0x34, 0x98,
+	0x06, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/modules/apps/transfer/types/tx.pb.go b/modules/apps/transfer/types/tx.pb.go
index c1e0e40ad54..5ec9e5571f8 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,45 @@ func init() {
 }
 
 var fileDescriptor_7401ed9bed2f8e09 = []byte{
-	// 583 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x41, 0x4f, 0xd4, 0x4e,
-	0x14, 0xdf, 0x42, 0xd9, 0x3f, 0xff, 0x59, 0x01, 0x1d, 0x8d, 0x94, 0xc6, 0x74, 0xc9, 0x46, 0x12,
-	0x84, 0x30, 0x93, 0x62, 0x08, 0x09, 0x47, 0x38, 0xe8, 0x85, 0x04, 0x37, 0x78, 0xf1, 0x42, 0xda,
-	0xe1, 0xd9, 0x9d, 0xb8, 0x9d, 0xa9, 0x33, 0xb3, 0x8d, 0x5e, 0x8c, 0xf1, 0xe4, 0xd1, 0x8f, 0xe0,
-	0x47, 0xe0, 0x63, 0x70, 0xe4, 0x68, 0x62, 0x62, 0x0c, 0x1c, 0xb8, 0xf8, 0x21, 0x4c, 0xa7, 0xd3,
-	0x4d, 0xf5, 0x80, 0x7a, 0xea, 0xcc, 0x7b, 0xbf, 0xf7, 0x7b, 0xbf, 0xf7, 0x9b, 0x3e, 0xb4, 0xc6,
-	0x53, 0x46, 0x93, 0xa2, 0x18, 0x73, 0x96, 0x18, 0x2e, 0x85, 0xa6, 0x46, 0x25, 0x42, 0xbf, 0x04,
-	0x45, 0xcb, 0x98, 0x9a, 0x37, 0xa4, 0x50, 0xd2, 0x48, 0xfc, 0x80, 0xa7, 0x8c, 0xb4, 0x61, 0xa4,
-	0x81, 0x91, 0x32, 0x0e, 0xef, 0x65, 0x32, 0x93, 0x16, 0x48, 0xab, 0x53, 0x5d, 0x13, 0x2e, 0x33,
-	0xa9, 0x73, 0xa9, 0x69, 0xae, 0xb3, 0x8a, 0x2b, 0xd7, 0x99, 0x4b, 0x44, 0x2e, 0x91, 0x26, 0x1a,
-	0x68, 0x19, 0xa7, 0x60, 0x92, 0x98, 0x32, 0xc9, 0x85, 0xcb, 0xf7, 0x2b, 0x4d, 0x4c, 0x2a, 0xa0,
-	0x6c, 0xcc, 0x41, 0x98, 0xaa, 0xba, 0x3e, 0x39, 0xc0, 0xe6, 0xcd, 0xa2, 0x1b, 0x65, 0x16, 0x3c,
-	0xf8, 0x3a, 0x83, 0x7a, 0x87, 0x3a, 0x3b, 0x76, 0x51, 0xdc, 0x47, 0x3d, 0x2d, 0x27, 0x8a, 0xc1,
-	0x49, 0x21, 0x95, 0x09, 0xbc, 0x55, 0x6f, 0xfd, 0xff, 0x21, 0xaa, 0x43, 0x47, 0x52, 0x19, 0xbc,
-	0x86, 0x16, 0x1d, 0x80, 0x8d, 0x12, 0x21, 0x60, 0x1c, 0xcc, 0x58, 0xcc, 0x42, 0x1d, 0x3d, 0xa8,
-	0x83, 0x78, 0x07, 0xcd, 0x19, 0xf9, 0x0a, 0x44, 0x30, 0xbb, 0xea, 0xad, 0xf7, 0xb6, 0x57, 0x48,
-	0x3d, 0x15, 0xa9, 0xa6, 0x22, 0x6e, 0x2a, 0x72, 0x20, 0xb9, 0xd8, 0xf7, 0xcf, 0xbf, 0xf5, 0x3b,
-	0xc3, 0x1a, 0x8d, 0xef, 0xa3, 0xae, 0x06, 0x71, 0x0a, 0x2a, 0xf0, 0x2d, 0xab, 0xbb, 0xe1, 0x10,
-	0xcd, 0x2b, 0x60, 0xc0, 0x4b, 0x50, 0xc1, 0x9c, 0xcd, 0x4c, 0xef, 0xf8, 0x09, 0x5a, 0x34, 0x3c,
-	0x07, 0x39, 0x31, 0x27, 0x23, 0xe0, 0xd9, 0xc8, 0x04, 0x5d, 0xdb, 0x33, 0x24, 0xd5, 0xb3, 0x54,
-	0x4e, 0x11, 0xe7, 0x4f, 0x19, 0x93, 0xa7, 0x16, 0xe1, 0x9a, 0x2e, 0xb8, 0xba, 0x3a, 0x88, 0x37,
-	0xd1, 0x9d, 0x86, 0xa8, 0xfa, 0x6a, 0x93, 0xe4, 0x45, 0xf0, 0xdf, 0xaa, 0xb7, 0xee, 0x0f, 0x6f,
-	0xbb, 0xc4, 0x71, 0x13, 0xc7, 0x18, 0xf9, 0x39, 0xe4, 0x32, 0x98, 0xb7, 0x6a, 0xec, 0x79, 0x6f,
-	0xe9, 0xe3, 0xe7, 0x7e, 0xe7, 0xc3, 0xf5, 0xd9, 0x86, 0x93, 0x3d, 0xd8, 0x45, 0x77, 0x5b, 0xe6,
-	0x0e, 0x41, 0x17, 0x52, 0x68, 0xa8, 0xa6, 0xd1, 0xf0, 0x7a, 0x02, 0x82, 0x81, 0x75, 0xd8, 0x1f,
-	0x4e, 0xef, 0x7b, 0x7e, 0xc5, 0x31, 0x78, 0x87, 0x96, 0x0e, 0x75, 0xf6, 0xbc, 0x38, 0x4d, 0x0c,
-	0x1c, 0x25, 0x2a, 0xc9, 0xb5, 0xb5, 0x86, 0x67, 0x02, 0x94, 0x7b, 0x14, 0x77, 0xc3, 0xfb, 0xa8,
-	0x5b, 0x58, 0x84, 0x7d, 0x88, 0xde, 0xf6, 0x43, 0x72, 0xd3, 0xdf, 0x48, 0x6a, 0x36, 0x67, 0x80,
-	0xab, 0x6c, 0x0b, 0xb7, 0xa4, 0x83, 0x15, 0xb4, 0xfc, 0x5b, 0xff, 0x46, 0xfc, 0xf6, 0x0f, 0x0f,
-	0xcd, 0x1e, 0xea, 0x0c, 0x8f, 0xd0, 0xfc, 0xf4, 0xaf, 0x79, 0x74, 0x73, 0xcf, 0x96, 0x07, 0x61,
-	0xfc, 0xd7, 0xd0, 0xa9, 0x5d, 0x06, 0xdd, 0xfa, 0xc5, 0x89, 0xad, 0x3f, 0x52, 0xb4, 0xe1, 0xe1,
-	0xce, 0x3f, 0xc1, 0x9b, 0xae, 0xe1, 0xdc, 0xfb, 0xeb, 0xb3, 0x0d, 0x6f, 0xff, 0xd9, 0xf9, 0x65,
-	0xe4, 0x5d, 0x5c, 0x46, 0xde, 0xf7, 0xcb, 0xc8, 0xfb, 0x74, 0x15, 0x75, 0x2e, 0xae, 0xa2, 0xce,
-	0x97, 0xab, 0xa8, 0xf3, 0x62, 0x37, 0xe3, 0x66, 0x34, 0x49, 0x09, 0x93, 0x39, 0x75, 0x3b, 0xcb,
-	0x53, 0xb6, 0x95, 0x49, 0x5a, 0xee, 0xd2, 0x5c, 0x9e, 0x4e, 0xc6, 0xa0, 0xab, 0x3d, 0x6c, 0xed,
-	0x9f, 0x79, 0x5b, 0x80, 0x4e, 0xbb, 0x76, 0xf5, 0x1e, 0xff, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x31,
-	0x59, 0x33, 0x3e, 0x5e, 0x04, 0x00, 0x00,
+	// 602 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xcf, 0x4e, 0x14, 0x4f,
+	0x10, 0xde, 0x81, 0x65, 0x7f, 0xfb, 0xeb, 0x15, 0x90, 0xd6, 0xc8, 0x30, 0x21, 0xb3, 0x64, 0x23,
+	0x09, 0x42, 0xe8, 0xce, 0x60, 0x08, 0x09, 0x47, 0x38, 0xe8, 0x85, 0x04, 0x37, 0x78, 0xf1, 0x42,
+	0x66, 0x9a, 0x72, 0xb6, 0xe3, 0x4e, 0xf7, 0xd8, 0xdd, 0x3b, 0xd1, 0x8b, 0x31, 0x9e, 0x8c, 0x27,
+	0x1f, 0xc1, 0x47, 0xe0, 0x31, 0x38, 0x72, 0xf4, 0x64, 0x0c, 0x1c, 0xf0, 0xe0, 0x43, 0x98, 0xe9,
+	0xe9, 0x59, 0x57, 0x0f, 0xab, 0x5e, 0x76, 0xeb, 0xcf, 0x57, 0x5f, 0x55, 0x7d, 0x3d, 0x85, 0xd6,
+	0x79, 0xc2, 0x68, 0x9c, 0xe7, 0x43, 0xce, 0x62, 0xc3, 0xa5, 0xd0, 0xd4, 0xa8, 0x58, 0xe8, 0xe7,
+	0xa0, 0x68, 0x11, 0x51, 0xf3, 0x8a, 0xe4, 0x4a, 0x1a, 0x89, 0x57, 0x79, 0xc2, 0xc8, 0x24, 0x8c,
+	0xd4, 0x30, 0x52, 0x44, 0xc1, 0x52, 0x9c, 0x71, 0x21, 0xa9, 0xfd, 0xad, 0x0a, 0x82, 0xbb, 0xa9,
+	0x4c, 0xa5, 0x35, 0x69, 0x69, 0xb9, 0xe8, 0x32, 0x93, 0x3a, 0x93, 0x9a, 0x66, 0x3a, 0x2d, 0xe9,
+	0x33, 0x9d, 0xba, 0x44, 0xe8, 0x12, 0x49, 0xac, 0x81, 0x16, 0x51, 0x02, 0x26, 0x8e, 0x28, 0x93,
+	0x5c, 0xb8, 0x7c, 0xb7, 0x1c, 0x93, 0x49, 0x05, 0x94, 0x0d, 0x39, 0x08, 0x53, 0x56, 0x57, 0x96,
+	0x03, 0x6c, 0x4d, 0xdf, 0xa3, 0x1e, 0xd6, 0x82, 0x7b, 0xdf, 0x66, 0x50, 0xe7, 0x48, 0xa7, 0x27,
+	0x2e, 0x8a, 0xbb, 0xa8, 0xa3, 0xe5, 0x48, 0x31, 0x38, 0xcd, 0xa5, 0x32, 0xbe, 0xb7, 0xe6, 0x6d,
+	0xfc, 0xdf, 0x47, 0x55, 0xe8, 0x58, 0x2a, 0x83, 0xd7, 0xd1, 0x82, 0x03, 0xb0, 0x41, 0x2c, 0x04,
+	0x0c, 0xfd, 0x19, 0x8b, 0x99, 0xaf, 0xa2, 0x87, 0x55, 0x10, 0xef, 0xa2, 0x39, 0x23, 0x5f, 0x80,
+	0xf0, 0x67, 0xd7, 0xbc, 0x8d, 0xce, 0xce, 0x0a, 0xa9, 0xb6, 0x22, 0xe5, 0x56, 0xc4, 0x6d, 0x45,
+	0x0e, 0x25, 0x17, 0x07, 0xcd, 0x8b, 0x2f, 0xdd, 0x46, 0xbf, 0x42, 0xe3, 0x7b, 0xa8, 0xa5, 0x41,
+	0x9c, 0x81, 0xf2, 0x9b, 0x96, 0xd5, 0x79, 0x38, 0x40, 0x6d, 0x05, 0x0c, 0x78, 0x01, 0xca, 0x9f,
+	0xb3, 0x99, 0xb1, 0x8f, 0x1f, 0xa1, 0x05, 0xc3, 0x33, 0x90, 0x23, 0x73, 0x3a, 0x00, 0x9e, 0x0e,
+	0x8c, 0xdf, 0xb2, 0x3d, 0x03, 0x52, 0xbe, 0x54, 0xa9, 0x14, 0x71, 0xfa, 0x14, 0x11, 0x79, 0x6c,
+	0x11, 0xae, 0xe9, 0xbc, 0xab, 0xab, 0x82, 0x78, 0x0b, 0x2d, 0xd5, 0x44, 0xe5, 0xbf, 0x36, 0x71,
+	0x96, 0xfb, 0xff, 0xad, 0x79, 0x1b, 0xcd, 0xfe, 0x6d, 0x97, 0x38, 0xa9, 0xe3, 0x18, 0xa3, 0x66,
+	0x06, 0x99, 0xf4, 0xdb, 0x76, 0x1a, 0x6b, 0xef, 0xaf, 0xbe, 0xff, 0xd4, 0x6d, 0xbc, 0xbb, 0x39,
+	0xdf, 0x74, 0x63, 0x7f, 0xb8, 0x39, 0xdf, 0x6c, 0xd7, 0x82, 0xf7, 0xf6, 0xd0, 0x9d, 0x09, 0xa5,
+	0xfb, 0xa0, 0x73, 0x29, 0x34, 0x94, 0xab, 0x69, 0x78, 0x39, 0x02, 0xc1, 0xc0, 0xca, 0xdd, 0xec,
+	0x8f, 0xfd, 0xfd, 0x66, 0x49, 0xd8, 0x7b, 0x83, 0x16, 0x8f, 0x74, 0xfa, 0x34, 0x3f, 0x8b, 0x0d,
+	0x1c, 0xc7, 0x2a, 0xce, 0xb4, 0xd5, 0x89, 0xa7, 0x02, 0x94, 0x7b, 0x21, 0xe7, 0xe1, 0x03, 0xd4,
+	0xca, 0x2d, 0xc2, 0xbe, 0x4a, 0x67, 0xe7, 0x3e, 0x99, 0xf6, 0xb5, 0x92, 0x8a, 0xcd, 0xa9, 0xe1,
+	0x2a, 0xf7, 0x17, 0x7f, 0x6e, 0x61, 0x49, 0x7b, 0x2b, 0x68, 0xf9, 0xb7, 0xfe, 0xf5, 0xf0, 0x3b,
+	0xdf, 0x3d, 0x34, 0x7b, 0xa4, 0x53, 0x3c, 0x40, 0xed, 0xf1, 0x27, 0xf4, 0x60, 0x7a, 0xcf, 0x09,
+	0x0d, 0x82, 0xe8, 0xaf, 0xa1, 0x63, 0xb9, 0x0c, 0xba, 0xf5, 0x8b, 0x12, 0xdb, 0x7f, 0xa4, 0x98,
+	0x84, 0x07, 0xbb, 0xff, 0x04, 0xaf, 0xbb, 0x06, 0x73, 0x6f, 0x6f, 0xce, 0x37, 0xbd, 0x83, 0x27,
+	0x17, 0x57, 0xa1, 0x77, 0x79, 0x15, 0x7a, 0x5f, 0xaf, 0x42, 0xef, 0xe3, 0x75, 0xd8, 0xb8, 0xbc,
+	0x0e, 0x1b, 0x9f, 0xaf, 0xc3, 0xc6, 0xb3, 0xbd, 0x94, 0x9b, 0xc1, 0x28, 0x21, 0x4c, 0x66, 0xd4,
+	0x1d, 0x30, 0x4f, 0xd8, 0x76, 0x2a, 0x69, 0xb1, 0x47, 0x33, 0x79, 0x36, 0x1a, 0x82, 0x2e, 0x8f,
+	0x72, 0xe2, 0x18, 0xcd, 0xeb, 0x1c, 0x74, 0xd2, 0xb2, 0x77, 0xf8, 0xf0, 0x47, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0x2b, 0x43, 0xf4, 0xd1, 0x7e, 0x04, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/ibc/applications/fee/v1/tx.proto b/proto/ibc/applications/fee/v1/tx.proto
index 3b72b8aa599..a8ddd76d2c6 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/v7/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";
@@ -82,6 +83,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)           = "payPacketFee";
   option (cosmos.msg.v1.signer) = "signer";
 
   option (gogoproto.goproto_getters) = false;
@@ -104,6 +106,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)                = "payPacketFeeAsync";
   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 1f021aa73e5..25b787041d2 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/v7/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)           = "transfer";
   option (cosmos.msg.v1.signer) = "sender";
 
   option (gogoproto.goproto_getters) = false;

From 54e4dc6dcb1d4d071b80a314aeb93171078dbd40 Mon Sep 17 00:00:00 2001
From: Damian Nolan <damiannolan@gmail.com>
Date: Tue, 5 Sep 2023 16:30:00 +0200
Subject: [PATCH 4/5] fix: rename amino.name annotations for fee and transfer
 msgs

---
 modules/apps/29-fee/types/tx.pb.go          | 89 +++++++++++----------
 modules/apps/transfer/types/tx.pb.go        | 78 +++++++++---------
 proto/ibc/applications/fee/v1/tx.proto      |  6 +-
 proto/ibc/applications/transfer/v1/tx.proto |  2 +-
 4 files changed, 89 insertions(+), 86 deletions(-)

diff --git a/modules/apps/29-fee/types/tx.pb.go b/modules/apps/29-fee/types/tx.pb.go
index 1982ede2a34..835119da37b 100644
--- a/modules/apps/29-fee/types/tx.pb.go
+++ b/modules/apps/29-fee/types/tx.pb.go
@@ -374,50 +374,51 @@ func init() {
 func init() { proto.RegisterFile("ibc/applications/fee/v1/tx.proto", fileDescriptor_05c93128649f1b96) }
 
 var fileDescriptor_05c93128649f1b96 = []byte{
-	// 675 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4f, 0x6f, 0xd3, 0x4e,
-	0x10, 0x8d, 0x9b, 0xfe, 0xcb, 0xb4, 0xbf, 0x5f, 0x9b, 0x55, 0x45, 0x52, 0xab, 0x75, 0x43, 0x54,
-	0xa1, 0x36, 0x52, 0x6c, 0x12, 0xa8, 0x10, 0x95, 0x90, 0xa0, 0x95, 0x8a, 0x7a, 0xa8, 0x88, 0x72,
-	0xe4, 0x52, 0x39, 0x9b, 0xa9, 0x6b, 0x88, 0xbd, 0x96, 0xd7, 0x89, 0xf0, 0x0d, 0x71, 0x42, 0x88,
-	0x03, 0x7c, 0x03, 0x3e, 0x42, 0xf9, 0x16, 0x3d, 0x70, 0xe8, 0x91, 0x13, 0x42, 0xed, 0xa1, 0x47,
-	0x6e, 0x9c, 0xd1, 0xda, 0x6b, 0xcb, 0x4d, 0x49, 0x15, 0x90, 0xb8, 0x44, 0x9e, 0x99, 0xb7, 0x6f,
-	0xe6, 0xbd, 0xcc, 0xda, 0x50, 0xb1, 0x3b, 0xd4, 0x30, 0x3d, 0xaf, 0x67, 0x53, 0x33, 0xb0, 0x99,
-	0xcb, 0x8d, 0x23, 0x44, 0x63, 0xd0, 0x30, 0x82, 0x57, 0xba, 0xe7, 0xb3, 0x80, 0x91, 0x92, 0xdd,
-	0xa1, 0x7a, 0x16, 0xa1, 0x1f, 0x21, 0xea, 0x83, 0x86, 0x5a, 0x34, 0x1d, 0xdb, 0x65, 0x46, 0xf4,
-	0x1b, 0x63, 0xd5, 0x25, 0x8b, 0x59, 0x2c, 0x7a, 0x34, 0xc4, 0x93, 0xcc, 0xde, 0x1e, 0xd5, 0x43,
-	0x10, 0x65, 0x20, 0x94, 0xf9, 0x68, 0xd0, 0x63, 0xd3, 0x75, 0xb1, 0x27, 0xca, 0xf2, 0x51, 0x42,
-	0x4a, 0x94, 0x71, 0x87, 0x71, 0xc3, 0xe1, 0x96, 0x28, 0x3a, 0xdc, 0x8a, 0x0b, 0xd5, 0xf7, 0x0a,
-	0x2c, 0x1e, 0x70, 0xab, 0x8d, 0x96, 0xcd, 0x03, 0xf4, 0x5b, 0x66, 0x88, 0x48, 0x4a, 0x30, 0xe3,
-	0x31, 0x3f, 0x38, 0xb4, 0xbb, 0x65, 0xa5, 0xa2, 0x6c, 0x14, 0xda, 0xd3, 0x22, 0xdc, 0xef, 0x92,
-	0x55, 0x00, 0xc9, 0x2b, 0x6a, 0x13, 0x51, 0xad, 0x20, 0x33, 0xfb, 0x5d, 0x52, 0x86, 0x19, 0x1f,
-	0x7b, 0x66, 0x88, 0x7e, 0x39, 0x1f, 0xd5, 0x92, 0x90, 0x2c, 0xc1, 0x94, 0x27, 0xa8, 0xcb, 0x93,
-	0x51, 0x3e, 0x0e, 0xb6, 0x17, 0xdf, 0x7e, 0x5a, 0xcb, 0xbd, 0xb9, 0x3c, 0xa9, 0x25, 0xb8, 0xaa,
-	0x0a, 0xe5, 0xe1, 0x69, 0xda, 0xc8, 0x3d, 0xe6, 0x72, 0xac, 0x7e, 0x56, 0x60, 0x25, 0x53, 0xdc,
-	0x65, 0x7d, 0x37, 0x40, 0xdf, 0x33, 0xfd, 0x20, 0xfc, 0x57, 0x63, 0xd7, 0x81, 0xd0, 0x4c, 0x9b,
-	0xc3, 0xac, 0x86, 0x22, 0x1d, 0x1e, 0xe0, 0x37, 0x7a, 0xee, 0xc0, 0xfa, 0x4d, 0x23, 0xa7, 0xda,
-	0x7e, 0x28, 0xb0, 0x70, 0xc0, 0xad, 0x96, 0x19, 0xb6, 0x4c, 0xfa, 0x12, 0x83, 0x3d, 0x44, 0x72,
-	0x1f, 0xf2, 0x47, 0x88, 0x91, 0x94, 0xb9, 0xe6, 0x8a, 0x3e, 0x62, 0x93, 0xf4, 0x3d, 0xc4, 0x9d,
-	0xc9, 0xd3, 0x6f, 0x6b, 0xb9, 0xb6, 0x80, 0x93, 0x75, 0xf8, 0x9f, 0xb3, 0xbe, 0x4f, 0xf1, 0x30,
-	0xf1, 0x22, 0xd6, 0x3b, 0x1f, 0x67, 0x5b, 0xb1, 0x23, 0x35, 0x28, 0x4a, 0x54, 0xc6, 0x98, 0x58,
-	0xfc, 0x42, 0x5c, 0xd8, 0x4d, 0xed, 0xb9, 0x05, 0xd3, 0xdc, 0xb6, 0x5c, 0xf4, 0xa5, 0x70, 0x19,
-	0x11, 0x15, 0x66, 0xa5, 0x4c, 0x5e, 0x9e, 0xaa, 0xe4, 0x37, 0x0a, 0xed, 0x34, 0xde, 0xae, 0x24,
-	0x4e, 0x48, 0xf0, 0xbb, 0xcb, 0x93, 0xda, 0xbc, 0x97, 0x51, 0x57, 0x5d, 0x86, 0xd2, 0x90, 0xe0,
-	0xd4, 0x8c, 0x2f, 0x0a, 0x2c, 0x0d, 0xd5, 0x9e, 0xf0, 0xd0, 0xa5, 0xe4, 0x31, 0x14, 0xbc, 0x28,
-	0x93, 0xfc, 0xc5, 0x73, 0xcd, 0xd5, 0xc8, 0x17, 0xb1, 0xfc, 0x7a, 0xb2, 0xf1, 0x83, 0x86, 0x1e,
-	0x9f, 0xdb, 0xef, 0x4a, 0x63, 0x66, 0x3d, 0x19, 0x93, 0xa7, 0x00, 0x92, 0x41, 0x58, 0x3b, 0x11,
-	0x51, 0x54, 0x47, 0x5a, 0x9b, 0xb6, 0x97, 0x3c, 0xb2, 0xfb, 0x1e, 0xe2, 0xf6, 0x66, 0x22, 0x30,
-	0xc3, 0x27, 0x44, 0x16, 0xbd, 0xe1, 0xa9, 0xab, 0x5a, 0xb4, 0xb6, 0xd7, 0xd4, 0x24, 0x72, 0x9b,
-	0x3f, 0xf3, 0x90, 0x3f, 0xe0, 0x16, 0x71, 0xe0, 0xbf, 0xab, 0xd7, 0x70, 0x73, 0xe4, 0x60, 0xc3,
-	0x77, 0x44, 0x6d, 0x8c, 0x0d, 0x4d, 0xda, 0x92, 0x8f, 0x0a, 0x2c, 0x8f, 0xbe, 0x4b, 0x5b, 0xe3,
-	0x10, 0x5e, 0x3b, 0xa6, 0x3e, 0xfa, 0xab, 0x63, 0xe9, 0x4c, 0x2f, 0x60, 0xfe, 0xca, 0x15, 0xd8,
-	0xb8, 0x89, 0x2e, 0x8b, 0x54, 0xef, 0x8e, 0x8b, 0x4c, 0x7b, 0x85, 0x50, 0xbc, 0xbe, 0x61, 0xf5,
-	0x71, 0x69, 0x22, 0xb8, 0xba, 0xf5, 0x47, 0xf0, 0xa4, 0xb5, 0x3a, 0xf5, 0xfa, 0xf2, 0xa4, 0xa6,
-	0xec, 0x3c, 0x3b, 0x3d, 0xd7, 0x94, 0xb3, 0x73, 0x4d, 0xf9, 0x7e, 0xae, 0x29, 0x1f, 0x2e, 0xb4,
-	0xdc, 0xd9, 0x85, 0x96, 0xfb, 0x7a, 0xa1, 0xe5, 0x9e, 0x6f, 0x59, 0x76, 0x70, 0xdc, 0xef, 0xe8,
-	0x94, 0x39, 0x86, 0x7c, 0x73, 0xdb, 0x1d, 0x5a, 0xb7, 0x98, 0x31, 0x78, 0x60, 0x38, 0xac, 0xdb,
-	0xef, 0x21, 0x17, 0x1f, 0x05, 0x6e, 0x34, 0x1f, 0xd6, 0xc5, 0xf7, 0x20, 0x08, 0x3d, 0xe4, 0x9d,
-	0xe9, 0xe8, 0x9d, 0x7e, 0xef, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x94, 0xc4, 0x79, 0x34, 0x98,
-	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, 0x55, 0x44, 0x20, 0x41, 0x2b, 0x15, 0xf5, 0x50, 0x11, 0xe5, 0xc8, 0xa5,
+	0x72, 0x9c, 0xa9, 0x6b, 0x1a, 0x7b, 0x2d, 0xaf, 0x13, 0xe1, 0x1b, 0xe2, 0x84, 0x38, 0xc1, 0x1b,
+	0xf0, 0x00, 0x1c, 0xfa, 0x18, 0x3d, 0xf6, 0x88, 0x90, 0x40, 0xa8, 0x3d, 0xf4, 0x0d, 0xb8, 0x21,
+	0xa1, 0x5d, 0xaf, 0x2d, 0x37, 0x69, 0xaa, 0x80, 0xc4, 0xc5, 0xf2, 0xcc, 0x7c, 0xfb, 0xcd, 0x7c,
+	0x9f, 0x76, 0xb4, 0xb0, 0x62, 0xb7, 0x4c, 0xdd, 0xf0, 0xbc, 0x8e, 0x6d, 0x1a, 0x81, 0x4d, 0x5c,
+	0xaa, 0x1f, 0x20, 0xea, 0xbd, 0xaa, 0x1e, 0xbc, 0xd1, 0x3c, 0x9f, 0x04, 0x44, 0x2e, 0xd8, 0x2d,
+	0x53, 0x4b, 0x23, 0xb4, 0x03, 0x44, 0xad, 0x57, 0x55, 0xf2, 0x86, 0x63, 0xbb, 0x44, 0xe7, 0xdf,
+	0x08, 0xab, 0xcc, 0x5b, 0xc4, 0x22, 0xfc, 0x57, 0x67, 0x7f, 0x22, 0x7b, 0x77, 0x58, 0x0f, 0x46,
+	0x94, 0x82, 0x98, 0xc4, 0x47, 0xdd, 0x3c, 0x34, 0x5c, 0x17, 0x3b, 0xac, 0x2c, 0x7e, 0x05, 0xa4,
+	0x60, 0x12, 0xea, 0x10, 0xaa, 0x3b, 0xd4, 0x62, 0x45, 0x87, 0x5a, 0x51, 0x41, 0xfd, 0x22, 0xc1,
+	0xad, 0x3d, 0x6a, 0x35, 0xd1, 0xb2, 0x69, 0x80, 0x7e, 0xc3, 0x08, 0x11, 0xe5, 0x02, 0x4c, 0x79,
+	0xc4, 0x0f, 0xf6, 0xed, 0x76, 0x51, 0x5a, 0x91, 0xd6, 0x72, 0xcd, 0x49, 0x16, 0xee, 0xb6, 0xe5,
+	0x25, 0x00, 0xc1, 0xcb, 0x6a, 0x63, 0xbc, 0x96, 0x13, 0x99, 0xdd, 0xb6, 0x5c, 0x84, 0x29, 0x1f,
+	0x3b, 0x46, 0x88, 0x7e, 0x31, 0xcb, 0x6b, 0x71, 0x28, 0xcf, 0xc3, 0x84, 0xc7, 0xa8, 0x8b, 0xe3,
+	0x3c, 0x1f, 0x05, 0xf5, 0xf5, 0xf7, 0x9f, 0x97, 0x33, 0xef, 0x2e, 0x8e, 0xcb, 0x31, 0xee, 0xc3,
+	0xc5, 0x71, 0xf9, 0x4e, 0x34, 0x6a, 0x85, 0xb6, 0x8f, 0xf4, 0xfe, 0xc9, 0x54, 0x05, 0x8a, 0xfd,
+	0xb9, 0x26, 0x52, 0x8f, 0xb8, 0x14, 0xd5, 0xef, 0x12, 0x2c, 0xa6, 0x8a, 0xdb, 0xa4, 0xeb, 0x06,
+	0xe8, 0x7b, 0x86, 0x1f, 0x84, 0xff, 0x4b, 0x56, 0x05, 0x64, 0x33, 0xd5, 0x66, 0x3f, 0xad, 0x31,
+	0x6f, 0xf6, 0x0f, 0x50, 0x7f, 0x72, 0x95, 0xde, 0xfb, 0x57, 0xeb, 0x1d, 0x18, 0x5f, 0xbd, 0x07,
+	0xab, 0xd7, 0xd5, 0x13, 0x1f, 0x7e, 0x4b, 0x30, 0xb7, 0x47, 0xad, 0x86, 0x11, 0x36, 0x0c, 0xf3,
+	0x08, 0x83, 0x1d, 0x44, 0xf9, 0x11, 0x64, 0x0f, 0x10, 0xb9, 0xec, 0x99, 0xda, 0xa2, 0x36, 0xe4,
+	0x56, 0x6a, 0x3b, 0x88, 0x5b, 0xe3, 0x27, 0x3f, 0x96, 0x33, 0x4d, 0x06, 0x97, 0x57, 0xe1, 0x26,
+	0x25, 0x5d, 0xdf, 0xc4, 0xfd, 0xd8, 0xb7, 0xc8, 0x9b, 0xd9, 0x28, 0xdb, 0x88, 0xdc, 0x2b, 0x43,
+	0x5e, 0xa0, 0x52, 0x26, 0x46, 0x46, 0xcd, 0x45, 0x85, 0xed, 0xc4, 0xca, 0xdb, 0x30, 0x49, 0x6d,
+	0xcb, 0x45, 0x5f, 0x98, 0x24, 0x22, 0x59, 0x81, 0x69, 0x61, 0x09, 0x2d, 0x4e, 0xac, 0x64, 0xd7,
+	0x72, 0xcd, 0x24, 0xae, 0x6b, 0xb1, 0x6b, 0x02, 0xcc, 0x4c, 0x53, 0x2e, 0x9b, 0x96, 0xd6, 0xaa,
+	0x2e, 0x40, 0xa1, 0x2f, 0x95, 0x58, 0xf3, 0x4d, 0x82, 0xf9, 0xbe, 0xda, 0x73, 0x1a, 0xba, 0xa6,
+	0xfc, 0x0c, 0x72, 0x1e, 0xcf, 0xc4, 0x97, 0x63, 0xa6, 0xb6, 0xc4, 0x5d, 0x62, 0x6b, 0xa5, 0xc5,
+	0xbb, 0xd4, 0xab, 0x6a, 0xd1, 0xb9, 0xdd, 0xb6, 0xb0, 0x69, 0xda, 0x13, 0xb1, 0xfc, 0x02, 0x40,
+	0x30, 0x30, 0xa3, 0xc7, 0x38, 0x85, 0x3a, 0xd4, 0xe8, 0xa4, 0xbd, 0xe0, 0x11, 0xdd, 0x77, 0x10,
+	0xeb, 0x9b, 0xb1, 0xdc, 0x14, 0x1f, 0x93, 0xbc, 0x3c, 0x5c, 0x32, 0xd7, 0xa0, 0x96, 0xf8, 0xf5,
+	0x1f, 0xc8, 0xc7, 0xe2, 0x6b, 0xbf, 0xb2, 0x90, 0xdd, 0xa3, 0x96, 0xec, 0xc0, 0x8d, 0xcb, 0xeb,
+	0xfe, 0x60, 0xe8, 0x98, 0xfd, 0xbb, 0xa6, 0x54, 0x47, 0x86, 0xc6, 0x6d, 0xe5, 0x4f, 0x12, 0x2c,
+	0x0c, 0xdf, 0xc9, 0x8d, 0x51, 0x08, 0x07, 0x8e, 0x29, 0x4f, 0xff, 0xe9, 0x58, 0x32, 0xd3, 0x6b,
+	0x98, 0xbd, 0xb4, 0x1e, 0x6b, 0xd7, 0xd1, 0xa5, 0x91, 0xca, 0xfa, 0xa8, 0xc8, 0xa4, 0x57, 0x08,
+	0xf9, 0xc1, 0xfb, 0x56, 0x19, 0x95, 0x86, 0xc3, 0x95, 0x8d, 0xbf, 0x82, 0xc7, 0xad, 0x95, 0x89,
+	0xb7, 0x17, 0xc7, 0x65, 0x69, 0xeb, 0xe5, 0xc9, 0x59, 0x49, 0x3a, 0x3d, 0x2b, 0x49, 0x3f, 0xcf,
+	0x4a, 0xd2, 0xc7, 0xf3, 0x52, 0xe6, 0xf4, 0xbc, 0x94, 0xf9, 0x7a, 0x5e, 0xca, 0xbc, 0xda, 0xb0,
+	0xec, 0xe0, 0xb0, 0xdb, 0xd2, 0x4c, 0xe2, 0xe8, 0xe2, 0x85, 0xb0, 0x5b, 0x66, 0xc5, 0x22, 0x7a,
+	0x6f, 0x53, 0x77, 0x48, 0xbb, 0xdb, 0x41, 0xca, 0x1e, 0x1f, 0xaa, 0xd7, 0x1e, 0x57, 0xd8, 0xbb,
+	0x13, 0x84, 0x1e, 0xd2, 0xd6, 0x24, 0x7f, 0x3b, 0x1e, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x1e,
+	0x62, 0xbf, 0xcd, 0x00, 0x07, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/modules/apps/transfer/types/tx.pb.go b/modules/apps/transfer/types/tx.pb.go
index 5ec9e5571f8..5c6401475e7 100644
--- a/modules/apps/transfer/types/tx.pb.go
+++ b/modules/apps/transfer/types/tx.pb.go
@@ -221,45 +221,45 @@ func init() {
 }
 
 var fileDescriptor_7401ed9bed2f8e09 = []byte{
-	// 602 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xcf, 0x4e, 0x14, 0x4f,
-	0x10, 0xde, 0x81, 0x65, 0x7f, 0xfb, 0xeb, 0x15, 0x90, 0xd6, 0xc8, 0x30, 0x21, 0xb3, 0x64, 0x23,
-	0x09, 0x42, 0xe8, 0xce, 0x60, 0x08, 0x09, 0x47, 0x38, 0xe8, 0x85, 0x04, 0x37, 0x78, 0xf1, 0x42,
-	0x66, 0x9a, 0x72, 0xb6, 0xe3, 0x4e, 0xf7, 0xd8, 0xdd, 0x3b, 0xd1, 0x8b, 0x31, 0x9e, 0x8c, 0x27,
-	0x1f, 0xc1, 0x47, 0xe0, 0x31, 0x38, 0x72, 0xf4, 0x64, 0x0c, 0x1c, 0xf0, 0xe0, 0x43, 0x98, 0xe9,
-	0xe9, 0x59, 0x57, 0x0f, 0xab, 0x5e, 0x76, 0xeb, 0xcf, 0x57, 0x5f, 0x55, 0x7d, 0x3d, 0x85, 0xd6,
-	0x79, 0xc2, 0x68, 0x9c, 0xe7, 0x43, 0xce, 0x62, 0xc3, 0xa5, 0xd0, 0xd4, 0xa8, 0x58, 0xe8, 0xe7,
-	0xa0, 0x68, 0x11, 0x51, 0xf3, 0x8a, 0xe4, 0x4a, 0x1a, 0x89, 0x57, 0x79, 0xc2, 0xc8, 0x24, 0x8c,
-	0xd4, 0x30, 0x52, 0x44, 0xc1, 0x52, 0x9c, 0x71, 0x21, 0xa9, 0xfd, 0xad, 0x0a, 0x82, 0xbb, 0xa9,
-	0x4c, 0xa5, 0x35, 0x69, 0x69, 0xb9, 0xe8, 0x32, 0x93, 0x3a, 0x93, 0x9a, 0x66, 0x3a, 0x2d, 0xe9,
-	0x33, 0x9d, 0xba, 0x44, 0xe8, 0x12, 0x49, 0xac, 0x81, 0x16, 0x51, 0x02, 0x26, 0x8e, 0x28, 0x93,
-	0x5c, 0xb8, 0x7c, 0xb7, 0x1c, 0x93, 0x49, 0x05, 0x94, 0x0d, 0x39, 0x08, 0x53, 0x56, 0x57, 0x96,
-	0x03, 0x6c, 0x4d, 0xdf, 0xa3, 0x1e, 0xd6, 0x82, 0x7b, 0xdf, 0x66, 0x50, 0xe7, 0x48, 0xa7, 0x27,
-	0x2e, 0x8a, 0xbb, 0xa8, 0xa3, 0xe5, 0x48, 0x31, 0x38, 0xcd, 0xa5, 0x32, 0xbe, 0xb7, 0xe6, 0x6d,
-	0xfc, 0xdf, 0x47, 0x55, 0xe8, 0x58, 0x2a, 0x83, 0xd7, 0xd1, 0x82, 0x03, 0xb0, 0x41, 0x2c, 0x04,
-	0x0c, 0xfd, 0x19, 0x8b, 0x99, 0xaf, 0xa2, 0x87, 0x55, 0x10, 0xef, 0xa2, 0x39, 0x23, 0x5f, 0x80,
-	0xf0, 0x67, 0xd7, 0xbc, 0x8d, 0xce, 0xce, 0x0a, 0xa9, 0xb6, 0x22, 0xe5, 0x56, 0xc4, 0x6d, 0x45,
-	0x0e, 0x25, 0x17, 0x07, 0xcd, 0x8b, 0x2f, 0xdd, 0x46, 0xbf, 0x42, 0xe3, 0x7b, 0xa8, 0xa5, 0x41,
-	0x9c, 0x81, 0xf2, 0x9b, 0x96, 0xd5, 0x79, 0x38, 0x40, 0x6d, 0x05, 0x0c, 0x78, 0x01, 0xca, 0x9f,
-	0xb3, 0x99, 0xb1, 0x8f, 0x1f, 0xa1, 0x05, 0xc3, 0x33, 0x90, 0x23, 0x73, 0x3a, 0x00, 0x9e, 0x0e,
-	0x8c, 0xdf, 0xb2, 0x3d, 0x03, 0x52, 0xbe, 0x54, 0xa9, 0x14, 0x71, 0xfa, 0x14, 0x11, 0x79, 0x6c,
-	0x11, 0xae, 0xe9, 0xbc, 0xab, 0xab, 0x82, 0x78, 0x0b, 0x2d, 0xd5, 0x44, 0xe5, 0xbf, 0x36, 0x71,
-	0x96, 0xfb, 0xff, 0xad, 0x79, 0x1b, 0xcd, 0xfe, 0x6d, 0x97, 0x38, 0xa9, 0xe3, 0x18, 0xa3, 0x66,
-	0x06, 0x99, 0xf4, 0xdb, 0x76, 0x1a, 0x6b, 0xef, 0xaf, 0xbe, 0xff, 0xd4, 0x6d, 0xbc, 0xbb, 0x39,
-	0xdf, 0x74, 0x63, 0x7f, 0xb8, 0x39, 0xdf, 0x6c, 0xd7, 0x82, 0xf7, 0xf6, 0xd0, 0x9d, 0x09, 0xa5,
-	0xfb, 0xa0, 0x73, 0x29, 0x34, 0x94, 0xab, 0x69, 0x78, 0x39, 0x02, 0xc1, 0xc0, 0xca, 0xdd, 0xec,
-	0x8f, 0xfd, 0xfd, 0x66, 0x49, 0xd8, 0x7b, 0x83, 0x16, 0x8f, 0x74, 0xfa, 0x34, 0x3f, 0x8b, 0x0d,
-	0x1c, 0xc7, 0x2a, 0xce, 0xb4, 0xd5, 0x89, 0xa7, 0x02, 0x94, 0x7b, 0x21, 0xe7, 0xe1, 0x03, 0xd4,
-	0xca, 0x2d, 0xc2, 0xbe, 0x4a, 0x67, 0xe7, 0x3e, 0x99, 0xf6, 0xb5, 0x92, 0x8a, 0xcd, 0xa9, 0xe1,
-	0x2a, 0xf7, 0x17, 0x7f, 0x6e, 0x61, 0x49, 0x7b, 0x2b, 0x68, 0xf9, 0xb7, 0xfe, 0xf5, 0xf0, 0x3b,
-	0xdf, 0x3d, 0x34, 0x7b, 0xa4, 0x53, 0x3c, 0x40, 0xed, 0xf1, 0x27, 0xf4, 0x60, 0x7a, 0xcf, 0x09,
-	0x0d, 0x82, 0xe8, 0xaf, 0xa1, 0x63, 0xb9, 0x0c, 0xba, 0xf5, 0x8b, 0x12, 0xdb, 0x7f, 0xa4, 0x98,
-	0x84, 0x07, 0xbb, 0xff, 0x04, 0xaf, 0xbb, 0x06, 0x73, 0x6f, 0x6f, 0xce, 0x37, 0xbd, 0x83, 0x27,
-	0x17, 0x57, 0xa1, 0x77, 0x79, 0x15, 0x7a, 0x5f, 0xaf, 0x42, 0xef, 0xe3, 0x75, 0xd8, 0xb8, 0xbc,
-	0x0e, 0x1b, 0x9f, 0xaf, 0xc3, 0xc6, 0xb3, 0xbd, 0x94, 0x9b, 0xc1, 0x28, 0x21, 0x4c, 0x66, 0xd4,
-	0x1d, 0x30, 0x4f, 0xd8, 0x76, 0x2a, 0x69, 0xb1, 0x47, 0x33, 0x79, 0x36, 0x1a, 0x82, 0x2e, 0x8f,
-	0x72, 0xe2, 0x18, 0xcd, 0xeb, 0x1c, 0x74, 0xd2, 0xb2, 0x77, 0xf8, 0xf0, 0x47, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0x2b, 0x43, 0xf4, 0xd1, 0x7e, 0x04, 0x00, 0x00,
+	// 605 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4d, 0x4f, 0x13, 0x41,
+	0x18, 0xee, 0x42, 0xa9, 0x38, 0x15, 0x90, 0xd1, 0xc0, 0xb2, 0x31, 0x5b, 0xd2, 0x48, 0x82, 0x25,
+	0xcc, 0xa4, 0x18, 0x42, 0xc2, 0x11, 0x0e, 0x7a, 0x21, 0xc1, 0x06, 0x2f, 0x5e, 0xc8, 0xee, 0xf4,
+	0x75, 0x3b, 0xa1, 0x3b, 0xb3, 0xce, 0x4c, 0x1b, 0xbd, 0x18, 0xe3, 0xc9, 0x78, 0xf2, 0x27, 0xf8,
+	0x13, 0xf8, 0x19, 0x1c, 0x39, 0x7a, 0x32, 0x06, 0x0e, 0x5c, 0x3c, 0x7b, 0x36, 0x3b, 0x3b, 0x5b,
+	0x57, 0x0f, 0x55, 0x2f, 0xed, 0xfb, 0xf1, 0xbc, 0x1f, 0xcf, 0x33, 0xfb, 0xa2, 0x0d, 0x1e, 0x33,
+	0x1a, 0x65, 0xd9, 0x90, 0xb3, 0xc8, 0x70, 0x29, 0x34, 0x35, 0x2a, 0x12, 0xfa, 0x25, 0x28, 0x3a,
+	0xee, 0x52, 0xf3, 0x9a, 0x64, 0x4a, 0x1a, 0x89, 0x1f, 0xf0, 0x98, 0x91, 0x2a, 0x8c, 0x94, 0x30,
+	0x32, 0xee, 0x06, 0xcb, 0x51, 0xca, 0x85, 0xa4, 0xf6, 0xb7, 0x28, 0x08, 0xee, 0x27, 0x32, 0x91,
+	0xd6, 0xa4, 0xb9, 0xe5, 0xa2, 0xab, 0x4c, 0xea, 0x54, 0x6a, 0x9a, 0xea, 0x24, 0x6f, 0x9f, 0xea,
+	0xc4, 0x25, 0x42, 0x97, 0x88, 0x23, 0x0d, 0x74, 0xdc, 0x8d, 0xc1, 0x44, 0x5d, 0xca, 0x24, 0x17,
+	0x2e, 0xdf, 0xca, 0xd7, 0x64, 0x52, 0x01, 0x65, 0x43, 0x0e, 0xc2, 0xe4, 0xd5, 0x85, 0xe5, 0x00,
+	0x5b, 0xd3, 0x79, 0x94, 0xcb, 0x5a, 0x70, 0xfb, 0xc7, 0x0c, 0x6a, 0x1e, 0xe9, 0xe4, 0xc4, 0x45,
+	0x71, 0x0b, 0x35, 0xb5, 0x1c, 0x29, 0x06, 0xa7, 0x99, 0x54, 0xc6, 0xf7, 0xd6, 0xbd, 0xcd, 0xdb,
+	0x3d, 0x54, 0x84, 0x8e, 0xa5, 0x32, 0x78, 0x03, 0x2d, 0x3a, 0x00, 0x1b, 0x44, 0x42, 0xc0, 0xd0,
+	0x9f, 0xb1, 0x98, 0x85, 0x22, 0x7a, 0x58, 0x04, 0xf1, 0x2e, 0x9a, 0x33, 0xf2, 0x0c, 0x84, 0x3f,
+	0xbb, 0xee, 0x6d, 0x36, 0x77, 0xd6, 0x48, 0xc1, 0x8a, 0xe4, 0xac, 0x88, 0x63, 0x45, 0x0e, 0x25,
+	0x17, 0x07, 0xf5, 0x8b, 0xaf, 0xad, 0x5a, 0xaf, 0x40, 0xe3, 0x15, 0xd4, 0xd0, 0x20, 0xfa, 0xa0,
+	0xfc, 0xba, 0xed, 0xea, 0x3c, 0x1c, 0xa0, 0x79, 0x05, 0x0c, 0xf8, 0x18, 0x94, 0x3f, 0x67, 0x33,
+	0x13, 0x1f, 0x3f, 0x41, 0x8b, 0x86, 0xa7, 0x20, 0x47, 0xe6, 0x74, 0x00, 0x3c, 0x19, 0x18, 0xbf,
+	0x61, 0x67, 0x06, 0x24, 0x7f, 0xa9, 0x5c, 0x29, 0xe2, 0xf4, 0x19, 0x77, 0xc9, 0x53, 0x8b, 0x70,
+	0x43, 0x17, 0x5c, 0x5d, 0x11, 0xc4, 0x5b, 0x68, 0xb9, 0x6c, 0x94, 0xff, 0x6b, 0x13, 0xa5, 0x99,
+	0x7f, 0x6b, 0xdd, 0xdb, 0xac, 0xf7, 0xee, 0xba, 0xc4, 0x49, 0x19, 0xc7, 0x18, 0xd5, 0x53, 0x48,
+	0xa5, 0x3f, 0x6f, 0xb7, 0xb1, 0xf6, 0x7e, 0xe7, 0xc3, 0xe7, 0x56, 0xed, 0xfd, 0xcd, 0x79, 0xc7,
+	0xad, 0xfd, 0xf1, 0xe6, 0xbc, 0xb3, 0x52, 0x10, 0xdf, 0xd6, 0xfd, 0x33, 0x5a, 0x11, 0xba, 0xbd,
+	0x87, 0xee, 0x55, 0xdc, 0x1e, 0xe8, 0x4c, 0x0a, 0x0d, 0x39, 0x51, 0x0d, 0xaf, 0x46, 0x20, 0x18,
+	0x58, 0xf1, 0xeb, 0xbd, 0x89, 0xbf, 0x5f, 0xcf, 0xdb, 0xb7, 0xdf, 0xa2, 0xa5, 0x23, 0x9d, 0x3c,
+	0xcf, 0xfa, 0x91, 0x81, 0xe3, 0x48, 0x45, 0xa9, 0xb6, 0xaa, 0xf1, 0x44, 0x80, 0x72, 0xef, 0xe5,
+	0x3c, 0x7c, 0x80, 0x1a, 0x99, 0x45, 0xd8, 0x37, 0x6a, 0xee, 0x3c, 0x24, 0xd3, 0xbe, 0x5d, 0x52,
+	0x74, 0x73, 0xda, 0xb8, 0xca, 0xfd, 0xa5, 0x5f, 0x9c, 0x6c, 0xd3, 0xf6, 0x1a, 0x5a, 0xfd, 0x63,
+	0x7e, 0xb9, 0xfc, 0xce, 0x77, 0x0f, 0xcd, 0x1e, 0xe9, 0x04, 0x0f, 0xd0, 0xfc, 0xe4, 0x83, 0x7a,
+	0x34, 0x7d, 0x66, 0x45, 0x83, 0xa0, 0xfb, 0xcf, 0xd0, 0x89, 0x5c, 0x06, 0xdd, 0xf9, 0x4d, 0x89,
+	0xed, 0xbf, 0xb6, 0xa8, 0xc2, 0x83, 0xdd, 0xff, 0x82, 0x97, 0x53, 0x83, 0xb9, 0x77, 0x37, 0xe7,
+	0x1d, 0xef, 0xe0, 0xd9, 0xc5, 0x55, 0xe8, 0x5d, 0x5e, 0x85, 0xde, 0xb7, 0xab, 0xd0, 0xfb, 0x74,
+	0x1d, 0xd6, 0x2e, 0xaf, 0xc3, 0xda, 0x97, 0xeb, 0xb0, 0xf6, 0x62, 0x2f, 0xe1, 0x66, 0x30, 0x8a,
+	0x09, 0x93, 0x29, 0x75, 0xe7, 0xcc, 0x63, 0xb6, 0x9d, 0x48, 0x3a, 0xde, 0xa3, 0xa9, 0xec, 0x8f,
+	0x86, 0xa0, 0xf3, 0x13, 0xad, 0x9c, 0xa6, 0x79, 0x93, 0x81, 0x8e, 0x1b, 0xf6, 0x2a, 0x1f, 0xff,
+	0x0c, 0x00, 0x00, 0xff, 0xff, 0x8a, 0x7c, 0x74, 0x58, 0x8c, 0x04, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/ibc/applications/fee/v1/tx.proto b/proto/ibc/applications/fee/v1/tx.proto
index a8ddd76d2c6..3b0abf5eabd 100644
--- a/proto/ibc/applications/fee/v1/tx.proto
+++ b/proto/ibc/applications/fee/v1/tx.proto
@@ -43,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;
@@ -62,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;
@@ -83,7 +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)           = "payPacketFee";
+  option (amino.name)           = "cosmos-sdk/MsgPayPacketFee";
   option (cosmos.msg.v1.signer) = "signer";
 
   option (gogoproto.goproto_getters) = false;
@@ -106,7 +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)                = "payPacketFeeAsync";
+  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 25b787041d2..34466599470 100644
--- a/proto/ibc/applications/transfer/v1/tx.proto
+++ b/proto/ibc/applications/transfer/v1/tx.proto
@@ -26,7 +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)           = "transfer";
+  option (amino.name)           = "cosmos-sdk/MsgTransfer";
   option (cosmos.msg.v1.signer) = "sender";
 
   option (gogoproto.goproto_getters) = false;

From a74aca2cc1d2d43a9971b0403ca5c703351ee3d2 Mon Sep 17 00:00:00 2001
From: Damian Nolan <damiannolan@gmail.com>
Date: Wed, 6 Sep 2023 10:20:57 +0200
Subject: [PATCH 5/5] chore: adding amino encoding annoations to sdk coins

---
 modules/apps/29-fee/types/fee.pb.go         | 67 ++++++++---------
 modules/apps/transfer/types/tx.pb.go        | 79 +++++++++++----------
 proto/ibc/applications/fee/v1/fee.proto     | 24 +++++--
 proto/ibc/applications/transfer/v1/tx.proto |  2 +-
 4 files changed, 94 insertions(+), 78 deletions(-)

diff --git a/modules/apps/29-fee/types/fee.pb.go b/modules/apps/29-fee/types/fee.pb.go
index c678c1c867f..19022350537 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/v7/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, 0x08, 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, 0xb0, 0x8c, 0x0d, 0x3d, 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, 0x42, 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, 0x1c, 0x9f,
+	0x62, 0xaa, 0x2c, 0x04, 0x00, 0x00,
 }
 
 func (m *Fee) Marshal() (dAtA []byte, err error) {
diff --git a/modules/apps/transfer/types/tx.pb.go b/modules/apps/transfer/types/tx.pb.go
index 5c6401475e7..4f521af5be3 100644
--- a/modules/apps/transfer/types/tx.pb.go
+++ b/modules/apps/transfer/types/tx.pb.go
@@ -221,45 +221,46 @@ func init() {
 }
 
 var fileDescriptor_7401ed9bed2f8e09 = []byte{
-	// 605 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4d, 0x4f, 0x13, 0x41,
-	0x18, 0xee, 0x42, 0xa9, 0x38, 0x15, 0x90, 0xd1, 0xc0, 0xb2, 0x31, 0x5b, 0xd2, 0x48, 0x82, 0x25,
-	0xcc, 0xa4, 0x18, 0x42, 0xc2, 0x11, 0x0e, 0x7a, 0x21, 0xc1, 0x06, 0x2f, 0x5e, 0xc8, 0xee, 0xf4,
-	0x75, 0x3b, 0xa1, 0x3b, 0xb3, 0xce, 0x4c, 0x1b, 0xbd, 0x18, 0xe3, 0xc9, 0x78, 0xf2, 0x27, 0xf8,
-	0x13, 0xf8, 0x19, 0x1c, 0x39, 0x7a, 0x32, 0x06, 0x0e, 0x5c, 0x3c, 0x7b, 0x36, 0x3b, 0x3b, 0x5b,
-	0x57, 0x0f, 0x55, 0x2f, 0xed, 0xfb, 0xf1, 0xbc, 0x1f, 0xcf, 0x33, 0xfb, 0xa2, 0x0d, 0x1e, 0x33,
-	0x1a, 0x65, 0xd9, 0x90, 0xb3, 0xc8, 0x70, 0x29, 0x34, 0x35, 0x2a, 0x12, 0xfa, 0x25, 0x28, 0x3a,
-	0xee, 0x52, 0xf3, 0x9a, 0x64, 0x4a, 0x1a, 0x89, 0x1f, 0xf0, 0x98, 0x91, 0x2a, 0x8c, 0x94, 0x30,
-	0x32, 0xee, 0x06, 0xcb, 0x51, 0xca, 0x85, 0xa4, 0xf6, 0xb7, 0x28, 0x08, 0xee, 0x27, 0x32, 0x91,
-	0xd6, 0xa4, 0xb9, 0xe5, 0xa2, 0xab, 0x4c, 0xea, 0x54, 0x6a, 0x9a, 0xea, 0x24, 0x6f, 0x9f, 0xea,
-	0xc4, 0x25, 0x42, 0x97, 0x88, 0x23, 0x0d, 0x74, 0xdc, 0x8d, 0xc1, 0x44, 0x5d, 0xca, 0x24, 0x17,
-	0x2e, 0xdf, 0xca, 0xd7, 0x64, 0x52, 0x01, 0x65, 0x43, 0x0e, 0xc2, 0xe4, 0xd5, 0x85, 0xe5, 0x00,
-	0x5b, 0xd3, 0x79, 0x94, 0xcb, 0x5a, 0x70, 0xfb, 0xc7, 0x0c, 0x6a, 0x1e, 0xe9, 0xe4, 0xc4, 0x45,
-	0x71, 0x0b, 0x35, 0xb5, 0x1c, 0x29, 0x06, 0xa7, 0x99, 0x54, 0xc6, 0xf7, 0xd6, 0xbd, 0xcd, 0xdb,
-	0x3d, 0x54, 0x84, 0x8e, 0xa5, 0x32, 0x78, 0x03, 0x2d, 0x3a, 0x00, 0x1b, 0x44, 0x42, 0xc0, 0xd0,
-	0x9f, 0xb1, 0x98, 0x85, 0x22, 0x7a, 0x58, 0x04, 0xf1, 0x2e, 0x9a, 0x33, 0xf2, 0x0c, 0x84, 0x3f,
-	0xbb, 0xee, 0x6d, 0x36, 0x77, 0xd6, 0x48, 0xc1, 0x8a, 0xe4, 0xac, 0x88, 0x63, 0x45, 0x0e, 0x25,
-	0x17, 0x07, 0xf5, 0x8b, 0xaf, 0xad, 0x5a, 0xaf, 0x40, 0xe3, 0x15, 0xd4, 0xd0, 0x20, 0xfa, 0xa0,
-	0xfc, 0xba, 0xed, 0xea, 0x3c, 0x1c, 0xa0, 0x79, 0x05, 0x0c, 0xf8, 0x18, 0x94, 0x3f, 0x67, 0x33,
-	0x13, 0x1f, 0x3f, 0x41, 0x8b, 0x86, 0xa7, 0x20, 0x47, 0xe6, 0x74, 0x00, 0x3c, 0x19, 0x18, 0xbf,
-	0x61, 0x67, 0x06, 0x24, 0x7f, 0xa9, 0x5c, 0x29, 0xe2, 0xf4, 0x19, 0x77, 0xc9, 0x53, 0x8b, 0x70,
-	0x43, 0x17, 0x5c, 0x5d, 0x11, 0xc4, 0x5b, 0x68, 0xb9, 0x6c, 0x94, 0xff, 0x6b, 0x13, 0xa5, 0x99,
-	0x7f, 0x6b, 0xdd, 0xdb, 0xac, 0xf7, 0xee, 0xba, 0xc4, 0x49, 0x19, 0xc7, 0x18, 0xd5, 0x53, 0x48,
-	0xa5, 0x3f, 0x6f, 0xb7, 0xb1, 0xf6, 0x7e, 0xe7, 0xc3, 0xe7, 0x56, 0xed, 0xfd, 0xcd, 0x79, 0xc7,
-	0xad, 0xfd, 0xf1, 0xe6, 0xbc, 0xb3, 0x52, 0x10, 0xdf, 0xd6, 0xfd, 0x33, 0x5a, 0x11, 0xba, 0xbd,
-	0x87, 0xee, 0x55, 0xdc, 0x1e, 0xe8, 0x4c, 0x0a, 0x0d, 0x39, 0x51, 0x0d, 0xaf, 0x46, 0x20, 0x18,
-	0x58, 0xf1, 0xeb, 0xbd, 0x89, 0xbf, 0x5f, 0xcf, 0xdb, 0xb7, 0xdf, 0xa2, 0xa5, 0x23, 0x9d, 0x3c,
-	0xcf, 0xfa, 0x91, 0x81, 0xe3, 0x48, 0x45, 0xa9, 0xb6, 0xaa, 0xf1, 0x44, 0x80, 0x72, 0xef, 0xe5,
-	0x3c, 0x7c, 0x80, 0x1a, 0x99, 0x45, 0xd8, 0x37, 0x6a, 0xee, 0x3c, 0x24, 0xd3, 0xbe, 0x5d, 0x52,
-	0x74, 0x73, 0xda, 0xb8, 0xca, 0xfd, 0xa5, 0x5f, 0x9c, 0x6c, 0xd3, 0xf6, 0x1a, 0x5a, 0xfd, 0x63,
-	0x7e, 0xb9, 0xfc, 0xce, 0x77, 0x0f, 0xcd, 0x1e, 0xe9, 0x04, 0x0f, 0xd0, 0xfc, 0xe4, 0x83, 0x7a,
-	0x34, 0x7d, 0x66, 0x45, 0x83, 0xa0, 0xfb, 0xcf, 0xd0, 0x89, 0x5c, 0x06, 0xdd, 0xf9, 0x4d, 0x89,
-	0xed, 0xbf, 0xb6, 0xa8, 0xc2, 0x83, 0xdd, 0xff, 0x82, 0x97, 0x53, 0x83, 0xb9, 0x77, 0x37, 0xe7,
-	0x1d, 0xef, 0xe0, 0xd9, 0xc5, 0x55, 0xe8, 0x5d, 0x5e, 0x85, 0xde, 0xb7, 0xab, 0xd0, 0xfb, 0x74,
-	0x1d, 0xd6, 0x2e, 0xaf, 0xc3, 0xda, 0x97, 0xeb, 0xb0, 0xf6, 0x62, 0x2f, 0xe1, 0x66, 0x30, 0x8a,
-	0x09, 0x93, 0x29, 0x75, 0xe7, 0xcc, 0x63, 0xb6, 0x9d, 0x48, 0x3a, 0xde, 0xa3, 0xa9, 0xec, 0x8f,
-	0x86, 0xa0, 0xf3, 0x13, 0xad, 0x9c, 0xa6, 0x79, 0x93, 0x81, 0x8e, 0x1b, 0xf6, 0x2a, 0x1f, 0xff,
-	0x0c, 0x00, 0x00, 0xff, 0xff, 0x8a, 0x7c, 0x74, 0x58, 0x8c, 0x04, 0x00, 0x00,
+	// 622 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4f, 0x4f, 0x13, 0x41,
+	0x14, 0xef, 0x4a, 0xa9, 0x38, 0x15, 0x90, 0x95, 0xc0, 0xb2, 0x31, 0x5b, 0xd2, 0x48, 0x82, 0x25,
+	0xcc, 0xa4, 0x18, 0x43, 0xc2, 0xb1, 0xc4, 0xe8, 0x85, 0x04, 0x1b, 0xbc, 0x78, 0x21, 0xbb, 0xd3,
+	0xe7, 0x76, 0x42, 0x77, 0x66, 0x9d, 0x99, 0x36, 0x72, 0x31, 0xc6, 0x83, 0x31, 0x9e, 0x3c, 0x7b,
+	0xf2, 0x23, 0xf4, 0x63, 0x70, 0xe4, 0xe8, 0xc9, 0x18, 0x38, 0xf4, 0xe2, 0x87, 0x30, 0x33, 0x3b,
+	0xad, 0xd5, 0x43, 0xd5, 0xcb, 0xee, 0xfb, 0xf3, 0x7b, 0xff, 0x7e, 0x6f, 0x1e, 0xda, 0x62, 0x09,
+	0x25, 0x71, 0x9e, 0xf7, 0x18, 0x8d, 0x35, 0x13, 0x5c, 0x11, 0x2d, 0x63, 0xae, 0x5e, 0x82, 0x24,
+	0x83, 0x26, 0xd1, 0xaf, 0x71, 0x2e, 0x85, 0x16, 0xfe, 0x3d, 0x96, 0x50, 0x3c, 0x0d, 0xc3, 0x63,
+	0x18, 0x1e, 0x34, 0xc3, 0x95, 0x38, 0x63, 0x5c, 0x10, 0xfb, 0x2d, 0x02, 0xc2, 0xd5, 0x54, 0xa4,
+	0xc2, 0x8a, 0xc4, 0x48, 0xce, 0xba, 0x4e, 0x85, 0xca, 0x84, 0x22, 0x99, 0x4a, 0x4d, 0xfa, 0x4c,
+	0xa5, 0xce, 0x11, 0x39, 0x47, 0x12, 0x2b, 0x20, 0x83, 0x66, 0x02, 0x3a, 0x6e, 0x12, 0x2a, 0x18,
+	0x77, 0xfe, 0x9a, 0x69, 0x93, 0x0a, 0x09, 0x84, 0xf6, 0x18, 0x70, 0x6d, 0xa2, 0x0b, 0xc9, 0x01,
+	0x76, 0x66, 0xcf, 0x31, 0x6e, 0xd6, 0x82, 0xeb, 0xef, 0xe7, 0x50, 0xf5, 0x48, 0xa5, 0x27, 0xce,
+	0xea, 0xd7, 0x50, 0x55, 0x89, 0xbe, 0xa4, 0x70, 0x9a, 0x0b, 0xa9, 0x03, 0x6f, 0xd3, 0xdb, 0xbe,
+	0xd5, 0x46, 0x85, 0xe9, 0x58, 0x48, 0xed, 0x6f, 0xa1, 0x25, 0x07, 0xa0, 0xdd, 0x98, 0x73, 0xe8,
+	0x05, 0x37, 0x2c, 0x66, 0xb1, 0xb0, 0x1e, 0x16, 0x46, 0xff, 0x31, 0x9a, 0xd7, 0xe2, 0x0c, 0x78,
+	0x30, 0xb7, 0xe9, 0x6d, 0x57, 0xf7, 0x36, 0x70, 0x31, 0x15, 0x36, 0x53, 0x61, 0x37, 0x15, 0x3e,
+	0x14, 0x8c, 0xb7, 0x56, 0x2f, 0xbe, 0xd5, 0x4a, 0x9f, 0x47, 0xc3, 0x46, 0xb5, 0x07, 0x69, 0x4c,
+	0xcf, 0x4f, 0xcd, 0xac, 0xed, 0x22, 0xda, 0x5f, 0x43, 0x15, 0x05, 0xbc, 0x03, 0x32, 0x28, 0xdb,
+	0x2a, 0x4e, 0xf3, 0x43, 0xb4, 0x20, 0x81, 0x02, 0x1b, 0x80, 0x0c, 0xe6, 0xad, 0x67, 0xa2, 0xfb,
+	0x4f, 0xd0, 0x92, 0x66, 0x19, 0x88, 0xbe, 0x3e, 0xed, 0x02, 0x4b, 0xbb, 0x3a, 0xa8, 0xd8, 0x1e,
+	0x42, 0x6c, 0x36, 0x67, 0x98, 0xc3, 0x8e, 0xaf, 0x41, 0x13, 0x3f, 0xb5, 0x88, 0x56, 0xd9, 0x34,
+	0xd1, 0x5e, 0x74, 0x71, 0x85, 0xd1, 0xdf, 0x41, 0x2b, 0xe3, 0x44, 0xe6, 0xaf, 0x74, 0x9c, 0xe5,
+	0xc1, 0xcd, 0x4d, 0x6f, 0xbb, 0xdc, 0xbe, 0xe3, 0x1c, 0x27, 0x63, 0xbb, 0xef, 0xa3, 0x72, 0x06,
+	0x99, 0x08, 0x16, 0x6c, 0x37, 0x56, 0x3e, 0x68, 0x7c, 0xf8, 0x52, 0x2b, 0xbd, 0x1b, 0x0d, 0x1b,
+	0xae, 0xed, 0x8f, 0xa3, 0x61, 0x63, 0xad, 0x20, 0x62, 0x57, 0x75, 0xce, 0xc8, 0x14, 0xf1, 0xf5,
+	0x7d, 0x74, 0x77, 0x4a, 0x6d, 0x83, 0xca, 0x05, 0x57, 0x60, 0x06, 0x55, 0xf0, 0xaa, 0x0f, 0x9c,
+	0x82, 0x5d, 0x46, 0xb9, 0x3d, 0xd1, 0x0f, 0xca, 0x26, 0x7d, 0xfd, 0x0d, 0x5a, 0x3e, 0x52, 0xe9,
+	0xf3, 0xbc, 0x13, 0x6b, 0x38, 0x8e, 0x65, 0x9c, 0x29, 0xcb, 0x1a, 0x4b, 0x39, 0x48, 0xb7, 0x3f,
+	0xa7, 0xf9, 0x2d, 0x54, 0xc9, 0x2d, 0xc2, 0xee, 0xac, 0xba, 0x77, 0x1f, 0xcf, 0x7a, 0xcb, 0xb8,
+	0xc8, 0xe6, 0xb8, 0x71, 0x91, 0x07, 0xcb, 0xbf, 0x66, 0xb2, 0x49, 0xeb, 0x1b, 0x68, 0xfd, 0x8f,
+	0xfa, 0xe3, 0xe6, 0xf7, 0x7e, 0x78, 0x68, 0xee, 0x48, 0xa5, 0x7e, 0x17, 0x2d, 0x4c, 0x1e, 0xd8,
+	0x83, 0xd9, 0x35, 0xa7, 0x38, 0x08, 0x9b, 0xff, 0x0c, 0x9d, 0xd0, 0xa5, 0xd1, 0xed, 0xdf, 0x98,
+	0xd8, 0xfd, 0x6b, 0x8a, 0x69, 0x78, 0xf8, 0xe8, 0xbf, 0xe0, 0xe3, 0xaa, 0xe1, 0xfc, 0xdb, 0xd1,
+	0xb0, 0xe1, 0xb5, 0x9e, 0x5d, 0x5c, 0x45, 0xde, 0xe5, 0x55, 0xe4, 0x7d, 0xbf, 0x8a, 0xbc, 0x4f,
+	0xd7, 0x51, 0xe9, 0xf2, 0x3a, 0x2a, 0x7d, 0xbd, 0x8e, 0x4a, 0x2f, 0xf6, 0x53, 0xa6, 0xbb, 0xfd,
+	0x04, 0x53, 0x91, 0x11, 0x77, 0xde, 0x2c, 0xa1, 0xbb, 0xa9, 0x20, 0x83, 0x7d, 0x92, 0x89, 0x4e,
+	0xbf, 0x07, 0xca, 0x9c, 0xec, 0xd4, 0xa9, 0xea, 0xf3, 0x1c, 0x54, 0x52, 0xb1, 0x57, 0xfa, 0xf0,
+	0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0x41, 0x6f, 0x51, 0xf6, 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 7d451c0c6e8..f0a247a8199 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/v7/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/transfer/v1/tx.proto b/proto/ibc/applications/transfer/v1/tx.proto
index 34466599470..da67daa75f0 100644
--- a/proto/ibc/applications/transfer/v1/tx.proto
+++ b/proto/ibc/applications/transfer/v1/tx.proto
@@ -36,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