Skip to content
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.

Sign up for GitHub

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

fix: ics29: switch source with destintion for chan/port IDs #961

Merged
merged 12 commits into from
Feb 25, 2022
+60 −16
Merged

fix: ics29: switch source with destintion for chan/port IDs #961

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
be8d931
fix: switch source with destintion for chan/port IDs
seantking Feb 21, 2022
1884d32
Merge branch 'ics29-fee-middleware' into sean/issue#757-switch-dest-s…
seantking Feb 21, 2022
86bda95
fix: blunder
seantking Feb 22, 2022
2d867e0
Merge branch 'ics29-fee-middleware' into sean/issue#757-switch-dest-s…
seantking Feb 22, 2022
113c892
Merge branch 'ics29-fee-middleware' into sean/issue#757-switch-dest-s…
seantking Feb 24, 2022
53decd4
test: adding tests in case of incorrect channel/port id
seantking Feb 24, 2022
f67f139
test: moving check to WriteAcknowledgement
seantking Feb 24, 2022
36d0b6b
Merge branch 'ics29-fee-middleware' into sean/issue#757-switch-dest-s…
seantking Feb 24, 2022
40ccecd
add test case for Get/Set counterparty address
seantking Feb 24, 2022
5bdcd17
nit: path name
seantking Feb 24, 2022
599c574
Update modules/apps/29-fee/keeper/msg_server_test.go
seantking Feb 24, 2022
a3d4ed3
Merge branch 'ics29-fee-middleware' into sean/issue#757-switch-dest-s…
seantking Feb 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/apps/29-fee/ibc_module.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ func (im IBCModule) OnRecvPacket(

// incase of async aknowledgement (ack == nil) store the ForwardRelayer address for use later
if ack == nil && found {
im.keeper.SetForwardRelayerAddress(ctx, channeltypes.NewPacketId(packet.GetSourceChannel(), packet.GetSourcePort(), packet.GetSequence()), forwardRelayer)
im.keeper.SetForwardRelayerAddress(ctx, channeltypes.NewPacketId(packet.GetDestChannel(), packet.GetDestPort(), packet.GetSequence()), forwardRelayer)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a test for this so we can catch the issue if it occurs again?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a good point.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've written some tests that will fail if we use the incorrect port/channel ID in either place now. One of the tests is failing when comparing the ack though. Suggestions welcome

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

failing here -> https://github.com/cosmos/ibc-go/pull/961/files#diff-79b2cea153b51838e9cb02a38178bc5bc0eb313f75d74f8988774ad0d492e957R541

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright, I have instead moved the check for WriteAcknowledgement to the tests in relay_test.go instead as it was easier and made more sense. We have full coverage now so if either of these lines are accidentally set to SourceChannel instead of DestinationChannel the tests will fail.

return nil
}

Expand Down
2 changes: 1 addition & 1 deletion modules/apps/29-fee/keeper/relay.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func (k Keeper) WriteAcknowledgement(ctx sdk.Context, chanCap *capabilitytypes.C
}

// retrieve the forward relayer that was stored in `onRecvPacket`
packetId := channeltypes.NewPacketId(packet.GetSourceChannel(), packet.GetSourcePort(), packet.GetSequence())
packetId := channeltypes.NewPacketId(packet.GetDestChannel(), packet.GetDestPort(), packet.GetSequence())
colin-axner marked this conversation as resolved.
Show resolved Hide resolved
relayer, _ := k.GetForwardRelayerAddress(ctx, packetId)

k.DeleteForwardRelayerAddress(ctx, packetId)
Expand Down