From f14179de3b26b0d9454dc79f4237e536135713e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?colin=20axn=C3=A9r?=
 <25233464+colin-axner@users.noreply.github.com>
Date: Mon, 29 Aug 2022 16:32:05 +0200
Subject: [PATCH 1/3] e2e: transfer receive enabled param test (#2071)

* scaffolding

* add foundations to param change test

* bump ibctest version

* add partially working modify genesis

* testing passing :tada:

* test fix

* add back go.mod fix

* revert go.mod change

* simplify modify genesis

* split params tests

* remove unnecessary var

* update gov exec to wait for voting period

* fix merge conflict

* remove hardcoding
---
 e2e/go.mod                      |   2 +-
 e2e/tests/transfer/base_test.go | 120 +++++++++++++++++++++++++++++++-
 e2e/testsuite/testsuite.go      |   3 +-
 3 files changed, 122 insertions(+), 3 deletions(-)

diff --git a/e2e/go.mod b/e2e/go.mod
index 28d80c1fb43..31dcc00ae23 100644
--- a/e2e/go.mod
+++ b/e2e/go.mod
@@ -11,6 +11,7 @@ require (
 	github.com/docker/docker v20.10.17+incompatible
 	github.com/strangelove-ventures/ibctest v0.0.0-20220824150312-9d02bdb119b0
 	github.com/stretchr/testify v1.8.0
+	github.com/tendermint/tendermint v0.34.20
 	go.uber.org/zap v1.21.0
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
 	google.golang.org/grpc v1.48.0
@@ -160,7 +161,6 @@ require (
 	github.com/tendermint/btcd v0.1.1 // indirect
 	github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect
 	github.com/tendermint/go-amino v0.16.0 // indirect
-	github.com/tendermint/tendermint v0.34.20 // indirect
 	github.com/tendermint/tm-db v0.6.7 // indirect
 	github.com/ulikunitz/xz v0.5.8 // indirect
 	github.com/vedhavyas/go-subkey v1.0.3 // indirect
diff --git a/e2e/tests/transfer/base_test.go b/e2e/tests/transfer/base_test.go
index 71ebb559369..72f3111ed14 100644
--- a/e2e/tests/transfer/base_test.go
+++ b/e2e/tests/transfer/base_test.go
@@ -41,7 +41,7 @@ func (s *TransferTestSuite) Transfer(ctx context.Context, chain *cosmos.CosmosCh
 func (s *TransferTestSuite) QueryTransferSendEnabledParam(ctx context.Context, chain ibc.Chain) bool {
 	queryClient := s.GetChainGRCPClients(chain).ParamsQueryClient
 	res, err := queryClient.Params(ctx, &paramsproposaltypes.QueryParamsRequest{
-		Subspace: "transfer",
+		Subspace: transfertypes.StoreKey,
 		Key:      string(transfertypes.KeySendEnabled),
 	})
 	s.Require().NoError(err)
@@ -52,6 +52,21 @@ func (s *TransferTestSuite) QueryTransferSendEnabledParam(ctx context.Context, c
 	return enabled
 }
 
+// QueryTransferSendEnabledParam queries the on-chain receive enabled param for the transfer module
+func (s *TransferTestSuite) QueryTransferReceiveEnabledParam(ctx context.Context, chain ibc.Chain) bool {
+	queryClient := s.GetChainGRCPClients(chain).ParamsQueryClient
+	res, err := queryClient.Params(ctx, &paramsproposaltypes.QueryParamsRequest{
+		Subspace: transfertypes.StoreKey,
+		Key:      string(transfertypes.KeyReceiveEnabled),
+	})
+	s.Require().NoError(err)
+
+	enabled, err := strconv.ParseBool(res.Param.Value)
+	s.Require().NoError(err)
+
+	return enabled
+}
+
 // TestMsgTransfer_Succeeds_Nonincentivized will test sending successful IBC transfers from chainA to chainB.
 // The transfer will occur over a basic transfer channel (non incentivized) and both native and non-native tokens
 // will be sent forwards and backwards in the IBC transfer timeline (both chains will act as source and receiver chains).
@@ -272,6 +287,109 @@ func (s *TransferTestSuite) TestSendEnabledParam() {
 	})
 }
 
+// TestReceiveEnabledParam tests changing ics20 ReceiveEnabled parameter
+func (s *TransferTestSuite) TestReceiveEnabledParam() {
+	t := s.T()
+	ctx := context.TODO()
+
+	relayer, channelA := s.SetupChainsRelayerAndChannel(ctx, transferChannelOptions())
+	chainA, chainB := s.GetChains()
+
+	chainAWallet := s.CreateUserOnChainA(ctx, testvalues.StartingTokenAmount)
+	chainBWallet := s.CreateUserOnChainB(ctx, testvalues.StartingTokenAmount)
+
+	var (
+		chainBDenom    = chainB.Config().Denom
+		chainAIBCToken = s.getIBCToken(chainBDenom, channelA.PortID, channelA.ChannelID) // IBC token sent to chainA
+
+		chainAAddress = chainAWallet.Bech32Address(chainA.Config().Bech32Prefix)
+		chainBAddress = chainBWallet.Bech32Address(chainB.Config().Bech32Prefix)
+	)
+
+	s.Require().NoError(test.WaitForBlocks(ctx, 1, chainA, chainB), "failed to wait for blocks")
+
+	t.Run("ensure transfer receive is enabled", func(t *testing.T) {
+		enabled := s.QueryTransferReceiveEnabledParam(ctx, chainA)
+		s.Require().True(enabled)
+	})
+
+	t.Run("ensure packets can be received, send from chainB to chainA", func(t *testing.T) {
+		t.Run("send from chainB to chainA", func(t *testing.T) {
+			transferTxResp, err := s.Transfer(ctx, chainB, chainBWallet, channelA.Counterparty.PortID, channelA.Counterparty.ChannelID, testvalues.DefaultTransferAmount(chainBDenom), chainBAddress, chainAAddress, s.GetTimeoutHeight(ctx, chainA), 0)
+			s.Require().NoError(err)
+			s.AssertValidTxResponse(transferTxResp)
+		})
+
+		t.Run("tokens are escrowed", func(t *testing.T) {
+			actualBalance, err := s.GetChainBNativeBalance(ctx, chainBWallet)
+			s.Require().NoError(err)
+
+			expected := testvalues.StartingTokenAmount - testvalues.IBCTransferAmount
+			s.Require().Equal(expected, actualBalance)
+		})
+
+		t.Run("start relayer", func(t *testing.T) {
+			s.StartRelayer(relayer)
+		})
+
+		t.Run("packets are relayed", func(t *testing.T) {
+			s.AssertPacketRelayed(ctx, chainA, channelA.Counterparty.PortID, channelA.Counterparty.ChannelID, 1)
+
+			actualBalance, err := chainA.GetBalance(ctx, chainAAddress, chainAIBCToken.IBCDenom())
+			s.Require().NoError(err)
+
+			expected := testvalues.IBCTransferAmount
+			s.Require().Equal(expected, actualBalance)
+		})
+
+		t.Run("stop relayer", func(t *testing.T) {
+			s.StopRelayer(ctx, relayer)
+		})
+	})
+
+	t.Run("change send enabled parameter to disabled ", func(t *testing.T) {
+		changes := []paramsproposaltypes.ParamChange{
+			paramsproposaltypes.NewParamChange(transfertypes.StoreKey, string(transfertypes.KeyReceiveEnabled), "false"),
+		}
+
+		proposal := paramsproposaltypes.NewParameterChangeProposal(ibctesting.Title, ibctesting.Description, changes)
+		s.ExecuteGovProposal(ctx, chainA, chainAWallet, proposal)
+	})
+
+	t.Run("ensure transfer params are disabled", func(t *testing.T) {
+		enabled := s.QueryTransferReceiveEnabledParam(ctx, chainA)
+		s.Require().False(enabled)
+	})
+
+	t.Run("ensure ics20 transfer fails", func(t *testing.T) {
+		t.Run("send from chainB to chainA", func(t *testing.T) {
+			transferTxResp, err := s.Transfer(ctx, chainB, chainBWallet, channelA.Counterparty.PortID, channelA.Counterparty.ChannelID, testvalues.DefaultTransferAmount(chainBDenom), chainBAddress, chainAAddress, s.GetTimeoutHeight(ctx, chainA), 0)
+			s.Require().NoError(err)
+			s.AssertValidTxResponse(transferTxResp)
+		})
+
+		t.Run("tokens are escrowed", func(t *testing.T) {
+			actualBalance, err := s.GetChainBNativeBalance(ctx, chainBWallet)
+			s.Require().NoError(err)
+
+			expected := testvalues.StartingTokenAmount - (testvalues.IBCTransferAmount * 2) // second send
+			s.Require().Equal(expected, actualBalance)
+		})
+
+		t.Run("start relayer", func(t *testing.T) {
+			s.StartRelayer(relayer)
+		})
+
+		t.Run("tokens are unescrowed in failed acknowledgement", func(t *testing.T) {
+			actualBalance, err := s.GetChainBNativeBalance(ctx, chainBWallet)
+			s.Require().NoError(err)
+
+			expected := testvalues.StartingTokenAmount - testvalues.IBCTransferAmount // only first send marked
+			s.Require().Equal(expected, actualBalance)
+		})
+	})
+}
+
 // transferChannelOptions configures both of the chains to have non-incentivized transfer channels.
 func transferChannelOptions() func(options *ibc.CreateChannelOptions) {
 	return func(opts *ibc.CreateChannelOptions) {
diff --git a/e2e/testsuite/testsuite.go b/e2e/testsuite/testsuite.go
index f2f5860c94f..a6c8aaae72f 100644
--- a/e2e/testsuite/testsuite.go
+++ b/e2e/testsuite/testsuite.go
@@ -23,6 +23,7 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/cosmos/ibc-go/e2e/testconfig"
+	"github.com/cosmos/ibc-go/e2e/testvalues"
 	feetypes "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/types"
 	clienttypes "github.com/cosmos/ibc-go/v5/modules/core/02-client/types"
 	channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types"
@@ -430,7 +431,7 @@ func (s *E2ETestSuite) ExecuteGovProposal(ctx context.Context, chain *cosmos.Cos
 	s.Require().NoError(err)
 	s.Require().Equal(govtypes.StatusVotingPeriod, proposal.Status)
 
-	time.Sleep(time.Second * 30) // pass proposal
+	time.Sleep(testvalues.VotingPeriod) // pass proposal
 
 	proposal, err = s.QueryProposal(ctx, chain, 1)
 	s.Require().NoError(err)

From f8f879b7bd3c5e14c5c334f703462cbc51f34ad0 Mon Sep 17 00:00:00 2001
From: Charly <charly@interchain.berlin>
Date: Mon, 29 Aug 2022 18:29:14 +0200
Subject: [PATCH 2/3] chore: refactor genesis types to separate directory, mv
 controller interfaces registration to module.go (#2133)

Co-authored-by: Damian Nolan <damiannolan@gmail.com>
---
 CHANGELOG.md                                  |   1 +
 docs/ibc/proto-docs.md                        | 160 +++++++++---------
 .../controller/keeper/genesis.go              |   8 +-
 .../controller/keeper/genesis_test.go         |   8 +-
 .../controller/keeper/keeper.go               |  13 +-
 .../controller/keeper/keeper_test.go          |   5 +-
 .../{ => genesis}/types/genesis.go            |   7 +-
 .../{ => genesis}/types/genesis.pb.go         | 114 ++++++-------
 .../{ => genesis}/types/genesis_test.go       |  93 +++++-----
 .../host/keeper/genesis.go                    |   7 +-
 .../host/keeper/genesis_test.go               |   7 +-
 .../host/keeper/keeper.go                     |  13 +-
 .../host/keeper/keeper_test.go                |   5 +-
 modules/apps/27-interchain-accounts/module.go |  14 +-
 .../27-interchain-accounts/types/codec.go     |   4 -
 .../{ => genesis}/v1/genesis.proto            |   4 +-
 16 files changed, 242 insertions(+), 221 deletions(-)
 rename modules/apps/27-interchain-accounts/{ => genesis}/types/genesis.go (93%)
 rename modules/apps/27-interchain-accounts/{ => genesis}/types/genesis.pb.go (89%)
 rename modules/apps/27-interchain-accounts/{ => genesis}/types/genesis_test.go (53%)
 rename proto/ibc/applications/interchain_accounts/{ => genesis}/v1/genesis.proto (96%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae3378bfe46..dafccccb5ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,6 +71,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Improvements
 
+* (apps/27-interchain-accounts) [\#2133](https://github.com/cosmos/ibc-go/pull/2133) Generates genesis protos in a separate directory to avoid circular import errors. The protobuf package name has changed for the genesis types. 
 * (linting) [\#1418](https://github.com/cosmos/ibc-go/pull/1418) Fix linting errors, resulting compatiblity with go1.18 linting style, golangci-lint 1.46.2 and the revivie linter.  This caused breaking changes in core/04-channel, core/ante, and the testing library.
 * (modules/light-clients/07-tendermint) [\#1713](https://github.com/cosmos/ibc-go/pull/1713) Allow client upgrade proposals to update `TrustingPeriod`. See ADR-026 for context.
 * (modules/core/02-client) [\#1188](https://github.com/cosmos/ibc-go/pull/1188/files) Routing `MsgSubmitMisbehaviour` to `UpdateClient` keeper function. Deprecating `SubmitMisbehaviour` endpoint.
diff --git a/docs/ibc/proto-docs.md b/docs/ibc/proto-docs.md
index 21d874ccdf2..ee2d23577e6 100644
--- a/docs/ibc/proto-docs.md
+++ b/docs/ibc/proto-docs.md
@@ -98,6 +98,13 @@
 - [ibc/applications/interchain_accounts/host/v1/host.proto](#ibc/applications/interchain_accounts/host/v1/host.proto)
     - [Params](#ibc.applications.interchain_accounts.host.v1.Params)
   
+- [ibc/applications/interchain_accounts/genesis/v1/genesis.proto](#ibc/applications/interchain_accounts/genesis/v1/genesis.proto)
+    - [ActiveChannel](#ibc.applications.interchain_accounts.genesis.v1.ActiveChannel)
+    - [ControllerGenesisState](#ibc.applications.interchain_accounts.genesis.v1.ControllerGenesisState)
+    - [GenesisState](#ibc.applications.interchain_accounts.genesis.v1.GenesisState)
+    - [HostGenesisState](#ibc.applications.interchain_accounts.genesis.v1.HostGenesisState)
+    - [RegisteredInterchainAccount](#ibc.applications.interchain_accounts.genesis.v1.RegisteredInterchainAccount)
+  
 - [ibc/applications/interchain_accounts/host/v1/query.proto](#ibc/applications/interchain_accounts/host/v1/query.proto)
     - [QueryParamsRequest](#ibc.applications.interchain_accounts.host.v1.QueryParamsRequest)
     - [QueryParamsResponse](#ibc.applications.interchain_accounts.host.v1.QueryParamsResponse)
@@ -107,13 +114,6 @@
 - [ibc/applications/interchain_accounts/v1/account.proto](#ibc/applications/interchain_accounts/v1/account.proto)
     - [InterchainAccount](#ibc.applications.interchain_accounts.v1.InterchainAccount)
   
-- [ibc/applications/interchain_accounts/v1/genesis.proto](#ibc/applications/interchain_accounts/v1/genesis.proto)
-    - [ActiveChannel](#ibc.applications.interchain_accounts.v1.ActiveChannel)
-    - [ControllerGenesisState](#ibc.applications.interchain_accounts.v1.ControllerGenesisState)
-    - [GenesisState](#ibc.applications.interchain_accounts.v1.GenesisState)
-    - [HostGenesisState](#ibc.applications.interchain_accounts.v1.HostGenesisState)
-    - [RegisteredInterchainAccount](#ibc.applications.interchain_accounts.v1.RegisteredInterchainAccount)
-  
 - [ibc/applications/interchain_accounts/v1/metadata.proto](#ibc/applications/interchain_accounts/v1/metadata.proto)
     - [Metadata](#ibc.applications.interchain_accounts.v1.Metadata)
   
@@ -1608,74 +1608,93 @@ The following parameters may be used to disable the host submodule.
 
 
 
-<a name="ibc/applications/interchain_accounts/host/v1/query.proto"></a>
+<a name="ibc/applications/interchain_accounts/genesis/v1/genesis.proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## ibc/applications/interchain_accounts/host/v1/query.proto
+## ibc/applications/interchain_accounts/genesis/v1/genesis.proto
 
 
 
-<a name="ibc.applications.interchain_accounts.host.v1.QueryParamsRequest"></a>
+<a name="ibc.applications.interchain_accounts.genesis.v1.ActiveChannel"></a>
 
-### QueryParamsRequest
-QueryParamsRequest is the request type for the Query/Params RPC method.
+### ActiveChannel
+ActiveChannel contains a connection ID, port ID and associated active channel ID
 
 
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `connection_id` | [string](#string) |  |  |
+| `port_id` | [string](#string) |  |  |
+| `channel_id` | [string](#string) |  |  |
 
 
 
 
-<a name="ibc.applications.interchain_accounts.host.v1.QueryParamsResponse"></a>
 
-### QueryParamsResponse
-QueryParamsResponse is the response type for the Query/Params RPC method.
+
+<a name="ibc.applications.interchain_accounts.genesis.v1.ControllerGenesisState"></a>
+
+### ControllerGenesisState
+ControllerGenesisState defines the interchain accounts controller genesis state
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `params` | [Params](#ibc.applications.interchain_accounts.host.v1.Params) |  | params defines the parameters of the module. |
+| `active_channels` | [ActiveChannel](#ibc.applications.interchain_accounts.genesis.v1.ActiveChannel) | repeated |  |
+| `interchain_accounts` | [RegisteredInterchainAccount](#ibc.applications.interchain_accounts.genesis.v1.RegisteredInterchainAccount) | repeated |  |
+| `ports` | [string](#string) | repeated |  |
+| `params` | [ibc.applications.interchain_accounts.controller.v1.Params](#ibc.applications.interchain_accounts.controller.v1.Params) |  |  |
 
 
 
 
 
- <!-- end messages -->
 
- <!-- end enums -->
+<a name="ibc.applications.interchain_accounts.genesis.v1.GenesisState"></a>
 
- <!-- end HasExtensions -->
+### GenesisState
+GenesisState defines the interchain accounts genesis state
 
 
-<a name="ibc.applications.interchain_accounts.host.v1.Query"></a>
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `controller_genesis_state` | [ControllerGenesisState](#ibc.applications.interchain_accounts.genesis.v1.ControllerGenesisState) |  |  |
+| `host_genesis_state` | [HostGenesisState](#ibc.applications.interchain_accounts.genesis.v1.HostGenesisState) |  |  |
 
-### Query
-Query provides defines the gRPC querier service.
 
-| Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint |
-| ----------- | ------------ | ------------- | ------------| ------- | -------- |
-| `Params` | [QueryParamsRequest](#ibc.applications.interchain_accounts.host.v1.QueryParamsRequest) | [QueryParamsResponse](#ibc.applications.interchain_accounts.host.v1.QueryParamsResponse) | Params queries all parameters of the ICA host submodule. | GET|/ibc/apps/interchain_accounts/host/v1/params|
 
- <!-- end services -->
 
 
 
-<a name="ibc/applications/interchain_accounts/v1/account.proto"></a>
-<p align="right"><a href="#top">Top</a></p>
+<a name="ibc.applications.interchain_accounts.genesis.v1.HostGenesisState"></a>
 
-## ibc/applications/interchain_accounts/v1/account.proto
+### HostGenesisState
+HostGenesisState defines the interchain accounts host genesis state
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `active_channels` | [ActiveChannel](#ibc.applications.interchain_accounts.genesis.v1.ActiveChannel) | repeated |  |
+| `interchain_accounts` | [RegisteredInterchainAccount](#ibc.applications.interchain_accounts.genesis.v1.RegisteredInterchainAccount) | repeated |  |
+| `port` | [string](#string) |  |  |
+| `params` | [ibc.applications.interchain_accounts.host.v1.Params](#ibc.applications.interchain_accounts.host.v1.Params) |  |  |
 
 
 
-<a name="ibc.applications.interchain_accounts.v1.InterchainAccount"></a>
 
-### InterchainAccount
-An InterchainAccount is defined as a BaseAccount & the address of the account owner on the controller chain
+
+
+<a name="ibc.applications.interchain_accounts.genesis.v1.RegisteredInterchainAccount"></a>
+
+### RegisteredInterchainAccount
+RegisteredInterchainAccount contains a connection ID, port ID and associated interchain account address
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `base_account` | [cosmos.auth.v1beta1.BaseAccount](#cosmos.auth.v1beta1.BaseAccount) |  |  |
-| `account_owner` | [string](#string) |  |  |
+| `connection_id` | [string](#string) |  |  |
+| `port_id` | [string](#string) |  |  |
+| `account_address` | [string](#string) |  |  |
 
 
 
@@ -1691,93 +1710,74 @@ An InterchainAccount is defined as a BaseAccount & the address of the account ow
 
 
 
-<a name="ibc/applications/interchain_accounts/v1/genesis.proto"></a>
+<a name="ibc/applications/interchain_accounts/host/v1/query.proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## ibc/applications/interchain_accounts/v1/genesis.proto
-
-
+## ibc/applications/interchain_accounts/host/v1/query.proto
 
-<a name="ibc.applications.interchain_accounts.v1.ActiveChannel"></a>
 
-### ActiveChannel
-ActiveChannel contains a connection ID, port ID and associated active channel ID
 
+<a name="ibc.applications.interchain_accounts.host.v1.QueryParamsRequest"></a>
 
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| `connection_id` | [string](#string) |  |  |
-| `port_id` | [string](#string) |  |  |
-| `channel_id` | [string](#string) |  |  |
+### QueryParamsRequest
+QueryParamsRequest is the request type for the Query/Params RPC method.
 
 
 
 
 
 
-<a name="ibc.applications.interchain_accounts.v1.ControllerGenesisState"></a>
+<a name="ibc.applications.interchain_accounts.host.v1.QueryParamsResponse"></a>
 
-### ControllerGenesisState
-ControllerGenesisState defines the interchain accounts controller genesis state
+### QueryParamsResponse
+QueryParamsResponse is the response type for the Query/Params RPC method.
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `active_channels` | [ActiveChannel](#ibc.applications.interchain_accounts.v1.ActiveChannel) | repeated |  |
-| `interchain_accounts` | [RegisteredInterchainAccount](#ibc.applications.interchain_accounts.v1.RegisteredInterchainAccount) | repeated |  |
-| `ports` | [string](#string) | repeated |  |
-| `params` | [ibc.applications.interchain_accounts.controller.v1.Params](#ibc.applications.interchain_accounts.controller.v1.Params) |  |  |
-
-
-
+| `params` | [Params](#ibc.applications.interchain_accounts.host.v1.Params) |  | params defines the parameters of the module. |
 
 
 
-<a name="ibc.applications.interchain_accounts.v1.GenesisState"></a>
 
-### GenesisState
-GenesisState defines the interchain accounts genesis state
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| `controller_genesis_state` | [ControllerGenesisState](#ibc.applications.interchain_accounts.v1.ControllerGenesisState) |  |  |
-| `host_genesis_state` | [HostGenesisState](#ibc.applications.interchain_accounts.v1.HostGenesisState) |  |  |
 
+ <!-- end messages -->
 
+ <!-- end enums -->
 
+ <!-- end HasExtensions -->
 
 
+<a name="ibc.applications.interchain_accounts.host.v1.Query"></a>
 
-<a name="ibc.applications.interchain_accounts.v1.HostGenesisState"></a>
+### Query
+Query provides defines the gRPC querier service.
 
-### HostGenesisState
-HostGenesisState defines the interchain accounts host genesis state
+| Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint |
+| ----------- | ------------ | ------------- | ------------| ------- | -------- |
+| `Params` | [QueryParamsRequest](#ibc.applications.interchain_accounts.host.v1.QueryParamsRequest) | [QueryParamsResponse](#ibc.applications.interchain_accounts.host.v1.QueryParamsResponse) | Params queries all parameters of the ICA host submodule. | GET|/ibc/apps/interchain_accounts/host/v1/params|
 
+ <!-- end services -->
 
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| `active_channels` | [ActiveChannel](#ibc.applications.interchain_accounts.v1.ActiveChannel) | repeated |  |
-| `interchain_accounts` | [RegisteredInterchainAccount](#ibc.applications.interchain_accounts.v1.RegisteredInterchainAccount) | repeated |  |
-| `port` | [string](#string) |  |  |
-| `params` | [ibc.applications.interchain_accounts.host.v1.Params](#ibc.applications.interchain_accounts.host.v1.Params) |  |  |
 
 
+<a name="ibc/applications/interchain_accounts/v1/account.proto"></a>
+<p align="right"><a href="#top">Top</a></p>
 
+## ibc/applications/interchain_accounts/v1/account.proto
 
 
 
-<a name="ibc.applications.interchain_accounts.v1.RegisteredInterchainAccount"></a>
+<a name="ibc.applications.interchain_accounts.v1.InterchainAccount"></a>
 
-### RegisteredInterchainAccount
-RegisteredInterchainAccount contains a connection ID, port ID and associated interchain account address
+### InterchainAccount
+An InterchainAccount is defined as a BaseAccount & the address of the account owner on the controller chain
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `connection_id` | [string](#string) |  |  |
-| `port_id` | [string](#string) |  |  |
-| `account_address` | [string](#string) |  |  |
+| `base_account` | [cosmos.auth.v1beta1.BaseAccount](#cosmos.auth.v1beta1.BaseAccount) |  |  |
+| `account_owner` | [string](#string) |  |  |
 
 
 
diff --git a/modules/apps/27-interchain-accounts/controller/keeper/genesis.go b/modules/apps/27-interchain-accounts/controller/keeper/genesis.go
index 25acfc74a8a..ebf63a7ca3f 100644
--- a/modules/apps/27-interchain-accounts/controller/keeper/genesis.go
+++ b/modules/apps/27-interchain-accounts/controller/keeper/genesis.go
@@ -5,12 +5,12 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
+	genesistypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/genesis/types"
 	host "github.com/cosmos/ibc-go/v5/modules/core/24-host"
 )
 
 // InitGenesis initializes the interchain accounts controller application state from a provided genesis state
-func InitGenesis(ctx sdk.Context, keeper Keeper, state icatypes.ControllerGenesisState) {
+func InitGenesis(ctx sdk.Context, keeper Keeper, state genesistypes.ControllerGenesisState) {
 	for _, portID := range state.Ports {
 		if !keeper.IsBound(ctx, portID) {
 			cap := keeper.BindPort(ctx, portID)
@@ -32,8 +32,8 @@ func InitGenesis(ctx sdk.Context, keeper Keeper, state icatypes.ControllerGenesi
 }
 
 // ExportGenesis returns the interchain accounts controller exported genesis
-func ExportGenesis(ctx sdk.Context, keeper Keeper) icatypes.ControllerGenesisState {
-	return icatypes.NewControllerGenesisState(
+func ExportGenesis(ctx sdk.Context, keeper Keeper) genesistypes.ControllerGenesisState {
+	return genesistypes.NewControllerGenesisState(
 		keeper.GetAllActiveChannels(ctx),
 		keeper.GetAllInterchainAccounts(ctx),
 		keeper.GetAllPorts(ctx),
diff --git a/modules/apps/27-interchain-accounts/controller/keeper/genesis_test.go b/modules/apps/27-interchain-accounts/controller/keeper/genesis_test.go
index ac4698cbc7f..a787c52c03b 100644
--- a/modules/apps/27-interchain-accounts/controller/keeper/genesis_test.go
+++ b/modules/apps/27-interchain-accounts/controller/keeper/genesis_test.go
@@ -3,22 +3,22 @@ package keeper_test
 import (
 	"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/keeper"
 	"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types"
-	icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
+	genesistypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/genesis/types"
 	ibctesting "github.com/cosmos/ibc-go/v5/testing"
 )
 
 func (suite *KeeperTestSuite) TestInitGenesis() {
 	suite.SetupTest()
 
-	genesisState := icatypes.ControllerGenesisState{
-		ActiveChannels: []icatypes.ActiveChannel{
+	genesisState := genesistypes.ControllerGenesisState{
+		ActiveChannels: []genesistypes.ActiveChannel{
 			{
 				ConnectionId: ibctesting.FirstConnectionID,
 				PortId:       TestPortID,
 				ChannelId:    ibctesting.FirstChannelID,
 			},
 		},
-		InterchainAccounts: []icatypes.RegisteredInterchainAccount{
+		InterchainAccounts: []genesistypes.RegisteredInterchainAccount{
 			{
 				ConnectionId:   ibctesting.FirstConnectionID,
 				PortId:         TestPortID,
diff --git a/modules/apps/27-interchain-accounts/controller/keeper/keeper.go b/modules/apps/27-interchain-accounts/controller/keeper/keeper.go
index 2b281e93a45..9ccd4abc6a4 100644
--- a/modules/apps/27-interchain-accounts/controller/keeper/keeper.go
+++ b/modules/apps/27-interchain-accounts/controller/keeper/keeper.go
@@ -12,6 +12,7 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 
 	"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types"
+	genesistypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/genesis/types"
 	icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
 	channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types"
 	host "github.com/cosmos/ibc-go/v5/modules/core/24-host"
@@ -134,16 +135,16 @@ func (k Keeper) GetOpenActiveChannel(ctx sdk.Context, connectionID, portID strin
 }
 
 // GetAllActiveChannels returns a list of all active interchain accounts controller channels and their associated connection and port identifiers
-func (k Keeper) GetAllActiveChannels(ctx sdk.Context) []icatypes.ActiveChannel {
+func (k Keeper) GetAllActiveChannels(ctx sdk.Context) []genesistypes.ActiveChannel {
 	store := ctx.KVStore(k.storeKey)
 	iterator := sdk.KVStorePrefixIterator(store, []byte(icatypes.ActiveChannelKeyPrefix))
 	defer iterator.Close()
 
-	var activeChannels []icatypes.ActiveChannel
+	var activeChannels []genesistypes.ActiveChannel
 	for ; iterator.Valid(); iterator.Next() {
 		keySplit := strings.Split(string(iterator.Key()), "/")
 
-		ch := icatypes.ActiveChannel{
+		ch := genesistypes.ActiveChannel{
 			ConnectionId: keySplit[2],
 			PortId:       keySplit[1],
 			ChannelId:    string(iterator.Value()),
@@ -180,15 +181,15 @@ func (k Keeper) GetInterchainAccountAddress(ctx sdk.Context, connectionID, portI
 }
 
 // GetAllInterchainAccounts returns a list of all registered interchain account addresses and their associated connection and controller port identifiers
-func (k Keeper) GetAllInterchainAccounts(ctx sdk.Context) []icatypes.RegisteredInterchainAccount {
+func (k Keeper) GetAllInterchainAccounts(ctx sdk.Context) []genesistypes.RegisteredInterchainAccount {
 	store := ctx.KVStore(k.storeKey)
 	iterator := sdk.KVStorePrefixIterator(store, []byte(icatypes.OwnerKeyPrefix))
 
-	var interchainAccounts []icatypes.RegisteredInterchainAccount
+	var interchainAccounts []genesistypes.RegisteredInterchainAccount
 	for ; iterator.Valid(); iterator.Next() {
 		keySplit := strings.Split(string(iterator.Key()), "/")
 
-		acc := icatypes.RegisteredInterchainAccount{
+		acc := genesistypes.RegisteredInterchainAccount{
 			ConnectionId:   keySplit[2],
 			PortId:         keySplit[1],
 			AccountAddress: string(iterator.Value()),
diff --git a/modules/apps/27-interchain-accounts/controller/keeper/keeper_test.go b/modules/apps/27-interchain-accounts/controller/keeper/keeper_test.go
index 21d58f0762c..18d9860e66a 100644
--- a/modules/apps/27-interchain-accounts/controller/keeper/keeper_test.go
+++ b/modules/apps/27-interchain-accounts/controller/keeper/keeper_test.go
@@ -7,6 +7,7 @@ import (
 	"github.com/stretchr/testify/suite"
 	"github.com/tendermint/tendermint/crypto"
 
+	genesistypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/genesis/types"
 	icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
 	channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types"
 	ibctesting "github.com/cosmos/ibc-go/v5/testing"
@@ -179,7 +180,7 @@ func (suite *KeeperTestSuite) TestGetAllActiveChannels() {
 
 	suite.chainA.GetSimApp().ICAControllerKeeper.SetActiveChannelID(suite.chainA.GetContext(), ibctesting.FirstConnectionID, expectedPortID, expectedChannelID)
 
-	expectedChannels := []icatypes.ActiveChannel{
+	expectedChannels := []genesistypes.ActiveChannel{
 		{
 			ConnectionId: ibctesting.FirstConnectionID,
 			PortId:       TestPortID,
@@ -213,7 +214,7 @@ func (suite *KeeperTestSuite) TestGetAllInterchainAccounts() {
 
 	suite.chainA.GetSimApp().ICAControllerKeeper.SetInterchainAccountAddress(suite.chainA.GetContext(), ibctesting.FirstConnectionID, expectedPortID, expectedAccAddr)
 
-	expectedAccounts := []icatypes.RegisteredInterchainAccount{
+	expectedAccounts := []genesistypes.RegisteredInterchainAccount{
 		{
 			ConnectionId:   ibctesting.FirstConnectionID,
 			PortId:         TestPortID,
diff --git a/modules/apps/27-interchain-accounts/types/genesis.go b/modules/apps/27-interchain-accounts/genesis/types/genesis.go
similarity index 93%
rename from modules/apps/27-interchain-accounts/types/genesis.go
rename to modules/apps/27-interchain-accounts/genesis/types/genesis.go
index 38929c664b0..7d6be8f6502 100644
--- a/modules/apps/27-interchain-accounts/types/genesis.go
+++ b/modules/apps/27-interchain-accounts/genesis/types/genesis.go
@@ -3,6 +3,7 @@ package types
 import (
 	controllertypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types"
 	hosttypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host/types"
+	icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
 	host "github.com/cosmos/ibc-go/v5/modules/core/24-host"
 )
 
@@ -69,7 +70,7 @@ func (gs ControllerGenesisState) Validate() error {
 			return err
 		}
 
-		if err := ValidateAccountAddress(acc.AccountAddress); err != nil {
+		if err := icatypes.ValidateAccountAddress(acc.AccountAddress); err != nil {
 			return err
 		}
 	}
@@ -90,7 +91,7 @@ func (gs ControllerGenesisState) Validate() error {
 // DefaultHostGenesis creates and returns the default interchain accounts HostGenesisState
 func DefaultHostGenesis() HostGenesisState {
 	return HostGenesisState{
-		Port:   PortID,
+		Port:   icatypes.PortID,
 		Params: hosttypes.DefaultParams(),
 	}
 }
@@ -122,7 +123,7 @@ func (gs HostGenesisState) Validate() error {
 			return err
 		}
 
-		if err := ValidateAccountAddress(acc.AccountAddress); err != nil {
+		if err := icatypes.ValidateAccountAddress(acc.AccountAddress); err != nil {
 			return err
 		}
 	}
diff --git a/modules/apps/27-interchain-accounts/types/genesis.pb.go b/modules/apps/27-interchain-accounts/genesis/types/genesis.pb.go
similarity index 89%
rename from modules/apps/27-interchain-accounts/types/genesis.pb.go
rename to modules/apps/27-interchain-accounts/genesis/types/genesis.pb.go
index 7bac7e84f53..fb0a9bd7b5e 100644
--- a/modules/apps/27-interchain-accounts/types/genesis.pb.go
+++ b/modules/apps/27-interchain-accounts/genesis/types/genesis.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: ibc/applications/interchain_accounts/v1/genesis.proto
+// source: ibc/applications/interchain_accounts/genesis/v1/genesis.proto
 
 package types
 
@@ -35,7 +35,7 @@ func (m *GenesisState) Reset()         { *m = GenesisState{} }
 func (m *GenesisState) String() string { return proto.CompactTextString(m) }
 func (*GenesisState) ProtoMessage()    {}
 func (*GenesisState) Descriptor() ([]byte, []int) {
-	return fileDescriptor_629b3ced0911516b, []int{0}
+	return fileDescriptor_d4aa48c8e29a1947, []int{0}
 }
 func (m *GenesisState) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -90,7 +90,7 @@ func (m *ControllerGenesisState) Reset()         { *m = ControllerGenesisState{}
 func (m *ControllerGenesisState) String() string { return proto.CompactTextString(m) }
 func (*ControllerGenesisState) ProtoMessage()    {}
 func (*ControllerGenesisState) Descriptor() ([]byte, []int) {
-	return fileDescriptor_629b3ced0911516b, []int{1}
+	return fileDescriptor_d4aa48c8e29a1947, []int{1}
 }
 func (m *ControllerGenesisState) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -159,7 +159,7 @@ func (m *HostGenesisState) Reset()         { *m = HostGenesisState{} }
 func (m *HostGenesisState) String() string { return proto.CompactTextString(m) }
 func (*HostGenesisState) ProtoMessage()    {}
 func (*HostGenesisState) Descriptor() ([]byte, []int) {
-	return fileDescriptor_629b3ced0911516b, []int{2}
+	return fileDescriptor_d4aa48c8e29a1947, []int{2}
 }
 func (m *HostGenesisState) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -227,7 +227,7 @@ func (m *ActiveChannel) Reset()         { *m = ActiveChannel{} }
 func (m *ActiveChannel) String() string { return proto.CompactTextString(m) }
 func (*ActiveChannel) ProtoMessage()    {}
 func (*ActiveChannel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_629b3ced0911516b, []int{3}
+	return fileDescriptor_d4aa48c8e29a1947, []int{3}
 }
 func (m *ActiveChannel) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -288,7 +288,7 @@ func (m *RegisteredInterchainAccount) Reset()         { *m = RegisteredInterchai
 func (m *RegisteredInterchainAccount) String() string { return proto.CompactTextString(m) }
 func (*RegisteredInterchainAccount) ProtoMessage()    {}
 func (*RegisteredInterchainAccount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_629b3ced0911516b, []int{4}
+	return fileDescriptor_d4aa48c8e29a1947, []int{4}
 }
 func (m *RegisteredInterchainAccount) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -339,60 +339,60 @@ func (m *RegisteredInterchainAccount) GetAccountAddress() string {
 }
 
 func init() {
-	proto.RegisterType((*GenesisState)(nil), "ibc.applications.interchain_accounts.v1.GenesisState")
-	proto.RegisterType((*ControllerGenesisState)(nil), "ibc.applications.interchain_accounts.v1.ControllerGenesisState")
-	proto.RegisterType((*HostGenesisState)(nil), "ibc.applications.interchain_accounts.v1.HostGenesisState")
-	proto.RegisterType((*ActiveChannel)(nil), "ibc.applications.interchain_accounts.v1.ActiveChannel")
-	proto.RegisterType((*RegisteredInterchainAccount)(nil), "ibc.applications.interchain_accounts.v1.RegisteredInterchainAccount")
+	proto.RegisterType((*GenesisState)(nil), "ibc.applications.interchain_accounts.genesis.v1.GenesisState")
+	proto.RegisterType((*ControllerGenesisState)(nil), "ibc.applications.interchain_accounts.genesis.v1.ControllerGenesisState")
+	proto.RegisterType((*HostGenesisState)(nil), "ibc.applications.interchain_accounts.genesis.v1.HostGenesisState")
+	proto.RegisterType((*ActiveChannel)(nil), "ibc.applications.interchain_accounts.genesis.v1.ActiveChannel")
+	proto.RegisterType((*RegisteredInterchainAccount)(nil), "ibc.applications.interchain_accounts.genesis.v1.RegisteredInterchainAccount")
 }
 
 func init() {
-	proto.RegisterFile("ibc/applications/interchain_accounts/v1/genesis.proto", fileDescriptor_629b3ced0911516b)
-}
-
-var fileDescriptor_629b3ced0911516b = []byte{
-	// 645 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x95, 0x3f, 0x6f, 0x13, 0x3f,
-	0x18, 0xc7, 0xe3, 0xa4, 0xbf, 0xfe, 0x14, 0xf7, 0x0f, 0xc5, 0x94, 0xea, 0x08, 0xd2, 0x25, 0x78,
-	0x69, 0x24, 0xd4, 0x3b, 0xb5, 0xb4, 0x54, 0x54, 0x42, 0xa8, 0x17, 0x10, 0x64, 0x43, 0x66, 0x41,
-	0x2c, 0x27, 0xc7, 0x67, 0x25, 0x96, 0x92, 0x73, 0x74, 0x76, 0x23, 0x75, 0x62, 0x67, 0x62, 0x43,
-	0xac, 0x48, 0xbc, 0x00, 0xde, 0x01, 0x63, 0x27, 0xd4, 0x91, 0x29, 0x42, 0xed, 0x3b, 0xc8, 0x2b,
-	0x40, 0xf6, 0x9d, 0x92, 0xf4, 0x48, 0xab, 0x9b, 0x98, 0x98, 0x62, 0xdf, 0xe3, 0xef, 0xf7, 0xf9,
-	0x3c, 0x7e, 0x1c, 0x1b, 0x1e, 0x88, 0x0e, 0xf3, 0xe9, 0x70, 0xd8, 0x17, 0x8c, 0x6a, 0x21, 0x63,
-	0xe5, 0x8b, 0x58, 0xf3, 0x84, 0xf5, 0xa8, 0x88, 0x43, 0xca, 0x98, 0x3c, 0x89, 0xb5, 0xf2, 0x47,
-	0xbb, 0x7e, 0x97, 0xc7, 0x5c, 0x09, 0xe5, 0x0d, 0x13, 0xa9, 0x25, 0xda, 0x16, 0x1d, 0xe6, 0xcd,
-	0xcb, 0xbc, 0x05, 0x32, 0x6f, 0xb4, 0x5b, 0xdb, 0xec, 0xca, 0xae, 0xb4, 0x1a, 0xdf, 0x8c, 0x52,
-	0x79, 0xad, 0x55, 0x28, 0x2b, 0x93, 0xb1, 0x4e, 0x64, 0xbf, 0xcf, 0x13, 0x03, 0x30, 0x9b, 0x65,
-	0x26, 0x87, 0x85, 0x4c, 0x7a, 0x52, 0x69, 0x23, 0x37, 0xbf, 0xa9, 0x10, 0x7f, 0x2f, 0xc3, 0xd5,
-	0x97, 0x69, 0x39, 0x6f, 0x34, 0xd5, 0x1c, 0x7d, 0x01, 0xd0, 0x99, 0xd9, 0x87, 0x59, 0xa9, 0xa1,
-	0x32, 0x41, 0x07, 0x34, 0x40, 0x73, 0x65, 0xef, 0x99, 0x57, 0xb0, 0x62, 0xaf, 0x35, 0x35, 0x9a,
-	0xcf, 0x11, 0x6c, 0x9f, 0x8d, 0xeb, 0xa5, 0xc9, 0xb8, 0x5e, 0x3f, 0xa5, 0x83, 0xfe, 0x11, 0xbe,
-	0x2e, 0x1d, 0x26, 0x5b, 0x6c, 0xa1, 0x01, 0xfa, 0x00, 0x20, 0x32, 0x45, 0xe4, 0xf0, 0xca, 0x16,
-	0xef, 0x49, 0x61, 0xbc, 0x57, 0x52, 0xe9, 0x2b, 0x60, 0x0f, 0x32, 0xb0, 0x7b, 0x29, 0xd8, 0x9f,
-	0x29, 0x30, 0xd9, 0xe8, 0xe5, 0x44, 0xf8, 0x6b, 0x05, 0x6e, 0x2d, 0x2e, 0x14, 0xbd, 0x87, 0xb7,
-	0x28, 0xd3, 0x62, 0xc4, 0x43, 0xd6, 0xa3, 0x71, 0xcc, 0xfb, 0xca, 0x01, 0x8d, 0x4a, 0x73, 0x65,
-	0xef, 0x71, 0x61, 0xc6, 0x63, 0xab, 0x6f, 0xa5, 0xf2, 0xc0, 0xcd, 0x00, 0xb7, 0x52, 0xc0, 0x9c,
-	0x39, 0x26, 0xeb, 0x74, 0x7e, 0xb9, 0x42, 0x9f, 0x01, 0xbc, 0xb3, 0xc0, 0xd8, 0x29, 0x5b, 0x8a,
-	0xe7, 0x85, 0x29, 0x08, 0xef, 0x0a, 0xa5, 0x79, 0xc2, 0xa3, 0xf6, 0x74, 0xc1, 0x71, 0x1a, 0x0f,
-	0x70, 0xc6, 0x54, 0x4b, 0x99, 0x16, 0x38, 0x60, 0x82, 0x44, 0x5e, 0xa6, 0xd0, 0x26, 0xfc, 0x6f,
-	0x28, 0x13, 0xad, 0x9c, 0x4a, 0xa3, 0xd2, 0xac, 0x92, 0x74, 0x82, 0xde, 0xc2, 0xe5, 0x21, 0x4d,
-	0xe8, 0x40, 0x39, 0x4b, 0xb6, 0x9b, 0x47, 0xc5, 0x18, 0xe7, 0xfe, 0x11, 0xa3, 0x5d, 0xef, 0xb5,
-	0x75, 0x08, 0x96, 0x0c, 0x19, 0xc9, 0xfc, 0xf0, 0xa7, 0x0a, 0xdc, 0xc8, 0x77, 0xfc, 0x5f, 0x87,
-	0x6e, 0xea, 0x10, 0x82, 0x4b, 0xa6, 0x29, 0x4e, 0xa5, 0x01, 0x9a, 0x55, 0x62, 0xc7, 0x88, 0xe4,
-	0xfa, 0xb3, 0x5f, 0x8c, 0xd0, 0x5e, 0x39, 0xd7, 0x75, 0xe6, 0x1b, 0x80, 0x6b, 0x57, 0x76, 0x11,
-	0x3d, 0x85, 0x6b, 0x4c, 0xc6, 0x31, 0x67, 0xc6, 0x31, 0x14, 0x91, 0xbd, 0x79, 0xaa, 0x81, 0x33,
-	0x19, 0xd7, 0x37, 0xa7, 0x97, 0xc6, 0x2c, 0x8c, 0xc9, 0xea, 0x6c, 0xde, 0x8e, 0xd0, 0x43, 0xf8,
-	0xbf, 0x81, 0x35, 0xc2, 0xb2, 0x15, 0xa2, 0xc9, 0xb8, 0xbe, 0x9e, 0x0a, 0xb3, 0x00, 0x26, 0xcb,
-	0x66, 0xd4, 0x8e, 0xd0, 0x3e, 0x84, 0x59, 0x7b, 0xcc, 0x7a, 0x5b, 0x6b, 0x70, 0x77, 0x32, 0xae,
-	0xdf, 0xce, 0x12, 0x4d, 0x63, 0x98, 0x54, 0xb3, 0x49, 0x3b, 0xc2, 0x3f, 0x00, 0xbc, 0x7f, 0xc3,
-	0x9e, 0xff, 0xd5, 0x0a, 0x5a, 0xe6, 0x10, 0xdb, 0xb4, 0x21, 0x8d, 0xa2, 0x84, 0x2b, 0x95, 0x95,
-	0x51, 0x9b, 0x3f, 0x88, 0x57, 0x16, 0xd8, 0x83, 0x68, 0xbf, 0x1c, 0xa7, 0x1f, 0x82, 0xf0, 0xec,
-	0xc2, 0x05, 0xe7, 0x17, 0x2e, 0xf8, 0x75, 0xe1, 0x82, 0x8f, 0x97, 0x6e, 0xe9, 0xfc, 0xd2, 0x2d,
-	0xfd, 0xbc, 0x74, 0x4b, 0xef, 0x5e, 0x74, 0x85, 0xee, 0x9d, 0x74, 0x3c, 0x26, 0x07, 0x3e, 0x93,
-	0x6a, 0x20, 0x95, 0x2f, 0x3a, 0x6c, 0xa7, 0x2b, 0xfd, 0xd1, 0x81, 0x3f, 0x90, 0xd1, 0x49, 0x9f,
-	0x2b, 0xf3, 0xf8, 0x28, 0x7f, 0xef, 0x70, 0x67, 0xd6, 0xfc, 0x9d, 0xe9, 0xbb, 0xa3, 0x4f, 0x87,
-	0x5c, 0x75, 0x96, 0xed, 0x8b, 0xf3, 0xe8, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5c, 0x2b, 0x9a,
-	0xce, 0x67, 0x07, 0x00, 0x00,
+	proto.RegisterFile("ibc/applications/interchain_accounts/genesis/v1/genesis.proto", fileDescriptor_d4aa48c8e29a1947)
+}
+
+var fileDescriptor_d4aa48c8e29a1947 = []byte{
+	// 648 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x95, 0x4d, 0x6b, 0x13, 0x41,
+	0x18, 0xc7, 0x33, 0x49, 0xad, 0x64, 0xfa, 0x62, 0x1d, 0x6b, 0x59, 0x23, 0x6c, 0xe2, 0x5c, 0x0c,
+	0x48, 0x77, 0x69, 0xad, 0x14, 0x0a, 0x15, 0xb2, 0x39, 0xd4, 0x80, 0x82, 0x8c, 0x17, 0xf1, 0x12,
+	0x26, 0xb3, 0xc3, 0x66, 0x20, 0xd9, 0x09, 0x3b, 0xd3, 0x40, 0x3f, 0x81, 0x57, 0xf1, 0x1b, 0x78,
+	0x13, 0x6f, 0x5e, 0xfc, 0x0c, 0x3d, 0x49, 0x8f, 0x9e, 0x82, 0xb4, 0xdf, 0x20, 0x9f, 0x40, 0x66,
+	0x76, 0x9b, 0xb7, 0xa6, 0x92, 0x5c, 0x3c, 0x79, 0xca, 0xcc, 0xce, 0xf3, 0xff, 0x3f, 0xbf, 0x67,
+	0x9e, 0xc9, 0x0c, 0x3c, 0x16, 0x2d, 0xe6, 0xd3, 0x5e, 0xaf, 0x23, 0x18, 0xd5, 0x42, 0xc6, 0xca,
+	0x17, 0xb1, 0xe6, 0x09, 0x6b, 0x53, 0x11, 0x37, 0x29, 0x63, 0xf2, 0x34, 0xd6, 0xca, 0x8f, 0x78,
+	0xcc, 0x95, 0x50, 0x7e, 0x7f, 0xef, 0x7a, 0xe8, 0xf5, 0x12, 0xa9, 0x25, 0xf2, 0x45, 0x8b, 0x79,
+	0x93, 0x72, 0x6f, 0x8e, 0xdc, 0xbb, 0xd6, 0xf4, 0xf7, 0x4a, 0xdb, 0x91, 0x8c, 0xa4, 0xd5, 0xfa,
+	0x66, 0x94, 0xda, 0x94, 0xea, 0x0b, 0x51, 0x30, 0x19, 0xeb, 0x44, 0x76, 0x3a, 0x3c, 0x31, 0x20,
+	0xe3, 0x59, 0x66, 0x72, 0xb8, 0x90, 0x49, 0x5b, 0x2a, 0x6d, 0xe4, 0xe6, 0x37, 0x15, 0xe2, 0x8b,
+	0x3c, 0x5c, 0x3f, 0x49, 0x11, 0xdf, 0x69, 0xaa, 0x39, 0xfa, 0x06, 0xa0, 0x33, 0xb6, 0x6f, 0x66,
+	0xf8, 0x4d, 0x65, 0x16, 0x1d, 0x50, 0x01, 0xd5, 0xb5, 0xfd, 0x13, 0x6f, 0xc9, 0xca, 0xbd, 0xfa,
+	0xc8, 0x70, 0x32, 0x57, 0xf0, 0xf4, 0x7c, 0x50, 0xce, 0x0d, 0x07, 0xe5, 0xf2, 0x19, 0xed, 0x76,
+	0x8e, 0xf0, 0x6d, 0x69, 0x31, 0xd9, 0x61, 0x73, 0x0d, 0xd0, 0x67, 0x00, 0x91, 0x29, 0x66, 0x06,
+	0x33, 0x6f, 0x31, 0x6b, 0x4b, 0x63, 0xbe, 0x92, 0x4a, 0x4f, 0x01, 0x3e, 0xc9, 0x00, 0x1f, 0xa5,
+	0x80, 0x37, 0x53, 0x61, 0xb2, 0xd5, 0x9e, 0x11, 0xe1, 0x1f, 0x05, 0xb8, 0x33, 0xbf, 0x60, 0xf4,
+	0x11, 0xc0, 0x7b, 0x94, 0x69, 0xd1, 0xe7, 0x4d, 0xd6, 0xa6, 0x71, 0xcc, 0x3b, 0xca, 0x01, 0x95,
+	0x42, 0x75, 0x6d, 0xff, 0xe5, 0xd2, 0xb0, 0x35, 0xeb, 0x53, 0x4f, 0x6d, 0x02, 0x37, 0x23, 0xdd,
+	0x49, 0x49, 0x67, 0x92, 0x60, 0xb2, 0x49, 0x27, 0xc3, 0x15, 0xfa, 0x02, 0xe0, 0x83, 0x39, 0x09,
+	0x9c, 0xbc, 0xa5, 0x79, 0xbd, 0x34, 0x0d, 0xe1, 0x91, 0x50, 0x9a, 0x27, 0x3c, 0x6c, 0x8c, 0x02,
+	0x6b, 0x69, 0x5c, 0x80, 0x33, 0xb6, 0x52, 0xca, 0x36, 0xc7, 0x09, 0x13, 0x24, 0x66, 0x65, 0x0a,
+	0x6d, 0xc3, 0x3b, 0x3d, 0x99, 0x68, 0xe5, 0x14, 0x2a, 0x85, 0x6a, 0x91, 0xa4, 0x13, 0xf4, 0x1e,
+	0xae, 0xf6, 0x68, 0x42, 0xbb, 0xca, 0x59, 0xb1, 0x6d, 0x3e, 0x5a, 0x8c, 0x75, 0xe2, 0x2f, 0xd3,
+	0xdf, 0xf3, 0xde, 0x5a, 0x87, 0x60, 0xc5, 0x90, 0x91, 0xcc, 0x0f, 0x7f, 0x2d, 0xc0, 0xad, 0xd9,
+	0x23, 0xf0, 0xbf, 0x65, 0x4b, 0xb5, 0x0c, 0xc1, 0x15, 0xd3, 0x25, 0xa7, 0x50, 0x01, 0xd5, 0x22,
+	0xb1, 0x63, 0x44, 0x66, 0x1a, 0x76, 0xb0, 0x18, 0xa9, 0xbd, 0xa4, 0x6e, 0x6b, 0xd5, 0x77, 0x00,
+	0x37, 0xa6, 0x76, 0x13, 0x1d, 0xc3, 0x0d, 0x26, 0xe3, 0x98, 0x33, 0xe3, 0xd8, 0x14, 0xa1, 0xbd,
+	0xab, 0x8a, 0x81, 0x33, 0x1c, 0x94, 0xb7, 0x47, 0xd7, 0xcb, 0x78, 0x19, 0x93, 0xf5, 0xf1, 0xbc,
+	0x11, 0xa2, 0x67, 0xf0, 0xae, 0x81, 0x35, 0xc2, 0xbc, 0x15, 0xa2, 0xe1, 0xa0, 0xbc, 0x99, 0x0a,
+	0xb3, 0x05, 0x4c, 0x56, 0xcd, 0xa8, 0x11, 0xa2, 0x03, 0x08, 0xb3, 0x36, 0x99, 0x78, 0x5b, 0x6b,
+	0xf0, 0x70, 0x38, 0x28, 0xdf, 0xcf, 0x12, 0x8d, 0xd6, 0x30, 0x29, 0x66, 0x93, 0x46, 0x88, 0x7f,
+	0x02, 0xf8, 0xf8, 0x2f, 0x7b, 0xfe, 0x4f, 0x2b, 0xa8, 0x9b, 0x43, 0x6d, 0xd3, 0x36, 0x69, 0x18,
+	0x26, 0x5c, 0xa9, 0xac, 0x8c, 0xd2, 0xe4, 0x81, 0x9c, 0x0a, 0xb0, 0x07, 0xd2, 0x7e, 0xa9, 0xa5,
+	0x1f, 0x82, 0xe8, 0xfc, 0xd2, 0x05, 0x17, 0x97, 0x2e, 0xf8, 0x7d, 0xe9, 0x82, 0x4f, 0x57, 0x6e,
+	0xee, 0xe2, 0xca, 0xcd, 0xfd, 0xba, 0x72, 0x73, 0x1f, 0xde, 0x44, 0x42, 0xb7, 0x4f, 0x5b, 0x1e,
+	0x93, 0x5d, 0x9f, 0x49, 0xd5, 0x95, 0xca, 0x3c, 0x96, 0xbb, 0x91, 0xf4, 0xfb, 0x2f, 0xfc, 0xae,
+	0x0c, 0x4f, 0x3b, 0x5c, 0x99, 0xe7, 0x4a, 0xf9, 0xfb, 0x87, 0xbb, 0xe3, 0xe6, 0xef, 0xde, 0x78,
+	0x74, 0xf5, 0x59, 0x8f, 0xab, 0xd6, 0xaa, 0x7d, 0xab, 0x9e, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff,
+	0x1d, 0xb1, 0x33, 0x63, 0xb1, 0x07, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/modules/apps/27-interchain-accounts/types/genesis_test.go b/modules/apps/27-interchain-accounts/genesis/types/genesis_test.go
similarity index 53%
rename from modules/apps/27-interchain-accounts/types/genesis_test.go
rename to modules/apps/27-interchain-accounts/genesis/types/genesis_test.go
index 9adc1469564..9f3a9c7be45 100644
--- a/modules/apps/27-interchain-accounts/types/genesis_test.go
+++ b/modules/apps/27-interchain-accounts/genesis/types/genesis_test.go
@@ -1,14 +1,29 @@
 package types_test
 
 import (
+	"github.com/stretchr/testify/suite"
+
 	controllertypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types"
+	genesistypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/genesis/types"
 	hosttypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host/types"
-	"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
+	icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
 	ibctesting "github.com/cosmos/ibc-go/v5/testing"
 )
 
-func (suite *TypesTestSuite) TestValidateGenesisState() {
-	var genesisState types.GenesisState
+var (
+	// TestOwnerAddress defines a reusable bech32 address for testing purposes
+	TestOwnerAddress = "cosmos17dtl0mjt3t77kpuhg2edqzjpszulwhgzuj9ljs"
+
+	// TestPortID defines a reusable port identifier for testing purposes
+	TestPortID, _ = icatypes.NewControllerPortID(TestOwnerAddress)
+)
+
+type GenesisTypesTestSuite struct {
+	suite.Suite
+}
+
+func (suite *GenesisTypesTestSuite) TestValidateGenesisState() {
+	var genesisState genesistypes.GenesisState
 
 	testCases := []struct {
 		name     string
@@ -23,21 +38,21 @@ func (suite *TypesTestSuite) TestValidateGenesisState() {
 		{
 			"failed to validate - empty value",
 			func() {
-				genesisState = types.GenesisState{}
+				genesisState = genesistypes.GenesisState{}
 			},
 			false,
 		},
 		{
 			"failed to validate - invalid controller genesis",
 			func() {
-				genesisState = *types.NewGenesisState(types.ControllerGenesisState{Ports: []string{"invalid|port"}}, types.DefaultHostGenesis())
+				genesisState = *genesistypes.NewGenesisState(genesistypes.ControllerGenesisState{Ports: []string{"invalid|port"}}, genesistypes.DefaultHostGenesis())
 			},
 			false,
 		},
 		{
 			"failed to validate - invalid host genesis",
 			func() {
-				genesisState = *types.NewGenesisState(types.DefaultControllerGenesis(), types.HostGenesisState{})
+				genesisState = *genesistypes.NewGenesisState(genesistypes.DefaultControllerGenesis(), genesistypes.HostGenesisState{})
 			},
 			false,
 		},
@@ -45,7 +60,7 @@ func (suite *TypesTestSuite) TestValidateGenesisState() {
 
 	for _, tc := range testCases {
 		suite.Run(tc.name, func() {
-			genesisState = *types.DefaultGenesis()
+			genesisState = *genesistypes.DefaultGenesis()
 
 			tc.malleate() // malleate mutates test data
 
@@ -60,8 +75,8 @@ func (suite *TypesTestSuite) TestValidateGenesisState() {
 	}
 }
 
-func (suite *TypesTestSuite) TestValidateControllerGenesisState() {
-	var genesisState types.ControllerGenesisState
+func (suite *GenesisTypesTestSuite) TestValidateControllerGenesisState() {
+	var genesisState genesistypes.ControllerGenesisState
 
 	testCases := []struct {
 		name     string
@@ -76,91 +91,91 @@ func (suite *TypesTestSuite) TestValidateControllerGenesisState() {
 		{
 			"failed to validate active channel - invalid port identifier",
 			func() {
-				activeChannels := []types.ActiveChannel{
+				activeChannels := []genesistypes.ActiveChannel{
 					{
 						PortId:    "invalid|port",
 						ChannelId: ibctesting.FirstChannelID,
 					},
 				}
 
-				genesisState = types.NewControllerGenesisState(activeChannels, []types.RegisteredInterchainAccount{}, []string{}, controllertypes.DefaultParams())
+				genesisState = genesistypes.NewControllerGenesisState(activeChannels, []genesistypes.RegisteredInterchainAccount{}, []string{}, controllertypes.DefaultParams())
 			},
 			false,
 		},
 		{
 			"failed to validate active channel - invalid channel identifier",
 			func() {
-				activeChannels := []types.ActiveChannel{
+				activeChannels := []genesistypes.ActiveChannel{
 					{
 						PortId:    TestPortID,
 						ChannelId: "invalid|channel",
 					},
 				}
 
-				genesisState = types.NewControllerGenesisState(activeChannels, []types.RegisteredInterchainAccount{}, []string{}, controllertypes.DefaultParams())
+				genesisState = genesistypes.NewControllerGenesisState(activeChannels, []genesistypes.RegisteredInterchainAccount{}, []string{}, controllertypes.DefaultParams())
 			},
 			false,
 		},
 		{
 			"failed to validate registered account - invalid port identifier",
 			func() {
-				activeChannels := []types.ActiveChannel{
+				activeChannels := []genesistypes.ActiveChannel{
 					{
 						PortId:    TestPortID,
 						ChannelId: ibctesting.FirstChannelID,
 					},
 				}
 
-				registeredAccounts := []types.RegisteredInterchainAccount{
+				registeredAccounts := []genesistypes.RegisteredInterchainAccount{
 					{
 						PortId:         "invalid|port",
 						AccountAddress: TestOwnerAddress,
 					},
 				}
 
-				genesisState = types.NewControllerGenesisState(activeChannels, registeredAccounts, []string{}, controllertypes.DefaultParams())
+				genesisState = genesistypes.NewControllerGenesisState(activeChannels, registeredAccounts, []string{}, controllertypes.DefaultParams())
 			},
 			false,
 		},
 		{
 			"failed to validate registered account - invalid owner address",
 			func() {
-				activeChannels := []types.ActiveChannel{
+				activeChannels := []genesistypes.ActiveChannel{
 					{
 						PortId:    TestPortID,
 						ChannelId: ibctesting.FirstChannelID,
 					},
 				}
 
-				registeredAccounts := []types.RegisteredInterchainAccount{
+				registeredAccounts := []genesistypes.RegisteredInterchainAccount{
 					{
 						PortId:         TestPortID,
 						AccountAddress: "",
 					},
 				}
 
-				genesisState = types.NewControllerGenesisState(activeChannels, registeredAccounts, []string{}, controllertypes.DefaultParams())
+				genesisState = genesistypes.NewControllerGenesisState(activeChannels, registeredAccounts, []string{}, controllertypes.DefaultParams())
 			},
 			false,
 		},
 		{
 			"failed to validate controller ports - invalid port identifier",
 			func() {
-				activeChannels := []types.ActiveChannel{
+				activeChannels := []genesistypes.ActiveChannel{
 					{
 						PortId:    TestPortID,
 						ChannelId: ibctesting.FirstChannelID,
 					},
 				}
 
-				registeredAccounts := []types.RegisteredInterchainAccount{
+				registeredAccounts := []genesistypes.RegisteredInterchainAccount{
 					{
 						PortId:         TestPortID,
 						AccountAddress: TestOwnerAddress,
 					},
 				}
 
-				genesisState = types.NewControllerGenesisState(activeChannels, registeredAccounts, []string{"invalid|port"}, controllertypes.DefaultParams())
+				genesisState = genesistypes.NewControllerGenesisState(activeChannels, registeredAccounts, []string{"invalid|port"}, controllertypes.DefaultParams())
 			},
 			false,
 		},
@@ -168,7 +183,7 @@ func (suite *TypesTestSuite) TestValidateControllerGenesisState() {
 
 	for _, tc := range testCases {
 		suite.Run(tc.name, func() {
-			genesisState = types.DefaultControllerGenesis()
+			genesisState = genesistypes.DefaultControllerGenesis()
 
 			tc.malleate() // malleate mutates test data
 
@@ -183,8 +198,8 @@ func (suite *TypesTestSuite) TestValidateControllerGenesisState() {
 	}
 }
 
-func (suite *TypesTestSuite) TestValidateHostGenesisState() {
-	var genesisState types.HostGenesisState
+func (suite *GenesisTypesTestSuite) TestValidateHostGenesisState() {
+	var genesisState genesistypes.HostGenesisState
 
 	testCases := []struct {
 		name     string
@@ -199,91 +214,91 @@ func (suite *TypesTestSuite) TestValidateHostGenesisState() {
 		{
 			"failed to validate active channel - invalid port identifier",
 			func() {
-				activeChannels := []types.ActiveChannel{
+				activeChannels := []genesistypes.ActiveChannel{
 					{
 						PortId:    "invalid|port",
 						ChannelId: ibctesting.FirstChannelID,
 					},
 				}
 
-				genesisState = types.NewHostGenesisState(activeChannels, []types.RegisteredInterchainAccount{}, types.PortID, hosttypes.DefaultParams())
+				genesisState = genesistypes.NewHostGenesisState(activeChannels, []genesistypes.RegisteredInterchainAccount{}, icatypes.PortID, hosttypes.DefaultParams())
 			},
 			false,
 		},
 		{
 			"failed to validate active channel - invalid channel identifier",
 			func() {
-				activeChannels := []types.ActiveChannel{
+				activeChannels := []genesistypes.ActiveChannel{
 					{
 						PortId:    TestPortID,
 						ChannelId: "invalid|channel",
 					},
 				}
 
-				genesisState = types.NewHostGenesisState(activeChannels, []types.RegisteredInterchainAccount{}, types.PortID, hosttypes.DefaultParams())
+				genesisState = genesistypes.NewHostGenesisState(activeChannels, []genesistypes.RegisteredInterchainAccount{}, icatypes.PortID, hosttypes.DefaultParams())
 			},
 			false,
 		},
 		{
 			"failed to validate registered account - invalid port identifier",
 			func() {
-				activeChannels := []types.ActiveChannel{
+				activeChannels := []genesistypes.ActiveChannel{
 					{
 						PortId:    TestPortID,
 						ChannelId: ibctesting.FirstChannelID,
 					},
 				}
 
-				registeredAccounts := []types.RegisteredInterchainAccount{
+				registeredAccounts := []genesistypes.RegisteredInterchainAccount{
 					{
 						PortId:         "invalid|port",
 						AccountAddress: TestOwnerAddress,
 					},
 				}
 
-				genesisState = types.NewHostGenesisState(activeChannels, registeredAccounts, types.PortID, hosttypes.DefaultParams())
+				genesisState = genesistypes.NewHostGenesisState(activeChannels, registeredAccounts, icatypes.PortID, hosttypes.DefaultParams())
 			},
 			false,
 		},
 		{
 			"failed to validate registered account - invalid owner address",
 			func() {
-				activeChannels := []types.ActiveChannel{
+				activeChannels := []genesistypes.ActiveChannel{
 					{
 						PortId:    TestPortID,
 						ChannelId: ibctesting.FirstChannelID,
 					},
 				}
 
-				registeredAccounts := []types.RegisteredInterchainAccount{
+				registeredAccounts := []genesistypes.RegisteredInterchainAccount{
 					{
 						PortId:         TestPortID,
 						AccountAddress: "",
 					},
 				}
 
-				genesisState = types.NewHostGenesisState(activeChannels, registeredAccounts, types.PortID, hosttypes.DefaultParams())
+				genesisState = genesistypes.NewHostGenesisState(activeChannels, registeredAccounts, icatypes.PortID, hosttypes.DefaultParams())
 			},
 			false,
 		},
 		{
 			"failed to validate controller ports - invalid port identifier",
 			func() {
-				activeChannels := []types.ActiveChannel{
+				activeChannels := []genesistypes.ActiveChannel{
 					{
 						PortId:    TestPortID,
 						ChannelId: ibctesting.FirstChannelID,
 					},
 				}
 
-				registeredAccounts := []types.RegisteredInterchainAccount{
+				registeredAccounts := []genesistypes.RegisteredInterchainAccount{
 					{
 						PortId:         TestPortID,
 						AccountAddress: TestOwnerAddress,
 					},
 				}
 
-				genesisState = types.NewHostGenesisState(activeChannels, registeredAccounts, "invalid|port", hosttypes.DefaultParams())
+				genesisState = genesistypes.NewHostGenesisState(activeChannels, registeredAccounts, "invalid|port", hosttypes.DefaultParams())
 			},
 			false,
 		},
@@ -291,7 +306,7 @@ func (suite *TypesTestSuite) TestValidateHostGenesisState() {
 
 	for _, tc := range testCases {
 		suite.Run(tc.name, func() {
-			genesisState = types.DefaultHostGenesis()
+			genesisState = genesistypes.DefaultHostGenesis()
 
 			tc.malleate() // malleate mutates test data
 
diff --git a/modules/apps/27-interchain-accounts/host/keeper/genesis.go b/modules/apps/27-interchain-accounts/host/keeper/genesis.go
index c4c66e88414..03a714804bf 100644
--- a/modules/apps/27-interchain-accounts/host/keeper/genesis.go
+++ b/modules/apps/27-interchain-accounts/host/keeper/genesis.go
@@ -5,12 +5,13 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
+	genesistypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/genesis/types"
 	icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
 	host "github.com/cosmos/ibc-go/v5/modules/core/24-host"
 )
 
 // InitGenesis initializes the interchain accounts host application state from a provided genesis state
-func InitGenesis(ctx sdk.Context, keeper Keeper, state icatypes.HostGenesisState) {
+func InitGenesis(ctx sdk.Context, keeper Keeper, state genesistypes.HostGenesisState) {
 	if !keeper.IsBound(ctx, state.Port) {
 		cap := keeper.BindPort(ctx, state.Port)
 		if err := keeper.ClaimCapability(ctx, cap, host.PortPath(state.Port)); err != nil {
@@ -30,8 +31,8 @@ func InitGenesis(ctx sdk.Context, keeper Keeper, state icatypes.HostGenesisState
 }
 
 // ExportGenesis returns the interchain accounts host exported genesis
-func ExportGenesis(ctx sdk.Context, keeper Keeper) icatypes.HostGenesisState {
-	return icatypes.NewHostGenesisState(
+func ExportGenesis(ctx sdk.Context, keeper Keeper) genesistypes.HostGenesisState {
+	return genesistypes.NewHostGenesisState(
 		keeper.GetAllActiveChannels(ctx),
 		keeper.GetAllInterchainAccounts(ctx),
 		icatypes.PortID,
diff --git a/modules/apps/27-interchain-accounts/host/keeper/genesis_test.go b/modules/apps/27-interchain-accounts/host/keeper/genesis_test.go
index 9a39befbaee..d9c3cfa8091 100644
--- a/modules/apps/27-interchain-accounts/host/keeper/genesis_test.go
+++ b/modules/apps/27-interchain-accounts/host/keeper/genesis_test.go
@@ -1,6 +1,7 @@
 package keeper_test
 
 import (
+	genesistypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/genesis/types"
 	"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host/keeper"
 	"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host/types"
 	icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
@@ -10,15 +11,15 @@ import (
 func (suite *KeeperTestSuite) TestInitGenesis() {
 	suite.SetupTest()
 
-	genesisState := icatypes.HostGenesisState{
-		ActiveChannels: []icatypes.ActiveChannel{
+	genesisState := genesistypes.HostGenesisState{
+		ActiveChannels: []genesistypes.ActiveChannel{
 			{
 				ConnectionId: ibctesting.FirstConnectionID,
 				PortId:       TestPortID,
 				ChannelId:    ibctesting.FirstChannelID,
 			},
 		},
-		InterchainAccounts: []icatypes.RegisteredInterchainAccount{
+		InterchainAccounts: []genesistypes.RegisteredInterchainAccount{
 			{
 				ConnectionId:   ibctesting.FirstConnectionID,
 				PortId:         TestPortID,
diff --git a/modules/apps/27-interchain-accounts/host/keeper/keeper.go b/modules/apps/27-interchain-accounts/host/keeper/keeper.go
index acad2ea4622..693df6fcd67 100644
--- a/modules/apps/27-interchain-accounts/host/keeper/keeper.go
+++ b/modules/apps/27-interchain-accounts/host/keeper/keeper.go
@@ -11,6 +11,7 @@ import (
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	"github.com/tendermint/tendermint/libs/log"
 
+	genesistypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/genesis/types"
 	"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host/types"
 	icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
 	channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types"
@@ -118,16 +119,16 @@ func (k Keeper) GetOpenActiveChannel(ctx sdk.Context, connectionID, portID strin
 }
 
 // GetAllActiveChannels returns a list of all active interchain accounts host channels and their associated connection and port identifiers
-func (k Keeper) GetAllActiveChannels(ctx sdk.Context) []icatypes.ActiveChannel {
+func (k Keeper) GetAllActiveChannels(ctx sdk.Context) []genesistypes.ActiveChannel {
 	store := ctx.KVStore(k.storeKey)
 	iterator := sdk.KVStorePrefixIterator(store, []byte(icatypes.ActiveChannelKeyPrefix))
 	defer iterator.Close()
 
-	var activeChannels []icatypes.ActiveChannel
+	var activeChannels []genesistypes.ActiveChannel
 	for ; iterator.Valid(); iterator.Next() {
 		keySplit := strings.Split(string(iterator.Key()), "/")
 
-		ch := icatypes.ActiveChannel{
+		ch := genesistypes.ActiveChannel{
 			ConnectionId: keySplit[2],
 			PortId:       keySplit[1],
 			ChannelId:    string(iterator.Value()),
@@ -164,15 +165,15 @@ func (k Keeper) GetInterchainAccountAddress(ctx sdk.Context, connectionID, portI
 }
 
 // GetAllInterchainAccounts returns a list of all registered interchain account addresses and their associated connection and controller port identifiers
-func (k Keeper) GetAllInterchainAccounts(ctx sdk.Context) []icatypes.RegisteredInterchainAccount {
+func (k Keeper) GetAllInterchainAccounts(ctx sdk.Context) []genesistypes.RegisteredInterchainAccount {
 	store := ctx.KVStore(k.storeKey)
 	iterator := sdk.KVStorePrefixIterator(store, []byte(icatypes.OwnerKeyPrefix))
 
-	var interchainAccounts []icatypes.RegisteredInterchainAccount
+	var interchainAccounts []genesistypes.RegisteredInterchainAccount
 	for ; iterator.Valid(); iterator.Next() {
 		keySplit := strings.Split(string(iterator.Key()), "/")
 
-		acc := icatypes.RegisteredInterchainAccount{
+		acc := genesistypes.RegisteredInterchainAccount{
 			ConnectionId:   keySplit[2],
 			PortId:         keySplit[1],
 			AccountAddress: string(iterator.Value()),
diff --git a/modules/apps/27-interchain-accounts/host/keeper/keeper_test.go b/modules/apps/27-interchain-accounts/host/keeper/keeper_test.go
index eb475cea6c8..25a01f66ea9 100644
--- a/modules/apps/27-interchain-accounts/host/keeper/keeper_test.go
+++ b/modules/apps/27-interchain-accounts/host/keeper/keeper_test.go
@@ -7,6 +7,7 @@ import (
 	"github.com/stretchr/testify/suite"
 	"github.com/tendermint/tendermint/crypto"
 
+	genesistypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/genesis/types"
 	icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
 	channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types"
 	ibctesting "github.com/cosmos/ibc-go/v5/testing"
@@ -163,7 +164,7 @@ func (suite *KeeperTestSuite) TestGetAllActiveChannels() {
 
 	suite.chainB.GetSimApp().ICAHostKeeper.SetActiveChannelID(suite.chainB.GetContext(), ibctesting.FirstConnectionID, expectedPortID, expectedChannelID)
 
-	expectedChannels := []icatypes.ActiveChannel{
+	expectedChannels := []genesistypes.ActiveChannel{
 		{
 			ConnectionId: ibctesting.FirstConnectionID,
 			PortId:       path.EndpointA.ChannelConfig.PortID,
@@ -197,7 +198,7 @@ func (suite *KeeperTestSuite) TestGetAllInterchainAccounts() {
 
 	suite.chainB.GetSimApp().ICAHostKeeper.SetInterchainAccountAddress(suite.chainB.GetContext(), ibctesting.FirstConnectionID, expectedPortID, expectedAccAddr)
 
-	expectedAccounts := []icatypes.RegisteredInterchainAccount{
+	expectedAccounts := []genesistypes.RegisteredInterchainAccount{
 		{
 			ConnectionId:   ibctesting.FirstConnectionID,
 			PortId:         TestPortID,
diff --git a/modules/apps/27-interchain-accounts/module.go b/modules/apps/27-interchain-accounts/module.go
index 18c52693313..778053333ab 100644
--- a/modules/apps/27-interchain-accounts/module.go
+++ b/modules/apps/27-interchain-accounts/module.go
@@ -17,6 +17,7 @@ import (
 	"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/client/cli"
 	controllerkeeper "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/keeper"
 	controllertypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types"
+	genesistypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/genesis/types"
 	"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host"
 	hostkeeper "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host/keeper"
 	hosttypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host/types"
@@ -45,18 +46,19 @@ func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {}
 
 // RegisterInterfaces registers module concrete types into protobuf Any
 func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry) {
+	controllertypes.RegisterInterfaces(registry)
 	types.RegisterInterfaces(registry)
 }
 
 // DefaultGenesis returns default genesis state as raw bytes for the IBC
 // interchain accounts module
 func (AppModuleBasic) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage {
-	return cdc.MustMarshalJSON(types.DefaultGenesis())
+	return cdc.MustMarshalJSON(genesistypes.DefaultGenesis())
 }
 
 // ValidateGenesis performs genesis state validation for the IBC interchain acounts module
 func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, config client.TxEncodingConfig, bz json.RawMessage) error {
-	var gs types.GenesisState
+	var gs genesistypes.GenesisState
 	if err := cdc.UnmarshalJSON(bz, &gs); err != nil {
 		return fmt.Errorf("failed to unmarshal %s genesis state: %w", types.ModuleName, err)
 	}
@@ -152,7 +154,7 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 // InitGenesis performs genesis initialization for the interchain accounts module.
 // It returns no validator updates.
 func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, data json.RawMessage) []abci.ValidatorUpdate {
-	var genesisState types.GenesisState
+	var genesisState genesistypes.GenesisState
 	cdc.MustUnmarshalJSON(data, &genesisState)
 
 	if am.controllerKeeper != nil {
@@ -169,8 +171,8 @@ func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, data json.
 // ExportGenesis returns the exported genesis state as raw bytes for the interchain accounts module
 func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage {
 	var (
-		controllerGenesisState = types.DefaultControllerGenesis()
-		hostGenesisState       = types.DefaultHostGenesis()
+		controllerGenesisState = genesistypes.DefaultControllerGenesis()
+		hostGenesisState       = genesistypes.DefaultHostGenesis()
 	)
 
 	if am.controllerKeeper != nil {
@@ -181,7 +183,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw
 		hostGenesisState = hostkeeper.ExportGenesis(ctx, *am.hostKeeper)
 	}
 
-	gs := types.NewGenesisState(controllerGenesisState, hostGenesisState)
+	gs := genesistypes.NewGenesisState(controllerGenesisState, hostGenesisState)
 
 	return cdc.MustMarshalJSON(gs)
 }
diff --git a/modules/apps/27-interchain-accounts/types/codec.go b/modules/apps/27-interchain-accounts/types/codec.go
index f2400d3d1b7..4c9fdea401d 100644
--- a/modules/apps/27-interchain-accounts/types/codec.go
+++ b/modules/apps/27-interchain-accounts/types/codec.go
@@ -6,8 +6,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-
-	controllertypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types"
 )
 
 // ModuleCdc references the global interchain accounts module codec. Note, the codec
@@ -20,8 +18,6 @@ var ModuleCdc = codec.NewProtoCodec(codectypes.NewInterfaceRegistry())
 // RegisterInterfaces registers the interchain accounts controller types and the concrete InterchainAccount implementation
 // against the associated x/auth AccountI and GenesisAccount interfaces.
 func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
-	controllertypes.RegisterInterfaces(registry)
-
 	registry.RegisterImplementations((*authtypes.AccountI)(nil), &InterchainAccount{})
 	registry.RegisterImplementations((*authtypes.GenesisAccount)(nil), &InterchainAccount{})
 }
diff --git a/proto/ibc/applications/interchain_accounts/v1/genesis.proto b/proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto
similarity index 96%
rename from proto/ibc/applications/interchain_accounts/v1/genesis.proto
rename to proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto
index 0687003195f..58870b8cd7c 100644
--- a/proto/ibc/applications/interchain_accounts/v1/genesis.proto
+++ b/proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto
@@ -1,8 +1,8 @@
 syntax = "proto3";
 
-package ibc.applications.interchain_accounts.v1;
+package ibc.applications.interchain_accounts.genesis.v1;
 
-option go_package = "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types";
+option go_package = "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/genesis/types";
 
 import "gogoproto/gogo.proto";
 import "ibc/applications/interchain_accounts/controller/v1/controller.proto";

From f2637940b6b9fb5b7fba115e6b037f64fd5bc40d Mon Sep 17 00:00:00 2001
From: Charly <charly@interchain.berlin>
Date: Tue, 30 Aug 2022 12:40:02 +0200
Subject: [PATCH 3/3] chore: adding basic Msg service and SubmitTx rpc
 boilerplate (#2086)

* add protos/rpcs, boilerplate
---
 docs/ibc/proto-docs.md                        | 171 +++--
 .../controller/keeper/msg_server.go           |   5 +
 .../controller/types/codec.go                 |   6 +-
 .../controller/types/msgs.go                  |  23 +
 .../controller/types/tx.pb.go                 | 591 +++++++++++++++++-
 .../controller/v1/tx.proto                    |  27 +
 6 files changed, 730 insertions(+), 93 deletions(-)

diff --git a/docs/ibc/proto-docs.md b/docs/ibc/proto-docs.md
index ee2d23577e6..d88d3fd001c 100644
--- a/docs/ibc/proto-docs.md
+++ b/docs/ibc/proto-docs.md
@@ -89,9 +89,17 @@
   
     - [Query](#ibc.applications.interchain_accounts.controller.v1.Query)
   
+- [ibc/applications/interchain_accounts/v1/packet.proto](#ibc/applications/interchain_accounts/v1/packet.proto)
+    - [CosmosTx](#ibc.applications.interchain_accounts.v1.CosmosTx)
+    - [InterchainAccountPacketData](#ibc.applications.interchain_accounts.v1.InterchainAccountPacketData)
+  
+    - [Type](#ibc.applications.interchain_accounts.v1.Type)
+  
 - [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)
   
     - [Msg](#ibc.applications.interchain_accounts.controller.v1.Msg)
   
@@ -117,12 +125,6 @@
 - [ibc/applications/interchain_accounts/v1/metadata.proto](#ibc/applications/interchain_accounts/v1/metadata.proto)
     - [Metadata](#ibc.applications.interchain_accounts.v1.Metadata)
   
-- [ibc/applications/interchain_accounts/v1/packet.proto](#ibc/applications/interchain_accounts/v1/packet.proto)
-    - [CosmosTx](#ibc.applications.interchain_accounts.v1.CosmosTx)
-    - [InterchainAccountPacketData](#ibc.applications.interchain_accounts.v1.InterchainAccountPacketData)
-  
-    - [Type](#ibc.applications.interchain_accounts.v1.Type)
-  
 - [ibc/applications/transfer/v1/transfer.proto](#ibc/applications/transfer/v1/transfer.proto)
     - [DenomTrace](#ibc.applications.transfer.v1.DenomTrace)
     - [Params](#ibc.applications.transfer.v1.Params)
@@ -1517,6 +1519,67 @@ Query provides defines the gRPC querier service.
 
 
 
+<a name="ibc/applications/interchain_accounts/v1/packet.proto"></a>
+<p align="right"><a href="#top">Top</a></p>
+
+## ibc/applications/interchain_accounts/v1/packet.proto
+
+
+
+<a name="ibc.applications.interchain_accounts.v1.CosmosTx"></a>
+
+### CosmosTx
+CosmosTx contains a list of sdk.Msg's. It should be used when sending transactions to an SDK host chain.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `messages` | [google.protobuf.Any](#google.protobuf.Any) | repeated |  |
+
+
+
+
+
+
+<a name="ibc.applications.interchain_accounts.v1.InterchainAccountPacketData"></a>
+
+### InterchainAccountPacketData
+InterchainAccountPacketData is comprised of a raw transaction, type of transaction and optional memo field.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `type` | [Type](#ibc.applications.interchain_accounts.v1.Type) |  |  |
+| `data` | [bytes](#bytes) |  |  |
+| `memo` | [string](#string) |  |  |
+
+
+
+
+
+ <!-- end messages -->
+
+
+<a name="ibc.applications.interchain_accounts.v1.Type"></a>
+
+### Type
+Type defines a classification of message issued from a controller chain to its associated interchain accounts
+host
+
+| Name | Number | Description |
+| ---- | ------ | ----------- |
+| TYPE_UNSPECIFIED | 0 | Default zero value enumeration |
+| TYPE_EXECUTE_TX | 1 | Execute a transaction on an interchain accounts host chain |
+
+
+ <!-- end enums -->
+
+ <!-- end HasExtensions -->
+
+ <!-- end services -->
+
+
+
 <a name="ibc/applications/interchain_accounts/controller/v1/tx.proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
@@ -1555,6 +1618,40 @@ MsgRegisterAccountResponse defines the response for Msg/RegisterAccount
 
 
 
+
+<a name="ibc.applications.interchain_accounts.controller.v1.MsgSubmitTx"></a>
+
+### MsgSubmitTx
+MsgSubmitTx defines the payload for MsgSubmitTx
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `owner` | [string](#string) |  |  |
+| `connection_id` | [string](#string) |  |  |
+| `timeout_height` | [ibc.core.client.v1.Height](#ibc.core.client.v1.Height) |  | Timeout height relative to the current block height. The timeout is disabled when set to 0. |
+| `timeout_timestamp` | [uint64](#uint64) |  | Timeout timestamp in absolute nanoseconds since unix epoch. The timeout is disabled when set to 0. |
+| `packet_data` | [ibc.applications.interchain_accounts.v1.InterchainAccountPacketData](#ibc.applications.interchain_accounts.v1.InterchainAccountPacketData) |  |  |
+
+
+
+
+
+
+<a name="ibc.applications.interchain_accounts.controller.v1.MsgSubmitTxResponse"></a>
+
+### MsgSubmitTxResponse
+MsgSubmitTxResponse defines the response for MsgSubmitTx
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `sequence` | [uint64](#uint64) |  |  |
+
+
+
+
+
  <!-- end messages -->
 
  <!-- end enums -->
@@ -1570,6 +1667,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. | |
 
  <!-- end services -->
 
@@ -1830,67 +1928,6 @@ See ICS004: https://github.com/cosmos/ibc/tree/master/spec/core/ics-004-channel-
 
 
 
-<a name="ibc/applications/interchain_accounts/v1/packet.proto"></a>
-<p align="right"><a href="#top">Top</a></p>
-
-## ibc/applications/interchain_accounts/v1/packet.proto
-
-
-
-<a name="ibc.applications.interchain_accounts.v1.CosmosTx"></a>
-
-### CosmosTx
-CosmosTx contains a list of sdk.Msg's. It should be used when sending transactions to an SDK host chain.
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| `messages` | [google.protobuf.Any](#google.protobuf.Any) | repeated |  |
-
-
-
-
-
-
-<a name="ibc.applications.interchain_accounts.v1.InterchainAccountPacketData"></a>
-
-### InterchainAccountPacketData
-InterchainAccountPacketData is comprised of a raw transaction, type of transaction and optional memo field.
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| `type` | [Type](#ibc.applications.interchain_accounts.v1.Type) |  |  |
-| `data` | [bytes](#bytes) |  |  |
-| `memo` | [string](#string) |  |  |
-
-
-
-
-
- <!-- end messages -->
-
-
-<a name="ibc.applications.interchain_accounts.v1.Type"></a>
-
-### Type
-Type defines a classification of message issued from a controller chain to its associated interchain accounts
-host
-
-| Name | Number | Description |
-| ---- | ------ | ----------- |
-| TYPE_UNSPECIFIED | 0 | Default zero value enumeration |
-| TYPE_EXECUTE_TX | 1 | Execute a transaction on an interchain accounts host chain |
-
-
- <!-- end enums -->
-
- <!-- end HasExtensions -->
-
- <!-- end services -->
-
-
-
 <a name="ibc/applications/transfer/v1/transfer.proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
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 206ef9e6660..aaf50bcb930 100644
--- a/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go
+++ b/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go
@@ -23,3 +23,8 @@ func (k Keeper) RegisterAccount(goCtx context.Context, msg *types.MsgRegisterAcc
 		ChannelId: channelID,
 	}, nil
 }
+
+// SubmitTx defines a rpc handler for MsgSubmitTx
+func (k Keeper) SubmitTx(goCtx context.Context, msg *types.MsgSubmitTx) (*types.MsgSubmitTxResponse, error) {
+	return &types.MsgSubmitTxResponse{}, nil
+}
diff --git a/modules/apps/27-interchain-accounts/controller/types/codec.go b/modules/apps/27-interchain-accounts/controller/types/codec.go
index 70f6abcdb5e..a1b5d7fd56a 100644
--- a/modules/apps/27-interchain-accounts/controller/types/codec.go
+++ b/modules/apps/27-interchain-accounts/controller/types/codec.go
@@ -7,5 +7,9 @@ import (
 
 // RegisterInterfaces registers the interchain accounts controller message types using the provided InterfaceRegistry
 func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
-	registry.RegisterImplementations((*sdk.Msg)(nil), &MsgRegisterAccount{})
+	registry.RegisterImplementations(
+		(*sdk.Msg)(nil),
+		&MsgRegisterAccount{},
+		&MsgSubmitTx{},
+	)
 }
diff --git a/modules/apps/27-interchain-accounts/controller/types/msgs.go b/modules/apps/27-interchain-accounts/controller/types/msgs.go
index fec761e2123..0b0dfce1922 100644
--- a/modules/apps/27-interchain-accounts/controller/types/msgs.go
+++ b/modules/apps/27-interchain-accounts/controller/types/msgs.go
@@ -6,6 +6,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
+	icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
+	clienttypes "github.com/cosmos/ibc-go/v5/modules/core/02-client/types"
 	host "github.com/cosmos/ibc-go/v5/modules/core/24-host"
 )
 
@@ -46,3 +48,24 @@ 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{
+		ConnectionId:     connectionID,
+		Owner:            owner,
+		TimeoutHeight:    timeoutHeight,
+		TimeoutTimestamp: timeoutTimestamp,
+		PacketData:       packetData,
+	}
+}
+
+// ValidateBasic implements sdk.Msg
+func (msg MsgSubmitTx) ValidateBasic() error {
+	return nil
+}
+
+// GetSigners implements sdk.Msg
+func (msg MsgSubmitTx) GetSigners() []sdk.AccAddress {
+	return []sdk.AccAddress{}
+}
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 12540ab7d39..cae572e1533 100644
--- a/modules/apps/27-interchain-accounts/controller/types/tx.pb.go
+++ b/modules/apps/27-interchain-accounts/controller/types/tx.pb.go
@@ -6,6 +6,8 @@ package types
 import (
 	context "context"
 	fmt "fmt"
+	types1 "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
+	types "github.com/cosmos/ibc-go/v5/modules/core/02-client/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	grpc1 "github.com/gogo/protobuf/grpc"
 	proto "github.com/gogo/protobuf/proto"
@@ -113,9 +115,102 @@ func (m *MsgRegisterAccountResponse) GetChannelId() string {
 	return ""
 }
 
+// MsgSubmitTx defines the payload for MsgSubmitTx
+type MsgSubmitTx 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.
+	// The timeout is disabled when set to 0.
+	TimeoutHeight types.Height `protobuf:"bytes,3,opt,name=timeout_height,json=timeoutHeight,proto3" json:"timeout_height" yaml:"timeout_height"`
+	// Timeout timestamp in absolute nanoseconds since unix epoch.
+	// The timeout is disabled when set to 0.
+	TimeoutTimestamp uint64                             `protobuf:"varint,4,opt,name=timeout_timestamp,json=timeoutTimestamp,proto3" json:"timeout_timestamp,omitempty" yaml:"timeout_timestamp"`
+	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) {
+	return fileDescriptor_7def041328c84a30, []int{2}
+}
+func (m *MsgSubmitTx) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *MsgSubmitTx) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_MsgSubmitTx.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *MsgSubmitTx) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgSubmitTx.Merge(m, src)
+}
+func (m *MsgSubmitTx) XXX_Size() int {
+	return m.Size()
+}
+func (m *MsgSubmitTx) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgSubmitTx.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgSubmitTx proto.InternalMessageInfo
+
+// MsgSubmitTxResponse defines the response for MsgSubmitTx
+type MsgSubmitTxResponse 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) {
+	return fileDescriptor_7def041328c84a30, []int{3}
+}
+func (m *MsgSubmitTxResponse) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *MsgSubmitTxResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_MsgSubmitTxResponse.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *MsgSubmitTxResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgSubmitTxResponse.Merge(m, src)
+}
+func (m *MsgSubmitTxResponse) XXX_Size() int {
+	return m.Size()
+}
+func (m *MsgSubmitTxResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgSubmitTxResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgSubmitTxResponse proto.InternalMessageInfo
+
+func (m *MsgSubmitTxResponse) GetSequence() uint64 {
+	if m != nil {
+		return m.Sequence
+	}
+	return 0
+}
+
 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")
 }
 
 func init() {
@@ -123,31 +218,45 @@ func init() {
 }
 
 var fileDescriptor_7def041328c84a30 = []byte{
-	// 379 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0xbd, 0x6a, 0xe3, 0x40,
-	0x14, 0x85, 0x35, 0x6b, 0xf6, 0xc7, 0xc3, 0x2e, 0xcb, 0x0a, 0x2f, 0x08, 0x17, 0xd2, 0xa2, 0x6a,
-	0x1b, 0xcf, 0x60, 0xef, 0x2e, 0x0b, 0x0e, 0x29, 0xe2, 0x22, 0xe0, 0xc2, 0x21, 0xa8, 0x4c, 0x63,
-	0xa4, 0xd1, 0x20, 0x4f, 0x90, 0xe6, 0x0a, 0xcd, 0x58, 0x89, 0xdf, 0x20, 0x4d, 0x20, 0x8f, 0xe0,
-	0x36, 0x65, 0xde, 0x22, 0xa5, 0xcb, 0x54, 0x26, 0xd8, 0x4d, 0x6a, 0x3f, 0x41, 0x90, 0x7f, 0xa2,
-	0x24, 0x76, 0x13, 0x48, 0x37, 0x67, 0x2e, 0xdf, 0xe1, 0xdc, 0xcb, 0xc1, 0x7b, 0x22, 0x60, 0xd4,
-	0x4f, 0xd3, 0x58, 0x30, 0x5f, 0x0b, 0x90, 0x8a, 0x0a, 0xa9, 0x79, 0xc6, 0x06, 0xbe, 0x90, 0x7d,
-	0x9f, 0x31, 0x18, 0x4a, 0xad, 0x28, 0x03, 0xa9, 0x33, 0x88, 0x63, 0x9e, 0xd1, 0xbc, 0x49, 0xf5,
-	0x39, 0x49, 0x33, 0xd0, 0x60, 0xb6, 0x44, 0xc0, 0xc8, 0x73, 0x98, 0xec, 0x80, 0x49, 0x09, 0x93,
-	0xbc, 0x59, 0xaf, 0x45, 0x10, 0xc1, 0x12, 0xa7, 0xc5, 0x6b, 0xe5, 0xe4, 0x5e, 0x22, 0x6c, 0xf6,
-	0x54, 0xe4, 0xf1, 0x48, 0x28, 0xcd, 0xb3, 0x83, 0x15, 0x6b, 0xee, 0xe3, 0x6f, 0x0c, 0xa4, 0xe4,
-	0xac, 0x70, 0xef, 0x8b, 0xd0, 0x42, 0xbf, 0xd0, 0xef, 0x6a, 0xc7, 0x5a, 0x4c, 0x9d, 0xda, 0xc8,
-	0x4f, 0xe2, 0xb6, 0xfb, 0x62, 0xec, 0x7a, 0x5f, 0x4b, 0xdd, 0x0d, 0xcd, 0x1a, 0xfe, 0x08, 0x67,
-	0x92, 0x67, 0xd6, 0x87, 0x02, 0xf3, 0x56, 0xc2, 0xb4, 0xf0, 0xe7, 0x9c, 0x67, 0x4a, 0x80, 0xb4,
-	0x2a, 0xcb, 0xff, 0x8d, 0x6c, 0x7f, 0xb9, 0x18, 0x3b, 0xc6, 0xc3, 0xd8, 0x31, 0x5c, 0x0f, 0xd7,
-	0xb7, 0xe3, 0x78, 0x5c, 0xa5, 0x20, 0x15, 0x37, 0xff, 0x62, 0xcc, 0x06, 0xbe, 0x94, 0x3c, 0x2e,
-	0x33, 0xfd, 0x5c, 0x4c, 0x9d, 0x1f, 0xeb, 0x4c, 0x4f, 0x33, 0xd7, 0xab, 0xae, 0x45, 0x37, 0x6c,
-	0xdd, 0x20, 0x5c, 0xe9, 0xa9, 0xc8, 0xbc, 0x46, 0xf8, 0xfb, 0xeb, 0x45, 0x0f, 0xc9, 0xdb, 0x4f,
-	0x49, 0xb6, 0x13, 0xd6, 0x8f, 0xde, 0xc7, 0x67, 0xb3, 0x69, 0xe7, 0xf4, 0x76, 0x66, 0xa3, 0xc9,
-	0xcc, 0x46, 0xf7, 0x33, 0x1b, 0x5d, 0xcd, 0x6d, 0x63, 0x32, 0xb7, 0x8d, 0xbb, 0xb9, 0x6d, 0x9c,
-	0x1c, 0x47, 0x42, 0x0f, 0x86, 0x01, 0x61, 0x90, 0x50, 0x06, 0x2a, 0x01, 0x45, 0x45, 0xc0, 0x1a,
-	0x11, 0xd0, 0xfc, 0x1f, 0x4d, 0x20, 0x1c, 0xc6, 0x5c, 0x15, 0xc5, 0x52, 0xb4, 0xf5, 0xbf, 0x51,
-	0x66, 0x68, 0xec, 0xea, 0x94, 0x1e, 0xa5, 0x5c, 0x05, 0x9f, 0x96, 0x55, 0xf8, 0xf3, 0x18, 0x00,
-	0x00, 0xff, 0xff, 0x48, 0x33, 0x66, 0x3d, 0x93, 0x02, 0x00, 0x00,
+	// 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,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -164,6 +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)
 }
 
 type msgClient struct {
@@ -183,10 +294,21 @@ 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...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // MsgServer is the server API for Msg service.
 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)
 }
 
 // UnimplementedMsgServer can be embedded to have forward compatible implementations.
@@ -196,6 +318,9 @@ 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 RegisterMsgServer(s grpc1.Server, srv MsgServer) {
 	s.RegisterService(&_Msg_serviceDesc, srv)
@@ -219,6 +344,24 @@ 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)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(MsgServer).SubmitTx(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/ibc.applications.interchain_accounts.controller.v1.Msg/SubmitTx",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(MsgServer).SubmitTx(ctx, req.(*MsgSubmitTx))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _Msg_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "ibc.applications.interchain_accounts.controller.v1.Msg",
 	HandlerType: (*MsgServer)(nil),
@@ -227,6 +370,10 @@ var _Msg_serviceDesc = grpc.ServiceDesc{
 			MethodName: "RegisterAccount",
 			Handler:    _Msg_RegisterAccount_Handler,
 		},
+		{
+			MethodName: "SubmitTx",
+			Handler:    _Msg_SubmitTx_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "ibc/applications/interchain_accounts/controller/v1/tx.proto",
@@ -306,6 +453,96 @@ func (m *MsgRegisterAccountResponse) MarshalToSizedBuffer(dAtA []byte) (int, err
 	return len(dAtA) - i, nil
 }
 
+func (m *MsgSubmitTx) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *MsgSubmitTx) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *MsgSubmitTx) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	{
+		size, err := m.PacketData.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintTx(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x2a
+	if m.TimeoutTimestamp != 0 {
+		i = encodeVarintTx(dAtA, i, uint64(m.TimeoutTimestamp))
+		i--
+		dAtA[i] = 0x20
+	}
+	{
+		size, err := m.TimeoutHeight.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintTx(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x1a
+	if len(m.ConnectionId) > 0 {
+		i -= len(m.ConnectionId)
+		copy(dAtA[i:], m.ConnectionId)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.ConnectionId)))
+		i--
+		dAtA[i] = 0x12
+	}
+	if len(m.Owner) > 0 {
+		i -= len(m.Owner)
+		copy(dAtA[i:], m.Owner)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.Owner)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *MsgSubmitTxResponse) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *MsgSubmitTxResponse) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *MsgSubmitTxResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.Sequence != 0 {
+		i = encodeVarintTx(dAtA, i, uint64(m.Sequence))
+		i--
+		dAtA[i] = 0x8
+	}
+	return len(dAtA) - i, nil
+}
+
 func encodeVarintTx(dAtA []byte, offset int, v uint64) int {
 	offset -= sovTx(v)
 	base := offset
@@ -351,6 +588,42 @@ func (m *MsgRegisterAccountResponse) Size() (n int) {
 	return n
 }
 
+func (m *MsgSubmitTx) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.Owner)
+	if l > 0 {
+		n += 1 + l + sovTx(uint64(l))
+	}
+	l = len(m.ConnectionId)
+	if l > 0 {
+		n += 1 + l + sovTx(uint64(l))
+	}
+	l = m.TimeoutHeight.Size()
+	n += 1 + l + sovTx(uint64(l))
+	if m.TimeoutTimestamp != 0 {
+		n += 1 + sovTx(uint64(m.TimeoutTimestamp))
+	}
+	l = m.PacketData.Size()
+	n += 1 + l + sovTx(uint64(l))
+	return n
+}
+
+func (m *MsgSubmitTxResponse) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.Sequence != 0 {
+		n += 1 + sovTx(uint64(m.Sequence))
+	}
+	return n
+}
+
 func sovTx(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
@@ -585,6 +858,274 @@ func (m *MsgRegisterAccountResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *MsgSubmitTx) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowTx
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MsgSubmitTx: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MsgSubmitTx: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Owner", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Owner = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ConnectionId", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ConnectionId = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field TimeoutHeight", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.TimeoutHeight.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 4:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field TimeoutTimestamp", wireType)
+			}
+			m.TimeoutTimestamp = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.TimeoutTimestamp |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 5:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field PacketData", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.PacketData.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipTx(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthTx
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *MsgSubmitTxResponse) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowTx
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MsgSubmitTxResponse: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MsgSubmitTxResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Sequence", wireType)
+			}
+			m.Sequence = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Sequence |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		default:
+			iNdEx = preIndex
+			skippy, err := skipTx(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthTx
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func skipTx(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0
diff --git a/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto b/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto
index b72a69ae631..51c30fa0c0e 100644
--- a/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto
+++ b/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto
@@ -5,11 +5,15 @@ package ibc.applications.interchain_accounts.controller.v1;
 option go_package = "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types";
 
 import "gogoproto/gogo.proto";
+import "ibc/core/client/v1/client.proto";
+import "ibc/applications/interchain_accounts/v1/packet.proto";
 
 // Msg defines the 27-interchain-accounts/controller Msg service.
 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);
 }
 
 // MsgRegisterAccount defines the payload for Msg/RegisterAccount
@@ -26,3 +30,26 @@ message MsgRegisterAccount {
 message MsgRegisterAccountResponse {
   string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""];
 }
+
+// MsgSubmitTx defines the payload for MsgSubmitTx
+message MsgSubmitTx {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  string owner         = 1;
+  string connection_id = 2 [(gogoproto.moretags) = "yaml:\"connection_id\""];
+  // Timeout height relative to the current block height.
+  // The timeout is disabled when set to 0.
+  ibc.core.client.v1.Height timeout_height = 3
+      [(gogoproto.moretags) = "yaml:\"timeout_height\"", (gogoproto.nullable) = false];
+  // Timeout timestamp in absolute nanoseconds since unix epoch.
+  // The timeout is disabled when set to 0.
+  uint64 timeout_timestamp = 4 [(gogoproto.moretags) = "yaml:\"timeout_timestamp\""];
+  ibc.applications.interchain_accounts.v1.InterchainAccountPacketData packet_data = 5
+      [(gogoproto.moretags) = "yaml:\"packet_data\"", (gogoproto.nullable) = false];
+}
+
+// MsgSubmitTxResponse defines the response for MsgSubmitTx
+message MsgSubmitTxResponse {
+  uint64 sequence = 1;
+}
\ No newline at end of file