[Issue-4321] feat: edit step amount (temp)

Author: bluezdot

packages/extension-base/src/services/swap-service/handler/base-handler.ts

@@ -219,7 +219,8 @@ export class SwapBaseHandler {
 
         if (needEditAmount) {
           bnSendingValue = BigN(selectedQuote.toAmount).multipliedBy(DEFAULT_EXCESS_AMOUNT_WEIGHT); // need to round
-        } else {
+        } else { // todo: remove
+          console.log('The code cannot run into here, if it runs into here, pls check');
           bnSendingValue = BigN(selectedQuote.toAmount);
         }
       }

packages/extension-base/src/services/swap-service/handler/uniswap-handler.ts

@@ -6,7 +6,7 @@ import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/K
 import { validateTypedSignMessageDataV3V4 } from '@subwallet/extension-base/core/logic-validation';
 import { estimateTxFee, getERC20Allowance, getERC20SpendingApprovalTx } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
 import { createAcrossBridgeExtrinsic, CreateXcmExtrinsicProps } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
-import { getAcrossQuote } from '@subwallet/extension-base/services/balance-service/transfer/xcm/acrossBridge';
+import { AcrossQuote, getAcrossQuote } from '@subwallet/extension-base/services/balance-service/transfer/xcm/acrossBridge';
 import TransactionService from '@subwallet/extension-base/services/transaction-service';
 import { ApproveStepMetadata, BaseStepDetail, BaseSwapStepMetadata, BasicTxErrorType, CommonOptimalSwapPath, CommonStepFeeInfo, CommonStepType, DynamicSwapType, EvmFeeInfo, FeeOptionKey, GenSwapStepFuncV2, HandleYieldStepData, OptimalSwapPathParamsV2, PermitSwapData, SwapBaseTxData, SwapFeeType, SwapProviderId, SwapStepType, SwapSubmitParams, SwapSubmitStepData, TokenSpendingApprovalParams, ValidateSwapProcessParams } from '@subwallet/extension-base/types';
 import { _reformatAddressWithChain } from '@subwallet/extension-base/utils';
@@ -20,6 +20,7 @@ import { _getAssetOriginChain, _getChainNativeTokenSlug, _getContractAddressOfTo
 import FeeService from '../../fee-service/service';
 import { calculateGasFeeParams } from '../../fee-service/utils';
 import { SwapBaseHandler, SwapBaseInterface } from './base-handler';
+import {DEFAULT_EXCESS_AMOUNT_WEIGHT, FEE_RATE_MULTIPLIER} from "@subwallet/extension-base/services/swap-service/utils";
 
 const API_URL = 'https://trade-api.gateway.uniswap.org/v1';
 const headers = {
@@ -482,7 +483,7 @@ export class UniswapHandler implements SwapBaseInterface {
       type: SwapStepType.SWAP,
       // @ts-ignore
       metadata: {
-        sendingValue: request.fromAmount.toString(),
+        sendingValue: request.fromAmount.toString(), // todo: * 1.04 in case swap first
         expectedReceive: selectedQuote.toAmount,
         originTokenInfo,
         destinationTokenInfo,
@@ -523,7 +524,6 @@ export class UniswapHandler implements SwapBaseInterface {
     const toTokenInfo = this.chainService.getAssetBySlug(bridgePairInfo.pair.to);
     const fromChainInfo = this.chainService.getChainInfoByKey(fromTokenInfo.originChain);
     const toChainInfo = this.chainService.getChainInfoByKey(toTokenInfo.originChain);
-    const isBridgeNativeToken = _isNativeToken(fromTokenInfo);
 
     if (!fromChainInfo || !toChainInfo || !fromChainInfo || !toChainInfo) {
       throw Error('Token or chain not found');
@@ -535,15 +535,10 @@ export class UniswapHandler implements SwapBaseInterface {
 
     if (isBridgeFirst) {
       receiverAddress = _reformatAddressWithChain(request.address, toChainInfo);
-
-      if (isBridgeNativeToken) {
-        mockSendingValue = BigNumber(selectedQuote.fromAmount).multipliedBy(1.02).toFixed(0, 1);
-      } else {
-        mockSendingValue = selectedQuote.fromAmount;
-      }
+      mockSendingValue = BigNumber(selectedQuote.fromAmount).toFixed(0, 1);
     } else if (isBridgeSecond) {
       receiverAddress = _reformatAddressWithChain(request.recipient || request.address, toChainInfo);
-      mockSendingValue = BigNumber(selectedQuote.toAmount).div(1.02).toFixed(0, 1);
+      mockSendingValue = BigNumber(selectedQuote.toAmount).toFixed(0, 1);
     } else {
       return undefined;
     }
@@ -576,31 +571,20 @@ export class UniswapHandler implements SwapBaseInterface {
         feeInfo
       });
 
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
-      const destinationFee = BigNumber(mockSendingValue).minus(acrossQuote.metadata.outputAmount).toFixed(0, 1);
+      const acrossQuoteMetadata = acrossQuote.metadata as AcrossQuote;
+
       const estimatedBridgeFee = await estimateTxFee(tx, evmApi, feeInfo);
+      const estimatedDestinationFee = BigNumber(mockSendingValue).minus(acrossQuoteMetadata.outputAmount).toFixed(0, 1); // todo: should better handle on backend and return desFee metadata instead of minus like this
 
       let sendingValue;
       let expectedReceive;
 
       if (isBridgeFirst) {
         expectedReceive = selectedQuote.fromAmount;
-        sendingValue = BigNumber(destinationFee).multipliedBy(1.02).plus(expectedReceive).toFixed(0, 1);
-
-        // if (isBridgeNativeToken) {
-        //   sendingValue = BigNumber(expectedReceive).plus(estimatedBridgeFee).toFixed(0, 1);
-        // } else {
-        //   sendingValue = BigNumber(expectedReceive).toFixed(0, 1);
-        // }
+        sendingValue = BigNumber(estimatedDestinationFee).multipliedBy(FEE_RATE_MULTIPLIER.medium).plus(selectedQuote.fromAmount).toFixed(0, 1);
       } else if (isBridgeSecond) {
-        sendingValue = BigNumber(selectedQuote.toAmount).div(1.02).toFixed(0, 1);
-        expectedReceive = BigNumber(sendingValue).minus(destinationFee).toFixed(0, 1);
-
-        // if (isBridgeNativeToken) {
-        //   expectedReceive = BigNumber(sendingValue).minus(estimatedBridgeFee).toFixed(0, 1);
-        // } else {
-        //   expectedReceive = sendingValue;
-        // }
+        expectedReceive = selectedQuote.toAmount;
+        sendingValue = BigNumber(selectedQuote.toAmount).multipliedBy(DEFAULT_EXCESS_AMOUNT_WEIGHT).toFixed(0, 1);
       } else {
         return undefined;
       }