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

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

@@ -3,12 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.simpleSwapApiKey = exports.SimpleSwapHandler = void 0;
+exports.SimpleSwapHandler = void 0;
 var _SwapError = require("@subwallet/extension-base/background/errors/SwapError");
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _types = require("@subwallet/extension-base/types");
+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 = _interopRequireWildcard(require("bignumber.js"));
@@ -20,9 +21,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const apiUrl = 'https://api.simpleswap.io/v3';
-const simpleSwapApiKey = process.env.SIMPLE_SWAP_API_KEY || '';
-exports.simpleSwapApiKey = simpleSwapApiKey;
 const toBNString = (input, decimal) => {
   const raw = new _bignumber.BigNumber(input);
   return raw.shiftedBy(decimal).integerValue(_bignumber.BigNumber.ROUND_CEIL).toFixed();
@@ -54,12 +52,11 @@ const buildTxForSimpleSwap = async params => {
       userRefundAddress: sender,
       userRefundExtraId: ''
     };
-    const response = await fetch(`${apiUrl}/exchanges`, {
+    const response = await (0, _utils2.fetchFromProxyService)(_environment.ProxyServiceRoute.SIMPLESWAP, '/exchanges', {
       method: 'POST',
       headers: {
-        accept: 'application/json',
         'Content-Type': 'application/json',
-        'x-api-key': simpleSwapApiKey
+        accept: 'application/json'
       },
       body: JSON.stringify(requestBody)
     });

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

@@ -13,6 +13,7 @@ var _xcm = require("@subwallet/extension-base/services/balance-service/transfer/
 var _acrossBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/acrossBridge");
 var _utils = require("@subwallet/extension-base/services/swap-service/utils");
 var _types = require("@subwallet/extension-base/types");
+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"));
@@ -22,10 +23,6 @@ var _baseHandler = require("./base-handler");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const API_URL = 'https://trade-api.gateway.uniswap.org/v1';
-const headers = {
-  'x-api-key': process.env.UNISWAP_API_KEY || ''
-};
 async function fetchCheckApproval(request) {
   const {
     address,
@@ -56,10 +53,9 @@ async function fetchCheckApproval(request) {
   } else {
     return undefined;
   }
-  const response = await fetch(`${API_URL}/check_approval`, {
+  const response = await (0, _utils2.fetchFromProxyService)(_environment.ProxyServiceRoute.UNISWAP, '/check_approval', {
     method: 'POST',
     headers: {
-      ...headers,
       'Content-Type': 'application/json'
     },
     body: JSON.stringify({
@@ -624,10 +620,9 @@ class UniswapHandler {
       if (permitData) {
         body.permitData = permitData;
       }
-      postTransactionResponse = await fetch(`${API_URL}/swap`, {
+      postTransactionResponse = await (0, _utils2.fetchFromProxyService)(_environment.ProxyServiceRoute.UNISWAP, '/swap', {
         method: 'POST',
         headers: {
-          ...headers,
           'Content-Type': 'application/json'
         },
         body: JSON.stringify(body)
@@ -638,10 +633,9 @@ class UniswapHandler {
       const dutchQuote = quote;
       const submitSwapOrder = async () => {
         try {
-          const res = await fetch(`${API_URL}/order`, {
+          const res = await (0, _utils2.fetchFromProxyService)(_environment.ProxyServiceRoute.UNISWAP, '/order', {
             method: 'POST',
             headers: {
-              ...headers,
               'Content-Type': 'application/json'
             },
             body: JSON.stringify({
@@ -682,10 +676,9 @@ class UniswapHandler {
         const swapper = dutchQuote.orderInfo.swapper;
         return retryGetUniswapTx(async () => {
           try {
-            const response = await fetch(`${API_URL}/orders?orderId=${orderId}&swapper=${swapper}`, {
+            const response = await (0, _utils2.fetchFromProxyService)(_environment.ProxyServiceRoute.UNISWAP, `/orders?orderId=${orderId}&swapper=${swapper}`, {
               method: 'GET',
               headers: {
-                ...headers,
                 'Content-Type': 'application/json'
               }
             });

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

@@ -13,9 +13,6 @@ 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.getSupportedSwapChains = getSupportedSwapChains;
@@ -29,7 +26,6 @@ exports.processStepsToPathActions = processStepsToPathActions;
 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 _types2 = require("@subwallet/extension-base/types");
 var _swap = require("@subwallet/extension-base/types/swap");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
@@ -105,39 +101,52 @@ function convertSwapRate(rate, fromAsset, toAsset) {
   const bnRate = (0, _bignumber.default)(rate);
   return bnRate.times(10 ** decimalDiff).pow(-1).toNumber();
 }
-function getChainflipOptions(isTestnet) {
-  if (isTestnet) {
-    return {
-      network: getChainflipNetwork(isTestnet)
-    };
-  }
-  return {
-    network: getChainflipNetwork(isTestnet),
-    broker: getChainflipBroker(isTestnet)
-  };
-}
-function getChainflipNetwork(isTestnet) {
-  return isTestnet ? 'perseverance' : 'mainnet';
-}
-function getChainflipBroker(isTestnet) {
-  // noted: currently not use testnet broker
-  if (isTestnet) {
-    return {
-      url: `https://perseverance.chainflip-broker.io/rpc/${_chainflipHandler.CHAINFLIP_BROKER_API}`
-    };
-  } else {
-    return {
-      url: `https://chainflip-broker.io/rpc/${_chainflipHandler.CHAINFLIP_BROKER_API}`
-    };
-  }
-}
-function getChainflipSwap(isTestnet) {
-  if (isTestnet) {
-    return `https://perseverance.chainflip-broker.io/swap?apikey=${_chainflipHandler.CHAINFLIP_BROKER_API}`;
-  } else {
-    return `https://chainflip-broker.io/swap?apikey=${_chainflipHandler.CHAINFLIP_BROKER_API}`;
-  }
-}
+
+// export function getChainflipOptions (isTestnet: boolean) {
+//   if (isTestnet) {
+//     return {
+//       network: getChainflipNetwork(isTestnet)
+//     };
+//   }
+
+//   return {
+//     network: getChainflipNetwork(isTestnet),
+//     broker: getChainflipBroker(isTestnet)
+//   };
+// }
+
+// function getChainflipNetwork (isTestnet: boolean) {
+//   return isTestnet ? 'perseverance' : 'mainnet';
+// }
+
+// export function getChainflipBroker (isTestnet: boolean) { // noted: currently not use testnet broker
+//   if (isTestnet) {
+//     return {
+//       url: `https://perseverance.chainflip-broker.io/rpc/${CHAINFLIP_BROKER_API}`
+//     };
+//   } else {
+//     return {
+//       url: `https://chainflip-broker.io/rpc/${CHAINFLIP_BROKER_API}`
+//     };
+//   }
+// }
+
+// export function getChainflipSwap (isTestnet: boolean) {
+//   if (isTestnet) {
+//     return `https://perseverance.chainflip-broker.io/swap?apikey=${CHAINFLIP_BROKER_API}`;
+//   } else {
+//     return `https://chainflip-broker.io/swap?apikey=${CHAINFLIP_BROKER_API}`;
+//   }
+// }
+
+// export function getAssetsUrl (isTestnet: boolean) {
+//   if (isTestnet) {
+//     return 'https://perseverance.chainflip-broker.io/assets';
+//   } else {
+//     return 'https://chainflip-broker.io/assets';
+//   }
+// }
+
 function getBridgeStep(from, to) {
   return {
     action: _types2.DynamicSwapType.BRIDGE,

package/cjs/types/environment.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ProxyServiceRoute = void 0;
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+let ProxyServiceRoute;
+exports.ProxyServiceRoute = ProxyServiceRoute;
+(function (ProxyServiceRoute) {
+  ProxyServiceRoute["BITTENSOR"] = "/bittensor";
+  ProxyServiceRoute["CHAINFLIP"] = "/chainflip";
+  ProxyServiceRoute["KYBER"] = "/kyber";
+  ProxyServiceRoute["SIMPLESWAP"] = "/simpleswap";
+  ProxyServiceRoute["UNISWAP"] = "/uniswap";
+  ProxyServiceRoute["CARDANO"] = "/cardano";
+  ProxyServiceRoute["PARASPELL"] = "/paraspell";
+})(ProxyServiceRoute || (exports.ProxyServiceRoute = ProxyServiceRoute = {}));

package/cjs/utils/environment.js

@@ -4,10 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.targetIsWeb = exports.targetIsMobile = exports.targetIsExtension = exports.platformType = exports.platformModel = exports.osVersion = exports.osName = exports.isMobile = exports.isFirefox = exports.isBrave = exports.browserVersion = exports.browserName = exports.TARGET_ENV = exports.RuntimeInfo = exports.MODULE_SUPPORT = exports.BowserParser = void 0;
+exports.browserVersion = exports.browserName = exports.TARGET_ENV = exports.RuntimeInfo = exports.MODULE_SUPPORT = exports.BowserParser = void 0;
+exports.fetchFromProxyService = fetchFromProxyService;
+exports.targetIsWeb = exports.targetIsMobile = exports.targetIsExtension = exports.platformType = exports.platformModel = exports.osVersion = exports.osName = exports.isMobile = exports.isFirefox = exports.isBrave = void 0;
 var _mv = require("@subwallet/extension-base/utils/mv3");
 var _bowser = _interopRequireDefault(require("bowser"));
 var _KoniTypes = require("../background/KoniTypes");
+var _constants = require("../constants");
 var _navigator3;
 function detectRuntimeEnvironment() {
   if (_mv.isSupportWindow && typeof document !== 'undefined') {
@@ -104,4 +107,29 @@ exports.targetIsMobile = targetIsMobile;
 const MODULE_SUPPORT = {
   MANTA_ZK: false
 };
-exports.MODULE_SUPPORT = MODULE_SUPPORT;
+exports.MODULE_SUPPORT = MODULE_SUPPORT;
+var HEADERS;
+(function (HEADERS) {
+  HEADERS["PLATFORM"] = "Platform";
+})(HEADERS || (HEADERS = {}));
+function formatExternalServiceApi(url, isTestnet) {
+  if (isTestnet === true) {
+    return `${url}/testnet`;
+  }
+  if (isTestnet === false) {
+    return `${url}/mainnet`;
+  }
+  return url;
+}
+async function fetchFromProxyService(service, path, options, isTestnet) {
+  const baseUrl = formatExternalServiceApi(`${_constants.SW_EXTERNAL_SERVICES_API}${service}`, isTestnet);
+  const url = `${baseUrl}${path}`;
+  const headers = {
+    [HEADERS.PLATFORM]: TARGET_ENV,
+    ...(options.headers || {})
+  };
+  return fetch(url, {
+    ...options,
+    headers
+  });
+}

package/constants/environment.d.ts

@@ -1,3 +1,4 @@
 export declare const isProductionMode: boolean;
 export declare const BACKEND_API_URL: string;
 export declare const BACKEND_PRICE_HISTORY_URL: string;
+export declare const SW_EXTERNAL_SERVICES_API: string;

package/constants/environment.js

@@ -5,4 +5,5 @@ const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 export const isProductionMode = PRODUCTION_BRANCHES.indexOf(branchName) > -1;
 export const BACKEND_API_URL = process.env.SUBWALLET_API || (isProductionMode ? 'https://sw-services.subwallet.app/api' : 'https://be-dev.subwallet.app/api');
-export const BACKEND_PRICE_HISTORY_URL = process.env.SUBWALLET_PRICE_HISTORY_API || (isProductionMode ? 'https://price-history.subwallet.app/api' : 'https://price-history-dev.subwallet.app/api');
+export const BACKEND_PRICE_HISTORY_URL = process.env.SUBWALLET_PRICE_HISTORY_API || (isProductionMode ? 'https://price-history.subwallet.app/api' : 'https://price-history-dev.subwallet.app/api');
+export const SW_EXTERNAL_SERVICES_API = process.env.SW_EXTERNAL_SERVICES_API || (isProductionMode ? 'https://external-services.subwallet.app' : 'https://external-services-dev.subwallet.app');

package/koni/background/handlers/Extension.js

@@ -1452,7 +1452,7 @@ export default class KoniExtension {
     const isPosBridgeTransfer = _isPosChainBridge(originNetworkKey, destinationNetworkKey);
     const isAcrossBridgeTransfer = _isAcrossChainBridge(originNetworkKey, destinationNetworkKey);
     const extrinsicType = ExtrinsicType.TRANSFER_XCM;
-    const isSubstrateXcm = !(isAvailBridgeFromEvm || isAvailBridgeFromAvail || isSnowBridgeEvmTransfer || isPolygonBridgeTransfer || isPosBridgeTransfer);
+    const isSubstrateXcm = !(isAvailBridgeFromEvm || isAvailBridgeFromAvail || isSnowBridgeEvmTransfer || isPolygonBridgeTransfer || isPosBridgeTransfer || isAcrossBridgeTransfer);
     const isTransferNative = this.#koniState.getNativeTokenInfo(originNetworkKey).slug === tokenSlug;
     const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNative && tokenSlug === tokenPayFeeSlug;
     let xcmFeeDryRun;
@@ -1534,48 +1534,47 @@ export default class KoniExtension {
         }
         let isSendingTokenSufficient = false;
         let receiverSystemAccountInfo;
-        if (!_isChainSubstrateCompatible(chainInfoMap[destinationNetworkKey])) {
-          return undefined;
-        }
-        const setting = {
-          visible: true
-        };
-        await this.#koniState.chainService.updateAssetSetting(destinationTokenInfo.slug, setting, true);
-        const {
-          value: _senderTransferable
-        } = await this.getAddressTransferableBalance({
-          address: from,
-          networkKey: originNetworkKey,
-          token: originTokenInfo.slug
-        });
-        const senderTransferable = BigInt(_senderTransferable);
-        const sendingAmount = BigInt(value);
-        const {
-          value: _receiverDestinationTokenKeepAliveBalance
-        } = await this.getAddressTotalBalance({
-          address: to,
-          networkKey: destinationNetworkKey,
-          token: destinationTokenInfo.slug,
-          extrinsicType
-        });
-        const receiverDestinationTokenKeepAliveBalance = BigInt(_receiverDestinationTokenKeepAliveBalance);
-        if (!_isNativeToken(destinationTokenInfo)) {
-          const _receiverNativeTotal = await this.getAddressTotalBalance({
+        if (_isChainSubstrateCompatible(chainInfoMap[destinationNetworkKey])) {
+          const setting = {
+            visible: true
+          };
+          await this.#koniState.chainService.updateAssetSetting(destinationTokenInfo.slug, setting, true);
+          const {
+            value: _senderTransferable
+          } = await this.getAddressTransferableBalance({
+            address: from,
+            networkKey: originNetworkKey,
+            token: originTokenInfo.slug
+          });
+          const senderTransferable = BigInt(_senderTransferable);
+          const sendingAmount = BigInt(value);
+          const {
+            value: _receiverDestinationTokenKeepAliveBalance
+          } = await this.getAddressTotalBalance({
             address: to,
             networkKey: destinationNetworkKey,
-            token: destinationNativeTokenSlug,
+            token: destinationTokenInfo.slug,
             extrinsicType
           });
-          receiverSystemAccountInfo = _receiverNativeTotal.metadata;
+          const receiverDestinationTokenKeepAliveBalance = BigInt(_receiverDestinationTokenKeepAliveBalance);
+          if (!_isNativeToken(destinationTokenInfo)) {
+            const _receiverNativeTotal = await this.getAddressTotalBalance({
+              address: to,
+              networkKey: destinationNetworkKey,
+              token: destinationNativeTokenSlug,
+              extrinsicType
+            });
+            receiverSystemAccountInfo = _receiverNativeTotal.metadata;
+          }
+          const substrateApi = this.#koniState.getSubstrateApi(destinationNetworkKey);
+          const sufficientChain = this.#koniState.chainService.value.sufficientChains;
+          isSendingTokenSufficient = await _isSufficientToken(destinationTokenInfo, substrateApi, sufficientChain);
+          const [warning, error] = additionalValidateTransferForRecipient(destinationTokenInfo, destinationNativeTokenInfo, extrinsicType, receiverDestinationTokenKeepAliveBalance, sendingAmount, senderTransferable,
+          // different from sendingTokenInfo being passed in
+          receiverSystemAccountInfo, isSendingTokenSufficient);
+          warning.length && inputTransaction.warnings.push(...warning);
+          error.length && inputTransaction.errors.push(...error);
         }
-        const substrateApi = this.#koniState.getSubstrateApi(destinationNetworkKey);
-        const sufficientChain = this.#koniState.chainService.value.sufficientChains;
-        isSendingTokenSufficient = await _isSufficientToken(destinationTokenInfo, substrateApi, sufficientChain);
-        const [warning, error] = additionalValidateTransferForRecipient(destinationTokenInfo, destinationNativeTokenInfo, extrinsicType, receiverDestinationTokenKeepAliveBalance, sendingAmount, senderTransferable,
-        // different from sendingTokenInfo being passed in
-        receiverSystemAccountInfo, isSendingTokenSufficient);
-        warning.length && inputTransaction.warnings.push(...warning);
-        error.length && inputTransaction.errors.push(...error);
         if (isSubstrateXcm) {
           const isDryRunSuccess = await dryRunXcmExtrinsicV2(params);
           if (!isDryRunSuccess) {

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.40-0",
+  "version": "1.3.41-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2241,6 +2241,11 @@
       "require": "./cjs/types/common/storage.js",
       "default": "./types/common/storage.js"
     },
+    "./types/environment": {
+      "types": "./types/environment.d.ts",
+      "require": "./cjs/types/environment.js",
+      "default": "./types/environment.js"
+    },
     "./types/error": {
       "types": "./types/error.d.ts",
       "require": "./cjs/types/error.js",
@@ -2710,12 +2715,12 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.105",
-    "@subwallet/extension-base": "^1.3.40-0",
-    "@subwallet/extension-chains": "^1.3.40-0",
-    "@subwallet/extension-dapp": "^1.3.40-0",
-    "@subwallet/extension-inject": "^1.3.40-0",
+    "@subwallet/extension-base": "^1.3.41-0",
+    "@subwallet/extension-chains": "^1.3.41-0",
+    "@subwallet/extension-dapp": "^1.3.41-0",
+    "@subwallet/extension-inject": "^1.3.41-0",
     "@subwallet/keyring": "^0.1.12",
-    "@subwallet/subwallet-api-sdk": "^1.3.40-0",
+    "@subwallet/subwallet-api-sdk": "^1.3.41-0",
     "@subwallet/ui-keyring": "^0.1.12",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.0",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.3.40-0'
+  version: '1.3.41-0'
 };

package/services/balance-service/helpers/subscribe/evm.js

@@ -5,6 +5,7 @@ import { _AssetType } from '@subwallet/chain-list/types';
 import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
 import { ASTAR_REFRESH_BALANCE_INTERVAL, SUB_TOKEN_REFRESH_BALANCE_INTERVAL } from '@subwallet/extension-base/constants';
 import { getERC20Contract } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
+import { _BALANCE_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getContractAddressOfToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { filterAssetsByChainAndType } from '@subwallet/extension-base/utils';
 import { BN } from '@polkadot/util';
@@ -16,7 +17,11 @@ export function subscribeERC20Interval({
   evmApi
 }) {
   const chain = chainInfo.slug;
-  const tokenList = filterAssetsByChainAndType(assetMap, chain, [_AssetType.ERC20]);
+  let tokenList = filterAssetsByChainAndType(assetMap, chain, [_AssetType.ERC20]);
+  if (_BALANCE_CHAIN_GROUP.moonbeam.includes(chain)) {
+    const moonbeamLocal = filterAssetsByChainAndType(assetMap, chain, [_AssetType.LOCAL]);
+    tokenList = Object.assign({}, tokenList, moonbeamLocal);
+  }
   const erc20ContractMap = {};
   Object.entries(tokenList).forEach(([slug, tokenInfo]) => {
     erc20ContractMap[slug] = getERC20Contract(_getContractAddressOfToken(tokenInfo), evmApi);

package/services/balance-service/transfer/xcm/index.js

@@ -128,19 +128,25 @@ export const createXcmExtrinsicV2 = async request => {
 export const dryRunXcmExtrinsicV2 = async request => {
   try {
     const dryRunResult = await dryRunXcm(request);
-    const originDryRunResult = dryRunResult.origin;
-    if (originDryRunResult.success) {
-      const destinationDryRunResult = dryRunResult.destination;
-      if (destinationDryRunResult.success) {
-        return true;
+    const originDryRunRs = dryRunResult.origin;
+    if (originDryRunRs.success) {
+      const {
+        assetHub,
+        bridgeHub,
+        destination
+      } = dryRunResult;
+      if ((assetHub === null || assetHub === void 0 ? void 0 : assetHub.success) === false || (bridgeHub === null || bridgeHub === void 0 ? void 0 : bridgeHub.success) === false || (destination === null || destination === void 0 ? void 0 : destination.success) === false) {
+        if ((destination === null || destination === void 0 ? void 0 : destination.success) === false) {
+          // pass dry-run in these cases
+          return isChainNotSupportDryRun(destination.failureReason) || isChainNotSupportPolkadotApi(destination.failureReason);
+        }
+        return false;
       }
-
-      // pass dry-run in these cases
-      return isChainNotSupportDryRun(destinationDryRunResult.failureReason) || isChainNotSupportPolkadotApi(destinationDryRunResult.failureReason);
+      return true;
     }
 
     // pass dry-run in these cases
-    return isChainNotSupportDryRun(originDryRunResult.failureReason) || isChainNotSupportPolkadotApi(originDryRunResult.failureReason);
+    return isChainNotSupportDryRun(originDryRunRs.failureReason) || isChainNotSupportPolkadotApi(originDryRunRs.failureReason);
   } catch (e) {
     return false;
   }

package/services/balance-service/transfer/xcm/utils.d.ts

@@ -14,6 +14,8 @@ export declare type DryRunNodeResult = DryRunNodeSuccess | DryRunNodeFailure;
 export declare type DryRunResult = {
     origin: DryRunNodeResult;
     destination?: DryRunNodeResult;
+    assetHub?: DryRunNodeResult;
+    bridgeHub?: DryRunNodeResult;
 };
 interface GetXcmFeeRequest {
     sender: string;

package/services/balance-service/transfer/xcm/utils.js

@@ -2,14 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { fetchParaSpellChainMap } from '@subwallet/extension-base/constants/paraspell-chain-map';
+import { ProxyServiceRoute } from '@subwallet/extension-base/types/environment';
+import { fetchFromProxyService } from '@subwallet/extension-base/utils';
 import { assert, compactToU8a, isHex, u8aConcat, u8aEq } from '@polkadot/util';
-const paraSpellEndpoint = 'https://api.lightspell.xyz/v3';
+const version = '/v3';
 const paraSpellApi = {
-  buildXcm: `${paraSpellEndpoint}/x-transfer`,
-  dryRunXcm: `${paraSpellEndpoint}/dry-run`,
-  feeXcm: `${paraSpellEndpoint}/xcm-fee`
+  buildXcm: `${version}/x-transfer`,
+  dryRunXcm: `${version}/dry-run`,
+  feeXcm: `${version}/xcm-fee`
 };
-const paraSpellKey = process.env.PARASPELL_API_KEY || '';
 function txHexToSubmittableExtrinsic(api, hex) {
   try {
     assert(isHex(hex), 'Expected a hex-encoded call');
@@ -86,13 +87,12 @@ export async function buildXcm(request) {
     to: paraSpellChainMap[destinationChain.slug],
     currency: createParaSpellCurrency(psAssetType, psAssetValue, sendingValue)
   };
-  const response = await fetch(paraSpellApi.buildXcm, {
+  const response = await fetchFromProxyService(ProxyServiceRoute.PARASPELL, paraSpellApi.buildXcm, {
     method: 'POST',
     body: JSON.stringify(bodyData),
     headers: {
       'Content-Type': 'application/json',
-      Accept: 'application/json',
-      'X-API-KEY': paraSpellKey
+      Accept: 'application/json'
     }
   });
   if (!response.ok) {
@@ -126,13 +126,12 @@ export async function dryRunXcm(request) {
     to: paraSpellChainMap[destinationChain.slug],
     currency: createParaSpellCurrency(psAssetType, psAssetValue, sendingValue)
   };
-  const response = await fetch(paraSpellApi.dryRunXcm, {
+  const response = await fetchFromProxyService(ProxyServiceRoute.PARASPELL, paraSpellApi.dryRunXcm, {
     method: 'POST',
     body: JSON.stringify(bodyData),
     headers: {
       'Content-Type': 'application/json',
-      Accept: 'application/json',
-      'X-API-KEY': paraSpellKey
+      Accept: 'application/json'
     }
   });
   if (!response.ok) {
@@ -170,13 +169,12 @@ export async function estimateXcmFee(request) {
     to: paraSpellChainMap[toChainInfo.slug],
     currency: createParaSpellCurrency(psAssetType, psAssetValue, value)
   };
-  const response = await fetch(paraSpellApi.feeXcm, {
+  const response = await fetchFromProxyService(ProxyServiceRoute.PARASPELL, paraSpellApi.feeXcm, {
     method: 'POST',
     body: JSON.stringify(bodyData),
     headers: {
       'Content-Type': 'application/json',
-      Accept: 'application/json',
-      'X-API-KEY': paraSpellKey
+      Accept: 'application/json'
     }
   });
   if (!response.ok) {

package/services/chain-service/constants.d.ts

@@ -21,6 +21,7 @@ export declare const _BALANCE_CHAIN_GROUP: {
     centrifuge: string[];
     supportBridged: string[];
     bittensor: string[];
+    moonbeam: string[];
 };
 export declare const _BALANCE_TOKEN_GROUP: {
     crab: string[];

package/services/chain-service/constants.js

@@ -30,12 +30,13 @@ export const _BALANCE_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
   bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'hydradx_rococo', 'pendulum', 'amplitude', 'continuum_network', 'truth_network', 'jamton'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya', 'dbcchain', 'westend_assethub'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya', 'dbcchain', 'westend_assethub', 'chainflip_assethub'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
   centrifuge: ['centrifuge'],
   supportBridged: ['rococo_assethub', 'statemint', 'statemine', 'polimec'],
-  bittensor: ['bittensor', 'bittensor_testnet']
+  bittensor: ['bittensor', 'bittensor_testnet'],
+  moonbeam: ['moonbeam', 'moonriver', 'moonbase']
 };
 export const _BALANCE_TOKEN_GROUP = {
   crab: ['CKTON', 'PKTON'],
@@ -254,7 +255,7 @@ export const _TRANSFER_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   // crab: ['crab', 'pangolin'],
   bitcountry: ['pioneer', 'bitcountry'],
-  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest', 'dentnet', 'dbcchain', 'westend_assethub'],
+  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest', 'dentnet', 'dbcchain', 'westend_assethub', 'chainflip_assethub'],
   riochain: ['riochain'],
   sora_substrate: ['sora_substrate'],
   avail: ['kate', 'goldberg_testnet'],

package/services/chain-service/handler/CardanoApi.d.ts

@@ -3,10 +3,6 @@ import { _ApiOptions } from '@subwallet/extension-base/services/chain-service/ha
 import { _CardanoApi, _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
 import { PromiseHandler } from '@subwallet/extension-base/utils';
 import { BehaviorSubject } from 'rxjs';
-export declare const API_KEY: {
-    mainnet: string;
-    testnet: string;
-};
 export declare class CardanoApi implements _CardanoApi {
     chainSlug: string;
     apiUrl: string;
@@ -18,11 +14,11 @@ export declare class CardanoApi implements _CardanoApi {
     isApiReadyOnce: boolean;
     isReadyHandler: PromiseHandler<_CardanoApi>;
     isTestnet: boolean;
-    private projectId;
     providerName: string;
     constructor(chainSlug: string, apiUrl: string, { isTestnet, providerName }: _ApiOptions);
     get isApiConnected(): boolean;
     get connectionStatus(): _ChainConnectionStatus;
+    private fetchCardano;
     private updateConnectionStatus;
     get isReady(): Promise<_CardanoApi>;
     updateApiUrl(apiUrl: string): Promise<void>;