@subwallet/extension-base 1.3.30-0 → 1.3.31-1

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 { createAvailBridgeExtrinsicFromAvail, createAvailBridgeTxFromEth, createPolygonBridgeExtrinsic, createSnowBridgeExtrinsic, createXcmExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
+import { createAcrossBridgeExtrinsic, createAvailBridgeExtrinsicFromAvail, createAvailBridgeTxFromEth, createPolygonBridgeExtrinsic, createSnowBridgeExtrinsic, createXcmExtrinsicV2, dryRunXcmExtrinsicV2 } 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 { _getContractAddressOfToken, _isChainCardanoCompatible, _isChainEvmCompatible, _isChainTonCompatible, _isLocalToken, _isNativeToken, _isPureEvmChain, _isTokenEvmSmartContract, _isTokenTransferredByCardano, _isTokenTransferredByEvm, _isTokenTransferredByTon } from '@subwallet/extension-base/services/chain-service/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';
 import { isCardanoTransaction, isTonTransaction } from '@subwallet/extension-base/services/transaction-service/helpers';
@@ -29,7 +30,8 @@ export const detectTransferTxType = (srcToken, srcChain, destChain) => {
     const isSnowBridgeEvmTransfer = _isPureEvmChain(srcChain) && _isSnowBridgeXcm(srcChain, destChain) && !isAvailBridgeFromEvm;
     const isPolygonBridgeTransfer = _isPolygonChainBridge(srcChain.slug, destChain.slug);
     const isPosBridgeTransfer = _isPosChainBridge(srcChain.slug, destChain.slug);
-    return isAvailBridgeFromEvm || isSnowBridgeEvmTransfer || isPolygonBridgeTransfer || isPosBridgeTransfer ? 'evm' : 'substrate';
+    const isAcrossBridgeTransfer = _isAcrossChainBridge(srcChain.slug, destChain.slug);
+    return isAvailBridgeFromEvm || isSnowBridgeEvmTransfer || isPolygonBridgeTransfer || isPosBridgeTransfer || isAcrossBridgeTransfer ? 'evm' : 'substrate';
   } else {
     if (_isChainEvmCompatible(srcChain) && _isTokenTransferredByEvm(srcToken)) {
       return 'evm';
@@ -77,7 +79,8 @@ export const calculateTransferMaxTransferable = async (id, request, freeBalance,
     srcChain,
     srcToken,
     substrateApi,
-    tonApi
+    tonApi,
+    value
   } = request;
   const feeChainType = fee.type;
   let estimatedFee;
@@ -105,7 +108,7 @@ export const calculateTransferMaxTransferable = async (id, request, freeBalance,
           from: address,
           to: recipient,
           transferAll: false,
-          value: '0',
+          value,
           fallbackFee: true
         });
       } else {
@@ -118,7 +121,7 @@ export const calculateTransferMaxTransferable = async (id, request, freeBalance,
           from: address,
           to: recipient,
           transferAll: false,
-          value: '0',
+          value,
           fallbackFee: true
         });
       }
