refactor: avoid converting origin coin to ERC20 during crosschain ref…

…und (#762)

Co-authored-by: nulnut <[email protected]>

x/crosschain/keeper/bridge_call_out.go

@@ -7,6 +7,8 @@ import (
 	"strconv"
 	"time"
 
+	"cosmossdk.io/collections"
+	"cosmossdk.io/errors"
 	sdkmath "cosmossdk.io/math"
 	storetypes "cosmossdk.io/store/types"
 	"github.com/cosmos/cosmos-sdk/telemetry"
@@ -19,6 +21,7 @@ import (
 	"github.com/hashicorp/go-metrics"
 
 	fxtelemetry "github.com/functionx/fx-core/v8/telemetry"
+	fxtypes "github.com/functionx/fx-core/v8/types"
 	"github.com/functionx/fx-core/v8/x/crosschain/types"
 )
 
@@ -138,8 +141,22 @@ func (k Keeper) RefundOutgoingBridgeCall(ctx sdk.Context, data *types.OutgoingBr
 		sdk.NewAttribute(types.AttributeKeyRefund, refund.String()),
 	))
 
+	originAmount, err := k.erc20Keeper.GetCache(ctx, types.NewOriginTokenKey(k.moduleName, data.Nonce))
+	if err != nil && !errors.IsOf(err, collections.ErrNotFound) {
+		return err
+	}
+	if errors.IsOf(err, collections.ErrNotFound) {
+		originAmount = sdkmath.ZeroInt()
+	}
+
+	originCoin := sdk.NewCoin(fxtypes.DefaultDenom, originAmount)
+	if !baseCoins.IsAllGTE(sdk.NewCoins(originCoin)) {
+		return types.ErrInvalid.Wrapf("bridge call coin less than origin amount")
+	}
+	baseCoins = baseCoins.Sub(originCoin)
+
 	for _, coin := range baseCoins {
-		_, err := k.erc20Keeper.BaseCoinToEvm(ctx, common.BytesToAddress(refund.Bytes()), coin)
+		_, err = k.erc20Keeper.BaseCoinToEvm(ctx, common.BytesToAddress(refund.Bytes()), coin)
 		if err != nil {
 			return err
 		}

x/crosschain/keeper/many_to_one.go

@@ -148,14 +148,11 @@ func (k Keeper) IBCCoinRefund(ctx sdk.Context, holder sdk.AccAddress, ibcCoin sd
 	if err != nil {
 		return err
 	}
-	if !found {
-		return nil
+	if found {
+		return k.erc20Keeper.DeleteCache(ctx, ibcTransferKey)
 	}
 	_, err = k.erc20Keeper.BaseCoinToEvm(ctx, common.BytesToAddress(holder.Bytes()), sdk.NewCoin(baseDenom, ibcCoin.Amount))
-	if err != nil {
-		return err
-	}
-	return k.erc20Keeper.DeleteCache(ctx, ibcTransferKey)
+	return err
 }
 
 func (k Keeper) AfterIBCAckSuccess(ctx sdk.Context, ibcChannel string, ibcSequence uint64) error {

x/crosschain/types/expected_keepers.go

@@ -49,6 +49,7 @@ type Erc20Keeper interface {
 	HasCache(ctx context.Context, key string) (bool, error)
 	SetCache(ctx context.Context, key string, amount sdkmath.Int) error
 	DeleteCache(ctx context.Context, key string) error
+	GetCache(ctx context.Context, key string) (sdkmath.Int, error)
 
 	HasToken(ctx context.Context, token string) (bool, error)
 	GetBaseDenom(ctx context.Context, token string) (string, error)

x/erc20/keeper/cache.go

@@ -17,3 +17,7 @@ func (k Keeper) SetCache(ctx context.Context, key string, amount sdkmath.Int) er
 func (k Keeper) DeleteCache(ctx context.Context, key string) error {
 	return k.Cache.Remove(ctx, key)
 }
+
+func (k Keeper) GetCache(ctx context.Context, key string) (sdkmath.Int, error) {
+	return k.Cache.Get(ctx, key)
+}

x/ibc/middleware/keeper/relay_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 
 	"github.com/functionx/fx-core/v8/testutil/helpers"
+	crosschaintypes "github.com/functionx/fx-core/v8/x/crosschain/types"
 )
 
 func (suite *KeeperTestSuite) TestOnRecvPacket() {
@@ -80,6 +81,7 @@ func (suite *KeeperTestSuite) TestOnAcknowledgementPacket() {
 
 				escrowAddress := transfertypes.GetEscrowAddress(packet.SourcePort, packet.SourceChannel)
 				suite.mintCoin(escrowAddress, coin)
+				suite.Require().NoError(suite.App.Erc20Keeper.SetCache(suite.Ctx, crosschaintypes.NewIBCTransferKey(packet.SourceChannel, 1), coin.Amount))
 			},
 			true,
 			"",