set timeout

app/app.go

@@ -133,6 +133,7 @@ import (
 	ibcconnectiontypes "github.com/cosmos/ibc-go/v8/modules/core/03-connection/types"
 	ibcchanneltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
 	porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types"
+	ibcerrors "github.com/cosmos/ibc-go/v8/modules/core/errors"
 	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
 	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
 	ibctm "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
@@ -301,8 +302,7 @@ func (im CustomIBCFeeMiddleware) OnAcknowledgementPacket(
 ) error {
 	if im.keeper.IsFeeEnabled(ctx, packet.SourcePort, packet.SourceChannel) {
 		var ack ibcfeetypes.IncentivizedAcknowledgement
-		err := ibcfeetypes.ModuleCdc.UnmarshalJSON(acknowledgement, &ack)
-		if err != nil {
+		if err := ibcfeetypes.ModuleCdc.UnmarshalJSON(acknowledgement, &ack); err != nil {
 			return errors.Wrapf(err, "cannot unmarshal ICS-29 incentivized packet acknowledgement: %v", ack)
 		}
 		im.keeper.SetPayeeAddress(ctx, relayer.String(), ack.ForwardRelayerAddress, packet.SourceChannel)
@@ -315,6 +315,11 @@ func (im CustomIBCFeeMiddleware) OnTimeoutPacket(
 	packet ibcchanneltypes.Packet,
 	relayer sdk.AccAddress,
 ) error {
+	var data ibctransfertypes.FungibleTokenPacketData
+	if err := ibctransfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil {
+		return errors.Wrapf(ibcerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet data: %s", err.Error())
+	}
+	im.keeper.SetPayeeAddress(ctx, relayer.String(), data.Sender, packet.SourceChannel)
 	return im.IBCMiddleware.OnTimeoutPacket(ctx, packet, relayer)
 }