From b5ed5e0336c34854f87496a42206df203a0c9163 Mon Sep 17 00:00:00 2001 From: Gjermund Garaba Date: Wed, 12 Mar 2025 16:00:16 +0100 Subject: [PATCH] Merge commit from fork * v7 patch remove test case * fix test --------- Co-authored-by: Aditya Sripal <14364734+AdityaSripal@users.noreply.github.com> --- modules/core/04-channel/keeper/packet.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/core/04-channel/keeper/packet.go b/modules/core/04-channel/keeper/packet.go index 793e59a8e2e..a9e343d8659 100644 --- a/modules/core/04-channel/keeper/packet.go +++ b/modules/core/04-channel/keeper/packet.go @@ -451,6 +451,15 @@ func (k Keeper) AcknowledgePacket( packetCommitment := types.CommitPacket(k.cdc, packet) + var ack types.Acknowledgement + err := types.SubModuleCdc.UnmarshalJSON(acknowledgement, &ack) + if err == nil { + ackBz := ack.Acknowledgement() + if !bytes.Equal(ackBz, acknowledgement) { + return sdkerrors.Wrap(types.ErrInvalidAcknowledgement, "acknowledgement marshalling error") + } + } + // verify we sent the packet and haven't cleared it out yet if !bytes.Equal(commitment, packetCommitment) { return sdkerrors.Wrapf(types.ErrInvalidPacket, "commitment bytes are not equal: got (%v), expected (%v)", packetCommitment, commitment)