From 90a24fd7a923afa9d37bc5e8c0c9022f39658eb0 Mon Sep 17 00:00:00 2001 From: Damian Nolan Date: Thu, 25 May 2023 14:06:09 +0200 Subject: [PATCH] Merge pull request from GHSA-3v7p-4x7p-4rx7 --- go.mod | 5 ++++- modules/core/keeper/msg_server.go | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 24081544f05..10afc1c09b2 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,10 @@ go 1.19 module github.com/cosmos/ibc-go/v6 -retract v6.0.0 // depends on SDK version < v0.46.7 +retract ( + v6.1.0 // contains huckleberry vulnerability + [v6.0.0, v6.0.1] // depends on SDK version < v0.46.7 +) require ( cosmossdk.io/math v1.0.0-beta.3 diff --git a/modules/core/keeper/msg_server.go b/modules/core/keeper/msg_server.go index 77a0b2c55c4..230951ca75d 100644 --- a/modules/core/keeper/msg_server.go +++ b/modules/core/keeper/msg_server.go @@ -411,10 +411,6 @@ func (k Keeper) RecvPacket(goCtx context.Context, msg *channeltypes.MsgRecvPacke if ack == nil || ack.Success() { // write application state changes for asynchronous and successful acknowledgements writeFn() - } else { - // NOTE: The context returned by CacheContext() refers to a new EventManager, so it needs to explicitly set events to the original context. - // Events should still be emitted from failed acks and asynchronous acks - ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) } // Set packet acknowledgement only if the acknowledgement is not nil.