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
Merged

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

Show file tree
Hide file tree
Changes from 2 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 @@ -224,7 +224,7 @@ func (im IBCModule) OnAcknowledgementPacket(
return sdkerrors.Wrapf(err, "cannot unmarshal ICS-29 incentivized packet acknowledgement: %v", ack)
}

packetID := channeltypes.NewPacketId(packet.SourceChannel, packet.SourcePort, packet.Sequence)
packetID := channeltypes.NewPacketId(packet.DestinationChannel, packet.DestinationPort, packet.Sequence)
Copy link
Member

Choose a reason for hiding this comment

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

This line should stay as it is. Since it is executing on Source chain we want to identify packets using source channel/port

Copy link
Member

Choose a reason for hiding this comment

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

OnRecvPacket needs to change on line 203 to reference destination port/channel because it is being executed on destination chain

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry. This was late in an evening blunder. I meant to update OnRecvPacket. Casually introducing bugs into the codebase 😅

identifiedPacketFees, found := im.keeper.GetFeesInEscrow(ctx, packetID)
if !found {
// return underlying callback if no fee found for given packetID
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 @@ -18,7 +18,7 @@ func (k Keeper) SendPacket(ctx sdk.Context, chanCap *capabilitytypes.Capability,
// ICS29 WriteAcknowledgement is used for asynchronous acknowledgements
func (k Keeper) WriteAcknowledgement(ctx sdk.Context, chanCap *capabilitytypes.Capability, packet ibcexported.PacketI, acknowledgement []byte) error {
// 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