From 79ddb9de9e5d9e9565bf362c2d07cab9b3349e19 Mon Sep 17 00:00:00 2001 From: Sean King Date: Mon, 23 May 2022 17:37:39 +0200 Subject: [PATCH] chore: mini nits from ics29 audit (#1348) * chore: nits from ics29 audit * Update modules/apps/29-fee/keeper/escrow.go Co-authored-by: Carlos Rodriguez * Update modules/apps/29-fee/keeper/msg_server.go Co-authored-by: Carlos Rodriguez * nits: more nits Co-authored-by: Carlos Rodriguez --- modules/apps/29-fee/ibc_middleware.go | 2 +- modules/apps/29-fee/keeper/escrow.go | 3 +++ modules/apps/29-fee/keeper/msg_server.go | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/apps/29-fee/ibc_middleware.go b/modules/apps/29-fee/ibc_middleware.go index 7178c14ab4b..d5cc6f4cfca 100644 --- a/modules/apps/29-fee/ibc_middleware.go +++ b/modules/apps/29-fee/ibc_middleware.go @@ -248,7 +248,7 @@ func (im IBCMiddleware) OnAcknowledgementPacket( return im.app.OnAcknowledgementPacket(ctx, packet, acknowledgement, relayer) } - ack := new(types.IncentivizedAcknowledgement) + var ack = &types.IncentivizedAcknowledgement{} if err := types.ModuleCdc.UnmarshalJSON(acknowledgement, ack); err != nil { return sdkerrors.Wrapf(err, "cannot unmarshal ICS-29 incentivized packet acknowledgement: %v", ack) } diff --git a/modules/apps/29-fee/keeper/escrow.go b/modules/apps/29-fee/keeper/escrow.go index f5b786bbd9a..d698d84e795 100644 --- a/modules/apps/29-fee/keeper/escrow.go +++ b/modules/apps/29-fee/keeper/escrow.go @@ -50,6 +50,7 @@ func (k Keeper) DistributePacketFeesOnAcknowledgement(ctx sdk.Context, forwardRe // if the escrow account has insufficient balance then we want to avoid partially distributing fees cacheCtx, writeFn := ctx.CacheContext() + // forward relayer address will be empty if conversion fails forwardAddr, _ := sdk.AccAddressFromBech32(forwardRelayer) for _, packetFee := range packetFees { @@ -162,6 +163,7 @@ func (k Keeper) distributeFee(ctx sdk.Context, receiver, refundAccAddress sdk.Ac err := k.bankKeeper.SendCoinsFromModuleToAccount(cacheCtx, types.ModuleName, receiver, fee) if err != nil { if bytes.Equal(receiver, refundAccAddress) { + k.Logger(ctx).Error("error distributing fee", "receiver address", receiver, "fee", fee) return // if sending to the refund address already failed, then return (no-op) } @@ -169,6 +171,7 @@ func (k Keeper) distributeFee(ctx sdk.Context, receiver, refundAccAddress sdk.Ac // then attempt to refund the fee to the original sender err := k.bankKeeper.SendCoinsFromModuleToAccount(cacheCtx, types.ModuleName, refundAccAddress, fee) if err != nil { + k.Logger(ctx).Error("error refunding fee to the original sender", "refund address", refundAccAddress, "fee", fee) return // if sending to the refund address fails, no-op } } diff --git a/modules/apps/29-fee/keeper/msg_server.go b/modules/apps/29-fee/keeper/msg_server.go index 154a4150f54..e0c78028ea8 100644 --- a/modules/apps/29-fee/keeper/msg_server.go +++ b/modules/apps/29-fee/keeper/msg_server.go @@ -31,7 +31,7 @@ func (k Keeper) RegisterCounterpartyAddress(goCtx context.Context, msg *types.Ms ctx, msg.Address, msg.CounterpartyAddress, msg.ChannelId, ) - k.Logger(ctx).Info("Registering counterparty address for relayer.", "Address:", msg.Address, "Counterparty Address:", msg.CounterpartyAddress) + k.Logger(ctx).Info("registering counterparty address for relayer", "address", msg.Address, "counterparty address", msg.CounterpartyAddress, "channel", msg.ChannelId) return &types.MsgRegisterCounterpartyAddressResponse{}, nil }