From 577832d418f891a2fb8bd72886580ebf7ef59a4f Mon Sep 17 00:00:00 2001
From: zakir <80246097+zakir-code@users.noreply.github.com>
Date: Tue, 27 Feb 2024 14:58:28 +0800
Subject: [PATCH] fix: delete duplicate events when transfer erc20 (#170)

---
 x/crosschain/keeper/relay_transfer.go | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/x/crosschain/keeper/relay_transfer.go b/x/crosschain/keeper/relay_transfer.go
index 05d9de3ad..7a1ca57a8 100644
--- a/x/crosschain/keeper/relay_transfer.go
+++ b/x/crosschain/keeper/relay_transfer.go
@@ -42,7 +42,8 @@ func (k Keeper) RelayTransferHandler(ctx sdk.Context, eventNonce uint64, targetH
 	if fxTarget.GetTarget() == fxtypes.ERC20Target {
 		// transfer to evm
 		cacheCtx, commit := ctx.CacheContext()
-		if err := k.transferErc20Handler(cacheCtx, eventNonce, receiver, receiver, coin); err != nil {
+		receiverHex := common.BytesToAddress(receiver.Bytes())
+		if err := k.transferErc20Handler(cacheCtx, eventNonce, receiver, receiverHex, coin, true); err != nil {
 			return err
 		}
 		commit()
@@ -50,17 +51,18 @@ func (k Keeper) RelayTransferHandler(ctx sdk.Context, eventNonce uint64, targetH
 	return nil
 }
 
-func (k Keeper) transferErc20Handler(ctx sdk.Context, eventNonce uint64, sender, receiver sdk.AccAddress, coin sdk.Coin) error {
-	receiverEthAddr := common.BytesToAddress(receiver.Bytes())
-	if err := k.erc20Keeper.TransferAfter(ctx, sender, receiverEthAddr.String(), coin, sdk.NewCoin(coin.Denom, sdkmath.ZeroInt()), false); err != nil {
+func (k Keeper) transferErc20Handler(ctx sdk.Context, eventNonce uint64, sender sdk.AccAddress, receiver common.Address, coin sdk.Coin, isEmitEvent bool) error {
+	if err := k.erc20Keeper.TransferAfter(ctx, sender, receiver.String(), coin, sdk.NewCoin(coin.Denom, sdkmath.ZeroInt()), false); err != nil {
 		k.Logger(ctx).Error("transfer convert denom failed", "error", err.Error())
 		return err
 	}
-	ctx.EventManager().EmitEvent(sdk.NewEvent(
-		types.EventTypeEvmTransfer,
-		sdk.NewAttribute(sdk.AttributeKeyModule, k.moduleName),
-		sdk.NewAttribute(types.AttributeKeyEventNonce, fmt.Sprint(eventNonce)),
-	))
+	if isEmitEvent {
+		ctx.EventManager().EmitEvent(sdk.NewEvent(
+			types.EventTypeEvmTransfer,
+			sdk.NewAttribute(sdk.AttributeKeyModule, k.moduleName),
+			sdk.NewAttribute(types.AttributeKeyEventNonce, fmt.Sprint(eventNonce)),
+		))
+	}
 	return nil
 }
 
@@ -127,14 +129,16 @@ func (k Keeper) bridgeCallERC20Handler(
 	switch dstChainID {
 	case types.FxcoreChainID:
 		// convert coin to erc20
+		isEmitEvent := true
 		for _, coin := range targetCoins {
 			// not convert FX
 			if coin.Denom == fxtypes.DefaultDenom {
 				continue
 			}
-			if err = k.transferErc20Handler(ctx, eventNonce, senderAddr.Bytes(), receiver, coin); err != nil {
+			if err = k.transferErc20Handler(ctx, eventNonce, senderAddr.Bytes(), common.BytesToAddress(receiver), coin, isEmitEvent); err != nil {
 				return err
 			}
+			isEmitEvent = false
 		}
 		var toAddrPtr *common.Address
 		if len(to) > 0 {