Fixes for Packet Ack #6036
Merged
Fixes for Packet Ack #6036
Conversation
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
jackzampolin
requested review from
alessio,
alexanderbez,
fedekunze,
hschoenburg and
nylira
as code owners
AdityaSripal
approved these changes
Apr 20, 2020
| @@ -241,7 +241,8 @@ func (k Keeper) PacketExecuted( | |||
| ctx.EventManager().EmitEvents(sdk.Events{ | |||
| sdk.NewEvent( | |||
| types.EventTypeRecvPacket, | |||
| sdk.NewAttribute(types.AttributeKeyData, string(acknowledgement)), | |||
| sdk.NewAttribute(types.AttributeKeyData, string(packet.GetData())), | |||
There was a problem hiding this comment.
We need the data along with acknowledgement to reconstruct packet on relayer side for `MsgAcknowledgement
| @@ -250,7 +251,7 @@ func (cs ClientState) VerifyPacketAcknowledgement( | |||
| return err | |||
| } | |||
|
|
|||
| if err := proof.VerifyMembership(consensusState.GetRoot(), path, acknowledgement); err != nil { | |||
| if err := proof.VerifyMembership(consensusState.GetRoot(), path, channeltypes.CommitAcknowledgement(acknowledgement)); err != nil { | |||
There was a problem hiding this comment.
Leaf value is the hash of acknowledgement not ack itself
| @@ -169,7 +169,7 @@ func NewHandler(k Keeper) sdk.Handler { | |||
|
|
|||
| case channel.MsgAcknowledgement: | |||
| // Lookup module by channel capability | |||
| module, _, ok := k.ChannelKeeper.LookupModuleByChannel(ctx, msg.Packet.DestinationPort, msg.Packet.DestinationChannel) | |||
| module, _, ok := k.ChannelKeeper.LookupModuleByChannel(ctx, msg.Packet.SourcePort, msg.Packet.SourceChannel) | |||
There was a problem hiding this comment.
Both MsgAcknowledgment and MsgTimeout are sent to the original sending chain so they must grab the module using packet's SourcePort/Channel
There was a problem hiding this comment.
can you add that comment on the code?
|
This is good to go! |
|
some tests are failing |
|
I've fixed the tests locally. They should be g2g. |
alessio
added
the
A:automerge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
cc @AdityaSripal @cwgoes @fedekunze