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

package/cjs/services/swap-service/utils.js

@@ -4,16 +4,24 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._PROVIDER_TO_SUPPORTED_PAIR_MAP = exports.SWAP_QUOTE_TIMEOUT_MAP = exports.SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING = exports.SIMPLE_SWAP_EXPLORER = exports.FEE_RATE_MULTIPLIER = exports.CHAIN_FLIP_TESTNET_EXPLORER = exports.CHAIN_FLIP_MAINNET_EXPLORER = void 0;
+exports._PROVIDER_TO_SUPPORTED_PAIR_MAP = exports.SWAP_QUOTE_TIMEOUT_MAP = exports.SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING = exports.SIMPLE_SWAP_EXPLORER = exports.FEE_RATE_MULTIPLIER = exports.DEFAULT_EXCESS_AMOUNT_WEIGHT = exports.CHAIN_FLIP_TESTNET_EXPLORER = exports.CHAIN_FLIP_MAINNET_EXPLORER = void 0;
 exports.calculateSwapRate = calculateSwapRate;
 exports.convertSwapRate = convertSwapRate;
-exports.findXcmDestination = findXcmDestination;
+exports.findAllBridgeDestinations = findAllBridgeDestinations;
+exports.findBridgeTransitDestination = findBridgeTransitDestination;
+exports.findSwapTransitDestination = findSwapTransitDestination;
+exports.getAmountAfterSlippage = getAmountAfterSlippage;
 exports.getBridgeStep = getBridgeStep;
+exports.getChainRouteFromSteps = getChainRouteFromSteps;
 exports.getChainflipBroker = getChainflipBroker;
 exports.getChainflipOptions = getChainflipOptions;
 exports.getChainflipSwap = getChainflipSwap;
+exports.getFirstAmountFromSteps = getFirstAmountFromSteps;
+exports.getLastAmountFromSteps = getLastAmountFromSteps;
+exports.getSupportSwapChain = getSupportSwapChain;
 exports.getSwapAltToken = getSwapAltToken;
 exports.getSwapAlternativeAsset = getSwapAlternativeAsset;
+exports.getSwapChainsFromPath = getSwapChainsFromPath;
 exports.getSwapStep = getSwapStep;
 exports.getTokenPairFromStep = getTokenPairFromStep;
 exports.isChainsHasSameProvider = isChainsHasSameProvider;
@@ -21,7 +29,6 @@ var _chainList = require("@subwallet/chain-list");
 var _types = require("@subwallet/chain-list/types");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _chainflipHandler = require("@subwallet/extension-base/services/swap-service/handler/chainflip-handler");
-var _interface = require("@subwallet/extension-base/services/swap-service/interface");
 var _types2 = require("@subwallet/extension-base/types");
 var _swap = require("@subwallet/extension-base/types/swap");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