@@ -128,19 +131,18 @@ export const calculateTransferMaxTransferable = async (id, request, freeBalance,
         from: address,
         to: address,
         networkKey: srcChain.slug,
-        value: '0',
+        value,
         transferAll: false,
         // currently not used
         tonApi
       });
     } else if (isCardanoAddress(address) && _isTokenTransferredByCardano(srcToken)) {
-      const isTransferNativeToken = _isNativeToken(srcToken);
       [transaction] = await createCardanoTransaction({
         tokenInfo: srcToken,
         from: address,
         to: address,
         networkKey: srcChain.slug,
-        value: isTransferNativeToken ? '1000000' : '1',
+        value,
         cardanoTtlOffset: DEFAULT_CARDANO_TTL_OFFSET,
         transferAll: false,
         cardanoApi,
@@ -149,7 +151,7 @@ export const calculateTransferMaxTransferable = async (id, request, freeBalance,
     } else {
       [transaction] = await createSubstrateExtrinsic({
         transferAll: false,
-        value: '0',
+        value,
         from: address,
         networkKey: srcChain.slug,
         tokenInfo: srcToken,
@@ -285,10 +287,11 @@ export const calculateXcmMaxTransferable = async (id, request, freeBalance, fee)
     nativeToken,
     srcChain,
     srcToken,
-    substrateApi
+    substrateApi,
+    value
   } = request;
   const feeChainType = fee.type;
-  let estimatedFee;
+  let estimatedFee = '0';
   let feeOptions;
   let maxTransferable;
   let error;
@@ -297,20 +300,22 @@ export const calculateXcmMaxTransferable = async (id, request, freeBalance, fee)
   const isSnowBridgeEvmTransfer = _isPureEvmChain(srcChain) && _isSnowBridgeXcm(srcChain, destChain) && !isAvailBridgeFromEvm;
   const isPolygonBridgeTransfer = _isPolygonChainBridge(srcChain.slug, destChain.slug);
   const isPosBridgeTransfer = _isPosChainBridge(srcChain.slug, destChain.slug);
+  const isAcrossBridgeTransfer = _isAcrossChainBridge(srcChain.slug, destChain.slug);
+  const isSubstrateXcm = !(isAvailBridgeFromEvm || isAvailBridgeFromAvail || isSnowBridgeEvmTransfer || isPolygonBridgeTransfer || isPosBridgeTransfer || isAcrossBridgeTransfer);
   const fakeAddress = '5DRewsYzhJqZXU3SRaWy1FSt5iDr875ao91aw5fjrJmDG4Ap'; // todo: move this
   const substrateAddress = fakeAddress; // todo: move this
   const evmAddress = u8aToHex(addressToEvm(fakeAddress)); // todo: move this
-
+  const bnFreeBalance = new BigN(freeBalance.value);
   const recipient = _isChainEvmCompatible(destChain) ? evmAddress : substrateAddress;
+  if (!destToken) {
+    throw Error('Destination token is not available');
+  }
   try {
-    if (!destToken) {
-      throw Error('Destination token is not available');
-    }
     const params = {
       destinationTokenInfo: destToken,
       originTokenInfo: srcToken,
       // If value is 0, substrate will throw error when estimating fee
-      sendingValue: feeChainType === 'substrate' ? '1000000000000000000' : '0',
+      sendingValue: value,
       sender: address,
       recipient,
       destinationChain: destChain,
@@ -324,6 +329,13 @@ export const calculateXcmMaxTransferable = async (id, request, freeBalance, fee)
     let funcCreateExtrinsic;
     if (isPosBridgeTransfer || isPolygonBridgeTransfer) {
       funcCreateExtrinsic = createPolygonBridgeExtrinsic;
+    } else if (isAcrossBridgeTransfer) {
+      funcCreateExtrinsic = createAcrossBridgeExtrinsic;
+      if (_isAcrossTestnetBridge(srcChain.slug)) {
+        params.sendingValue = BigN(0.0037).shiftedBy(_getAssetDecimals(srcToken)).toFixed(0, 1);
+      } else {
+        params.sendingValue = BigN(1).shiftedBy(_getAssetDecimals(srcToken)).toFixed(0, 1);
+      }
     } else if (isSnowBridgeEvmTransfer) {
       funcCreateExtrinsic = createSnowBridgeExtrinsic;
     } else if (isAvailBridgeFromEvm) {
@@ -331,9 +343,12 @@ export const calculateXcmMaxTransferable = async (id, request, freeBalance, fee)
     } else if (isAvailBridgeFromAvail) {
       funcCreateExtrinsic = createAvailBridgeExtrinsicFromAvail;
     } else {
-      funcCreateExtrinsic = createXcmExtrinsic;
+      funcCreateExtrinsic = createXcmExtrinsicV2;
+      params.sendingValue = '1';
     }
     const extrinsic = await funcCreateExtrinsic(params);
+
+    // todo: refactor condition
     if (feeChainType === 'evm') {
       var _tx$gas2;
       // Calculate fee for evm transaction
@@ -353,12 +368,17 @@ export const calculateXcmMaxTransferable = async (id, request, freeBalance, fee)
       };
     } else if (feeChainType === 'substrate') {
       // Calculate fee for substrate transaction
-      try {
-        var _paymentInfo$partialF2;
-        const paymentInfo = await extrinsic.paymentInfo(address);
-        estimatedFee = (paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF2 = paymentInfo.partialFee) === null || _paymentInfo$partialF2 === void 0 ? void 0 : _paymentInfo$partialF2.toString()) || '0';
-      } catch (e) {
-        estimatedFee = '0';
+      if (isSubstrateXcm) {
+        const estimatedFeeByDryRun = await dryRunXcmExtrinsicV2(params);
+        estimatedFee = estimatedFeeByDryRun.fee || '0';
+      } else {
+        try {
+          var _paymentInfo$partialF2;
+          const paymentInfo = await extrinsic.paymentInfo(address);
+          estimatedFee = (paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF2 = paymentInfo.partialFee) === null || _paymentInfo$partialF2 === void 0 ? void 0 : _paymentInfo$partialF2.toString()) || '0';
+        } catch (e) {
+          estimatedFee = '0';
+        }
       }
       const _feeCustom = feeCustom;
       const tip = combineSubstrateFee(fee, feeOption, _feeCustom).tip;
@@ -398,12 +418,12 @@ export const calculateXcmMaxTransferable = async (id, request, freeBalance, fee)
     if (_SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(srcChain.slug)) {
       const estimatedFeeNative = (BigInt(estimatedFee) * BigInt(FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE) / BigInt(100)).toString();
       const estimatedFeeLocal = await calculateToAmountByReservePool(substrateApi.api, nativeToken, srcToken, estimatedFeeNative);
-      maxTransferable = BigN(freeBalance.value).minus(estimatedFeeLocal);
+      maxTransferable = bnFreeBalance.minus(estimatedFeeLocal);
     } else if (_SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(srcChain.slug)) {
       const rate = await getHydrationRate(address, nativeToken, srcToken);
       if (rate) {
         const estimatedFeeLocal = new BigN(estimatedFee).multipliedBy(rate).integerValue(BigN.ROUND_UP).toString();
-        maxTransferable = BigN(freeBalance.value).minus(estimatedFeeLocal);
+        maxTransferable = bnFreeBalance.minus(estimatedFeeLocal);
       } else {
         throw new Error(`Unable to estimate fee for ${srcChain.slug}.`);
       }
@@ -411,16 +431,20 @@ export const calculateXcmMaxTransferable = async (id, request, freeBalance, fee)
       throw new Error(`Unable to estimate fee for ${srcChain.slug}.`);
     }
   } else if (isTransferNativeTokenAndPayLocalTokenAsFee) {
-    maxTransferable = BigN(freeBalance.value);
+    maxTransferable = bnFreeBalance;
   } else {
     if (!_isNativeToken(srcToken)) {
-      maxTransferable = BigN(freeBalance.value);
+      maxTransferable = bnFreeBalance;
     } else {
-      maxTransferable = BigN(freeBalance.value).minus(new BigN(estimatedFee).multipliedBy(XCM_FEE_RATIO));
+      maxTransferable = bnFreeBalance.minus(BigN(estimatedFee).multipliedBy(XCM_FEE_RATIO));
     }
   }
+  if (isAvailBridgeFromAvail) {
+    const addedAmount = BigN(1).shiftedBy(_getAssetDecimals(srcToken));
+    maxTransferable = maxTransferable.minus(addedAmount);
+  }
   return {
-    maxTransferable: maxTransferable.gt(BN_ZERO) ? maxTransferable.toFixed(0) || '0' : '0',
+    maxTransferable: maxTransferable.gt(BN_ZERO) ? maxTransferable.toFixed(0) : '0',
     feeOptions: feeOptions,
     feeType: feeChainType,
     id: id,

package/utils/staticData/index.d.ts

@@ -10,6 +10,7 @@ export declare const blockedActionsFeatures: BlockedActionsFeaturesMap;
 export declare const remindNotificationTime: Record<NotificationActionType, number>;
 export declare const blockedActions: Record<string, EnvConfig>;
 export declare const oldChainPrefix: Record<string, EnvConfig>;
+export declare const paraSpellChainMap: Record<string, EnvConfig>;
 export declare enum StaticKey {
     BUY_SERVICE_INFOS = "buy-service-infos",
     CHAINS = "chains",
@@ -21,7 +22,8 @@ export declare enum StaticKey {
     BLOCKED_ACTIONS_FEATURES = "blocked-actions-features",
     REMIND_NOTIFICATION_TIME = "remind-notification-time",
     BLOCKED_ACTIONS = "blocked-actions",
-    OLD_CHAIN_PREFIX = "old-chain-prefix"
+    OLD_CHAIN_PREFIX = "old-chain-prefix",
+    PARASPELL_CHAIN_MAP = "paraspell-chain-map"
 }
 export declare const staticData: {
     chains: import("@subwallet/chain-list/types")._ChainInfo[];
@@ -35,4 +37,5 @@ export declare const staticData: {
     "remind-notification-time": Record<NotificationActionType, number>;
     "blocked-actions": Record<string, EnvConfig>;
     "old-chain-prefix": Record<string, EnvConfig>;
+    "paraspell-chain-map": Record<string, EnvConfig>;
 };

package/utils/staticData/index.js

@@ -23,6 +23,8 @@ export const remindNotificationTime = require("./remindNotificationTime.json");
 export const blockedActions = require("./blockedActions.json");
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 export const oldChainPrefix = require("./oldChainPrefix.json");
+// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
+export const paraSpellChainMap = require("./paraSpellChainMap.json");
 export let StaticKey;
 (function (StaticKey) {
   StaticKey["BUY_SERVICE_INFOS"] = "buy-service-infos";
@@ -36,6 +38,7 @@ export let StaticKey;
   StaticKey["REMIND_NOTIFICATION_TIME"] = "remind-notification-time";
   StaticKey["BLOCKED_ACTIONS"] = "blocked-actions";
   StaticKey["OLD_CHAIN_PREFIX"] = "old-chain-prefix";
+  StaticKey["PARASPELL_CHAIN_MAP"] = "paraspell-chain-map";
 })(StaticKey || (StaticKey = {}));
 export const staticData = {
   [StaticKey.CHAINS]: Object.values(ChainInfoMap),
@@ -48,5 +51,6 @@ export const staticData = {
   [StaticKey.BLOCKED_ACTIONS_FEATURES]: blockedActionsFeatures,
   [StaticKey.REMIND_NOTIFICATION_TIME]: remindNotificationTime,
   [StaticKey.BLOCKED_ACTIONS]: blockedActions,
-  [StaticKey.OLD_CHAIN_PREFIX]: oldChainPrefix
+  [StaticKey.OLD_CHAIN_PREFIX]: oldChainPrefix,
+  [StaticKey.PARASPELL_CHAIN_MAP]: paraSpellChainMap
 };

package/utils/staticData/paraSpellChainMap.json

@@ -0,0 +1 @@
+{}