Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: delete duplicate events when transfer erc20 #233

Merged
merged 1 commit into from
Feb 27, 2024
Merged

fix: delete duplicate events when transfer erc20 #233

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions x/crosschain/keeper/relay_transfer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,25 +42,27 @@ 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()
}
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
}

Expand Down Expand Up @@ -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 {
Expand Down
Loading