[FEAT] ICS20-V2 Path Forwarding #6693
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
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
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
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
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
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 |
|---|---|---|
|
|
@@ -191,57 +191,70 @@ func (s *E2ETestSuite) SetupChains(ctx context.Context, channelOptionsModifier C | |
| // SetupTest will by default use the default channel options to create a path between the chains. | ||
| // if non default channel options are required, the test suite must override the `SetupTest` function. | ||
| func (s *E2ETestSuite) SetupTest() { | ||
| s.SetupPaths(ibc.DefaultClientOpts(), defaultChannelOpts(s.GetAllChains())) | ||
| } | ||
|
|
||
| // SetupPaths creates paths between the chains using the provided client and channel options. | ||
| // The paths are created such that ChainA is connected to ChainB, ChainB is connected to ChainC etc. | ||
| func (s *E2ETestSuite) SetupPaths(clientOpts ibc.CreateClientOptions, channelOpts ibc.CreateChannelOptions) { | ||
| s.T().Logf("Setting up path for: %s", s.T().Name()) | ||
|
|
||
| ctx := context.TODO() | ||
| allChains := s.GetAllChains() | ||
| for i := 0; i < len(allChains)-1; i++ { | ||
| chainA, chainB := allChains[i], allChains[i+1] | ||
| _, _ = s.CreatePath(ctx, chainA, chainB, clientOpts, channelOpts) | ||
| } | ||
| } | ||
|
|
||
| func (s *E2ETestSuite) CreatePath( | ||
DimitrisJim marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ctx context.Context, | ||
| chainA ibc.Chain, | ||
| chainB ibc.Chain, | ||
| clientOpts ibc.CreateClientOptions, | ||
| channelOpts ibc.CreateChannelOptions, | ||
| ) (chainAChannel ibc.ChannelOutput, chainBChannel ibc.ChannelOutput) { | ||
| r := s.GetRelayer() | ||
|
|
||
| pathName := s.generatePathName() | ||
| s.T().Logf("establishing path between %s and %s on path %s", chainA.Config().ChainID, chainB.Config().ChainID, pathName) | ||
|
|
||
| err := r.GeneratePath(ctx, s.GetRelayerExecReporter(), chainA.Config().ChainID, chainB.Config().ChainID, pathName) | ||
| s.Require().NoError(err) | ||
|
|
||
| // Create new clients | ||
| err = r.CreateClients(ctx, s.GetRelayerExecReporter(), pathName, clientOpts) | ||
| s.Require().NoError(err) | ||
| err = test.WaitForBlocks(ctx, 1, chainA, chainB) | ||
| s.Require().NoError(err) | ||
|
|
||
| err = r.CreateConnections(ctx, s.GetRelayerExecReporter(), pathName) | ||
| s.Require().NoError(err) | ||
| err = test.WaitForBlocks(ctx, 1, chainA, chainB) | ||
| s.Require().NoError(err) | ||
|
|
||
| err = r.CreateChannel(ctx, s.GetRelayerExecReporter(), pathName, channelOpts) | ||
| s.Require().NoError(err) | ||
| err = test.WaitForBlocks(ctx, 1, chainA, chainB) | ||
| s.Require().NoError(err) | ||
|
|
||
| channelsA, err := r.GetChannels(ctx, s.GetRelayerExecReporter(), chainA.Config().ChainID) | ||
| s.Require().NoError(err) | ||
|
|
||
| channelsB, err := r.GetChannels(ctx, s.GetRelayerExecReporter(), chainB.Config().ChainID) | ||
| s.Require().NoError(err) | ||
|
|
||
| if s.channels[s.T().Name()] == nil { | ||
| s.channels[s.T().Name()] = make(map[ibc.Chain][]ibc.ChannelOutput) | ||
| } | ||
|
|
||
| // keep track of channels associated with a given chain for access within the tests. | ||
| s.channels[s.T().Name()][chainA] = channelsA | ||
| s.channels[s.T().Name()][chainB] = channelsB | ||
|
Comment on lines
+253
to
+254
There was a problem hiding this comment. there was a fix on main that assigns the correct values here, should look something like Only the last channel created is relevant for this test. tagging myself to fix! @chatton There was a problem hiding this comment. there's actually a small restructure that needs to happen here #6721 I will address this in that PR once it gets synced with main after this is merged |
||
|
|
||
| s.testPaths[s.T().Name()] = append(s.testPaths[s.T().Name()], pathName) | ||
|
|
||
| return channelsA[len(channelsA)-1], channelsB[len(channelsB)-1] | ||
| } | ||
|
|
||
| // GetChainAChannel returns the ibc.ChannelOutput for the current test. | ||
|
|
@@ -692,7 +705,7 @@ func getValidatorsAndFullNodes(chainIdx int) (int, int) { | |
| } | ||
|
|
||
| // GetMsgTransfer returns a MsgTransfer that is constructed based on the channel version | ||
| func GetMsgTransfer(portID, channelID, version string, tokens sdk.Coins, sender, receiver string, timeoutHeight clienttypes.Height, timeoutTimestamp uint64, memo string, forwarding transfertypes.Forwarding) *transfertypes.MsgTransfer { | ||
| if len(tokens) == 0 { | ||
| panic(errors.New("tokens cannot be empty")) | ||
| } | ||
|
|
@@ -712,7 +725,7 @@ func GetMsgTransfer(portID, channelID, version string, tokens sdk.Coins, sender, | |
| Tokens: sdk.NewCoins(), | ||
| } | ||
| case transfertypes.V2: | ||
| msg = transfertypes.NewMsgTransfer(portID, channelID, tokens, sender, receiver, timeoutHeight, timeoutTimestamp, memo, forwarding) | ||
| default: | ||
| panic(fmt.Errorf("unsupported transfer version: %s", version)) | ||
| } | ||
|
|
||
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
Oops, something went wrong.
Oops, something went wrong.
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.
we should probably also have a changelog entry for authz support.
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.
Maybe we should have a larger entry to highlight the changes to transfer?