@@ -44,7 +51,7 @@ const SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING = {
 exports.SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING = SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING;
 const SWAP_QUOTE_TIMEOUT_MAP = {
   // in milliseconds
-  default: 30000,
+  default: 90000,
   [_swap.SwapProviderId.CHAIN_FLIP_TESTNET]: 30000,
   [_swap.SwapProviderId.CHAIN_FLIP_MAINNET]: 30000
 };
@@ -69,6 +76,9 @@ const FEE_RATE_MULTIPLIER = {
   high: 2
 };
 exports.FEE_RATE_MULTIPLIER = FEE_RATE_MULTIPLIER;
+function getSupportSwapChain() {
+  return [...new Set(Object.values(_PROVIDER_TO_SUPPORTED_PAIR_MAP).flat())];
+}
 function getSwapAlternativeAsset(swapPair) {
   var _swapPair$metadata;
   return swapPair === null || swapPair === void 0 ? void 0 : (_swapPair$metadata = swapPair.metadata) === null || _swapPair$metadata === void 0 ? void 0 : _swapPair$metadata.alternativeAsset;
@@ -78,15 +88,15 @@ function getSwapAltToken(chainAsset) {
   return (_chainAsset$metadata = chainAsset.metadata) === null || _chainAsset$metadata === void 0 ? void 0 : _chainAsset$metadata.alternativeSwapAsset;
 }
 function calculateSwapRate(fromAmount, toAmount, fromAsset, toAsset) {
-  const bnFromAmount = new _bignumber.default(fromAmount);
-  const bnToAmount = new _bignumber.default(toAmount);
+  const bnFromAmount = (0, _bignumber.default)(fromAmount);
+  const bnToAmount = (0, _bignumber.default)(toAmount);
   const decimalDiff = (0, _utils._getAssetDecimals)(toAsset) - (0, _utils._getAssetDecimals)(fromAsset);
   const bnRate = bnFromAmount.div(bnToAmount);
   return 1 / bnRate.times(10 ** decimalDiff).toNumber();
 }
 function convertSwapRate(rate, fromAsset, toAsset) {
   const decimalDiff = (0, _utils._getAssetDecimals)(toAsset) - (0, _utils._getAssetDecimals)(fromAsset);
-  const bnRate = new _bignumber.default(rate);
+  const bnRate = (0, _bignumber.default)(rate);
   return bnRate.times(10 ** decimalDiff).pow(-1).toNumber();
 }
 function getChainflipOptions(isTestnet) {
@@ -124,9 +134,10 @@ function getChainflipSwap(isTestnet) {
 }
 function getBridgeStep(from, to) {
   return {
-    action: _interface.DynamicSwapType.BRIDGE,
+    action: _types2.DynamicSwapType.BRIDGE,
     pair: {
       slug: `${from}___${to}`,
+      // todo: recheck with assetRef format from chain list
       from,
       to
     }
@@ -134,21 +145,36 @@ function getBridgeStep(from, to) {
 }
 function getSwapStep(from, to) {
   return {
-    action: _interface.DynamicSwapType.SWAP,
+    action: _types2.DynamicSwapType.SWAP,
     pair: {
       slug: `${from}___${to}`,
+      // todo: recheck with assetRef format from chain list
       from,
       to
     }
   };
 }
-function findXcmDestination(assetRefMap, chainAsset, destChain) {
-  const foundAssetRef = Object.values(assetRefMap).find(assetRef => assetRef.srcAsset === chainAsset.slug && assetRef.destChain === destChain && assetRef.path === _types._AssetRefPath.XCM);
+function findBridgeTransitDestination(assetRefMap, fromToken, toToken) {
+  const foundAssetRef = Object.values(assetRefMap).find(assetRef => assetRef.srcAsset === fromToken.slug && assetRef.destChain === (0, _utils._getAssetOriginChain)(toToken) && assetRef.path === _types._AssetRefPath.XCM);
   if (foundAssetRef) {
     return foundAssetRef.destAsset;
   }
   return undefined;
 }
+function findSwapTransitDestination(assetRefMap, fromToken, toToken) {
+  const foundAssetRef = Object.values(assetRefMap).find(assetRef => assetRef.destAsset === toToken.slug && assetRef.srcChain === (0, _utils._getAssetOriginChain)(fromToken) && assetRef.path === _types._AssetRefPath.XCM);
+  if (foundAssetRef) {
+    return foundAssetRef.srcAsset;
+  }
+  return undefined;
+}
+function findAllBridgeDestinations(assetRefMap, fromToken) {
+  const foundAssetRefs = Object.values(assetRefMap).filter(assetRef => assetRef.srcAsset === fromToken.slug && assetRef.path === _types._AssetRefPath.XCM);
+  return foundAssetRefs.map(assetRef => assetRef.destAsset);
+}
+function getAmountAfterSlippage(amount, slippage) {
+  return (0, _bignumber.default)(amount).multipliedBy((0, _bignumber.default)(1).minus((0, _bignumber.default)(slippage))).integerValue(_bignumber.default.ROUND_DOWN).toString();
+}
 function isChainsHasSameProvider(fromChain, toChain) {
   // todo: a provider may support multiple chains but not cross-chain swaps
   for (const group of Object.values(_PROVIDER_TO_SUPPORTED_PAIR_MAP)) {
@@ -158,27 +184,91 @@ function isChainsHasSameProvider(fromChain, toChain) {
   }
   return false;
 }
-function getTokenPairFromStep(steps) {
+function getLastAmountFromSteps(steps) {
+  var _lastStep$metadata;
+  const lastStep = steps[steps.length - 1]; // last step
+  const lastAmount = lastStep === null || lastStep === void 0 ? void 0 : (_lastStep$metadata = lastStep.metadata) === null || _lastStep$metadata === void 0 ? void 0 : _lastStep$metadata.destinationValue;
+  return lastAmount !== null && lastAmount !== void 0 ? lastAmount : undefined;
+}
+function getFirstAmountFromSteps(steps) {
+  var _firstStep$metadata;
+  const firstStep = steps[1]; // first step after default step
+  const firstAmount = firstStep === null || firstStep === void 0 ? void 0 : (_firstStep$metadata = firstStep.metadata) === null || _firstStep$metadata === void 0 ? void 0 : _firstStep$metadata.sendingValue;
+  return firstAmount !== null && firstAmount !== void 0 ? firstAmount : undefined;
+}
+function getChainRouteFromSteps(steps) {
+  // todo: handle metadata for other providers than hydra & pah. Also add validate metadata.
   const mainSteps = steps.filter(step => step.type !== _types2.CommonStepType.DEFAULT);
+  return mainSteps.reduce((chainRoute, currentStep, currentIndex) => {
+    const metadata = currentStep.metadata;
+    if (!metadata) {
+      console.error('Step has no metadata');
+      return chainRoute;
+    }
+    if (currentIndex === 0) {
+      chainRoute.push(metadata.originTokenInfo.originChain);
+      chainRoute.push(metadata.destinationTokenInfo.originChain);
+    } else {
+      chainRoute.push(metadata.destinationTokenInfo.originChain);
+    }
+    return chainRoute;
+  }, []);
+}
+
+// note: this function may return undefined if metadata version is < 2 or does not exist
+function getTokenPairFromStep(steps) {
+  // todo: review this
+  const mainSteps = steps.filter(step => step.type !== _types2.CommonStepType.DEFAULT && step.type !== _types2.CommonStepType.TOKEN_APPROVAL && step.type !== _types2.SwapStepType.PERMIT);
   if (!mainSteps.length) {
     return undefined;
   }
+  const isStepValidIfSwap = step => {
+    const metadata = step.metadata;
+    return step.type !== _types2.SwapStepType.SWAP || !!(metadata !== null && metadata !== void 0 && metadata.version) && (metadata === null || metadata === void 0 ? void 0 : metadata.version) >= 2;
+  };
   if (mainSteps.length === 1) {
-    const metadata = mainSteps[0].metadata; // todo: temp for round 1, the exact interface is handle in round 2
-
+    if (!isStepValidIfSwap(mainSteps[0])) {
+      return undefined;
+    }
+    const metadata = mainSteps[0].metadata;
+    if (!metadata) {
+      return undefined;
+    }
     return {
       from: metadata.originTokenInfo.slug,
       to: metadata.destinationTokenInfo.slug,
-      slug: `${metadata.originTokenInfo.slug}___${metadata.destinationTokenInfo.slug}`
+      slug: (0, _utils._parseAssetRefKey)(metadata.originTokenInfo.slug, metadata.destinationTokenInfo.slug)
     };
   }
   const firstStep = mainSteps[0];
   const lastStep = mainSteps[mainSteps.length - 1];
+  if (!isStepValidIfSwap(firstStep) || !isStepValidIfSwap(lastStep)) {
+    return undefined;
+  }
   const firstMetadata = firstStep.metadata;
   const lastMetadata = lastStep.metadata;
+  if (!firstMetadata || !lastMetadata) {
+    return undefined;
+  }
   return {
     from: firstMetadata.originTokenInfo.slug,
     to: lastMetadata.destinationTokenInfo.slug,
-    slug: `${firstMetadata.originTokenInfo.slug}___${lastMetadata.destinationTokenInfo.slug}`
+    slug: (0, _utils._parseAssetRefKey)(firstMetadata.originTokenInfo.slug, lastMetadata.destinationTokenInfo.slug)
   };
-}
+}
+function getSwapChainsFromPath(path) {
+  const swapChains = [];
+  path.forEach(pathElement => {
+    const fromAssetOriginChain = (0, _utils._getOriginChainOfAsset)(pathElement.pair.from);
+    const toAssetOriginChain = (0, _utils._getOriginChainOfAsset)(pathElement.pair.to);
+    if (swapChains.at(-1) !== fromAssetOriginChain) {
+      swapChains.push(fromAssetOriginChain);
+    }
+    if (swapChains.at(-1) !== toAssetOriginChain) {
+      swapChains.push(toAssetOriginChain);
+    }
+  });
+  return swapChains;
+}
+const DEFAULT_EXCESS_AMOUNT_WEIGHT = 1.04; // add 2%
+exports.DEFAULT_EXCESS_AMOUNT_WEIGHT = DEFAULT_EXCESS_AMOUNT_WEIGHT;

package/cjs/services/transaction-service/index.js

@@ -87,7 +87,7 @@ class TransactionService {
     const blockedConfigObjects = await (0, _constants.fetchBlockedConfigObjects)();
     const currentConfig = this.state.settingService.getEnvironmentSetting();
     const passBlockedConfigId = (0, _constants.getPassConfigId)(currentConfig, blockedConfigObjects);
-    const blockedActionsFeaturesMaps = await (0, _constants.fetchLastestBlockedActionsAndFeatures)(passBlockedConfigId);
+    const blockedActionsFeaturesMaps = await (0, _constants.fetchLatestBlockedActionsAndFeatures)(passBlockedConfigId);
     for (const blockedActionsFeaturesMap of blockedActionsFeaturesMaps) {
       const {
         blockedActionsMap,

package/cjs/services/transaction-service/utils.js

@@ -6,10 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.getChainflipExplorerLink = getChainflipExplorerLink;
 exports.getExplorerLink = getExplorerLink;
 exports.getSimpleSwapExplorerLink = getSimpleSwapExplorerLink;
+exports.getTransactionId = getTransactionId;
 exports.parseTransactionData = parseTransactionData;
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/services/swap-service/utils");
 var _util = require("@polkadot/util");
+var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -32,19 +34,7 @@ function getBlockExplorerAccountRoute(explorerLink) {
   if (explorerLink.includes('3dpscan.io')) {
     return 'account';
   }
-  if (explorerLink.includes('explorer.polimec.org')) {
-    return 'account';
-  }
-  if (explorerLink.includes('invarch.statescan.io')) {
-    return '#/accounts';
-  }
-  if (explorerLink.includes('tangle.statescan.io')) {
-    return '#/accounts';
-  }
-  if (explorerLink.includes('laos.statescan.io')) {
-    return '#/accounts';
-  }
-  if (explorerLink.includes('polimec.statescan.io')) {
+  if (explorerLink.includes('statescan.io')) {
     return '#/accounts';
   }
   if (explorerLink.includes('explorer.zkverify.io')) {
@@ -68,15 +58,38 @@ function getBlockExplorerTxRoute(chainInfo) {
   if (['aventus', 'deeper_network'].includes(chainInfo.slug)) {
     return 'transaction';
   }
-  if (['invarch', 'tangle', 'polimec'].includes(chainInfo.slug)) {
+  const explorerLink = (0, _utils._getBlockExplorerFromChain)(chainInfo);
+  if (explorerLink && explorerLink.includes('statescan.io')) {
     return '#/extrinsics';
   }
   return 'extrinsic';
 }
+function getTransactionId(value) {
+  const query = `
+    query ExtrinsicQuery {
+      extrinsics(where: {hash_eq: ${value}}, limit: 1) {
+        id
+      }
+    }`;
+  const apiUrl = 'https://archive-explorer.truth-network.io/graphql';
+  return fetch(apiUrl, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify({
+      query
+    })
+  }).then(response => response.json()).then(result => result.data.extrinsics[0].id);
+}
 function getExplorerLink(chainInfo, value, type) {
   const explorerLink = (0, _utils._getBlockExplorerFromChain)(chainInfo);
   if (explorerLink && type === 'account') {
     const route = getBlockExplorerAccountRoute(explorerLink);
+    if (chainInfo.slug === 'truth_network') {
+      const address = (0, _util.u8aToHex)((0, _utilCrypto.decodeAddress)(value));
+      return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}${route}/${address}`;
+    }
     return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}${route}/${value}`;
   }
   if (explorerLink && (0, _util.isHex)((0, _util.hexAddPrefix)(value))) {
@@ -84,6 +97,17 @@ function getExplorerLink(chainInfo, value, type) {
     if (chainInfo.slug === 'tangle') {
       return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}extrinsic/${value}${route}/${value}`;
     }
+    if (chainInfo.slug === 'truth_network') {
+      // getTransactionId(value)
+      //   .then((transactionId) => {
+      //     return (`${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}${route}/${transactionId}`);
+      //   })
+      //   .catch((err) => {
+      //     console.error(err);
+      //   });
+
+      return undefined;
+    }
     return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}${route}/${value}`;
   }
   return undefined;

package/cjs/types/swap/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._SUPPORTED_SWAP_PROVIDERS = exports.SwapStepType = exports.SwapProviderId = exports.SwapFeeType = exports.SwapErrorType = exports.SIMPLE_SWAP_SLIPPAGE = exports.CHAINFLIP_SLIPPAGE = void 0;
+exports._SUPPORTED_SWAP_PROVIDERS = exports.SwapStepType = exports.SwapProviderId = exports.SwapFeeType = exports.SwapErrorType = exports.SIMPLE_SWAP_SLIPPAGE = exports.DynamicSwapType = exports.CHAINFLIP_SLIPPAGE = exports.BridgeStepPosition = void 0;
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 // core
@@ -58,6 +58,18 @@ exports.SwapFeeType = SwapFeeType;
   SwapFeeType["NETWORK_FEE"] = "NETWORK_FEE";
   SwapFeeType["WALLET_FEE"] = "WALLET_FEE";
 })(SwapFeeType || (exports.SwapFeeType = SwapFeeType = {}));
+let DynamicSwapType;
+exports.DynamicSwapType = DynamicSwapType;
+(function (DynamicSwapType) {
+  DynamicSwapType["SWAP"] = "SWAP";
+  DynamicSwapType["BRIDGE"] = "BRIDGE";
+})(DynamicSwapType || (exports.DynamicSwapType = DynamicSwapType = {}));
+let BridgeStepPosition;
+exports.BridgeStepPosition = BridgeStepPosition;
+(function (BridgeStepPosition) {
+  BridgeStepPosition[BridgeStepPosition["FIRST"] = 0] = "FIRST";
+  BridgeStepPosition[BridgeStepPosition["AFTER_SWAP"] = 1] = "AFTER_SWAP";
+})(BridgeStepPosition || (exports.BridgeStepPosition = BridgeStepPosition = {}));
 const CHAINFLIP_SLIPPAGE = 0.02; // Example: 0.01 for 1%
 exports.CHAINFLIP_SLIPPAGE = CHAINFLIP_SLIPPAGE;
 const SIMPLE_SWAP_SLIPPAGE = 0.05;

package/cjs/utils/fee/transfer.js

@@ -13,6 +13,7 @@ var _smartContract = require("@subwallet/extension-base/services/balance-service
 var _token = require("@subwallet/extension-base/services/balance-service/transfer/token");
 var _tonTransfer = require("@subwallet/extension-base/services/balance-service/transfer/ton-transfer");
 var _xcm = require("@subwallet/extension-base/services/balance-service/transfer/xcm");
+var _acrossBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/acrossBridge");
 var _availBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge");
 var _polygonBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/polygonBridge");
 var _posBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/posBridge");
@@ -36,7 +37,8 @@ const detectTransferTxType = (srcToken, srcChain, destChain) => {
     const isSnowBridgeEvmTransfer = (0, _utils._isPureEvmChain)(srcChain) && (0, _xcmParser._isSnowBridgeXcm)(srcChain, destChain) && !isAvailBridgeFromEvm;
     const isPolygonBridgeTransfer = (0, _polygonBridge._isPolygonChainBridge)(srcChain.slug, destChain.slug);
     const isPosBridgeTransfer = (0, _posBridge._isPosChainBridge)(srcChain.slug, destChain.slug);
-    return isAvailBridgeFromEvm || isSnowBridgeEvmTransfer || isPolygonBridgeTransfer || isPosBridgeTransfer ? 'evm' : 'substrate';
+    const isAcrossBridgeTransfer = (0, _acrossBridge._isAcrossChainBridge)(srcChain.slug, destChain.slug);
+    return isAvailBridgeFromEvm || isSnowBridgeEvmTransfer || isPolygonBridgeTransfer || isPosBridgeTransfer || isAcrossBridgeTransfer ? 'evm' : 'substrate';
   } else {
     if ((0, _utils._isChainEvmCompatible)(srcChain) && (0, _utils._isTokenTransferredByEvm)(srcToken)) {
       return 'evm';
@@ -86,7 +88,8 @@ const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) =
     srcChain,
     srcToken,
     substrateApi,
-    tonApi
+    tonApi,
+    value
   } = request;
   const feeChainType = fee.type;
   let estimatedFee;
@@ -114,7 +117,7 @@ const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) =
           from: address,
           to: recipient,
           transferAll: false,
-          value: '0',
+          value,
           fallbackFee: true
         });
       } else {
@@ -127,7 +130,7 @@ const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) =
           from: address,
           to: recipient,
           transferAll: false,
-          value: '0',
+          value,
           fallbackFee: true
         });
       }
@@ -137,19 +140,18 @@ const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) =
         from: address,
         to: address,
         networkKey: srcChain.slug,
-        value: '0',
+        value,
         transferAll: false,
         // currently not used
         tonApi
       });
     } else if ((0, _keyring.isCardanoAddress)(address) && (0, _utils._isTokenTransferredByCardano)(srcToken)) {
-      const isTransferNativeToken = (0, _utils._isNativeToken)(srcToken);
       [transaction] = await (0, _cardanoTransfer.createCardanoTransaction)({
         tokenInfo: srcToken,
         from: address,
         to: address,
         networkKey: srcChain.slug,
-        value: isTransferNativeToken ? '1000000' : '1',
+        value,
         cardanoTtlOffset: _consts.DEFAULT_CARDANO_TTL_OFFSET,
         transferAll: false,
         cardanoApi,
@@ -158,7 +160,7 @@ const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) =
     } else {
       [transaction] = await (0, _token.createSubstrateExtrinsic)({
         transferAll: false,
-        value: '0',
+        value,
         from: address,
         networkKey: srcChain.slug,
         tokenInfo: srcToken,
@@ -295,10 +297,11 @@ 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;
@@ -307,20 +310,22 @@ const calculateXcmMaxTransferable = async (id, request, freeBalance, fee) => {
   const isSnowBridgeEvmTransfer = (0, _utils._isPureEvmChain)(srcChain) && (0, _xcmParser._isSnowBridgeXcm)(srcChain, destChain) && !isAvailBridgeFromEvm;
   const isPolygonBridgeTransfer = (0, _polygonBridge._isPolygonChainBridge)(srcChain.slug, destChain.slug);
   const isPosBridgeTransfer = (0, _posBridge._isPosChainBridge)(srcChain.slug, destChain.slug);
+  const isAcrossBridgeTransfer = (0, _acrossBridge._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 = (0, _util.u8aToHex)((0, _utilCrypto.addressToEvm)(fakeAddress)); // todo: move this
-
+  const bnFreeBalance = new _bignumber.default(freeBalance.value);
   const recipient = (0, _utils._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,
@@ -334,6 +339,13 @@ const calculateXcmMaxTransferable = async (id, request, freeBalance, fee) => {
     let funcCreateExtrinsic;
     if (isPosBridgeTransfer || isPolygonBridgeTransfer) {
       funcCreateExtrinsic = _xcm.createPolygonBridgeExtrinsic;
+    } else if (isAcrossBridgeTransfer) {
+      funcCreateExtrinsic = _xcm.createAcrossBridgeExtrinsic;
+      if ((0, _acrossBridge._isAcrossTestnetBridge)(srcChain.slug)) {
+        params.sendingValue = (0, _bignumber.default)(0.0037).shiftedBy((0, _utils._getAssetDecimals)(srcToken)).toFixed(0, 1);
+      } else {
+        params.sendingValue = (0, _bignumber.default)(1).shiftedBy((0, _utils._getAssetDecimals)(srcToken)).toFixed(0, 1);
+      }
     } else if (isSnowBridgeEvmTransfer) {
       funcCreateExtrinsic = _xcm.createSnowBridgeExtrinsic;
     } else if (isAvailBridgeFromEvm) {
@@ -341,9 +353,12 @@ const calculateXcmMaxTransferable = async (id, request, freeBalance, fee) => {
     } else if (isAvailBridgeFromAvail) {
       funcCreateExtrinsic = _xcm.createAvailBridgeExtrinsicFromAvail;
     } else {
-      funcCreateExtrinsic = _xcm.createXcmExtrinsic;
+      funcCreateExtrinsic = _xcm.createXcmExtrinsicV2;
+      params.sendingValue = '1';
     }
     const extrinsic = await funcCreateExtrinsic(params);
+
+    // todo: refactor condition
     if (feeChainType === 'evm') {
       var _tx$gas2;
       // Calculate fee for evm transaction
@@ -363,12 +378,17 @@ 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 (0, _xcm.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 = (0, _combine.combineSubstrateFee)(fee, feeOption, _feeCustom).tip;
@@ -408,12 +428,12 @@ const calculateXcmMaxTransferable = async (id, request, freeBalance, fee) => {
     if (_constants._SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(srcChain.slug)) {
       const estimatedFeeNative = (BigInt(estimatedFee) * BigInt(_utils2.FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE) / BigInt(100)).toString();
       const estimatedFeeLocal = await (0, _utils2.calculateToAmountByReservePool)(substrateApi.api, nativeToken, srcToken, estimatedFeeNative);
-      maxTransferable = (0, _bignumber.default)(freeBalance.value).minus(estimatedFeeLocal);
+      maxTransferable = bnFreeBalance.minus(estimatedFeeLocal);
     } else if (_constants._SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(srcChain.slug)) {
       const rate = await (0, _tokenPayFee.getHydrationRate)(address, nativeToken, srcToken);
       if (rate) {
         const estimatedFeeLocal = new _bignumber.default(estimatedFee).multipliedBy(rate).integerValue(_bignumber.default.ROUND_UP).toString();
-        maxTransferable = (0, _bignumber.default)(freeBalance.value).minus(estimatedFeeLocal);
+        maxTransferable = bnFreeBalance.minus(estimatedFeeLocal);
       } else {
         throw new Error(`Unable to estimate fee for ${srcChain.slug}.`);
       }
@@ -421,16 +441,20 @@ const calculateXcmMaxTransferable = async (id, request, freeBalance, fee) => {
       throw new Error(`Unable to estimate fee for ${srcChain.slug}.`);
     }
   } else if (isTransferNativeTokenAndPayLocalTokenAsFee) {
-    maxTransferable = (0, _bignumber.default)(freeBalance.value);
+    maxTransferable = bnFreeBalance;
   } else {
     if (!(0, _utils._isNativeToken)(srcToken)) {
-      maxTransferable = (0, _bignumber.default)(freeBalance.value);
+      maxTransferable = bnFreeBalance;
     } else {
-      maxTransferable = (0, _bignumber.default)(freeBalance.value).minus(new _bignumber.default(estimatedFee).multipliedBy(_constants.XCM_FEE_RATIO));
+      maxTransferable = bnFreeBalance.minus((0, _bignumber.default)(estimatedFee).multipliedBy(_constants.XCM_FEE_RATIO));
     }
   }
+  if (isAvailBridgeFromAvail) {
+    const addedAmount = (0, _bignumber.default)(1).shiftedBy((0, _utils._getAssetDecimals)(srcToken));
+    maxTransferable = maxTransferable.minus(addedAmount);
+  }
   return {
-    maxTransferable: maxTransferable.gt(_utils3.BN_ZERO) ? maxTransferable.toFixed(0) || '0' : '0',
+    maxTransferable: maxTransferable.gt(_utils3.BN_ZERO) ? maxTransferable.toFixed(0) : '0',
     feeOptions: feeOptions,
     feeType: feeChainType,
     id: id,

package/cjs/utils/staticData/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.termAndCondition = exports.staticData = exports.remindNotificationTime = exports.oldChainPrefix = exports.marketingCampaigns = exports.currencySymbol = exports.crowdloanFunds = exports.buyTokenConfigs = exports.buyServiceInfos = exports.blockedActionsFeatures = exports.blockedActions = exports.StaticKey = void 0;
+exports.termAndCondition = exports.staticData = exports.remindNotificationTime = exports.paraSpellChainMap = exports.oldChainPrefix = exports.marketingCampaigns = exports.currencySymbol = exports.crowdloanFunds = exports.buyTokenConfigs = exports.buyServiceInfos = exports.blockedActionsFeatures = exports.blockedActions = exports.StaticKey = void 0;
 var _chainList = require("@subwallet/chain-list");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -39,7 +39,10 @@ const blockedActions = require('./blockedActions.json');
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 exports.blockedActions = blockedActions;
 const oldChainPrefix = require('./oldChainPrefix.json');
+// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 exports.oldChainPrefix = oldChainPrefix;
+const paraSpellChainMap = require('./paraSpellChainMap.json');
+exports.paraSpellChainMap = paraSpellChainMap;
 let StaticKey;
 exports.StaticKey = StaticKey;
 (function (StaticKey) {
@@ -54,6 +57,7 @@ exports.StaticKey = 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 || (exports.StaticKey = StaticKey = {}));
 const staticData = {
   [StaticKey.CHAINS]: Object.values(_chainList.ChainInfoMap),
@@ -66,6 +70,7 @@ 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
 };
 exports.staticData = staticData;

package/cjs/utils/swap.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.swapCustomFormatter = exports.formatNumberString = void 0;
+exports.swapNumberMetadata = exports.swapCustomFormatter = exports.formatNumberString = void 0;
 var _number = require("@subwallet/extension-base/utils/number");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -25,6 +25,10 @@ const NUM_1B = new _bignumber.default(1e9);
 const BLIM = new _bignumber.default(1e14);
 const NUM_1M = new _bignumber.default(1e6);
 const NUM_100M = new _bignumber.default(1e8);
+const swapNumberMetadata = {
+  minNumberFormat: 4
+};
+exports.swapNumberMetadata = swapNumberMetadata;
 const swapCustomFormatter = (input, metadata) => {
   const minNumberFormat = 2;
   const maxNumberFormat = (metadata === null || metadata === void 0 ? void 0 : metadata.maxNumberFormat) || 6;

package/constants/blocked-actions.d.ts

@@ -25,5 +25,5 @@ export interface OSConfig {
 declare type BlockedConfigObjects = Record<string, EnvConfig>;
 export declare function fetchBlockedConfigObjects(): Promise<BlockedConfigObjects>;
 export declare function getPassConfigId(currentConfig: EnvConfig, blockedConfigObjects: BlockedConfigObjects): string[];
-export declare function fetchLastestBlockedActionsAndFeatures(ids: string[]): Promise<BlockedActionsFeaturesMap[]>;
+export declare function fetchLatestBlockedActionsAndFeatures(ids: string[]): Promise<BlockedActionsFeaturesMap[]>;
 export {};

package/constants/blocked-actions.js

@@ -87,7 +87,7 @@ function isPassVersion(versionStr, versionCondition) {
   const versionConditionStr = versionCondition.trim();
   return versionStr === versionConditionStr;
 }
-export async function fetchLastestBlockedActionsAndFeatures(ids) {
+export async function fetchLatestBlockedActionsAndFeatures(ids) {
   if (ids.length === 0) {
     return [staticData[StaticKey.BLOCKED_ACTIONS_FEATURES]];
   }

package/constants/paraspell-chain-map.d.ts

@@ -0,0 +1 @@
+export declare function fetchParaSpellChainMap(): Promise<Record<string, string>>;

package/constants/paraspell-chain-map.js

@@ -0,0 +1,7 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { fetchStaticData } from '@subwallet/extension-base/utils';
+export async function fetchParaSpellChainMap() {
+  return await fetchStaticData('paraspell-chain-map');
+}

package/constants/remind-notification-time.d.ts

@@ -1,2 +1,2 @@
 import { NotificationActionType } from '@subwallet/extension-base/services/inapp-notification-service/interfaces';
-export declare const fetchLastestRemindNotificationTime: () => Promise<Record<NotificationActionType, number>>;
+export declare const fetchLatestRemindNotificationTime: () => Promise<Record<NotificationActionType, number>>;