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

package/cjs/services/earning-service/handlers/special.js

@@ -10,9 +10,10 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
 var _utils = require("@subwallet/extension-base/koni/api/yield/helper/utils");
 var _xcm = require("@subwallet/extension-base/services/balance-service/transfer/xcm");
-var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils2 = require("@subwallet/extension-base/services/balance-service/transfer/xcm/utils");
+var _utils3 = require("@subwallet/extension-base/services/chain-service/utils");
 var _types = require("@subwallet/extension-base/types");
-var _utils3 = require("@subwallet/extension-base/utils");
+var _utils4 = require("@subwallet/extension-base/utils");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
@@ -28,7 +29,7 @@ class BaseSpecialStakingPoolHandler extends _base.default {
   rate = 0;
   constructor(state, chain) {
     super(state, chain);
-    this.exchangeRatePromise = (0, _utils3.createPromiseHandler)();
+    this.exchangeRatePromise = (0, _utils4.createPromiseHandler)();
   }
   get metadataInfo() {
     return {
@@ -85,20 +86,20 @@ class BaseSpecialStakingPoolHandler extends _base.default {
     const bnMinJoinPool = new _util.BN(poolInfo.statistic.earningThreshold.join);
     const inputTokenInfo = this.state.chainService.getAssetBySlug(this.inputAsset);
     const altInputTokenInfo = this.state.chainService.getAssetBySlug(this.altInputAsset);
-    const existentialDeposit = new _util.BN((0, _utils2._getAssetExistentialDeposit)(altInputTokenInfo));
+    const existentialDeposit = new _util.BN((0, _utils3._getAssetExistentialDeposit)(altInputTokenInfo));
     const bnAltInputAssetBalance = new _util.BN(altInputAssetBalance.value);
     if (bnInputAssetBalance.add(bnAltInputAssetBalance).lt(bnMinJoinPool)) {
       const missingAmount = bnMinJoinPool.sub(bnInputAssetBalance).sub(bnAltInputAssetBalance);
       const isTheSame = missingAmount.toString() === bnMinJoinPool.toString();
       const originChain = this.state.getChainInfo(inputTokenInfo.originChain);
       const altChain = this.state.getChainInfo(altInputTokenInfo.originChain);
-      const originSymbol = (0, _utils2._getAssetSymbol)(inputTokenInfo);
-      const altSymbol = (0, _utils2._getAssetSymbol)(altInputTokenInfo);
+      const originSymbol = (0, _utils3._getAssetSymbol)(inputTokenInfo);
+      const altSymbol = (0, _utils3._getAssetSymbol)(altInputTokenInfo);
       const originName = originChain.name;
       const altName = altChain.name;
-      const parsedMinJoinPool = (0, _utils3.formatNumber)(missingAmount.toString(), inputAssetInfo.decimals || 0);
+      const parsedMinJoinPool = (0, _utils4.formatNumber)(missingAmount.toString(), inputAssetInfo.decimals || 0);
       const formatparsedMinJoinPool = isTheSame ? parsedMinJoinPool : Number(parsedMinJoinPool) + 0.01;
-      const parsedMinAltJoinPool = (0, _utils3.formatNumber)(missingAmount.add(existentialDeposit).toString(), inputAssetInfo.decimals || 0);
+      const parsedMinAltJoinPool = (0, _utils4.formatNumber)(missingAmount.add(existentialDeposit).toString(), inputAssetInfo.decimals || 0);
       const formatParsedMinAltJoinPool = isTheSame ? parsedMinAltJoinPool : Number(parsedMinAltJoinPool) + 0.01;
       return {
         passed: false,
@@ -224,35 +225,26 @@ class BaseSpecialStakingPoolHandler extends _base.default {
           const altChainInfo = this.state.getChainInfo(altInputTokenInfo.originChain);
           const symbol = altInputTokenInfo.symbol;
           const networkName = altChainInfo.name;
-          const xcmOriginSubstrateApi = await this.state.getSubstrateApi(altInputTokenInfo.originChain).isReady;
-          const id = (0, _getId.getId)();
-          const feeInfo = await this.state.feeService.subscribeChainFee(id, altChainInfo.slug, 'substrate');
-          const xcmRequest = {
-            sender: address,
-            originTokenInfo: altInputTokenInfo,
-            destinationTokenInfo: inputTokenInfo,
-            sendingValue: bnAmount.toString(),
-            recipient: address,
-            destinationChain: this.chainInfo,
-            originChain: altChainInfo,
-            substrateApi: xcmOriginSubstrateApi,
-            feeInfo
-          };
 
           // TODO: calculate fee for destination chain
-          let xcmFee;
-          const xcmFeeByDryRun = await (0, _xcm.dryRunXcmExtrinsicV2)(xcmRequest);
-          if (xcmFeeByDryRun.fee) {
-            xcmFee = (0, _bignumber.default)(xcmFeeByDryRun.fee).multipliedBy(_constants.XCM_MIN_AMOUNT_RATIO).toFixed(0, 1);
-          } else {
+          const xcmFeeInfo = await (0, _utils2.estimateXcmFee)({
+            fromChainInfo: altChainInfo,
+            fromTokenInfo: altInputTokenInfo,
+            toChainInfo: this.chainInfo,
+            recipient: address,
+            sender: address,
+            value: bnAmount.toString()
+          });
+          if (!xcmFeeInfo) {
             throw new Error('Error estimating XCM fee');
           }
+          const xcmFee = (0, _bignumber.default)(xcmFeeInfo.origin.fee).multipliedBy(_constants.XCM_MIN_AMOUNT_RATIO).toFixed(0, 1);
           const fee = {
             slug: altInputTokenSlug,
             amount: xcmFee
           };
           let bnTransferAmount = bnAmount.sub(bnInputTokenBalance);
-          if ((0, _utils2._isNativeToken)(altInputTokenInfo)) {
+          if ((0, _utils3._isNativeToken)(altInputTokenInfo)) {
             const bnXcmFee = new _util.BN(fee.amount || 0); // xcm fee is paid in native token but swap token is not always native token
 
             bnTransferAmount = bnTransferAmount.add(bnXcmFee);
@@ -316,14 +308,14 @@ class BaseSpecialStakingPoolHandler extends _base.default {
       processValidation.ok = false;
       processValidation.status = _types.YieldValidationStatus.NOT_ENOUGH_BALANCE;
       const bnMaxXCM = new _util.BN(altInputTokenBalance.value).sub(xcmFee.mul(new _util.BN(_constants.XCM_FEE_RATIO)));
-      const inputTokenDecimal = (0, _utils2._getAssetDecimals)(inputTokenInfo);
+      const inputTokenDecimal = (0, _utils3._getAssetDecimals)(inputTokenInfo);
       const maxBn = bnInputTokenBalance.add(new _util.BN(altInputTokenBalance.value)).sub(xcmFee).sub(xcmFee);
-      const maxValue = (0, _utils3.formatNumber)(maxBn.toString(), inputTokenInfo.decimals || 0);
-      const maxXCMValue = (0, _utils3.formatNumber)(bnMaxXCM.toString(), inputTokenDecimal);
-      const symbol = (0, _utils2._getAssetSymbol)(altInputTokenInfo);
+      const maxValue = (0, _utils4.formatNumber)(maxBn.toString(), inputTokenInfo.decimals || 0);
+      const maxXCMValue = (0, _utils4.formatNumber)(bnMaxXCM.toString(), inputTokenDecimal);
+      const symbol = (0, _utils3._getAssetSymbol)(altInputTokenInfo);
       const inputNetworkName = this.chainInfo.name;
-      const altNetworkName = (0, _utils2._getAssetName)(altInputTokenInfo);
-      const currentValue = (0, _utils3.formatNumber)(bnInputTokenBalance.toString(), inputTokenDecimal);
+      const altNetworkName = (0, _utils3._getAssetName)(altInputTokenInfo);
+      const currentValue = (0, _utils4.formatNumber)(bnInputTokenBalance.toString(), inputTokenDecimal);
       processValidation.message = (0, _i18next.t)('You can only enter a maximum of {{maxValue}} {{symbol}}, which is {{currentValue}} {{symbol}} ({{inputNetworkName}}) and {{maxXCMValue}} {{symbol}} ({{altNetworkName}}). Lower your amount and try again.', {
         replace: {
           symbol,
@@ -379,7 +371,7 @@ class BaseSpecialStakingPoolHandler extends _base.default {
       processValidation.failedStep = path.steps[id];
       processValidation.ok = false;
       processValidation.status = _types.YieldValidationStatus.NOT_ENOUGH_BALANCE;
-      const maxString = (0, _utils3.formatNumber)(bnInputTokenBalance.toString(), inputTokenInfo.decimals || 0);
+      const maxString = (0, _utils4.formatNumber)(bnInputTokenBalance.toString(), inputTokenInfo.decimals || 0);
       if (maxString !== '0') {
         processValidation.message = (0, _i18next.t)('Amount must be equal or less than {{number}}', {
           replace: {
@@ -443,7 +435,7 @@ class BaseSpecialStakingPoolHandler extends _base.default {
     const altInputTokenSlug = this.altInputAsset || '';
     const altInputTokenInfo = this.state.getAssetBySlug(altInputTokenSlug);
     const originChainInfo = this.state.getChainInfo(altInputTokenInfo.originChain);
-    const originTokenSlug = (0, _utils2._getChainNativeTokenSlug)(originChainInfo);
+    const originTokenSlug = (0, _utils3._getChainNativeTokenSlug)(originChainInfo);
     const originTokenInfo = this.state.getAssetBySlug(originTokenSlug);
     const destinationTokenInfo = this.state.getAssetBySlug(destinationTokenSlug);
     const substrateApi = this.state.getSubstrateApi(originChainInfo.slug);

package/cjs/services/swap-service/handler/base-handler.js

@@ -13,12 +13,13 @@ var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
 var _utils = require("@subwallet/extension-base/core/utils");
 var _xcm = require("@subwallet/extension-base/services/balance-service/transfer/xcm");
 var _acrossBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/acrossBridge");
-var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
-var _utils3 = require("@subwallet/extension-base/services/swap-service/utils");
+var _utils2 = require("@subwallet/extension-base/services/balance-service/transfer/xcm/utils");
+var _utils3 = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils4 = require("@subwallet/extension-base/services/swap-service/utils");
 var _types = require("@subwallet/extension-base/types");
 var _serviceBase = require("@subwallet/extension-base/types/service-base");
 var _swap = require("@subwallet/extension-base/types/swap");
-var _utils4 = require("@subwallet/extension-base/utils");
+var _utils5 = require("@subwallet/extension-base/utils");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
@@ -97,12 +98,12 @@ class SwapBaseHandler {
       throw Error('Token or chain not found');
     }
     let recipientAddress;
-    const senderAddress = (0, _utils4._reformatAddressWithChain)(address, fromChainInfo);
+    const senderAddress = (0, _utils5._reformatAddressWithChain)(address, fromChainInfo);
     if (stepIndex === 0) {
-      recipientAddress = (0, _utils4._reformatAddressWithChain)(address, toChainInfo);
+      recipientAddress = (0, _utils5._reformatAddressWithChain)(address, toChainInfo);
     } else {
       // bridge after swap
-      recipientAddress = (0, _utils4._reformatAddressWithChain)(recipient || address, toChainInfo);
+      recipientAddress = (0, _utils5._reformatAddressWithChain)(recipient || address, toChainInfo);
     }
     if (!(0, _xcmParser._isXcmWithinSameConsensus)(fromChainInfo, toChainInfo) || (0, _xcmParser._isSnowBridgeXcm)(fromChainInfo, toChainInfo) || (0, _xcmParser._isAcrossBridgeXcm)(fromChainInfo, toChainInfo)) {
       return undefined;
@@ -129,21 +130,25 @@ class SwapBaseHandler {
       };
 
       // TODO: calculate fee for destination chain
-      const bridgeFeeByDryRun = await (0, _xcm.dryRunXcmExtrinsicV2)(xcmRequest);
-      if (!bridgeFeeByDryRun.fee) {
-        return undefined;
-      }
-      const estimatedBridgeFee = (0, _bignumber.default)(bridgeFeeByDryRun.fee).multipliedBy(_utils3.FEE_RATE_MULTIPLIER.medium).toFixed(0, 1);
+      const xcmFeeInfo = await (0, _utils2.estimateXcmFee)({
+        fromChainInfo: xcmRequest.originChain,
+        fromTokenInfo: xcmRequest.originTokenInfo,
+        toChainInfo: xcmRequest.destinationChain,
+        recipient: xcmRequest.recipient,
+        sender: xcmRequest.sender,
+        value: xcmRequest.sendingValue
+      });
+      const estimatedBridgeFee = (0, _bignumber.default)((xcmFeeInfo === null || xcmFeeInfo === void 0 ? void 0 : xcmFeeInfo.origin.fee) || '0').multipliedBy(_utils4.FEE_RATE_MULTIPLIER.medium).toFixed(0, 1);
       const fee = {
         feeComponent: [{
           feeType: _swap.SwapFeeType.NETWORK_FEE,
           amount: estimatedBridgeFee,
-          tokenSlug: (0, _utils2._getChainNativeTokenSlug)(fromChainInfo)
+          tokenSlug: (0, _utils3._getChainNativeTokenSlug)(fromChainInfo)
         }],
-        defaultFeeToken: (0, _utils2._getChainNativeTokenSlug)(fromChainInfo),
-        feeOptions: [(0, _utils2._getChainNativeTokenSlug)(fromChainInfo)]
+        defaultFeeToken: (0, _utils3._getChainNativeTokenSlug)(fromChainInfo),
+        feeOptions: [(0, _utils3._getChainNativeTokenSlug)(fromChainInfo)]
       };
-      const isBridgeNativeToken = (0, _utils2._isNativeToken)(fromTokenInfo);
+      const isBridgeNativeToken = (0, _utils3._isNativeToken)(fromTokenInfo);
       let bnSendingValue;
       let expectedReceive;
       const actionList = JSON.stringify(path.map(step => step.action));
@@ -156,30 +161,30 @@ class SwapBaseHandler {
         expectedReceive = fromAmount;
         bnSendingValue = (0, _bignumber.default)(fromAmount);
         if (needEditAmount) {
-          bnSendingValue = bnSendingValue.multipliedBy(_utils3.DEFAULT_EXCESS_AMOUNT_WEIGHT);
+          bnSendingValue = bnSendingValue.multipliedBy(_utils4.DEFAULT_EXCESS_AMOUNT_WEIGHT);
           expectedReceive = bnSendingValue.toFixed(0, 1);
         }
         if (isBridgeNativeToken) {
           bnSendingValue = bnSendingValue.plus((0, _bignumber.default)(estimatedBridgeFee));
         } else {
-          bnSendingValue = bnSendingValue.plus((0, _bignumber.default)((0, _utils2._getTokenMinAmount)(toTokenInfo)).multipliedBy(_utils3.FEE_RATE_MULTIPLIER.medium)).plus((0, _utils2._getTokenMinAmount)(toTokenInfo));
+          bnSendingValue = bnSendingValue.plus((0, _bignumber.default)((0, _utils3._getTokenMinAmount)(toTokenInfo)).multipliedBy(_utils4.FEE_RATE_MULTIPLIER.medium)).plus((0, _utils3._getTokenMinAmount)(toTokenInfo));
         }
         if ((0, _bignumber.default)(toTokenBalance.value).lte(0)) {
-          bnSendingValue = bnSendingValue.plus((0, _utils2._getTokenMinAmount)(toTokenInfo));
+          bnSendingValue = bnSendingValue.plus((0, _utils3._getTokenMinAmount)(toTokenInfo));
         }
       } else {
         // bridge after swap
         expectedReceive = selectedQuote.toAmount;
         if (needEditAmount) {
-          bnSendingValue = (0, _bignumber.default)(selectedQuote.toAmount).multipliedBy(_utils3.DEFAULT_EXCESS_AMOUNT_WEIGHT); // need to round
+          bnSendingValue = (0, _bignumber.default)(selectedQuote.toAmount).multipliedBy(_utils4.DEFAULT_EXCESS_AMOUNT_WEIGHT); // need to round
         } else {
           // todo: remove
           console.log('The code cannot run into here, if it runs into here, pls ask dev to check');
           bnSendingValue = (0, _bignumber.default)(selectedQuote.toAmount);
         }
       }
-      if (toTokenInfo.originChain === 'mythos' && (0, _utils2._isNativeToken)(toTokenInfo)) {
-        bnSendingValue = bnSendingValue.plus((0, _bignumber.default)(2.5).shiftedBy((0, _utils2._getAssetDecimals)(toTokenInfo)));
+      if (toTokenInfo.originChain === 'mythos' && (0, _utils3._isNativeToken)(toTokenInfo)) {
+        bnSendingValue = bnSendingValue.plus((0, _bignumber.default)(2.5).shiftedBy((0, _utils3._getAssetDecimals)(toTokenInfo)));
       }
       const step = {
         // @ts-ignore
@@ -248,7 +253,7 @@ class SwapBaseHandler {
     return {
       txChain: originAsset.originChain,
       extrinsic,
-      transferNativeAmount: (0, _utils2._isNativeToken)(originAsset) ? briefXcmStep.sendingValue : '0',
+      transferNativeAmount: (0, _utils3._isNativeToken)(originAsset) ? briefXcmStep.sendingValue : '0',
       extrinsicType: _KoniTypes.ExtrinsicType.TRANSFER_XCM,
       chainType: _KoniTypes.ChainType.SUBSTRATE,
       txData: xcmData
@@ -291,7 +296,7 @@ class SwapBaseHandler {
     return {
       txChain: originTokenInfo.originChain,
       extrinsic: tx,
-      transferNativeAmount: (0, _utils2._isNativeToken)(originTokenInfo) ? bridgeStep.sendingValue : '0',
+      transferNativeAmount: (0, _utils3._isNativeToken)(originTokenInfo) ? bridgeStep.sendingValue : '0',
       extrinsicType: _KoniTypes.ExtrinsicType.TRANSFER_XCM,
       chainType: _KoniTypes.ChainType.EVM,
       txData: txData
@@ -313,14 +318,14 @@ class SwapBaseHandler {
     return [];
   }
   async validateBridgeStep(receiver, fromToken, toToken, selectedFeeToken, toChainNativeToken, bnBridgeAmount, bnFromTokenBalance, bnBridgeFeeAmount, bnFeeTokenBalance, bnBridgeDeliveryFee) {
-    const minBridgeAmountRequired = new _bignumber.default((0, _utils2._getTokenMinAmount)(toToken)).multipliedBy(_utils3.FEE_RATE_MULTIPLIER.high);
+    const minBridgeAmountRequired = new _bignumber.default((0, _utils3._getTokenMinAmount)(toToken)).multipliedBy(_utils4.FEE_RATE_MULTIPLIER.high);
     const spendingAndFeePaymentValidation = (0, _logicValidation.validateSpendingAndFeePayment)(fromToken, selectedFeeToken, bnBridgeAmount, bnFromTokenBalance, bnBridgeFeeAmount, bnFeeTokenBalance);
     if (spendingAndFeePaymentValidation.length > 0) {
       return spendingAndFeePaymentValidation;
     }
     if (bnBridgeAmount.lte(minBridgeAmountRequired.plus(bnBridgeDeliveryFee))) {
-      const atLeastStr = (0, _utils4.formatNumber)(minBridgeAmountRequired.plus(bnBridgeDeliveryFee), (0, _utils2._getAssetDecimals)(toToken), _utils4.balanceFormatter, {
-        maxNumberFormat: (0, _utils2._getAssetDecimals)(toToken) || 6
+      const atLeastStr = (0, _utils5.formatNumber)(minBridgeAmountRequired.plus(bnBridgeDeliveryFee), (0, _utils3._getAssetDecimals)(toToken), _utils5.balanceFormatter, {
+        maxNumberFormat: (0, _utils3._getAssetDecimals)(toToken) || 6
       });
       return [new _TransactionError.TransactionError(_types.TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, (0, _i18next.t)('You must transfer at least {{amount}} {{symbol}} to keep the destination account alive', {
         replace: {
@@ -329,7 +334,7 @@ class SwapBaseHandler {
         }
       }))];
     }
-    const isAcrossBridge = (0, _acrossBridge._isAcrossChainBridge)((0, _utils2._getAssetOriginChain)(fromToken), (0, _utils2._getAssetOriginChain)(toToken));
+    const isAcrossBridge = (0, _acrossBridge._isAcrossChainBridge)((0, _utils3._getAssetOriginChain)(fromToken), (0, _utils3._getAssetOriginChain)(toToken));
     if (!isAcrossBridge) {
       // By here, we know that the user is receiving a valid amount of toToken
       const toChainApi = this.chainService.getSubstrateApi(toToken.originChain);
@@ -340,7 +345,7 @@ class SwapBaseHandler {
 
       // Only need to check if account is alive with the receiving toToken
       const isToTokenSufficient = await (0, _utils._isSufficientToken)(toToken, toChainApi, sufficientChain);
-      if (!isToTokenSufficient && !(0, _utils2._isNativeToken)(toToken)) {
+      if (!isToTokenSufficient && !(0, _utils3._isNativeToken)(toToken)) {
         // sending token cannot keep account alive, must check with native token
         const toChainNativeTokenBalance = await this.balanceService.getTotalBalance(receiver, toToken.originChain, toChainNativeToken.slug, _KoniTypes.ExtrinsicType.TRANSFER_BALANCE);
         if (!(0, _systemPallet._isAccountActive)(toChainNativeTokenBalance.metadata)) {
@@ -361,20 +366,20 @@ class SwapBaseHandler {
     if (spendingAndFeePaymentValidation.length > 0) {
       return spendingAndFeePaymentValidation;
     }
-    if (bnExpectedReceivingAmount.lte((0, _utils2._getTokenMinAmount)(receivingToken))) {
-      const atLeastStr = (0, _utils4.formatNumber)((0, _utils2._getTokenMinAmount)(receivingToken), (0, _utils2._getAssetDecimals)(receivingToken), _utils4.balanceFormatter, {
-        maxNumberFormat: (0, _utils2._getAssetDecimals)(receivingToken) || 6
+    if (bnExpectedReceivingAmount.lte((0, _utils3._getTokenMinAmount)(receivingToken))) {
+      const atLeastStr = (0, _utils5.formatNumber)((0, _utils3._getTokenMinAmount)(receivingToken), (0, _utils3._getAssetDecimals)(receivingToken), _utils5.balanceFormatter, {
+        maxNumberFormat: (0, _utils3._getAssetDecimals)(receivingToken) || 6
       });
       return [new _TransactionError.TransactionError(_swap.SwapErrorType.NOT_MEET_MIN_SWAP, (0, _i18next.t)('You can\'t receive less than {{number}} {{symbol}}', {
         replace: {
           number: atLeastStr,
-          symbol: (0, _utils2._getAssetSymbol)(receivingToken)
+          symbol: (0, _utils3._getAssetSymbol)(receivingToken)
         }
       }))];
     }
     if (recipient) {
       const isEvmAddress = (0, _utilCrypto.isEthereumAddress)(recipient);
-      const isEvmDestChain = (0, _utils2._isChainEvmCompatible)(swapToChain);
+      const isEvmDestChain = (0, _utils3._isChainEvmCompatible)(swapToChain);
       if (isEvmAddress !== isEvmDestChain) {
         // todo: update condition if support swap chain # EVM or Substrate
         return [new _TransactionError.TransactionError(_swap.SwapErrorType.INVALID_RECIPIENT)];
@@ -442,8 +447,8 @@ class SwapBaseHandler {
     const bridgeSelectedFeeToken = this.chainService.getAssetBySlug(currentFee.selectedFeeToken || currentFee.defaultFeeToken);
     const bnBridgeDeliveryFee = (0, _bignumber.default)(0); // todo
 
-    const bridgeSender = (0, _utils4._reformatAddressWithChain)(xcmMetadata.sender, this.chainService.getChainInfoByKey(bridgeFromToken.originChain));
-    const bridgeReceiver = (0, _utils4._reformatAddressWithChain)((_xcmMetadata$receiver = xcmMetadata.receiver) !== null && _xcmMetadata$receiver !== void 0 ? _xcmMetadata$receiver : bridgeSender, this.chainService.getChainInfoByKey(bridgeToToken.originChain));
+    const bridgeSender = (0, _utils5._reformatAddressWithChain)(xcmMetadata.sender, this.chainService.getChainInfoByKey(bridgeFromToken.originChain));
+    const bridgeReceiver = (0, _utils5._reformatAddressWithChain)((_xcmMetadata$receiver = xcmMetadata.receiver) !== null && _xcmMetadata$receiver !== void 0 ? _xcmMetadata$receiver : bridgeSender, this.chainService.getChainInfoByKey(bridgeToToken.originChain));
     const [bridgeFromTokenBalance, bridgeFeeTokenBalance] = await Promise.all([this.balanceService.getTransferableBalance(bridgeSender, bridgeFromToken.originChain, bridgeFromToken.slug, _KoniTypes.ExtrinsicType.TRANSFER_XCM), this.balanceService.getTransferableBalance(bridgeSender, bridgeFromToken.originChain, bridgeSelectedFeeToken.slug, _KoniTypes.ExtrinsicType.TRANSFER_XCM)]);
 
     // Native token balance has already accounted for ED aka strict mode
@@ -487,11 +492,11 @@ class SwapBaseHandler {
     if (bnSwapValue.gt(bnBridgeAmount)) {
       return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR)];
     }
-    if (bnSwapValue.lte((0, _utils2._getTokenMinAmount)(swapToken))) {
-      const atLeastString = (0, _utils4.formatNumber)((0, _utils2._getTokenMinAmount)(swapToken), (0, _utils2._getAssetDecimals)(swapToken), _utils4.balanceFormatter, {
-        maxNumberFormat: (0, _utils2._getAssetDecimals)(swapToken) || 6
+    if (bnSwapValue.lte((0, _utils3._getTokenMinAmount)(swapToken))) {
+      const atLeastString = (0, _utils5.formatNumber)((0, _utils3._getTokenMinAmount)(swapToken), (0, _utils3._getAssetDecimals)(swapToken), _utils5.balanceFormatter, {
+        maxNumberFormat: (0, _utils3._getAssetDecimals)(swapToken) || 6
       });
-      return [new _TransactionError.TransactionError(_swap.SwapErrorType.NOT_MEET_MIN_SWAP, (0, _i18next.t)(`Swap amount too small. Increase to more than ${atLeastString} ${(0, _utils2._getAssetSymbol)(swapToken)} and try again`))];
+      return [new _TransactionError.TransactionError(_swap.SwapErrorType.NOT_MEET_MIN_SWAP, (0, _i18next.t)(`Swap amount too small. Increase to more than ${atLeastString} ${(0, _utils3._getAssetSymbol)(swapToken)} and try again`))];
     }
     const swapFeeToken = this.chainService.getAssetBySlug(swapFee.selectedFeeToken || swapFee.defaultFeeToken);
     const swapToChain = this.chainService.getChainInfoByKey(swapMetadata.destinationTokenInfo.originChain);
@@ -530,11 +535,11 @@ class SwapBaseHandler {
     const bnSwapReceivingAmount = (0, _bignumber.default)(swapMetadata.expectedReceive);
     const bnSwapValue = (0, _bignumber.default)(swapMetadata.sendingValue);
     const bnSwapFeeAmount = (0, _bignumber.default)(swapNetworkFee.amount);
-    if (bnSwapValue.lte((0, _utils2._getTokenMinAmount)(swapToken))) {
-      const atLeastString = (0, _utils4.formatNumber)((0, _utils2._getTokenMinAmount)(swapToken), (0, _utils2._getAssetDecimals)(swapToken), _utils4.balanceFormatter, {
-        maxNumberFormat: (0, _utils2._getAssetDecimals)(swapToken) || 6
+    if (bnSwapValue.lte((0, _utils3._getTokenMinAmount)(swapToken))) {
+      const atLeastString = (0, _utils5.formatNumber)((0, _utils3._getTokenMinAmount)(swapToken), (0, _utils3._getAssetDecimals)(swapToken), _utils5.balanceFormatter, {
+        maxNumberFormat: (0, _utils3._getAssetDecimals)(swapToken) || 6
       });
-      return [new _TransactionError.TransactionError(_swap.SwapErrorType.NOT_MEET_MIN_SWAP, (0, _i18next.t)(`Swap amount too small. Increase to more than ${atLeastString} ${(0, _utils2._getAssetSymbol)(swapToken)} and try again`))];
+      return [new _TransactionError.TransactionError(_swap.SwapErrorType.NOT_MEET_MIN_SWAP, (0, _i18next.t)(`Swap amount too small. Increase to more than ${atLeastString} ${(0, _utils3._getAssetSymbol)(swapToken)} and try again`))];
     }
     const swapFeeToken = this.chainService.getAssetBySlug(swapFee.selectedFeeToken || swapFee.defaultFeeToken);
     const swapToChain = this.chainService.getChainInfoByKey(swapMetadata.destinationTokenInfo.originChain);
@@ -573,8 +578,8 @@ class SwapBaseHandler {
     const bridgeSelectedFeeToken = this.chainService.getAssetBySlug(currentFee.selectedFeeToken || currentFee.defaultFeeToken);
     const bnBridgeDeliveryFee = (0, _bignumber.default)(0); // todo
 
-    const bridgeSender = (0, _utils4._reformatAddressWithChain)(xcmMetadata.sender, this.chainService.getChainInfoByKey(bridgeFromToken.originChain));
-    const bridgeReceiver = (0, _utils4._reformatAddressWithChain)((_xcmMetadata$receiver2 = xcmMetadata.receiver) !== null && _xcmMetadata$receiver2 !== void 0 ? _xcmMetadata$receiver2 : bridgeSender, this.chainService.getChainInfoByKey(bridgeToToken.originChain));
+    const bridgeSender = (0, _utils5._reformatAddressWithChain)(xcmMetadata.sender, this.chainService.getChainInfoByKey(bridgeFromToken.originChain));
+    const bridgeReceiver = (0, _utils5._reformatAddressWithChain)((_xcmMetadata$receiver2 = xcmMetadata.receiver) !== null && _xcmMetadata$receiver2 !== void 0 ? _xcmMetadata$receiver2 : bridgeSender, this.chainService.getChainInfoByKey(bridgeToToken.originChain));
     const [bridgeFromTokenBalance, bridgeFeeTokenBalance] = await Promise.all([this.balanceService.getTransferableBalance(bridgeSender, bridgeFromToken.originChain, bridgeFromToken.slug, _KoniTypes.ExtrinsicType.TRANSFER_XCM), this.balanceService.getTransferableBalance(bridgeSender, bridgeFromToken.originChain, bridgeSelectedFeeToken.slug, _KoniTypes.ExtrinsicType.TRANSFER_XCM)]);
 
     // Native token balance has already accounted for ED aka strict mode
@@ -612,8 +617,8 @@ class SwapBaseHandler {
     const bridgeSelectedFeeToken = this.chainService.getAssetBySlug(bridgeFee.selectedFeeToken || bridgeFee.defaultFeeToken);
     const bnBridgeDeliveryFee = (0, _bignumber.default)(0); // todo
 
-    const bridgeSender = (0, _utils4._reformatAddressWithChain)(bridgeMetadata.sender, this.chainService.getChainInfoByKey(bridgeFromToken.originChain));
-    const bridgeReceiver = (0, _utils4._reformatAddressWithChain)((_bridgeMetadata$recei = bridgeMetadata.receiver) !== null && _bridgeMetadata$recei !== void 0 ? _bridgeMetadata$recei : bridgeSender, this.chainService.getChainInfoByKey(bridgeToToken.originChain));
+    const bridgeSender = (0, _utils5._reformatAddressWithChain)(bridgeMetadata.sender, this.chainService.getChainInfoByKey(bridgeFromToken.originChain));
+    const bridgeReceiver = (0, _utils5._reformatAddressWithChain)((_bridgeMetadata$recei = bridgeMetadata.receiver) !== null && _bridgeMetadata$recei !== void 0 ? _bridgeMetadata$recei : bridgeSender, this.chainService.getChainInfoByKey(bridgeToToken.originChain));
     const [bridgeFromTokenBalance, bridgeFeeTokenBalance] = await Promise.all([this.balanceService.getTransferableBalance(bridgeSender, bridgeFromToken.originChain, bridgeFromToken.slug, _KoniTypes.ExtrinsicType.TRANSFER_XCM), this.balanceService.getTransferableBalance(bridgeSender, bridgeFromToken.originChain, bridgeSelectedFeeToken.slug, _KoniTypes.ExtrinsicType.TRANSFER_XCM)]);
 
     // Native token balance has already accounted for ED aka strict mode
@@ -657,11 +662,11 @@ class SwapBaseHandler {
     if (bnSwapValue.gt(bnBridgeAmount)) {
       return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR)];
     }
-    if (bnSwapValue.lte((0, _utils2._getTokenMinAmount)(swapToken))) {
-      const atLeastString = (0, _utils4.formatNumber)((0, _utils2._getTokenMinAmount)(swapToken), (0, _utils2._getAssetDecimals)(swapToken), _utils4.balanceFormatter, {
-        maxNumberFormat: (0, _utils2._getAssetDecimals)(swapToken) || 6
+    if (bnSwapValue.lte((0, _utils3._getTokenMinAmount)(swapToken))) {
+      const atLeastString = (0, _utils5.formatNumber)((0, _utils3._getTokenMinAmount)(swapToken), (0, _utils3._getAssetDecimals)(swapToken), _utils5.balanceFormatter, {
+        maxNumberFormat: (0, _utils3._getAssetDecimals)(swapToken) || 6
       });
-      return [new _TransactionError.TransactionError(_swap.SwapErrorType.NOT_MEET_MIN_SWAP, (0, _i18next.t)(`Swap amount too small. Increase to more than ${atLeastString} ${(0, _utils2._getAssetSymbol)(swapToken)} and try again`))];
+      return [new _TransactionError.TransactionError(_swap.SwapErrorType.NOT_MEET_MIN_SWAP, (0, _i18next.t)(`Swap amount too small. Increase to more than ${atLeastString} ${(0, _utils3._getAssetSymbol)(swapToken)} and try again`))];
     }
     const swapFeeToken = this.chainService.getAssetBySlug(swapFee.selectedFeeToken || swapFee.defaultFeeToken);
     const swapToChain = this.chainService.getChainInfoByKey(swapMetadata.destinationTokenInfo.originChain);
@@ -700,8 +705,8 @@ class SwapBaseHandler {
     const transitSelectedFeeToken = this.chainService.getAssetBySlug(transitTotalFee.selectedFeeToken || transitTotalFee.defaultFeeToken);
     const bnTransitDeliveryFee = (0, _bignumber.default)(0); // todo
 
-    const transitSender = (0, _utils4._reformatAddressWithChain)(transitMetadata.sender, this.chainService.getChainInfoByKey(transitFromToken.originChain));
-    const transitReceiver = (0, _utils4._reformatAddressWithChain)((_transitMetadata$rece = transitMetadata.receiver) !== null && _transitMetadata$rece !== void 0 ? _transitMetadata$rece : transitSender, this.chainService.getChainInfoByKey(transitToToken.originChain));
+    const transitSender = (0, _utils5._reformatAddressWithChain)(transitMetadata.sender, this.chainService.getChainInfoByKey(transitFromToken.originChain));
+    const transitReceiver = (0, _utils5._reformatAddressWithChain)((_transitMetadata$rece = transitMetadata.receiver) !== null && _transitMetadata$rece !== void 0 ? _transitMetadata$rece : transitSender, this.chainService.getChainInfoByKey(transitToToken.originChain));
     const [transitFromTokenBalance, transitFeeTokenBalance] = await Promise.all([this.balanceService.getTransferableBalance(transitSender, transitFromToken.originChain, transitFromToken.slug, _KoniTypes.ExtrinsicType.TRANSFER_XCM), this.balanceService.getTransferableBalance(transitSender, transitFromToken.originChain, transitSelectedFeeToken.slug, _KoniTypes.ExtrinsicType.TRANSFER_XCM)]);
 
     // Native token balance has already accounted for ED aka strict mode

package/cjs/services/swap-service/handler/chainflip-handler.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ChainflipSwapHandler = exports.CHAINFLIP_BROKER_API = void 0;
+exports.ChainflipSwapHandler = void 0;
 var _chainList = require("@subwallet/chain-list");
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
@@ -12,9 +12,9 @@ var _smartContract = require("@subwallet/extension-base/services/balance-service
 var _token = require("@subwallet/extension-base/services/balance-service/transfer/token");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _baseHandler = require("@subwallet/extension-base/services/swap-service/handler/base-handler");
-var _utils2 = require("@subwallet/extension-base/services/swap-service/utils");
 var _types = require("@subwallet/extension-base/types");
-var _utils3 = require("@subwallet/extension-base/utils");
+var _environment = require("@subwallet/extension-base/types/environment");
+var _utils2 = require("@subwallet/extension-base/utils");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-base
@@ -22,9 +22,10 @@ var _bignumber = _interopRequireDefault(require("bignumber.js"));
 
 const INTERMEDIARY_MAINNET_ASSET_SLUG = _chainList.COMMON_ASSETS.USDC_ETHEREUM;
 const INTERMEDIARY_TESTNET_ASSET_SLUG = _chainList.COMMON_ASSETS.USDC_SEPOLIA;
-const CHAINFLIP_BROKER_API = process.env.CHAINFLIP_BROKER_API || '';
-exports.CHAINFLIP_BROKER_API = CHAINFLIP_BROKER_API;
 class ChainflipSwapHandler {
+  // private baseUrl: string;
+  // private assetsUrl: string;
+
   constructor(chainService, balanceService, feeService) {
     let isTestnet = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
     this.swapBaseHandler = new _baseHandler.SwapBaseHandler({
@@ -36,8 +37,10 @@ class ChainflipSwapHandler {
     });
     this.isTestnet = isTestnet;
     this.providerSlug = isTestnet ? _types.SwapProviderId.CHAIN_FLIP_TESTNET : _types.SwapProviderId.CHAIN_FLIP_MAINNET;
-    this.baseUrl = (0, _utils2.getChainflipSwap)(isTestnet);
+    // this.baseUrl = getChainflipSwap(isTestnet);
+    // this.assetsUrl = getAssetsUrl(isTestnet);
   }
+
   get chainService() {
     return this.swapBaseHandler.chainService;
   }
@@ -73,7 +76,7 @@ class ChainflipSwapHandler {
     const chainInfo = this.chainService.getChainInfoByKey(fromAsset.originChain);
     const toChainInfo = this.chainService.getChainInfoByKey(fromAsset.originChain);
     const chainType = (0, _utils._isChainSubstrateCompatible)(chainInfo) ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM;
-    const receiver = (0, _utils3._reformatAddressWithChain)(recipient !== null && recipient !== void 0 ? recipient : address, toChainInfo);
+    const receiver = (0, _utils2._reformatAddressWithChain)(recipient !== null && recipient !== void 0 ? recipient : address, toChainInfo);
     const fromAssetId = (0, _utils._getAssetSymbol)(fromAsset);
     const toAssetId = (0, _utils._getAssetSymbol)(toAsset);
     const minReceive = new _bignumber.default(quote.rate).times(1 - slippage).toString();
@@ -85,23 +88,31 @@ class ChainflipSwapHandler {
     if (processMetadata.destChain !== quoteMetadata.destChain || processMetadata.srcChain !== quoteMetadata.srcChain) {
       throw new Error('Metadata for Chainflip not found');
     }
+    const assetsResponse = await (0, _utils2.fetchFromProxyService)(_environment.ProxyServiceRoute.CHAINFLIP, '/assets', {
+      method: 'GET'
+    }, this.isTestnet);
+    const _allAssets = await assetsResponse.json();
+    const allAssets = _allAssets.assets;
+    const sourceAsset = allAssets.find(asset => asset.network === processMetadata.srcChain && asset.ticker === fromAssetId);
+    const destinationAsset = allAssets.find(asset => asset.network === processMetadata.destChain && asset.ticker === toAssetId);
+    if (!sourceAsset || !destinationAsset) {
+      throw new Error('Error get Chainflip data');
+    }
     const depositParams = {
-      sourceChain: processMetadata.srcChain,
       destinationAddress: receiver,
-      destinationAsset: toAssetId,
-      destinationChain: processMetadata.destChain,
+      destinationAsset: destinationAsset.id,
+      sourceAsset: sourceAsset.id,
       minimumPrice: minReceive,
       // minimum accepted price for swaps through the channel
       refundAddress: address,
       // address to which assets are refunded
-      retryDurationInBlocks: '100',
-      // 100 blocks * 6 seconds = 10 minutes before deposits are refunded
-      sourceAsset: fromAssetId
+      retryDurationInBlocks: '100' // 100 blocks * 6 seconds = 10 minutes before deposits are refunded
     };
-    const url = `${this.baseUrl}&${new URLSearchParams(depositParams).toString()}`;
-    const response = await fetch(url, {
+
+    const path = `/swap?${new URLSearchParams(depositParams).toString()}`;
+    const response = await (0, _utils2.fetchFromProxyService)(_environment.ProxyServiceRoute.CHAINFLIP, path, {
       method: 'GET'
-    });
+    }, this.isTestnet);
     const data = await response.json();
     if (!data.id || !data.address || data.address === '' || !data.issuedBlock || !data.network || !data.channelId) {
       throw new Error('Error get Chainflip data');
@@ -208,8 +219,8 @@ class ChainflipSwapHandler {
         expectedReceive: params.selectedQuote.toAmount,
         originTokenInfo,
         destinationTokenInfo,
-        sender: (0, _utils3._reformatAddressWithChain)(params.request.address, originChain),
-        receiver: (0, _utils3._reformatAddressWithChain)(params.request.recipient || params.request.address, destinationChain),
+        sender: (0, _utils2._reformatAddressWithChain)(params.request.address, originChain),
+        receiver: (0, _utils2._reformatAddressWithChain)(params.request.recipient || params.request.address, destinationChain),
         srcChain: metadata.srcChain,
         destChain: metadata.destChain,
         version: 2