From 3602bb878899f69ea35e3a5f896d7e42bb8a7901 Mon Sep 17 00:00:00 2001 From: Justin Tieri <37750742+jtieri@users.noreply.github.com> Date: Wed, 4 Sep 2024 14:02:41 -0500 Subject: [PATCH] refactor: remove processed key and handling code --- .../packetforward/ibc_middleware.go | 11 ----------- .../packetforward/types/keys.go | 3 --- 2 files changed, 14 deletions(-) diff --git a/middleware/packet-forward-middleware/packetforward/ibc_middleware.go b/middleware/packet-forward-middleware/packetforward/ibc_middleware.go index c10f6de2..db77d1eb 100644 --- a/middleware/packet-forward-middleware/packetforward/ibc_middleware.go +++ b/middleware/packet-forward-middleware/packetforward/ibc_middleware.go @@ -196,7 +196,6 @@ func (im IBCMiddleware) OnRecvPacket( metadata := m.Forward goCtx := ctx.Context() - processed := getBoolFromAny(goCtx.Value(types.ProcessedKey{})) nonrefundable := getBoolFromAny(goCtx.Value(types.NonrefundableKey{})) disableDenomComposition := getBoolFromAny(goCtx.Value(types.DisableDenomCompositionKey{})) @@ -212,16 +211,6 @@ func (im IBCMiddleware) OnRecvPacket( return newErrorAcknowledgement(fmt.Errorf("failed to construct override receiver: %w", err)) } - // if this packet has been handled by another middleware in the stack there may be no need to call into the - // underlying app, otherwise the transfer module's OnRecvPacket callback could be invoked more than once - // which would mint/burn vouchers more than once - if !processed { - if err := im.receiveFunds(ctx, packet, data, overrideReceiver, relayer); err != nil { - logger.Error("packetForwardMiddleware OnRecvPacket error receiving packet", "error", err) - return newErrorAcknowledgement(fmt.Errorf("error receiving packet: %w", err)) - } - } - // if this packet's token denom is already the base denom for some native token on this chain, // we do not need to do any further composition of the denom before forwarding the packet denomOnThisChain := data.Denom diff --git a/middleware/packet-forward-middleware/packetforward/types/keys.go b/middleware/packet-forward-middleware/packetforward/types/keys.go index 13479e9a..072702c6 100644 --- a/middleware/packet-forward-middleware/packetforward/types/keys.go +++ b/middleware/packet-forward-middleware/packetforward/types/keys.go @@ -13,12 +13,9 @@ const ( QuerierRoute = ModuleName ) -var ParamsKey = []byte{0x00} - type ( NonrefundableKey struct{} DisableDenomCompositionKey struct{} - ProcessedKey struct{} ) func RefundPacketKey(channelID, portID string, sequence uint64) []byte {