chore: refactoring register ica account to broadcast message

e2e/go.mod

@@ -7,12 +7,12 @@ replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alp
 require (
 	github.com/cosmos/cosmos-sdk v0.46.0
 	github.com/cosmos/ibc-go/v5 v5.0.0-beta1
+	github.com/cosmos/interchain-accounts v0.3.0
 	github.com/docker/docker v20.10.17+incompatible
 	github.com/strangelove-ventures/ibctest v0.0.0-20220808203516-6cbd3743756d
 	github.com/stretchr/testify v1.8.0
 	go.uber.org/zap v1.21.0
 	google.golang.org/grpc v1.48.0
-	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
@@ -153,6 +153,7 @@ require (
 	google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/ini.v1 v1.66.6 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gotest.tools/v3 v3.3.0 // indirect
 	lukechampine.com/uint128 v1.1.1 // indirect

e2e/go.sum

@@ -256,6 +256,8 @@ github.com/cosmos/iavl v0.19.0 h1:sgyrjqOkycXiN7Tuupuo4QAldKFg7Sipyfeg/IL7cps=
 github.com/cosmos/iavl v0.19.0/go.mod h1:l5h9pAB3m5fihB3pXVgwYqdY8aBsMagqz7T0MUjxZeA=
 github.com/cosmos/ibc-go/v5 v5.0.0-beta1 h1:YqC9giQlZId8Wui8xpaUFI+TpVmEupQZSoDlmxAu6yI=
 github.com/cosmos/ibc-go/v5 v5.0.0-beta1/go.mod h1:9mmcbzuidgX7nhafIKng/XhXAHDEnRqDjGy/60W1cvg=
+github.com/cosmos/interchain-accounts v0.3.0 h1:Zu9372ze/a6HhUy5Z4Mu+C+FcnNLGrQ15aPwr6lRTeI=
+github.com/cosmos/interchain-accounts v0.3.0/go.mod h1:FYF1IiAz6M/LC1Gb3Jch042IaL0AXOfU+s1ZGvR4IqI=
 github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4=
 github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY=
 github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI=

e2e/interchain_accounts_test.go

@@ -2,23 +2,20 @@ package e2e
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"os"
 	"strings"
 	"testing"
 
-	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+	intertxtypes "github.com/cosmos/interchain-accounts/x/inter-tx/types"
+	"github.com/strangelove-ventures/ibctest"
 	"github.com/strangelove-ventures/ibctest/chain/cosmos"
-	"github.com/strangelove-ventures/ibctest/ibc"
 	"github.com/stretchr/testify/suite"
-	"gopkg.in/yaml.v2"
 
 	"github.com/cosmos/ibc-go/e2e/testsuite"
 	"github.com/cosmos/ibc-go/e2e/testvalues"
-	transfertypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types"
 )
 
 func init() {
@@ -48,19 +45,15 @@ func (s *InterchainAccountsTestSuite) TestInterchainAccounts() {
 	relayer, channelA := s.SetupChainsRelayerAndChannel(ctx)
 	chainA, chainB := s.GetChains()
 
-	_ = chainB
-	_ = relayer
 	_ = channelA
 
 	connectionId := "connection-0"
 	controllerWallet := s.CreateUserOnChainA(ctx, testvalues.StartingTokenAmount)
 	chainBWallet := s.CreateUserOnChainB(ctx, testvalues.StartingTokenAmount)
 
 	t.Run("register interchain account", func(t *testing.T) {
-		account, err := s.RegisterICA(ctx, chainA, controllerWallet.KeyName, connectionId)
+		err := s.RegisterICA(ctx, chainA, controllerWallet, controllerWallet.Bech32Address(chainA.Config().Bech32Prefix), connectionId)
 		s.Require().NoError(err)
-		s.Require().NotEmpty(account)
-		s.T().Logf("account created: %s", account)
 	})
 
 	t.Run("start relayer", func(t *testing.T) {
@@ -89,54 +82,19 @@ func (s *InterchainAccountsTestSuite) TestInterchainAccounts() {
 
 		s.AssertValidTxResponse(resp)
 		s.Require().NoError(err)
-
-		tokenOnChainBFromChainA := getIBCToken(chainA.Config().Denom, channelA.Counterparty.PortID, channelA.Counterparty.ChannelID)
-
-		balance, err := chainB.GetBalance(ctx, chainBWallet.Bech32Address(chainB.Config().Bech32Prefix), tokenOnChainBFromChainA.IBCDenom())
-		s.Require().NoError(err)
-
-		expected := testvalues.IBCTransferAmount
-		s.Require().Equal(expected, balance)
 	})
 }
 
-// TODO: replace the below methods with transaction broadcasts.
-
-type IBCTransferTx struct {
-	TxHash string `json:"txhash"`
-}
-
-// getIBCToken returns the denomination of the full token denom sent to the receiving channel
-func getIBCToken(fullTokenDenom string, portID, channelID string) transfertypes.DenomTrace {
-	return transfertypes.ParseDenomTrace(fmt.Sprintf("%s/%s/%s", portID, channelID, fullTokenDenom))
-}
-
 // RegisterICA will attempt to register an interchain account on the counterparty chain.
-func (*InterchainAccountsTestSuite) RegisterICA(ctx context.Context, chain *cosmos.CosmosChain, address, connectionID string) (string, error) {
-	config := chain.Config()
-	node := chain.ChainNodes[0]
-	command := []string{config.Bin, "tx", "intertx", "register",
-		"--from", address,
-		"--connection-id", connectionID,
-		"--chain-id", config.ChainID,
-		"--home", node.HomeDir(),
-		"--node", fmt.Sprintf("tcp://%s:26657", node.HostName()),
-		"--keyring-backend", keyring.BackendTest,
-		"-y",
-	}
-
-	stdout, _, err := node.Exec(ctx, command, nil)
-	if err != nil {
-		return "", err
-	}
-	output := IBCTransferTx{}
-	err = yaml.Unmarshal(stdout, &output)
-	if err != nil {
-		return "", err
-	}
-	return output.TxHash, nil
+func (s *InterchainAccountsTestSuite) RegisterICA(ctx context.Context, chain *cosmos.CosmosChain, user *ibctest.User, fromAddress, connectionID string) error {
+	msg := intertxtypes.NewMsgRegisterAccount(fromAddress, connectionID, "")
+	txResp, err := s.BroadcastMessages(ctx, chain, user, msg)
+	s.AssertValidTxResponse(txResp)
+	return err
 }
 
+// TODO: replace the below methods with transaction broadcasts.
+
 // QueryICA will query for an interchain account controlled by the specified address on the counterparty chain.
 func (*InterchainAccountsTestSuite) QueryICA(ctx context.Context, chain *cosmos.CosmosChain, connectionID, address string) (string, error) {
 	config := chain.Config()
@@ -160,39 +118,3 @@ func (*InterchainAccountsTestSuite) QueryICA(ctx context.Context, chain *cosmos.
 	}
 	return strings.TrimSpace(parts[1]), nil
 }
-
-// SendICABankTransfer builds a bank transfer message for a specified address and sends it to the specified
-// interchain account.
-func (*InterchainAccountsTestSuite) SendICABankTransfer(ctx context.Context, chain *cosmos.CosmosChain, connectionID string, amount ibc.WalletAmount, toAddr string) error {
-	config := chain.Config()
-	node := chain.ChainNodes[0]
-
-	msg, err := json.Marshal(map[string]any{
-		"@type":        "/cosmos.bank.v1beta1.MsgSend",
-		"from_address": amount.Address,
-		"to_address":   toAddr,
-		"amount": []map[string]any{
-			{
-				"denom":  amount.Denom,
-				"amount": amount.Amount,
-			},
-		},
-	})
-	if err != nil {
-		return err
-	}
-
-	command := []string{
-		config.Bin, "tx", "intertx", "submit", string(msg),
-		"--connection-id", connectionID,
-		"--from", amount.Address,
-		"--chain-id", node.Chain.Config().ChainID,
-		"--home", node.HomeDir(),
-		"--node", fmt.Sprintf("tcp://%s:26657", node.HostName()),
-		"--keyring-backend", keyring.BackendTest,
-		"-y",
-	}
-
-	_, _, err = node.Exec(ctx, command, nil)
-	return err
-}