@subwallet/extension-base 1.3.39-0 → 1.3.40-0

package/services/swap-service/handler/simpleswap-handler.js

@@ -4,50 +4,83 @@
 import { SwapError } from '@subwallet/extension-base/background/errors/SwapError';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { _getAssetDecimals, _getContractAddressOfToken, _isChainSubstrateCompatible, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetDecimals, _getAssetSymbol, _getContractAddressOfToken, _isChainSubstrateCompatible, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { BasicTxErrorType, CommonStepType, DynamicSwapType, SwapErrorType, SwapProviderId, SwapStepType } from '@subwallet/extension-base/types';
 import { _reformatAddressWithChain, formatNumber } from '@subwallet/extension-base/utils';
 import { getId } from '@subwallet/extension-base/utils/getId';
 import BigN, { BigNumber } from 'bignumber.js';
 import { getERC20TransactionObject, getEVMTransactionObject } from "../../balance-service/transfer/smart-contract.js";
 import { createSubstrateExtrinsic } from "../../balance-service/transfer/token.js";
-import { SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING } from "../utils.js";
 import { SwapBaseHandler } from "./base-handler.js";
-const apiUrl = 'https://api.simpleswap.io';
+const apiUrl = 'https://api.simpleswap.io/v3';
 export const simpleSwapApiKey = process.env.SIMPLE_SWAP_API_KEY || '';
 const toBNString = (input, decimal) => {
   const raw = new BigNumber(input);
   return raw.shiftedBy(decimal).integerValue(BigNumber.ROUND_CEIL).toFixed();
 };
-const createSwapRequest = async params => {
-  const fromDecimals = _getAssetDecimals(params.fromAsset);
-  const toDecimals = _getAssetDecimals(params.toAsset);
-  const formatedAmount = formatNumber(params.fromAmount, fromDecimals, s => s);
-  const requestBody = {
-    fixed: false,
-    currency_from: params.fromSymbol,
-    currency_to: params.toSymbol,
-    amount: formatedAmount,
-    // Convert to small number due to require of api
-    address_to: params.receiver,
-    extra_id_to: '',
-    user_refund_address: params.sender,
-    user_refund_extra_id: ''
-  };
-  const response = await fetch(`${apiUrl}/create_exchange?api_key=${simpleSwapApiKey}`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-      Accept: 'application/json'
-    },
-    body: JSON.stringify(requestBody)
-  });
-  const depositAddressResponse = await response.json();
-  return {
-    id: depositAddressResponse.id,
-    addressFrom: depositAddressResponse.address_from,
-    amountTo: toBNString(depositAddressResponse.amount_to, toDecimals)
-  };
+const buildTxForSimpleSwap = async params => {
+  try {
+    const {
+      fromAmount,
+      fromAsset,
+      fromSymbol,
+      metadata,
+      receiver,
+      sender,
+      toAsset,
+      toSymbol
+    } = params;
+    const fromDecimals = _getAssetDecimals(fromAsset);
+    const toDecimals = _getAssetDecimals(toAsset);
+    const formattedAmount = formatNumber(fromAmount, fromDecimals, s => s);
+    const requestBody = {
+      fixed: false,
+      tickerFrom: fromSymbol,
+      tickerTo: toSymbol,
+      amount: formattedAmount,
+      networkFrom: metadata.fromChainSymbol,
+      networkTo: metadata.toChainSymbol,
+      addressTo: receiver,
+      extraIdTo: '',
+      userRefundAddress: sender,
+      userRefundExtraId: ''
+    };
+    const response = await fetch(`${apiUrl}/exchanges`, {
+      method: 'POST',
+      headers: {
+        accept: 'application/json',
+        'Content-Type': 'application/json',
+        'x-api-key': simpleSwapApiKey
+      },
+      body: JSON.stringify(requestBody)
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      return {
+        error: new TransactionError(BasicTxErrorType.INTERNAL_ERROR, `Unable to create simpleswap transaction: ${errorText}`)
+      };
+    }
+    const depositAddressResponse = await response.json();
+    const result = depositAddressResponse.result;
+    console.log('simpleswapID', result.id);
+    if (!(result !== null && result !== void 0 && result.id) || !result.addressFrom || !result.amountTo) {
+      return {
+        error: new TransactionError(BasicTxErrorType.INTERNAL_ERROR)
+      };
+    }
+    return {
+      data: {
+        id: result.id,
+        addressFrom: result.addressFrom,
+        amountTo: toBNString(result.amountTo, toDecimals)
+      }
+    };
+  } catch (err) {
+    console.error('Error:', err);
+    return {
+      error: new TransactionError(BasicTxErrorType.INTERNAL_ERROR)
+    };
+  }
 };
 export class SimpleSwapHandler {
   constructor(chainService, balanceService, feeService) {
@@ -131,25 +164,31 @@ export class SimpleSwapHandler {
     const chainType = _isChainSubstrateCompatible(chainInfo) ? ChainType.SUBSTRATE : ChainType.EVM;
     const sender = _reformatAddressWithChain(address, chainInfo);
     const receiver = _reformatAddressWithChain(recipient !== null && recipient !== void 0 ? recipient : sender, toChainInfo);
-    const fromSymbol = SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING[fromAsset.slug];
-    const toSymbol = SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING[toAsset.slug];
+    const fromSymbol = _getAssetSymbol(fromAsset).toLowerCase();
+    const toSymbol = _getAssetSymbol(toAsset).toLowerCase();
+    const metadata = quote.metadata;
     const {
       fromAmount
     } = quote;
-    const {
-      addressFrom,
-      amountTo,
-      id
-    } = await createSwapRequest({
+    const result = await buildTxForSimpleSwap({
       fromSymbol,
       toSymbol,
       fromAmount,
       fromAsset,
       receiver,
       sender,
-      toAsset
+      toAsset,
+      metadata
     });
-    console.log('simpleswap data', id, addressFrom);
+    if (result.error) {
+      console.error('Simple swap error:', result.error);
+      throw result.error;
+    }
+    const {
+      addressFrom,
+      amountTo,
+      id
+    } = result.data;
     if (!id || id.length === 0 || !addressFrom || addressFrom.length === 0) {
       throw new SwapError(SwapErrorType.UNKNOWN);
     }

package/services/swap-service/utils.js

@@ -11,6 +11,8 @@ import BigN from 'bignumber.js';
 export const CHAIN_FLIP_TESTNET_EXPLORER = 'https://blocks-perseverance.chainflip.io';
 export const CHAIN_FLIP_MAINNET_EXPLORER = 'https://scan.chainflip.io';
 export const SIMPLE_SWAP_EXPLORER = 'https://simpleswap.io';
+
+// Deprecated
 export const SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING = {
   'bittensor-NATIVE-TAO': 'tao',
   [COMMON_ASSETS.ETH]: 'eth',

package/utils/fee/transfer.js

@@ -8,11 +8,12 @@ import { createCardanoTransaction } from '@subwallet/extension-base/services/bal
 import { getERC20TransactionObject, getEVMTransactionObject } from '@subwallet/extension-base/services/balance-service/transfer/smart-contract';
 import { createSubstrateExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/token';
 import { createTonTransaction } from '@subwallet/extension-base/services/balance-service/transfer/ton-transfer';
-import { createAcrossBridgeExtrinsic, createAvailBridgeExtrinsicFromAvail, createAvailBridgeTxFromEth, createPolygonBridgeExtrinsic, createSnowBridgeExtrinsic, createXcmExtrinsicV2, dryRunXcmExtrinsicV2 } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
+import { createAcrossBridgeExtrinsic, createAvailBridgeExtrinsicFromAvail, createAvailBridgeTxFromEth, createPolygonBridgeExtrinsic, createSnowBridgeExtrinsic, createXcmExtrinsicV2 } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
 import { _isAcrossChainBridge, _isAcrossTestnetBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/acrossBridge';
 import { isAvailChainBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge';
 import { _isPolygonChainBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polygonBridge';
 import { _isPosChainBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/posBridge';
+import { estimateXcmFee } from '@subwallet/extension-base/services/balance-service/transfer/xcm/utils';
 import { _getAssetDecimals, _getContractAddressOfToken, _isChainCardanoCompatible, _isChainEvmCompatible, _isChainTonCompatible, _isLocalToken, _isNativeToken, _isPureEvmChain, _isTokenEvmSmartContract, _isTokenTransferredByCardano, _isTokenTransferredByEvm, _isTokenTransferredByTon } from '@subwallet/extension-base/services/chain-service/utils';
 import { calculateToAmountByReservePool, FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE } from '@subwallet/extension-base/services/fee-service/utils';
 import { getHydrationRate } from '@subwallet/extension-base/services/fee-service/utils/tokenPayFee';
@@ -369,8 +370,15 @@ export const calculateXcmMaxTransferable = async (id, request, freeBalance, fee)
     } else if (feeChainType === 'substrate') {
       // Calculate fee for substrate transaction
       if (isSubstrateXcm) {
-        const estimatedFeeByDryRun = await dryRunXcmExtrinsicV2(params);
-        estimatedFee = estimatedFeeByDryRun.fee || '0';
+        const xcmFeeInfo = await estimateXcmFee({
+          fromChainInfo: params.originChain,
+          fromTokenInfo: params.originTokenInfo,
+          toChainInfo: params.destinationChain,
+          recipient: params.recipient,
+          sender: params.sender,
+          value: params.sendingValue
+        });
+        estimatedFee = (xcmFeeInfo === null || xcmFeeInfo === void 0 ? void 0 : xcmFeeInfo.origin.fee) || '0';
       } else {
         try {
           var _paymentInfo$partialF2;