Feat/ica proto

docs/ibc/proto-docs.md

@@ -4,6 +4,25 @@
 
 ## Table of Contents
 
+- [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)
+    - [GenesisState](#ibc.applications.interchain_accounts.v1.GenesisState)
+
+- [ibc/applications/interchain_accounts/v1/query.proto](#ibc/applications/interchain_accounts/v1/query.proto)
+    - [QueryInterchainAccountAddressRequest](#ibc.applications.interchain_accounts.v1.QueryInterchainAccountAddressRequest)
+    - [QueryInterchainAccountAddressResponse](#ibc.applications.interchain_accounts.v1.QueryInterchainAccountAddressResponse)
+
+    - [Query](#ibc.applications.interchain_accounts.v1.Query)
+
+- [ibc/applications/interchain_accounts/v1/types.proto](#ibc/applications/interchain_accounts/v1/types.proto)
+    - [IBCAccountPacketData](#ibc.applications.interchain_accounts.v1.IBCAccountPacketData)
+    - [IBCTxBody](#ibc.applications.interchain_accounts.v1.IBCTxBody)
+    - [IBCTxRaw](#ibc.applications.interchain_accounts.v1.IBCTxRaw)
+
+    - [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)
     - [FungibleTokenPacketData](#ibc.applications.transfer.v1.FungibleTokenPacketData)
@@ -246,6 +265,201 @@
 
 
 
+<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.InterchainAccount"></a>
+
+### InterchainAccount
+An InterchainAccount is defined as a BaseAccount & the address of the account owner on the controller chain
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `base_account` | [cosmos.auth.v1beta1.BaseAccount](#cosmos.auth.v1beta1.BaseAccount) |  |  |
+| `account_owner` | [string](#string) |  |  |
+
+
+
+
+
+ <!-- end messages -->
+
+ <!-- end enums -->
+
+ <!-- end HasExtensions -->
+
+ <!-- end services -->
+
+
+
+<a name="ibc/applications/interchain_accounts/v1/genesis.proto"></a>
+<p align="right"><a href="#top">Top</a></p>
+
+## ibc/applications/interchain_accounts/v1/genesis.proto
+
+
+
+<a name="ibc.applications.interchain_accounts.v1.GenesisState"></a>
+
+### GenesisState
+GenesisState defines the interchain_account genesis state
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `port_id` | [string](#string) |  |  |
+
+
+
+
+
+ <!-- end messages -->
+
+ <!-- end enums -->
+
+ <!-- end HasExtensions -->
+
+ <!-- end services -->
+
+
+
+<a name="ibc/applications/interchain_accounts/v1/query.proto"></a>
+<p align="right"><a href="#top">Top</a></p>
+
+## ibc/applications/interchain_accounts/v1/query.proto
+
+
+
+<a name="ibc.applications.interchain_accounts.v1.QueryInterchainAccountAddressRequest"></a>
+
+### QueryInterchainAccountAddressRequest
+Query request for an interchain account address
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `owner_address` | [string](#string) |  | Owner address is the owner of the interchain account on the controller chain |
+| `connection_id` | [string](#string) |  |  |
+
+
+
+
+
+
+<a name="ibc.applications.interchain_accounts.v1.QueryInterchainAccountAddressResponse"></a>
+
+### QueryInterchainAccountAddressResponse
+Query response for an interchain account address
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `interchain_account_address` | [string](#string) |  | The corresponding interchain account address on the host chain |
+
+
+
+
+
+ <!-- end messages -->
+
+ <!-- end enums -->
+
+ <!-- end HasExtensions -->
+
+
+<a name="ibc.applications.interchain_accounts.v1.Query"></a>
+
+### Query
+Query defines the gRPC querier service.
+
+| Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint |
+| ----------- | ------------ | ------------- | ------------| ------- | -------- |
+| `InterchainAccountAddress` | [QueryInterchainAccountAddressRequest](#ibc.applications.interchain_accounts.v1.QueryInterchainAccountAddressRequest) | [QueryInterchainAccountAddressResponse](#ibc.applications.interchain_accounts.v1.QueryInterchainAccountAddressResponse) | Query to get the address of an interchain account | |
+
+ <!-- end services -->
+
+
+
+<a name="ibc/applications/interchain_accounts/v1/types.proto"></a>
+<p align="right"><a href="#top">Top</a></p>
+
+## ibc/applications/interchain_accounts/v1/types.proto
+
+
+
+<a name="ibc.applications.interchain_accounts.v1.IBCAccountPacketData"></a>
+
+### IBCAccountPacketData
+Packet data is comprised of raw transaction & type of transaction
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `type` | [Type](#ibc.applications.interchain_accounts.v1.Type) |  |  |
+| `data` | [bytes](#bytes) |  |  |
+
+
+
+
+
+
+<a name="ibc.applications.interchain_accounts.v1.IBCTxBody"></a>
+
+### IBCTxBody
+Body of a tx for an ics27 IBC packet
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `messages` | [google.protobuf.Any](#google.protobuf.Any) | repeated |  |
+
+
+
+
+
+
+<a name="ibc.applications.interchain_accounts.v1.IBCTxRaw"></a>
+
+### IBCTxRaw
+Raw tx body
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `body_bytes` | [bytes](#bytes) |  |  |
+
+
+
+
+
+ <!-- end messages -->
+
+
+<a name="ibc.applications.interchain_accounts.v1.Type"></a>
+
+### Type
+The different types of interchain account transactions
+EXECUTE_TX is used when sending a TX from the controller side to the host side. The host side will execute the tx on
+behalf of the interchain account.
+
+| Name | Number | Description |
+| ---- | ------ | ----------- |
+| TYPE_EXECUTE_TX_UNSPECIFIED | 0 | Execute message type |
+
+
+ <!-- end enums -->
+
+ <!-- end HasExtensions -->
+
+ <!-- end services -->
+
+
+
 <a name="ibc/applications/transfer/v1/transfer.proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 

modules/apps/27-interchain-accounts/client/cli/query.go

@@ -19,12 +19,12 @@ func GetQueryCmd() *cobra.Command {
 		RunE:                       client.ValidateCmd,
 	}
 
-	cmd.AddCommand(GetIBCAccountCmd())
+	cmd.AddCommand(GetInterchainAccountCmd())
 
 	return cmd
 }
 
-func GetIBCAccountCmd() *cobra.Command {
+func GetInterchainAccountCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use: "address [address] [connection-id]",
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -33,11 +33,11 @@ func GetIBCAccountCmd() *cobra.Command {
 				return err
 			}
 
-			address := args[0]
+			ownerAddress := args[0]
 			connectionId := args[1]
 
 			queryClient := types.NewQueryClient(clientCtx)
-			res, err := queryClient.IBCAccount(context.Background(), &types.QueryIBCAccountRequest{Address: address, ConnectionId: connectionId})
+			res, err := queryClient.InterchainAccountAddress(context.Background(), &types.QueryInterchainAccountAddressRequest{OwnerAddress: ownerAddress, ConnectionId: connectionId})
 			if err != nil {
 				return err
 			}

modules/apps/27-interchain-accounts/keeper/account.go

@@ -41,15 +41,15 @@ func (k Keeper) InitInterchainAccount(ctx sdk.Context, connectionId, owner strin
 }
 
 // Register interchain account if it has not already been created
-func (k Keeper) RegisterInterchainAccount(ctx sdk.Context, portId string) (types.IBCAccountI, error) {
+func (k Keeper) RegisterInterchainAccount(ctx sdk.Context, portId string) (types.InterchainAccountI, error) {
 	address := k.GenerateAddress(portId)
 	account := k.accountKeeper.GetAccount(ctx, address)
 
 	if account != nil {
 		return nil, sdkerrors.Wrap(types.ErrAccountAlreadyExist, account.String())
 	}
 
-	interchainAccount := types.NewIBCAccount(
+	interchainAccount := types.NewInterchainAccount(
 		authtypes.NewBaseAccountWithAddress(address),
 		portId,
 	)
@@ -71,7 +71,7 @@ func (k Keeper) GetInterchainAccountAddress(ctx sdk.Context, portId string) (str
 	store := ctx.KVStore(k.storeKey)
 	key := types.KeyOwnerAccount(portId)
 	if !store.Has(key) {
-		return "", sdkerrors.Wrap(types.ErrIBCAccountNotFound, portId)
+		return "", sdkerrors.Wrap(types.ErrInterchainAccountNotFound, portId)
 	}
 
 	interchainAccountAddr := string(store.Get(key))
@@ -83,15 +83,15 @@ func (k Keeper) GenerateAddress(identifier string) []byte {
 	return tmhash.SumTruncated(append([]byte(identifier)))
 }
 
-func (k Keeper) GetIBCAccount(ctx sdk.Context, addr sdk.AccAddress) (types.IBCAccount, error) {
+func (k Keeper) GetInterchainAccount(ctx sdk.Context, addr sdk.AccAddress) (types.InterchainAccount, error) {
 	acc := k.accountKeeper.GetAccount(ctx, addr)
 	if acc == nil {
-		return types.IBCAccount{}, sdkerrors.Wrap(types.ErrIBCAccountNotFound, "there is no account")
+		return types.InterchainAccount{}, sdkerrors.Wrap(types.ErrInterchainAccountNotFound, "there is no account")
 	}
 
-	ibcAcc, ok := acc.(*types.IBCAccount)
+	interchainAccount, ok := acc.(*types.InterchainAccount)
 	if !ok {
-		return types.IBCAccount{}, sdkerrors.Wrap(types.ErrIBCAccountNotFound, "account is not an IBC account")
+		return types.InterchainAccount{}, sdkerrors.Wrap(types.ErrInterchainAccountNotFound, "account is not an interchain account")
 	}
-	return *ibcAcc, nil
+	return *interchainAccount, nil
 }

modules/apps/27-interchain-accounts/keeper/grpc_query.go

@@ -13,23 +13,23 @@ import (
 
 var _ types.QueryServer = Keeper{}
 
-// IBCAccount implements the Query/IBCAccount gRPC method
-func (k Keeper) IBCAccount(ctx context.Context, req *types.QueryIBCAccountRequest) (*types.QueryIBCAccountResponse, error) {
+// InterchainAccount implements the Query/InterchainAccount gRPC method
+func (k Keeper) InterchainAccountAddress(ctx context.Context, req *types.QueryInterchainAccountAddressRequest) (*types.QueryInterchainAccountAddressResponse, error) {
 	if req == nil {
 		return nil, status.Error(codes.InvalidArgument, "empty request")
 	}
 
-	if req.Address == "" {
+	if req.OwnerAddress == "" {
 		return nil, status.Error(codes.InvalidArgument, "address cannot be empty")
 	}
 
 	sdkCtx := sdk.UnwrapSDKContext(ctx)
-	portId := k.GeneratePortId(req.Address, req.ConnectionId)
+	portId := k.GeneratePortId(req.OwnerAddress, req.ConnectionId)
 
-	address, err := k.GetInterchainAccountAddress(sdkCtx, portId)
+	interchainAccountAddress, err := k.GetInterchainAccountAddress(sdkCtx, portId)
 	if err != nil {
 		return nil, err
 	}
 
-	return &types.QueryIBCAccountResponse{AccountAddress: address}, nil
+	return &types.QueryInterchainAccountAddressResponse{InterchainAccountAddress: interchainAccountAddress}, nil
 }

modules/apps/27-interchain-accounts/keeper/relay.go

@@ -72,7 +72,7 @@ func (k Keeper) createOutgoingPacket(
 	}
 
 	packetData := types.IBCAccountPacketData{
-		Type: types.Type_RUNTX,
+		Type: types.EXECUTE_TX,
 		Data: txBytes,
 	}
 
@@ -206,7 +206,7 @@ func (k Keeper) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet) error
 	}
 
 	switch data.Type {
-	case types.Type_RUNTX:
+	case types.EXECUTE_TX:
 		msgs, err := k.DeserializeTx(ctx, data.Data)
 		if err != nil {
 			return err