From a8f0607e1ce561501fc69337e4896a67b93070a8 Mon Sep 17 00:00:00 2001 From: Damian Nolan Date: Fri, 9 Sep 2022 12:19:52 +0200 Subject: [PATCH 1/2] updating naming of submit tx to send tx --- docs/ibc/proto-docs.md | 22 +- .../controller/client/cli/tx.go | 10 +- .../controller/keeper/msg_server.go | 18 +- .../controller/keeper/msg_server_test.go | 6 +- .../controller/types/codec.go | 2 +- .../controller/types/msgs.go | 10 +- .../controller/types/msgs_test.go | 10 +- .../controller/types/tx.pb.go | 204 +++++++++--------- .../genesis/types/genesis.pb.go | 4 +- .../controller/v1/tx.proto | 12 +- .../genesis/v1/genesis.proto | 4 +- 11 files changed, 151 insertions(+), 151 deletions(-) diff --git a/docs/ibc/proto-docs.md b/docs/ibc/proto-docs.md index c9e6f7c47e0..1a756c0a415 100644 --- a/docs/ibc/proto-docs.md +++ b/docs/ibc/proto-docs.md @@ -100,8 +100,8 @@ - [ibc/applications/interchain_accounts/controller/v1/tx.proto](#ibc/applications/interchain_accounts/controller/v1/tx.proto) - [MsgRegisterAccount](#ibc.applications.interchain_accounts.controller.v1.MsgRegisterAccount) - [MsgRegisterAccountResponse](#ibc.applications.interchain_accounts.controller.v1.MsgRegisterAccountResponse) - - [MsgSubmitTx](#ibc.applications.interchain_accounts.controller.v1.MsgSubmitTx) - - [MsgSubmitTxResponse](#ibc.applications.interchain_accounts.controller.v1.MsgSubmitTxResponse) + - [MsgSendTx](#ibc.applications.interchain_accounts.controller.v1.MsgSendTx) + - [MsgSendTxResponse](#ibc.applications.interchain_accounts.controller.v1.MsgSendTxResponse) - [Msg](#ibc.applications.interchain_accounts.controller.v1.Msg) @@ -1653,10 +1653,10 @@ MsgRegisterAccountResponse defines the response for Msg/RegisterAccount - + -### MsgSubmitTx -MsgSubmitTx defines the payload for MsgSubmitTx +### MsgSendTx +MsgSendTx defines the payload for Msg/SendTx | Field | Type | Label | Description | @@ -1672,10 +1672,10 @@ MsgSubmitTx defines the payload for MsgSubmitTx - + -### MsgSubmitTxResponse -MsgSubmitTxResponse defines the response for MsgSubmitTx +### MsgSendTxResponse +MsgSendTxResponse defines the response for MsgSendTx | Field | Type | Label | Description | @@ -1701,7 +1701,7 @@ Msg defines the 27-interchain-accounts/controller Msg service. | Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint | | ----------- | ------------ | ------------- | ------------| ------- | -------- | | `RegisterAccount` | [MsgRegisterAccount](#ibc.applications.interchain_accounts.controller.v1.MsgRegisterAccount) | [MsgRegisterAccountResponse](#ibc.applications.interchain_accounts.controller.v1.MsgRegisterAccountResponse) | RegisterAccount defines a rpc handler for MsgRegisterAccount. | | -| `SubmitTx` | [MsgSubmitTx](#ibc.applications.interchain_accounts.controller.v1.MsgSubmitTx) | [MsgSubmitTxResponse](#ibc.applications.interchain_accounts.controller.v1.MsgSubmitTxResponse) | SubmitTx defines a rpc handler for MsgSubmitTx. | | +| `SendTx` | [MsgSendTx](#ibc.applications.interchain_accounts.controller.v1.MsgSendTx) | [MsgSendTxResponse](#ibc.applications.interchain_accounts.controller.v1.MsgSendTxResponse) | SendTx defines a rpc handler for MsgSendTx. | | @@ -1750,8 +1750,8 @@ The following parameters may be used to disable the host submodule. ### ActiveChannel -ActiveChannel contains a connection ID, port ID and associated active channel ID, as well as boolean flag to indicate -if the channel is middleware enabled +ActiveChannel contains a connection ID, port ID and associated active channel ID, as well as a boolean flag to +indicate if the channel is middleware enabled | Field | Type | Label | Description | diff --git a/modules/apps/27-interchain-accounts/controller/client/cli/tx.go b/modules/apps/27-interchain-accounts/controller/client/cli/tx.go index ee84df01850..7e0c891ee42 100644 --- a/modules/apps/27-interchain-accounts/controller/client/cli/tx.go +++ b/modules/apps/27-interchain-accounts/controller/client/cli/tx.go @@ -35,7 +35,7 @@ func NewTxCmd() *cobra.Command { cmd.AddCommand( newRegisterAccountCmd(), - newSubmitTxCmd(), + newSendTxCmd(), ) return cmd @@ -77,10 +77,10 @@ the associated capability.`), return cmd } -func newSubmitTxCmd() *cobra.Command { +func newSendTxCmd() *cobra.Command { cmd := &cobra.Command{ - Use: "submit [connection-id] [path/to/packet_msg.json]", - Short: "Submit an interchain account txn on the provided connection.", + Use: "send-tx [connection-id] [path/to/packet_msg.json]", + Short: "Send an interchain account tx on the provided connection.", Long: strings.TrimSpace(`Submits pre-built packet data containing messages to be executed on the host chain and attempts to send the packet. Packet data is provided as json, file or string. An appropriate relative timeoutTimestamp must be provided with flag {packet-timeout-timestamp}, along with a timeoutHeight @@ -126,7 +126,7 @@ via {packet-timeout-timestamp}`), return err } - msg := types.NewMsgSubmitTx(owner, connectionID, timeoutHeight, timeoutTimestamp, icaMsgData) + msg := types.NewMsgSendTx(owner, connectionID, timeoutHeight, timeoutTimestamp, icaMsgData) return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) }, diff --git a/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go b/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go index ba0c564bdd4..59a09748fbb 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go @@ -15,7 +15,7 @@ import ( var _ types.MsgServer = msgServer{} type msgServer struct { - *Keeper + Keeper *Keeper } // NewMsgServerImpl returns an implementation of the ICS27 MsgServer interface @@ -25,7 +25,7 @@ func NewMsgServerImpl(keeper *Keeper) types.MsgServer { } // RegisterAccount defines a rpc handler for MsgRegisterAccount -func (k msgServer) RegisterAccount(goCtx context.Context, msg *types.MsgRegisterAccount) (*types.MsgRegisterAccountResponse, error) { +func (s msgServer) RegisterAccount(goCtx context.Context, msg *types.MsgRegisterAccount) (*types.MsgRegisterAccountResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) portID, err := icatypes.NewControllerPortID(msg.Owner) @@ -33,7 +33,7 @@ func (k msgServer) RegisterAccount(goCtx context.Context, msg *types.MsgRegister return nil, err } - channelID, err := k.registerInterchainAccount(ctx, msg.ConnectionId, portID, msg.Version) + channelID, err := s.Keeper.registerInterchainAccount(ctx, msg.ConnectionId, portID, msg.Version) if err != nil { return nil, err } @@ -43,8 +43,8 @@ func (k msgServer) RegisterAccount(goCtx context.Context, msg *types.MsgRegister }, nil } -// SubmitTx defines a rpc handler for MsgSubmitTx -func (k msgServer) SubmitTx(goCtx context.Context, msg *types.MsgSubmitTx) (*types.MsgSubmitTxResponse, error) { +// SendTx defines a rpc handler for MsgSendTx +func (s msgServer) SendTx(goCtx context.Context, msg *types.MsgSendTx) (*types.MsgSendTxResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) portID, err := icatypes.NewControllerPortID(msg.Owner) @@ -52,20 +52,20 @@ func (k msgServer) SubmitTx(goCtx context.Context, msg *types.MsgSubmitTx) (*typ return nil, err } - channelID, found := k.GetActiveChannelID(ctx, msg.ConnectionId, portID) + channelID, found := s.Keeper.GetActiveChannelID(ctx, msg.ConnectionId, portID) if !found { return nil, sdkerrors.Wrapf(icatypes.ErrActiveChannelNotFound, "failed to retrieve active channel for port %s", portID) } - chanCap, found := k.scopedKeeper.GetCapability(ctx, host.ChannelCapabilityPath(portID, channelID)) + chanCap, found := s.Keeper.scopedKeeper.GetCapability(ctx, host.ChannelCapabilityPath(portID, channelID)) if !found { return nil, sdkerrors.Wrap(channeltypes.ErrChannelCapabilityNotFound, "module does not own channel capability") } - seq, err := k.SendTx(ctx, chanCap, msg.ConnectionId, portID, msg.PacketData, msg.TimeoutTimestamp) + seq, err := s.Keeper.SendTx(ctx, chanCap, msg.ConnectionId, portID, msg.PacketData, msg.TimeoutTimestamp) if err != nil { return nil, err } - return &types.MsgSubmitTxResponse{Sequence: seq}, nil + return &types.MsgSendTxResponse{Sequence: seq}, nil } diff --git a/modules/apps/27-interchain-accounts/controller/keeper/msg_server_test.go b/modules/apps/27-interchain-accounts/controller/keeper/msg_server_test.go index fc608377b32..af938e17fa4 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/msg_server_test.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/msg_server_test.go @@ -96,7 +96,7 @@ func (suite *KeeperTestSuite) TestRegisterAccount() { func (suite *KeeperTestSuite) TestSubmitTx() { var ( path *ibctesting.Path - msg *types.MsgSubmitTx + msg *types.MsgSendTx ) testCases := []struct { @@ -180,13 +180,13 @@ func (suite *KeeperTestSuite) TestSubmitTx() { timeoutTimestamp := uint64(suite.chainA.GetContext().BlockTime().Add(time.Minute).UnixNano()) connectionID := path.EndpointA.ConnectionID - msg = types.NewMsgSubmitTx(owner, connectionID, clienttypes.ZeroHeight(), timeoutTimestamp, packetData) + msg = types.NewMsgSendTx(owner, connectionID, clienttypes.ZeroHeight(), timeoutTimestamp, packetData) tc.malleate() // malleate mutates test data ctx := suite.chainA.GetContext() msgServer := keeper.NewMsgServerImpl(&suite.chainA.GetSimApp().ICAControllerKeeper) - res, err := msgServer.SubmitTx(ctx, msg) + res, err := msgServer.SendTx(ctx, msg) if tc.expPass { suite.Require().NoError(err) diff --git a/modules/apps/27-interchain-accounts/controller/types/codec.go b/modules/apps/27-interchain-accounts/controller/types/codec.go index a1b5d7fd56a..d02d4a2a268 100644 --- a/modules/apps/27-interchain-accounts/controller/types/codec.go +++ b/modules/apps/27-interchain-accounts/controller/types/codec.go @@ -10,6 +10,6 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) { registry.RegisterImplementations( (*sdk.Msg)(nil), &MsgRegisterAccount{}, - &MsgSubmitTx{}, + &MsgSendTx{}, ) } diff --git a/modules/apps/27-interchain-accounts/controller/types/msgs.go b/modules/apps/27-interchain-accounts/controller/types/msgs.go index c959d08eb36..595959eb2ca 100644 --- a/modules/apps/27-interchain-accounts/controller/types/msgs.go +++ b/modules/apps/27-interchain-accounts/controller/types/msgs.go @@ -50,9 +50,9 @@ func (msg MsgRegisterAccount) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{accAddr} } -// NewMsgSubmitTx creates a new instance of MsgSubmitTx -func NewMsgSubmitTx(owner, connectionID string, timeoutHeight clienttypes.Height, timeoutTimestamp uint64, packetData icatypes.InterchainAccountPacketData) *MsgSubmitTx { - return &MsgSubmitTx{ +// NewMsgSendTx creates a new instance of MsgSendTx +func NewMsgSendTx(owner, connectionID string, timeoutHeight clienttypes.Height, timeoutTimestamp uint64, packetData icatypes.InterchainAccountPacketData) *MsgSendTx { + return &MsgSendTx{ ConnectionId: connectionID, Owner: owner, TimeoutHeight: timeoutHeight, @@ -62,7 +62,7 @@ func NewMsgSubmitTx(owner, connectionID string, timeoutHeight clienttypes.Height } // ValidateBasic implements sdk.Msg -func (msg MsgSubmitTx) ValidateBasic() error { +func (msg MsgSendTx) ValidateBasic() error { if err := host.ConnectionIdentifierValidator(msg.ConnectionId); err != nil { return sdkerrors.Wrap(err, "invalid connection ID") } @@ -87,7 +87,7 @@ func (msg MsgSubmitTx) ValidateBasic() error { } // GetSigners implements sdk.Msg -func (msg MsgSubmitTx) GetSigners() []sdk.AccAddress { +func (msg MsgSendTx) GetSigners() []sdk.AccAddress { accAddr, err := sdk.AccAddressFromBech32(msg.Owner) if err != nil { panic(err) diff --git a/modules/apps/27-interchain-accounts/controller/types/msgs_test.go b/modules/apps/27-interchain-accounts/controller/types/msgs_test.go index 6610a58a9f8..6a8b71e6761 100644 --- a/modules/apps/27-interchain-accounts/controller/types/msgs_test.go +++ b/modules/apps/27-interchain-accounts/controller/types/msgs_test.go @@ -98,8 +98,8 @@ func TestMsgRegisterAccountGetSigners(t *testing.T) { require.Equal(t, []sdk.AccAddress{expSigner}, msg.GetSigners()) } -func TestMsgSubmitTxValidateBasic(t *testing.T) { - var msg *types.MsgSubmitTx +func TestMsgSendTxValidateBasic(t *testing.T) { + var msg *types.MsgSendTx testCases := []struct { name string @@ -164,7 +164,7 @@ func TestMsgSubmitTxValidateBasic(t *testing.T) { Data: data, } - msg = types.NewMsgSubmitTx( + msg = types.NewMsgSendTx( ibctesting.TestAccAddress, ibctesting.FirstConnectionID, clienttypes.ZeroHeight(), @@ -183,7 +183,7 @@ func TestMsgSubmitTxValidateBasic(t *testing.T) { } } -func TestMsgSubmitTxGetSigners(t *testing.T) { +func TestMsgSendTxGetSigners(t *testing.T) { expSigner, err := sdk.AccAddressFromBech32(ibctesting.TestAccAddress) require.NoError(t, err) @@ -201,7 +201,7 @@ func TestMsgSubmitTxGetSigners(t *testing.T) { Data: data, } - msg := types.NewMsgSubmitTx( + msg := types.NewMsgSendTx( ibctesting.TestAccAddress, ibctesting.FirstConnectionID, clienttypes.ZeroHeight(), diff --git a/modules/apps/27-interchain-accounts/controller/types/tx.pb.go b/modules/apps/27-interchain-accounts/controller/types/tx.pb.go index cae572e1533..baf0cdbbf36 100644 --- a/modules/apps/27-interchain-accounts/controller/types/tx.pb.go +++ b/modules/apps/27-interchain-accounts/controller/types/tx.pb.go @@ -115,8 +115,8 @@ func (m *MsgRegisterAccountResponse) GetChannelId() string { return "" } -// MsgSubmitTx defines the payload for MsgSubmitTx -type MsgSubmitTx struct { +// MsgSendTx defines the payload for Msg/SendTx +type MsgSendTx struct { Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"` ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"` // Timeout height relative to the current block height. @@ -128,18 +128,18 @@ type MsgSubmitTx struct { PacketData types1.InterchainAccountPacketData `protobuf:"bytes,5,opt,name=packet_data,json=packetData,proto3" json:"packet_data" yaml:"packet_data"` } -func (m *MsgSubmitTx) Reset() { *m = MsgSubmitTx{} } -func (m *MsgSubmitTx) String() string { return proto.CompactTextString(m) } -func (*MsgSubmitTx) ProtoMessage() {} -func (*MsgSubmitTx) Descriptor() ([]byte, []int) { +func (m *MsgSendTx) Reset() { *m = MsgSendTx{} } +func (m *MsgSendTx) String() string { return proto.CompactTextString(m) } +func (*MsgSendTx) ProtoMessage() {} +func (*MsgSendTx) Descriptor() ([]byte, []int) { return fileDescriptor_7def041328c84a30, []int{2} } -func (m *MsgSubmitTx) XXX_Unmarshal(b []byte) error { +func (m *MsgSendTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgSubmitTx) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgSendTx) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgSubmitTx.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgSendTx.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -149,35 +149,35 @@ func (m *MsgSubmitTx) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } -func (m *MsgSubmitTx) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgSubmitTx.Merge(m, src) +func (m *MsgSendTx) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSendTx.Merge(m, src) } -func (m *MsgSubmitTx) XXX_Size() int { +func (m *MsgSendTx) XXX_Size() int { return m.Size() } -func (m *MsgSubmitTx) XXX_DiscardUnknown() { - xxx_messageInfo_MsgSubmitTx.DiscardUnknown(m) +func (m *MsgSendTx) XXX_DiscardUnknown() { + xxx_messageInfo_MsgSendTx.DiscardUnknown(m) } -var xxx_messageInfo_MsgSubmitTx proto.InternalMessageInfo +var xxx_messageInfo_MsgSendTx proto.InternalMessageInfo -// MsgSubmitTxResponse defines the response for MsgSubmitTx -type MsgSubmitTxResponse struct { +// MsgSendTxResponse defines the response for MsgSendTx +type MsgSendTxResponse struct { Sequence uint64 `protobuf:"varint,1,opt,name=sequence,proto3" json:"sequence,omitempty"` } -func (m *MsgSubmitTxResponse) Reset() { *m = MsgSubmitTxResponse{} } -func (m *MsgSubmitTxResponse) String() string { return proto.CompactTextString(m) } -func (*MsgSubmitTxResponse) ProtoMessage() {} -func (*MsgSubmitTxResponse) Descriptor() ([]byte, []int) { +func (m *MsgSendTxResponse) Reset() { *m = MsgSendTxResponse{} } +func (m *MsgSendTxResponse) String() string { return proto.CompactTextString(m) } +func (*MsgSendTxResponse) ProtoMessage() {} +func (*MsgSendTxResponse) Descriptor() ([]byte, []int) { return fileDescriptor_7def041328c84a30, []int{3} } -func (m *MsgSubmitTxResponse) XXX_Unmarshal(b []byte) error { +func (m *MsgSendTxResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgSubmitTxResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgSendTxResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgSubmitTxResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgSendTxResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -187,19 +187,19 @@ func (m *MsgSubmitTxResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *MsgSubmitTxResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgSubmitTxResponse.Merge(m, src) +func (m *MsgSendTxResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSendTxResponse.Merge(m, src) } -func (m *MsgSubmitTxResponse) XXX_Size() int { +func (m *MsgSendTxResponse) XXX_Size() int { return m.Size() } -func (m *MsgSubmitTxResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgSubmitTxResponse.DiscardUnknown(m) +func (m *MsgSendTxResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgSendTxResponse.DiscardUnknown(m) } -var xxx_messageInfo_MsgSubmitTxResponse proto.InternalMessageInfo +var xxx_messageInfo_MsgSendTxResponse proto.InternalMessageInfo -func (m *MsgSubmitTxResponse) GetSequence() uint64 { +func (m *MsgSendTxResponse) GetSequence() uint64 { if m != nil { return m.Sequence } @@ -209,8 +209,8 @@ func (m *MsgSubmitTxResponse) GetSequence() uint64 { func init() { proto.RegisterType((*MsgRegisterAccount)(nil), "ibc.applications.interchain_accounts.controller.v1.MsgRegisterAccount") proto.RegisterType((*MsgRegisterAccountResponse)(nil), "ibc.applications.interchain_accounts.controller.v1.MsgRegisterAccountResponse") - proto.RegisterType((*MsgSubmitTx)(nil), "ibc.applications.interchain_accounts.controller.v1.MsgSubmitTx") - proto.RegisterType((*MsgSubmitTxResponse)(nil), "ibc.applications.interchain_accounts.controller.v1.MsgSubmitTxResponse") + proto.RegisterType((*MsgSendTx)(nil), "ibc.applications.interchain_accounts.controller.v1.MsgSendTx") + proto.RegisterType((*MsgSendTxResponse)(nil), "ibc.applications.interchain_accounts.controller.v1.MsgSendTxResponse") } func init() { @@ -218,45 +218,45 @@ func init() { } var fileDescriptor_7def041328c84a30 = []byte{ - // 605 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xbf, 0x6f, 0xd3, 0x40, - 0x18, 0xb5, 0xfb, 0x03, 0xda, 0x2b, 0x05, 0x6a, 0x5a, 0xc9, 0xb2, 0xc0, 0xae, 0x3c, 0x75, 0xe9, - 0x9d, 0x1c, 0x8a, 0x90, 0x8a, 0x10, 0x22, 0xaa, 0x80, 0x0c, 0x45, 0x95, 0xe9, 0xc4, 0x12, 0xce, - 0x97, 0x93, 0x73, 0x60, 0xdf, 0x19, 0xdf, 0xd9, 0xb4, 0x23, 0x1b, 0x0b, 0x12, 0x03, 0x2b, 0x52, - 0x57, 0xfe, 0x93, 0x8e, 0x1d, 0x99, 0x22, 0xd4, 0x2e, 0xcc, 0xf9, 0x0b, 0x90, 0x7f, 0xc4, 0x49, - 0x49, 0x87, 0x16, 0x98, 0xe2, 0xef, 0xbb, 0xf7, 0xde, 0xbd, 0x4f, 0xef, 0xcb, 0x81, 0x47, 0x2c, - 0x20, 0x08, 0x27, 0x49, 0xc4, 0x08, 0x56, 0x4c, 0x70, 0x89, 0x18, 0x57, 0x34, 0x25, 0x7d, 0xcc, - 0x78, 0x17, 0x13, 0x22, 0x32, 0xae, 0x24, 0x22, 0x82, 0xab, 0x54, 0x44, 0x11, 0x4d, 0x51, 0xee, - 0x21, 0x75, 0x00, 0x93, 0x54, 0x28, 0x61, 0xb4, 0x58, 0x40, 0xe0, 0x24, 0x19, 0x5e, 0x40, 0x86, - 0x63, 0x32, 0xcc, 0x3d, 0x6b, 0x35, 0x14, 0xa1, 0x28, 0xe9, 0xa8, 0xf8, 0xaa, 0x94, 0x2c, 0xa7, - 0xb0, 0x41, 0x44, 0x4a, 0x11, 0x89, 0x18, 0xe5, 0xaa, 0xb8, 0xa6, 0xfa, 0xaa, 0x01, 0x5b, 0x97, - 0xf2, 0x99, 0x7b, 0x28, 0xc1, 0xe4, 0x1d, 0xad, 0x59, 0xee, 0x67, 0x1d, 0x18, 0xbb, 0x32, 0xf4, - 0x69, 0xc8, 0xa4, 0xa2, 0xe9, 0xd3, 0x0a, 0x67, 0x3c, 0x06, 0xcb, 0x44, 0x70, 0x4e, 0x49, 0xa1, - 0xd4, 0x65, 0x3d, 0x53, 0x5f, 0xd7, 0x37, 0x16, 0xdb, 0xe6, 0x70, 0xe0, 0xac, 0x1e, 0xe2, 0x38, - 0xda, 0x76, 0xcf, 0x1d, 0xbb, 0xfe, 0x8d, 0x71, 0xdd, 0xe9, 0x19, 0xab, 0x60, 0x5e, 0x7c, 0xe0, - 0x34, 0x35, 0x67, 0x0a, 0x9a, 0x5f, 0x15, 0x86, 0x09, 0xae, 0xe7, 0x34, 0x95, 0x4c, 0x70, 0x73, - 0xb6, 0xec, 0x8f, 0xca, 0xed, 0x85, 0x4f, 0x47, 0x8e, 0xf6, 0xeb, 0xc8, 0xd1, 0x5c, 0x1f, 0x58, - 0xd3, 0x76, 0x7c, 0x2a, 0x13, 0xc1, 0x25, 0x35, 0xb6, 0x00, 0x20, 0x7d, 0xcc, 0x39, 0x8d, 0xc6, - 0x9e, 0xd6, 0x86, 0x03, 0x67, 0xa5, 0xf6, 0xd4, 0x9c, 0xb9, 0xfe, 0x62, 0x5d, 0x74, 0x7a, 0xee, - 0xb7, 0x59, 0xb0, 0xb4, 0x2b, 0xc3, 0x57, 0x59, 0x10, 0x33, 0xb5, 0x7f, 0x30, 0x76, 0xa7, 0x4f, - 0xba, 0x9b, 0x1a, 0x79, 0xe6, 0x4a, 0x23, 0xbf, 0x01, 0x37, 0x15, 0x8b, 0xa9, 0xc8, 0x54, 0xb7, - 0x4f, 0x59, 0xd8, 0x57, 0xe5, 0x8c, 0x4b, 0x2d, 0x0b, 0x16, 0x2b, 0x50, 0x04, 0x07, 0xeb, 0xb8, - 0x72, 0x0f, 0xbe, 0x28, 0x11, 0xed, 0x7b, 0xc7, 0x03, 0x47, 0x1b, 0x0e, 0x9c, 0xb5, 0x4a, 0xff, - 0x3c, 0xdf, 0xf5, 0x97, 0xeb, 0x46, 0x85, 0x36, 0x3a, 0x60, 0x65, 0x84, 0x28, 0x7e, 0xa5, 0xc2, - 0x71, 0x62, 0xce, 0xad, 0xeb, 0x1b, 0x73, 0xed, 0xbb, 0xc3, 0x81, 0x63, 0x9e, 0x17, 0x69, 0x20, - 0xae, 0x7f, 0xbb, 0xee, 0xed, 0x8f, 0x5a, 0xc6, 0x47, 0x1d, 0x2c, 0x55, 0x6b, 0xd0, 0xed, 0x61, - 0x85, 0xcd, 0xf9, 0xd2, 0xea, 0x0e, 0xbc, 0xd4, 0xb6, 0xe6, 0x1e, 0xec, 0x34, 0xed, 0x3a, 0xa1, - 0xbd, 0x52, 0x6c, 0x07, 0x2b, 0xdc, 0xb6, 0xea, 0xa1, 0x8c, 0xca, 0xcf, 0xc4, 0x35, 0xae, 0x0f, - 0x92, 0x06, 0x37, 0x91, 0xb9, 0x07, 0xee, 0x4c, 0xc4, 0xd3, 0x84, 0x6d, 0x81, 0x05, 0x49, 0xdf, - 0x67, 0x94, 0x13, 0x5a, 0x26, 0x35, 0xe7, 0x37, 0x75, 0xeb, 0x78, 0x06, 0xcc, 0xee, 0xca, 0xd0, - 0xf8, 0xae, 0x83, 0x5b, 0x7f, 0xee, 0xee, 0x33, 0x78, 0xf5, 0x3f, 0x1d, 0x9c, 0x5e, 0x3a, 0xeb, - 0xe5, 0xff, 0xd1, 0x69, 0xe6, 0xf9, 0xaa, 0x83, 0x85, 0x66, 0x07, 0x9f, 0xfc, 0xa5, 0xf8, 0x48, - 0xc0, 0x7a, 0xfe, 0x8f, 0x02, 0x23, 0x5b, 0xed, 0xb7, 0xc7, 0xa7, 0xb6, 0x7e, 0x72, 0x6a, 0xeb, - 0x3f, 0x4f, 0x6d, 0xfd, 0xcb, 0x99, 0xad, 0x9d, 0x9c, 0xd9, 0xda, 0x8f, 0x33, 0x5b, 0x7b, 0xbd, - 0x17, 0x32, 0xd5, 0xcf, 0x02, 0x48, 0x44, 0x8c, 0x88, 0x90, 0xb1, 0x90, 0x88, 0x05, 0x64, 0x33, - 0x14, 0x28, 0x7f, 0x80, 0x62, 0xd1, 0xcb, 0x22, 0x2a, 0x8b, 0x17, 0x47, 0xa2, 0xd6, 0xc3, 0xcd, - 0xf1, 0xe5, 0x9b, 0x17, 0x3d, 0x8a, 0xea, 0x30, 0xa1, 0x32, 0xb8, 0x56, 0x3e, 0x3a, 0xf7, 0x7f, - 0x07, 0x00, 0x00, 0xff, 0xff, 0xca, 0xfa, 0x92, 0xae, 0x54, 0x05, 0x00, 0x00, + // 604 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x3f, 0x6f, 0xd3, 0x4e, + 0x18, 0xb6, 0xfb, 0xef, 0xd7, 0x5e, 0x7f, 0x05, 0x6a, 0xb5, 0x92, 0x65, 0x81, 0x5d, 0x79, 0xea, + 0xd2, 0x3b, 0x25, 0x14, 0x21, 0x15, 0x75, 0x20, 0x2a, 0x88, 0x0c, 0x41, 0x95, 0xe9, 0xc4, 0x12, + 0x2e, 0xe7, 0x93, 0x73, 0x60, 0xdf, 0x19, 0xdf, 0xc5, 0xb4, 0x23, 0x1b, 0x0b, 0x88, 0x9d, 0xa5, + 0x2b, 0x5f, 0x83, 0xa9, 0x63, 0x47, 0xa6, 0x08, 0x25, 0x0b, 0x73, 0x3e, 0x01, 0xf2, 0x9f, 0x38, + 0x09, 0xe9, 0xd0, 0x02, 0x53, 0xfc, 0xbe, 0xf7, 0x3c, 0xcf, 0x3d, 0xaf, 0x9e, 0x37, 0x07, 0x1e, + 0xb1, 0x0e, 0x41, 0x38, 0x8e, 0x43, 0x46, 0xb0, 0x62, 0x82, 0x4b, 0xc4, 0xb8, 0xa2, 0x09, 0xe9, + 0x62, 0xc6, 0xdb, 0x98, 0x10, 0xd1, 0xe3, 0x4a, 0x22, 0x22, 0xb8, 0x4a, 0x44, 0x18, 0xd2, 0x04, + 0xa5, 0x35, 0xa4, 0x4e, 0x61, 0x9c, 0x08, 0x25, 0x8c, 0x3a, 0xeb, 0x10, 0x38, 0x4d, 0x86, 0x57, + 0x90, 0xe1, 0x84, 0x0c, 0xd3, 0x9a, 0xb5, 0x15, 0x88, 0x40, 0xe4, 0x74, 0x94, 0x7d, 0x15, 0x4a, + 0x96, 0x93, 0xd9, 0x20, 0x22, 0xa1, 0x88, 0x84, 0x8c, 0x72, 0x95, 0x5d, 0x53, 0x7c, 0x95, 0x80, + 0xfd, 0x6b, 0xf9, 0x4c, 0x6b, 0x28, 0xc6, 0xe4, 0x0d, 0x2d, 0x59, 0xee, 0x47, 0x1d, 0x18, 0x2d, + 0x19, 0x78, 0x34, 0x60, 0x52, 0xd1, 0xe4, 0x71, 0x81, 0x33, 0x0e, 0xc1, 0x06, 0x11, 0x9c, 0x53, + 0x92, 0x29, 0xb5, 0x99, 0x6f, 0xea, 0x3b, 0xfa, 0xee, 0x5a, 0xc3, 0x1c, 0xf5, 0x9d, 0xad, 0x33, + 0x1c, 0x85, 0x07, 0xee, 0xcc, 0xb1, 0xeb, 0xfd, 0x3f, 0xa9, 0x9b, 0xbe, 0xb1, 0x05, 0x96, 0xc5, + 0x3b, 0x4e, 0x13, 0x73, 0x21, 0xa3, 0x79, 0x45, 0x61, 0x98, 0xe0, 0xbf, 0x94, 0x26, 0x92, 0x09, + 0x6e, 0x2e, 0xe6, 0xfd, 0x71, 0x79, 0xb0, 0xfa, 0xe1, 0xdc, 0xd1, 0x7e, 0x9e, 0x3b, 0x9a, 0xeb, + 0x01, 0x6b, 0xde, 0x8e, 0x47, 0x65, 0x2c, 0xb8, 0xa4, 0xc6, 0x3e, 0x00, 0xa4, 0x8b, 0x39, 0xa7, + 0xe1, 0xc4, 0xd3, 0xf6, 0xa8, 0xef, 0x6c, 0x96, 0x9e, 0xaa, 0x33, 0xd7, 0x5b, 0x2b, 0x8b, 0xa6, + 0xef, 0x7e, 0x59, 0x04, 0x6b, 0x2d, 0x19, 0xbc, 0xa0, 0xdc, 0x3f, 0x39, 0x9d, 0x78, 0xd3, 0xa7, + 0xbd, 0xcd, 0x0d, 0xbc, 0x70, 0xa3, 0x81, 0x5f, 0x81, 0x5b, 0x8a, 0x45, 0x54, 0xf4, 0x54, 0xbb, + 0x4b, 0x59, 0xd0, 0x55, 0xf9, 0x84, 0xeb, 0x75, 0x0b, 0x66, 0x0b, 0x90, 0xc5, 0x06, 0xcb, 0xb0, + 0xd2, 0x1a, 0x7c, 0x96, 0x23, 0x1a, 0xf7, 0x2e, 0xfa, 0x8e, 0x36, 0xea, 0x3b, 0xdb, 0x85, 0xfe, + 0x2c, 0xdf, 0xf5, 0x36, 0xca, 0x46, 0x81, 0x36, 0x9a, 0x60, 0x73, 0x8c, 0xc8, 0x7e, 0xa5, 0xc2, + 0x51, 0x6c, 0x2e, 0xed, 0xe8, 0xbb, 0x4b, 0x8d, 0xbb, 0xa3, 0xbe, 0x63, 0xce, 0x8a, 0x54, 0x10, + 0xd7, 0xbb, 0x53, 0xf6, 0x4e, 0xc6, 0x2d, 0xe3, 0xbd, 0x0e, 0xd6, 0x8b, 0x25, 0x68, 0xfb, 0x58, + 0x61, 0x73, 0x39, 0xb7, 0x7a, 0x04, 0xaf, 0xb5, 0xab, 0x69, 0x0d, 0x36, 0xab, 0x76, 0x99, 0xcf, + 0x71, 0x2e, 0x76, 0x84, 0x15, 0x6e, 0x58, 0xe5, 0x50, 0x46, 0xe1, 0x67, 0xea, 0x1a, 0xd7, 0x03, + 0x71, 0x85, 0x9b, 0x4a, 0x1c, 0x81, 0xcd, 0x2a, 0x9c, 0x2a, 0x68, 0x0b, 0xac, 0x4a, 0xfa, 0xb6, + 0x47, 0x39, 0xa1, 0x79, 0x4e, 0x4b, 0x5e, 0x55, 0xd7, 0xbf, 0x2d, 0x80, 0xc5, 0x96, 0x0c, 0x8c, + 0xaf, 0x3a, 0xb8, 0xfd, 0xfb, 0xde, 0x3e, 0x85, 0x37, 0xff, 0xc3, 0xc1, 0xf9, 0x85, 0xb3, 0x9e, + 0xff, 0x1b, 0x9d, 0x6a, 0x9e, 0x4f, 0x3a, 0x58, 0x29, 0xf7, 0xef, 0xf0, 0x0f, 0xa5, 0x0b, 0xba, + 0xf5, 0xe4, 0xaf, 0xe8, 0x63, 0x43, 0x8d, 0xd7, 0x17, 0x03, 0x5b, 0xbf, 0x1c, 0xd8, 0xfa, 0x8f, + 0x81, 0xad, 0x7f, 0x1e, 0xda, 0xda, 0xe5, 0xd0, 0xd6, 0xbe, 0x0f, 0x6d, 0xed, 0xe5, 0x71, 0xc0, + 0x54, 0xb7, 0xd7, 0x81, 0x44, 0x44, 0x88, 0x08, 0x19, 0x09, 0x89, 0x58, 0x87, 0xec, 0x05, 0x02, + 0xa5, 0x0f, 0x50, 0x24, 0xfc, 0x5e, 0x48, 0x65, 0xf6, 0xce, 0x48, 0x54, 0x7f, 0xb8, 0x37, 0xb9, + 0x7a, 0xef, 0xaa, 0xa7, 0x50, 0x9d, 0xc5, 0x54, 0x76, 0x56, 0xf2, 0xa7, 0xe6, 0xfe, 0xaf, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x63, 0x74, 0x04, 0x14, 0x4a, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -273,8 +273,8 @@ const _ = grpc.SupportPackageIsVersion4 type MsgClient interface { // RegisterAccount defines a rpc handler for MsgRegisterAccount. RegisterAccount(ctx context.Context, in *MsgRegisterAccount, opts ...grpc.CallOption) (*MsgRegisterAccountResponse, error) - // SubmitTx defines a rpc handler for MsgSubmitTx. - SubmitTx(ctx context.Context, in *MsgSubmitTx, opts ...grpc.CallOption) (*MsgSubmitTxResponse, error) + // SendTx defines a rpc handler for MsgSendTx. + SendTx(ctx context.Context, in *MsgSendTx, opts ...grpc.CallOption) (*MsgSendTxResponse, error) } type msgClient struct { @@ -294,9 +294,9 @@ func (c *msgClient) RegisterAccount(ctx context.Context, in *MsgRegisterAccount, return out, nil } -func (c *msgClient) SubmitTx(ctx context.Context, in *MsgSubmitTx, opts ...grpc.CallOption) (*MsgSubmitTxResponse, error) { - out := new(MsgSubmitTxResponse) - err := c.cc.Invoke(ctx, "/ibc.applications.interchain_accounts.controller.v1.Msg/SubmitTx", in, out, opts...) +func (c *msgClient) SendTx(ctx context.Context, in *MsgSendTx, opts ...grpc.CallOption) (*MsgSendTxResponse, error) { + out := new(MsgSendTxResponse) + err := c.cc.Invoke(ctx, "/ibc.applications.interchain_accounts.controller.v1.Msg/SendTx", in, out, opts...) if err != nil { return nil, err } @@ -307,8 +307,8 @@ func (c *msgClient) SubmitTx(ctx context.Context, in *MsgSubmitTx, opts ...grpc. type MsgServer interface { // RegisterAccount defines a rpc handler for MsgRegisterAccount. RegisterAccount(context.Context, *MsgRegisterAccount) (*MsgRegisterAccountResponse, error) - // SubmitTx defines a rpc handler for MsgSubmitTx. - SubmitTx(context.Context, *MsgSubmitTx) (*MsgSubmitTxResponse, error) + // SendTx defines a rpc handler for MsgSendTx. + SendTx(context.Context, *MsgSendTx) (*MsgSendTxResponse, error) } // UnimplementedMsgServer can be embedded to have forward compatible implementations. @@ -318,8 +318,8 @@ type UnimplementedMsgServer struct { func (*UnimplementedMsgServer) RegisterAccount(ctx context.Context, req *MsgRegisterAccount) (*MsgRegisterAccountResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method RegisterAccount not implemented") } -func (*UnimplementedMsgServer) SubmitTx(ctx context.Context, req *MsgSubmitTx) (*MsgSubmitTxResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method SubmitTx not implemented") +func (*UnimplementedMsgServer) SendTx(ctx context.Context, req *MsgSendTx) (*MsgSendTxResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SendTx not implemented") } func RegisterMsgServer(s grpc1.Server, srv MsgServer) { @@ -344,20 +344,20 @@ func _Msg_RegisterAccount_Handler(srv interface{}, ctx context.Context, dec func return interceptor(ctx, in, info, handler) } -func _Msg_SubmitTx_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgSubmitTx) +func _Msg_SendTx_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgSendTx) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(MsgServer).SubmitTx(ctx, in) + return srv.(MsgServer).SendTx(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ibc.applications.interchain_accounts.controller.v1.Msg/SubmitTx", + FullMethod: "/ibc.applications.interchain_accounts.controller.v1.Msg/SendTx", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).SubmitTx(ctx, req.(*MsgSubmitTx)) + return srv.(MsgServer).SendTx(ctx, req.(*MsgSendTx)) } return interceptor(ctx, in, info, handler) } @@ -371,8 +371,8 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ Handler: _Msg_RegisterAccount_Handler, }, { - MethodName: "SubmitTx", - Handler: _Msg_SubmitTx_Handler, + MethodName: "SendTx", + Handler: _Msg_SendTx_Handler, }, }, Streams: []grpc.StreamDesc{}, @@ -453,7 +453,7 @@ func (m *MsgRegisterAccountResponse) MarshalToSizedBuffer(dAtA []byte) (int, err return len(dAtA) - i, nil } -func (m *MsgSubmitTx) Marshal() (dAtA []byte, err error) { +func (m *MsgSendTx) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -463,12 +463,12 @@ func (m *MsgSubmitTx) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgSubmitTx) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgSendTx) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgSubmitTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgSendTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -515,7 +515,7 @@ func (m *MsgSubmitTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MsgSubmitTxResponse) Marshal() (dAtA []byte, err error) { +func (m *MsgSendTxResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -525,12 +525,12 @@ func (m *MsgSubmitTxResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgSubmitTxResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgSendTxResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgSubmitTxResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgSendTxResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -588,7 +588,7 @@ func (m *MsgRegisterAccountResponse) Size() (n int) { return n } -func (m *MsgSubmitTx) Size() (n int) { +func (m *MsgSendTx) Size() (n int) { if m == nil { return 0 } @@ -612,7 +612,7 @@ func (m *MsgSubmitTx) Size() (n int) { return n } -func (m *MsgSubmitTxResponse) Size() (n int) { +func (m *MsgSendTxResponse) Size() (n int) { if m == nil { return 0 } @@ -858,7 +858,7 @@ func (m *MsgRegisterAccountResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgSubmitTx) Unmarshal(dAtA []byte) error { +func (m *MsgSendTx) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -881,10 +881,10 @@ func (m *MsgSubmitTx) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgSubmitTx: wiretype end group for non-group") + return fmt.Errorf("proto: MsgSendTx: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgSubmitTx: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgSendTx: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -1057,7 +1057,7 @@ func (m *MsgSubmitTx) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgSubmitTxResponse) Unmarshal(dAtA []byte) error { +func (m *MsgSendTxResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1080,10 +1080,10 @@ func (m *MsgSubmitTxResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgSubmitTxResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgSendTxResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgSubmitTxResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgSendTxResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/modules/apps/27-interchain-accounts/genesis/types/genesis.pb.go b/modules/apps/27-interchain-accounts/genesis/types/genesis.pb.go index 8f2625cd749..247f8a45902 100644 --- a/modules/apps/27-interchain-accounts/genesis/types/genesis.pb.go +++ b/modules/apps/27-interchain-accounts/genesis/types/genesis.pb.go @@ -216,8 +216,8 @@ func (m *HostGenesisState) GetParams() types1.Params { return types1.Params{} } -// ActiveChannel contains a connection ID, port ID and associated active channel ID, as well as boolean flag to indicate -// if the channel is middleware enabled +// ActiveChannel contains a connection ID, port ID and associated active channel ID, as well as a boolean flag to +// indicate if the channel is middleware enabled type ActiveChannel struct { ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"` PortId string `protobuf:"bytes,2,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` diff --git a/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto b/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto index 51c30fa0c0e..d66f1e31a17 100644 --- a/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto +++ b/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto @@ -12,8 +12,8 @@ import "ibc/applications/interchain_accounts/v1/packet.proto"; service Msg { // RegisterAccount defines a rpc handler for MsgRegisterAccount. rpc RegisterAccount(MsgRegisterAccount) returns (MsgRegisterAccountResponse); - // SubmitTx defines a rpc handler for MsgSubmitTx. - rpc SubmitTx(MsgSubmitTx) returns (MsgSubmitTxResponse); + // SendTx defines a rpc handler for MsgSendTx. + rpc SendTx(MsgSendTx) returns (MsgSendTxResponse); } // MsgRegisterAccount defines the payload for Msg/RegisterAccount @@ -31,8 +31,8 @@ message MsgRegisterAccountResponse { string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""]; } -// MsgSubmitTx defines the payload for MsgSubmitTx -message MsgSubmitTx { +// MsgSendTx defines the payload for Msg/SendTx +message MsgSendTx { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; @@ -49,7 +49,7 @@ message MsgSubmitTx { [(gogoproto.moretags) = "yaml:\"packet_data\"", (gogoproto.nullable) = false]; } -// MsgSubmitTxResponse defines the response for MsgSubmitTx -message MsgSubmitTxResponse { +// MsgSendTxResponse defines the response for MsgSendTx +message MsgSendTxResponse { uint64 sequence = 1; } \ No newline at end of file diff --git a/proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto b/proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto index 092a2081d5d..e394e04bb88 100644 --- a/proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto +++ b/proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto @@ -36,8 +36,8 @@ message HostGenesisState { ibc.applications.interchain_accounts.host.v1.Params params = 4 [(gogoproto.nullable) = false]; } -// ActiveChannel contains a connection ID, port ID and associated active channel ID, as well as a boolean flag to indicate -// if the channel is middleware enabled +// ActiveChannel contains a connection ID, port ID and associated active channel ID, as well as a boolean flag to +// indicate if the channel is middleware enabled message ActiveChannel { string connection_id = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""]; string port_id = 2 [(gogoproto.moretags) = "yaml:\"port_id\""]; From 6208d383319bd7169f298cf1997363b01dfc4a5e Mon Sep 17 00:00:00 2001 From: Damian Nolan Date: Fri, 9 Sep 2022 13:51:34 +0200 Subject: [PATCH 2/2] use struct embedding --- .../27-interchain-accounts/controller/keeper/msg_server.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go b/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go index 59a09748fbb..e0a859de030 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go @@ -15,7 +15,7 @@ import ( var _ types.MsgServer = msgServer{} type msgServer struct { - Keeper *Keeper + *Keeper } // NewMsgServerImpl returns an implementation of the ICS27 MsgServer interface @@ -33,7 +33,7 @@ func (s msgServer) RegisterAccount(goCtx context.Context, msg *types.MsgRegister return nil, err } - channelID, err := s.Keeper.registerInterchainAccount(ctx, msg.ConnectionId, portID, msg.Version) + channelID, err := s.registerInterchainAccount(ctx, msg.ConnectionId, portID, msg.Version) if err != nil { return nil, err }