From 0b2a2de6aa32c2c4b33a616817695e885ae1f474 Mon Sep 17 00:00:00 2001
From: nulnut <151493716+nulnut@users.noreply.github.com>
Date: Wed, 21 Feb 2024 18:29:40 +0800
Subject: [PATCH] fix: convert bridge call coins (#144)

---
 x/crosschain/keeper/relay_transfer.go | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/x/crosschain/keeper/relay_transfer.go b/x/crosschain/keeper/relay_transfer.go
index f23719f31..e5a6f4406 100644
--- a/x/crosschain/keeper/relay_transfer.go
+++ b/x/crosschain/keeper/relay_transfer.go
@@ -12,6 +12,7 @@ import (
 	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/bech32"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types"
 	ibcclienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types"
 	"github.com/ethereum/go-ethereum/common"
@@ -118,14 +119,18 @@ func (k Keeper) bridgeCallERC20Handler(
 	if err != nil {
 		return errorsmod.Wrap(types.ErrInvalid, "asset erc20")
 	}
-	senderAddr := common.BytesToAddress(sender)
-	targetCoins, err := k.bridgeCallTargetCoinsHandler(ctx, senderAddr, tokens, amounts)
+	targetCoins, err := k.bridgeCallTargetCoinsHandler(ctx, tokens, amounts)
 	if err != nil {
 		return err
 	}
 
 	switch dstChainID {
 	case types.FxcoreChainID:
+		if len(targetCoins) > 0 {
+			if err := k.bankKeeper.SendCoinsFromModuleToAccount(ctx, k.moduleName, receiver, targetCoins); err != nil {
+				return errorsmod.Wrap(err, "transfer vouchers")
+			}
+		}
 		// convert coin to erc20
 		for _, coin := range targetCoins {
 			// not convert FX
@@ -142,6 +147,7 @@ func (k Keeper) bridgeCallERC20Handler(
 			toAddrPtr = &toAddr
 		}
 		if len(message) > 0 || toAddrPtr != nil {
+			senderAddr := common.BytesToAddress(sender)
 			k.bridgeCallEvmHandler(ctx, senderAddr, toAddrPtr, message, value, gasLimit, eventNonce)
 		}
 	default:
@@ -152,7 +158,7 @@ func (k Keeper) bridgeCallERC20Handler(
 	return nil
 }
 
-func (k Keeper) bridgeCallTargetCoinsHandler(ctx sdk.Context, receiver common.Address, tokens []common.Address, amounts []*big.Int) (sdk.Coins, error) {
+func (k Keeper) bridgeCallTargetCoinsHandler(ctx sdk.Context, tokens []common.Address, amounts []*big.Int) (sdk.Coins, error) {
 	tokens, amounts = types.MergeDuplicationERC20(tokens, amounts)
 	targetCoins := sdk.NewCoins()
 	for i := 0; i < len(tokens); i++ {
@@ -160,6 +166,9 @@ func (k Keeper) bridgeCallTargetCoinsHandler(ctx sdk.Context, receiver common.Ad
 		if bridgeToken == nil {
 			return nil, errorsmod.Wrap(types.ErrInvalid, "bridge token is not exist")
 		}
+		if amounts[i].Cmp(big.NewInt(0)) <= 0 {
+			continue
+		}
 		coin := sdk.NewCoin(bridgeToken.Denom, sdkmath.NewIntFromBigInt(amounts[i]))
 		isOriginOrConverted := k.erc20Keeper.IsOriginOrConvertedDenom(ctx, bridgeToken.Denom)
 		if !isOriginOrConverted {
@@ -167,11 +176,7 @@ func (k Keeper) bridgeCallTargetCoinsHandler(ctx sdk.Context, receiver common.Ad
 				return nil, errorsmod.Wrapf(err, "mint vouchers coins")
 			}
 		}
-		if err := k.bankKeeper.SendCoinsFromModuleToAccount(ctx, k.moduleName, receiver.Bytes(), sdk.NewCoins(coin)); err != nil {
-			return nil, errorsmod.Wrap(err, "transfer vouchers")
-		}
-
-		targetCoin, err := k.erc20Keeper.ConvertDenomToTarget(ctx, receiver.Bytes(), coin, fxtypes.ParseFxTarget(fxtypes.ERC20Target))
+		targetCoin, err := k.erc20Keeper.ConvertDenomToTarget(ctx, authtypes.NewModuleAddress(k.moduleName).Bytes(), coin, fxtypes.ParseFxTarget(fxtypes.ERC20Target))
 		if err != nil {
 			return nil, errorsmod.Wrap(err, "convert to target coin")
 		}