-
Notifications
You must be signed in to change notification settings - Fork 586
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore: e2e for ICA reopening #2720
Merged
Merged
Changes from 15 commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
2259ab5
wip test
crodriguezvega 38818f1
add sleep
crodriguezvega e693456
add logging
crodriguezvega 4455226
remove logging
crodriguezvega f72efb4
Merge branch 'main' into carlos/add-ica-reopen-channel-test
crodriguezvega 1056302
add new tag
crodriguezvega 09f2db6
trial & error to see if I can get the channel to get closed...
crodriguezvega c3402b4
some more trial and error
893d43c
comment import
cff318f
Merge branch 'main' into e2e_channel_reopen
charleenfei ac9ac4f
.
charleenfei 814627a
fix test
charleenfei 6b2aee3
rm todos
charleenfei 20bb218
Merge branch 'main' into e2e_channel_reopen
charleenfei 45c3533
update re: comments
charleenfei 939f348
update block time wait period
charleenfei 9ce26ff
Merge branch 'main' into e2e_channel_reopen
charleenfei 4e13744
pr comments
charleenfei 41a689e
typo
charleenfei 12f8537
typo
charleenfei 6e1da4f
add controllerAddress var in other tests
charleenfei 67db5e9
Merge branch 'main' into e2e_channel_reopen
charleenfei f7e2dbf
update expected balance to correct int64
charleenfei 62d4b2c
rm icad v0.1.5 tag (same as v0.1.4 but with shorter timeout)
charleenfei d13b134
merge
charleenfei 4c91678
Merge branch 'main' into e2e_channel_reopen
charleenfei File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,6 +6,7 @@ import ( | |
"time" | ||
|
||
ibctest "github.com/strangelove-ventures/ibctest/v6" | ||
"github.com/strangelove-ventures/ibctest/v6/chain/cosmos" | ||
"github.com/strangelove-ventures/ibctest/v6/ibc" | ||
"github.com/strangelove-ventures/ibctest/v6/test" | ||
"github.com/stretchr/testify/suite" | ||
|
@@ -21,6 +22,7 @@ import ( | |
|
||
controllertypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/controller/types" | ||
icatypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/types" | ||
channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types" | ||
ibctesting "github.com/cosmos/ibc-go/v6/testing" | ||
) | ||
|
||
|
@@ -44,6 +46,14 @@ func getICAVersion(chainAVersion, chainBVersion string) string { | |
return icatypes.NewDefaultMetadataString(ibctesting.FirstConnectionID, ibctesting.FirstConnectionID) | ||
} | ||
|
||
// RegisterInterchainAccount will attempt to register an interchain account on the counterparty chain. | ||
func (s *InterchainAccountsTestSuite) RegisterInterchainAccount(ctx context.Context, chain *cosmos.CosmosChain, user *ibc.Wallet, msgRegisterAccount *controllertypes.MsgRegisterInterchainAccount) error { | ||
txResp, err := s.BroadcastMessages(ctx, chain, user, msgRegisterAccount) | ||
s.Require().NoError(err) | ||
s.AssertValidTxResponse(txResp) | ||
return err | ||
colin-axner marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
func (s *InterchainAccountsTestSuite) TestMsgSendTx_SuccessfulTransfer() { | ||
t := s.T() | ||
ctx := context.TODO() | ||
|
@@ -228,3 +238,182 @@ func (s *InterchainAccountsTestSuite) TestMsgSendTx_FailedTransfer_InsufficientF | |
}) | ||
}) | ||
} | ||
|
||
func (s *InterchainAccountsTestSuite) TestMsgSubmitTx_SuccessfulTransfer_AfterReopeningICA() { | ||
t := s.T() | ||
ctx := context.TODO() | ||
|
||
// setup relayers and connection-0 between two chains | ||
// channel-0 is a transfer channel but it will not be used in this test case | ||
relayer, _ := s.SetupChainsRelayerAndChannel(ctx) | ||
chainA, chainB := s.GetChains() | ||
|
||
// setup 2 accounts: controller account on chain A, a second chain B account. | ||
// host account will be created when the ICA is registered | ||
controllerAccount := s.CreateUserOnChainA(ctx, testvalues.StartingTokenAmount) | ||
colin-axner marked this conversation as resolved.
Show resolved
Hide resolved
|
||
chainBAccount := s.CreateUserOnChainB(ctx, testvalues.StartingTokenAmount) | ||
|
||
var ( | ||
portID string | ||
hostAccount string | ||
) | ||
initialChannelId := "channel-1" | ||
channelIdAfterReopening := "channel-2" | ||
colin-axner marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
t.Run("register interchain account", func(t *testing.T) { | ||
version := getICAVersion(testconfig.GetChainATag(), testconfig.GetChainBTag()) | ||
msgRegisterInterchainAccount := controllertypes.NewMsgRegisterInterchainAccount(ibctesting.FirstConnectionID, controllerAccount.Bech32Address(chainA.Config().Bech32Prefix), version) | ||
err := s.RegisterInterchainAccount(ctx, chainA, controllerAccount, msgRegisterInterchainAccount) | ||
s.Require().NoError(err) | ||
|
||
portID, err = icatypes.NewControllerPortID(controllerAccount.Bech32Address(chainA.Config().Bech32Prefix)) | ||
s.Require().NoError(err) | ||
}) | ||
|
||
t.Run("start relayer", func(t *testing.T) { | ||
s.StartRelayer(relayer) | ||
}) | ||
|
||
t.Run("verify interchain account", func(t *testing.T) { | ||
var err error | ||
hostAccount, err = s.QueryInterchainAccount(ctx, chainA, controllerAccount.Bech32Address(chainA.Config().Bech32Prefix), ibctesting.FirstConnectionID) | ||
s.Require().NoError(err) | ||
s.Require().NotZero(len(hostAccount)) | ||
|
||
channels, err := relayer.GetChannels(ctx, s.GetRelayerExecReporter(), chainA.Config().ChainID) | ||
s.Require().NoError(err) | ||
s.Require().Equal(len(channels), 2) | ||
colin-axner marked this conversation as resolved.
Show resolved
Hide resolved
|
||
}) | ||
|
||
// stop the relayer to let the submit tx message time out | ||
t.Run("stop relayer", func(t *testing.T) { | ||
s.StopRelayer(ctx, relayer) | ||
}) | ||
|
||
t.Run("submit tx message with bank transfer message times out", func(t *testing.T) { | ||
t.Run("fund interchain account wallet", func(t *testing.T) { | ||
// fund the host account account so it has some $$ to send | ||
err := chainB.SendFunds(ctx, ibctest.FaucetAccountKeyName, ibc.WalletAmount{ | ||
Address: hostAccount, | ||
Amount: testvalues.StartingTokenAmount, | ||
Denom: chainB.Config().Denom, | ||
}) | ||
s.Require().NoError(err) | ||
}) | ||
|
||
t.Run("broadcast MsgSendTx", func(t *testing.T) { | ||
colin-axner marked this conversation as resolved.
Show resolved
Hide resolved
|
||
// assemble bank transfer message from host account to user account on host chain | ||
msgSend := &banktypes.MsgSend{ | ||
FromAddress: hostAccount, | ||
ToAddress: chainBAccount.Bech32Address(chainB.Config().Bech32Prefix), | ||
Amount: sdk.NewCoins(testvalues.DefaultTransferAmount(chainB.Config().Denom)), | ||
} | ||
|
||
cdc := testsuite.Codec() | ||
|
||
bz, err := icatypes.SerializeCosmosTx(cdc, []proto.Message{msgSend}) | ||
s.Require().NoError(err) | ||
|
||
packetData := icatypes.InterchainAccountPacketData{ | ||
Type: icatypes.EXECUTE_TX, | ||
Data: bz, | ||
Memo: "e2e", | ||
} | ||
|
||
msgSendTx := controllertypes.NewMsgSendTx(controllerAccount.Bech32Address(chainA.Config().Bech32Prefix), ibctesting.FirstConnectionID, uint64(1), packetData) | ||
|
||
resp, err := s.BroadcastMessages( | ||
ctx, | ||
chainA, | ||
controllerAccount, | ||
msgSendTx, | ||
) | ||
|
||
s.AssertValidTxResponse(resp) | ||
s.Require().NoError(err) | ||
colin-axner marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
// this sleep is to allow the packet to timeout | ||
time.Sleep(1 * time.Second) | ||
}) | ||
}) | ||
|
||
t.Run("start relayer", func(t *testing.T) { | ||
s.StartRelayer(relayer) | ||
}) | ||
|
||
t.Run("verify channel is closed due to timeout on ordered channel", func(t *testing.T) { | ||
channel, err := s.QueryChannel(ctx, chainA, portID, initialChannelId) | ||
s.Require().NoError(err) | ||
|
||
s.Require().Equal(channeltypes.CLOSED, channel.State, "the channel was not in an expected state") | ||
}) | ||
|
||
t.Run("verify tokens not transferred", func(t *testing.T) { | ||
balance, err := chainB.GetBalance(ctx, chainBAccount.Bech32Address(chainB.Config().Bech32Prefix), chainB.Config().Denom) | ||
s.Require().NoError(err) | ||
|
||
_, err = chainB.GetBalance(ctx, hostAccount, chainB.Config().Denom) | ||
s.Require().NoError(err) | ||
|
||
expected := testvalues.StartingTokenAmount | ||
s.Require().Equal(expected, balance) | ||
}) | ||
|
||
// re-register interchain account to reopen the channel now that it has been closed due to timeout | ||
// on an ordered channel | ||
t.Run("register interchain account", func(t *testing.T) { | ||
version := getICAVersion(testconfig.GetChainATag(), testconfig.GetChainBTag()) | ||
msgRegisterInterchainAccount := controllertypes.NewMsgRegisterInterchainAccount(ibctesting.FirstConnectionID, controllerAccount.Bech32Address(chainA.Config().Bech32Prefix), version) | ||
err := s.RegisterInterchainAccount(ctx, chainA, controllerAccount, msgRegisterInterchainAccount) | ||
s.Require().NoError(err) | ||
|
||
s.Require().NoError(test.WaitForBlocks(ctx, 3, chainA, chainB)) | ||
}) | ||
|
||
t.Run("verify new channel is now open and interchain account has been reregistered with the same portID", func(t *testing.T) { | ||
channel, err := s.QueryChannel(ctx, chainA, portID, channelIdAfterReopening) | ||
s.Require().NoError(err) | ||
|
||
s.Require().Equal(channeltypes.OPEN, channel.State, "the channel was not in an expected state") | ||
}) | ||
|
||
t.Run("broadcast MsgSendTx", func(t *testing.T) { | ||
// assemble bank transfer message from host account to user account on host chain | ||
msgSend := &banktypes.MsgSend{ | ||
FromAddress: hostAccount, | ||
ToAddress: chainBAccount.Bech32Address(chainB.Config().Bech32Prefix), | ||
Amount: sdk.NewCoins(testvalues.DefaultTransferAmount(chainB.Config().Denom)), | ||
} | ||
|
||
cdc := testsuite.Codec() | ||
|
||
bz, err := icatypes.SerializeCosmosTx(cdc, []proto.Message{msgSend}) | ||
s.Require().NoError(err) | ||
|
||
packetData := icatypes.InterchainAccountPacketData{ | ||
Type: icatypes.EXECUTE_TX, | ||
Data: bz, | ||
Memo: "e2e", | ||
} | ||
|
||
msgSendTx := controllertypes.NewMsgSendTx(controllerAccount.Bech32Address(chainA.Config().Bech32Prefix), ibctesting.FirstConnectionID, uint64(5*time.Minute), packetData) | ||
|
||
resp, err := s.BroadcastMessages( | ||
ctx, | ||
chainA, | ||
controllerAccount, | ||
msgSendTx, | ||
) | ||
|
||
s.AssertValidTxResponse(resp) | ||
s.Require().NoError(err) | ||
}) | ||
|
||
t.Run("verify tokens transferred", func(t *testing.T) { | ||
balance, err := chainB.GetBalance(ctx, chainBAccount.Bech32Address(chainB.Config().Bech32Prefix), chainB.Config().Denom) | ||
s.Require().NoError(err) | ||
|
||
expected := testvalues.DefaultTransferAmount(chainB.Config().Denom) | ||
s.Require().Equal(expected, balance) | ||
}) | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should we verify the bank send transferred funds correctly? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,6 +33,20 @@ func (s *E2ETestSuite) QueryClientState(ctx context.Context, chain ibc.Chain, cl | |
return clientState, nil | ||
} | ||
|
||
// QueryChannel queries the channel on a given chain for the provided portID and channelID | ||
func (s *E2ETestSuite) QueryChannel(ctx context.Context, chain ibc.Chain, portID, channelID string) (channeltypes.Channel, error) { | ||
queryClient := s.GetChainGRCPClients(chain).ChannelQueryClient | ||
res, err := queryClient.Channel(ctx, &channeltypes.QueryChannelRequest{ | ||
PortId: portID, | ||
ChannelId: channelID, | ||
}) | ||
if err != nil { | ||
return channeltypes.Channel{}, err | ||
} | ||
|
||
return *res.Channel, nil | ||
} | ||
|
||
Comment on lines
+37
to
+49
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. great addition! |
||
// QueryPacketCommitment queries the packet commitment on the given chain for the provided channel and sequence. | ||
func (s *E2ETestSuite) QueryPacketCommitment(ctx context.Context, chain ibc.Chain, portID, channelID string, sequence uint64) ([]byte, error) { | ||
queryClient := s.GetChainGRCPClients(chain).ChannelQueryClient | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the tag with the 1-minute packet timeout, right? Maybe we don't need to use it anymore, if we plan to test the timeout/reopen scenario only with simd >= 6.0.0.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since this is manual only, I don't think there's much harm in having this additional drop down option. I'm happy to have it removed though if people don't think it will ever be used!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would have to check, but I think v0.1.5 is basically the same as v0.1.4 but with a shorter timeout, so I think it doesn't really add much to have both...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okay sounds good to me to remove it 👍