diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index bf5750969..48ca3debf 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -796,6 +796,7 @@ func (cc *CosmosProvider) MsgTransfer( dstAddr string, amount sdk.Coin, info provider.PacketInfo, + memo string, ) (provider.RelayerMessage, error) { acc, err := cc.Address() if err != nil { @@ -808,6 +809,7 @@ func (cc *CosmosProvider) MsgTransfer( Sender: acc, Receiver: dstAddr, TimeoutTimestamp: info.TimeoutTimestamp, + Memo: memo, } // If the timeoutHeight is 0 then we don't need to explicitly set it on the MsgTransfer @@ -1746,7 +1748,7 @@ func (cc *CosmosProvider) SetWithExtensionOptions(txf tx.Factory) (tx.Factory, e for _, opt := range cc.PCfg.ExtensionOptions { max, ok := sdkmath.NewIntFromString(opt.Value) if !ok { - return txf,errors.New("invalid opt value") + return txf, errors.New("invalid opt value") } extensionOption := ethermint.ExtensionOptionDynamicFeeTx{ MaxPriorityPrice: max, diff --git a/relayer/chains/penumbra/tx.go b/relayer/chains/penumbra/tx.go index dbf8a2547..a08b90044 100644 --- a/relayer/chains/penumbra/tx.go +++ b/relayer/chains/penumbra/tx.go @@ -999,6 +999,7 @@ func (cc *PenumbraProvider) MsgTransfer( dstAddr string, amount sdk.Coin, info provider.PacketInfo, + memo string, ) (provider.RelayerMessage, error) { acc, err := cc.Address() if err != nil { @@ -1011,6 +1012,7 @@ func (cc *PenumbraProvider) MsgTransfer( Sender: acc, Receiver: dstAddr, TimeoutTimestamp: info.TimeoutTimestamp, + Memo: memo, } // If the timeoutHeight is 0 then we don't need to explicitly set it on the MsgTransfer @@ -2254,7 +2256,7 @@ func (cc *PenumbraProvider) waitForBlockInclusion( return cc.mkTxResult(res) } if strings.Contains(err.Error(), "transaction indexing is disabled") { - return nil,errors.New("cannot determine success/failure of tx because transaction indexing is disabled on rpc url") + return nil, errors.New("cannot determine success/failure of tx because transaction indexing is disabled on rpc url") } case <-ctx.Done(): return nil, ctx.Err() diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go index 490f18394..603317ac8 100644 --- a/relayer/packet-tx.go +++ b/relayer/packet-tx.go @@ -109,7 +109,7 @@ func (c *Chain) SendTransferMsg( TimeoutTimestamp: timeoutTimestamp, } - msg, err := c.ChainProvider.MsgTransfer(dstAddr, amount, pi) + msg, err := c.ChainProvider.MsgTransfer(dstAddr, amount, pi, memo) if err != nil { return err } diff --git a/relayer/provider/provider.go b/relayer/provider/provider.go index 1cb995b21..f0b3caedf 100644 --- a/relayer/provider/provider.go +++ b/relayer/provider/provider.go @@ -266,7 +266,7 @@ type ChainProvider interface { NextSeqRecv(ctx context.Context, msgTransfer PacketInfo, height uint64) (PacketProof, error) // MsgTransfer constructs a MsgTransfer message ready to write to the chain. - MsgTransfer(dstAddr string, amount sdk.Coin, info PacketInfo) (RelayerMessage, error) + MsgTransfer(dstAddr string, amount sdk.Coin, info PacketInfo, memo string) (RelayerMessage, error) // MsgRecvPacket takes the packet information from a MsgTransfer along with the packet commitment, // and assembles a full MsgRecvPacket ready to write to the chain.