@subwallet/extension-base 1.3.51-0 → 1.3.52-0

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

@@ -16,7 +16,7 @@ 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 _utils3 = require("@subwallet/extension-base/utils");
-var _subwalletApiSdk = _interopRequireDefault(require("@subwallet/subwallet-api-sdk"));
+var _subwalletServicesSdk = _interopRequireDefault(require("@subwallet-monorepos/subwallet-services-sdk"));
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
@@ -145,21 +145,27 @@ class HydradxHandler {
     let bnSendingValue = (0, _bignumber.default)(fromAmount);
     let bnExpectedReceive = (0, _bignumber.default)(selectedQuote.toAmount);
     if (needModifyData) {
-      var _subwalletApiSdk$swap;
+      var _quotes;
       // override info if xcm-swap-xcm
       bnSendingValue = bnSendingValue.multipliedBy(_utils2.DEFAULT_EXCESS_AMOUNT_WEIGHT);
       bnExpectedReceive = bnExpectedReceive.multipliedBy(_utils2.DEFAULT_EXCESS_AMOUNT_WEIGHT);
-      const quotes = await ((_subwalletApiSdk$swap = _subwalletApiSdk.default.swapApi) === null || _subwalletApiSdk$swap === void 0 ? void 0 : _subwalletApiSdk$swap.fetchSwapQuoteData({
-        address: sender,
-        pair: {
-          from: swapPairInfo.from,
-          to: swapPairInfo.to,
-          slug: swapPairInfo.slug
-        },
-        fromAmount: bnSendingValue.toFixed(0, 1),
-        slippage: params.request.slippage
-      }));
-      const quoteAskResponse = quotes === null || quotes === void 0 ? void 0 : quotes.find(quote => quote.provider === this.providerSlug);
+      let quotes = []; // todo
+
+      try {
+        quotes = await _subwalletServicesSdk.default.swapApi.fetchSwapQuoteData({
+          address: sender,
+          pair: {
+            from: swapPairInfo.from,
+            to: swapPairInfo.to,
+            slug: swapPairInfo.slug
+          },
+          fromAmount: bnSendingValue.toFixed(0, 1),
+          slippage: params.request.slippage
+        });
+      } catch (error) {
+        throw new Error(`Failed to fetch swap quote: ${error.message}`);
+      }
+      const quoteAskResponse = (_quotes = quotes) === null || _quotes === void 0 ? void 0 : _quotes.find(quote => quote.provider === this.providerSlug);
       if (!quoteAskResponse || !quoteAskResponse.quote) {
         return Promise.resolve(undefined);
       }

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

@@ -21,7 +21,7 @@ var _types3 = require("@subwallet/extension-base/types");
 var _serviceBase = require("@subwallet/extension-base/types/service-base");
 var _swap = require("@subwallet/extension-base/types/swap");
 var _utils3 = require("@subwallet/extension-base/utils");
-var _subwalletApiSdk = _interopRequireDefault(require("@subwallet/subwallet-api-sdk"));
+var _subwalletServicesSdk = _interopRequireDefault(require("@subwallet-monorepos/subwallet-services-sdk"));
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
 var _rxjs = require("rxjs");
@@ -43,7 +43,6 @@ class SwapService {
     this.chainService = state.chainService;
   }
   async askProvidersForQuote(_request) {
-    var _subwalletApiSdk$swap;
     const availableQuotes = [];
 
     // hotfix // todo: remove later
@@ -51,7 +50,7 @@ class SwapService {
       ..._request,
       isSupportKyberVersion: true
     };
-    const quotes = await ((_subwalletApiSdk$swap = _subwalletApiSdk.default.swapApi) === null || _subwalletApiSdk$swap === void 0 ? void 0 : _subwalletApiSdk$swap.fetchSwapQuoteData(request));
+    const quotes = await _subwalletServicesSdk.default.swapApi.fetchSwapQuoteData(request);
     if (Array.isArray(quotes)) {
       quotes.forEach(quoteData => {
         if (!_swap._SUPPORTED_SWAP_PROVIDERS.includes(quoteData.provider)) {
@@ -272,8 +271,12 @@ class SwapService {
     return [[], undefined];
   }
   async getLatestQuoteFromSwapRequest(request) {
-    var _subwalletApiSdk$swap2;
-    const availablePath = await ((_subwalletApiSdk$swap2 = _subwalletApiSdk.default.swapApi) === null || _subwalletApiSdk$swap2 === void 0 ? void 0 : _subwalletApiSdk$swap2.findAvailablePath(request));
+    let availablePath;
+    try {
+      availablePath = await _subwalletServicesSdk.default.swapApi.findAvailablePath(request);
+    } catch (e) {
+      console.log('Error findAvailablePath', e);
+    }
     if (!availablePath) {
       return {
         path: [],

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

@@ -6,7 +6,6 @@ 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");
@@ -52,12 +51,18 @@ function getBlockExplorerAccountRoute(explorerLink) {
   if (explorerLink.includes('devnet-explorer.mosaicchain.io')) {
     return 'accounts';
   }
+  if (explorerLink.includes('pdexmon.com')) {
+    return 'holders';
+  }
   return 'address';
 }
 function getBlockExplorerTxRoute(chainInfo) {
   if ((0, _utils._isPureEvmChain)(chainInfo) || (0, _utils._isPureBitcoinChain)(chainInfo)) {
     return 'tx';
   }
+  if (['moonbeam'].includes(chainInfo.slug)) {
+    return 'tx';
+  }
   if ((0, _utils._isPureCardanoChain)(chainInfo) || (0, _utils._isPureTonChain)(chainInfo)) {
     return 'transaction';
   }
@@ -67,33 +72,38 @@ function getBlockExplorerTxRoute(chainInfo) {
   if (['gen6_public'].includes(chainInfo.slug)) {
     return '#/extrinsics';
   }
-  if (['mosaicTest'].includes(chainInfo.slug)) {
+  if (['mosaicTest', 'polkadex'].includes(chainInfo.slug)) {
     return 'transactions';
   }
+  if (['autonomys'].includes(chainInfo.slug)) {
+    return 'extrinsics';
+  }
   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);
-}
+
+// export function getTransactionId (value: string): Promise<string> {
+//   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: SWApiResponse<ExtrinsicsDataResponse>) => result.data.extrinsics[0].id);
+// }
+
 function getExplorerLink(chainInfo, value, type) {
   const explorerLink = (0, _utils._getBlockExplorerFromChain)(chainInfo);
   if (explorerLink && type === 'account') {
@@ -129,6 +139,5 @@ function getChainflipExplorerLink(data, chainInfo) {
   return `${chainflipDomain}/channels/${data.depositChannelId}`;
 }
 function getSimpleSwapExplorerLink(data) {
-  const simpleswapDomain = _utils2.SIMPLE_SWAP_EXPLORER;
-  return `${simpleswapDomain}/exchange?id=${data.id}`;
+  return `${_utils2.SIMPLE_SWAP_EXPLORER}/exchange?id=${data.id}`;
 }

package/cjs/utils/index.js

@@ -343,6 +343,18 @@ Object.keys(_bitcoin).forEach(function (key) {
     }
   });
 });
+var _setupApiSdk = require("./setup-api-sdk");
+Object.keys(_setupApiSdk).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _setupApiSdk[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _setupApiSdk[key];
+    }
+  });
+});
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 

package/cjs/utils/setup-api-sdk.js

@@ -0,0 +1,27 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.setupApiSDK = setupApiSDK;
+var _constants = require("@subwallet/extension-base/constants");
+var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _subwalletServicesSdk = _interopRequireDefault(require("@subwallet-monorepos/subwallet-services-sdk"));
+var _environment = require("./environment");
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+function setupApiSDK() {
+  _subwalletServicesSdk.default.updateConfig({
+    appVersion: _constants.APP_VERSION,
+    baseUrl: _constants.BACKEND_API_URL,
+    platform: _environment.TARGET_ENV,
+    chainListVersion: _utils.ChainListVersion
+  });
+
+  // Custom the price history API with other different base URL
+  _subwalletServicesSdk.default.priceHistoryApi.updateConfig({
+    baseUrl: _constants.BACKEND_PRICE_HISTORY_URL
+  });
+}

package/constants/environment.d.ts

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

package/constants/environment.js

@@ -3,6 +3,7 @@
 
 const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
+export const APP_VERSION = process.env.PKG_VERSION || '';
 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');

package/koni/background/handlers/State.js

@@ -8,7 +8,7 @@ import { EvmProviderError } from '@subwallet/extension-base/background/errors/Ev
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
 import { isSubscriptionRunning, unsubscribe } from '@subwallet/extension-base/background/handlers/subscriptions';
 import { APIItemState, BitcoinProviderErrorType, CardanoProviderErrorType, ChainType, EvmProviderErrorType, ExternalRequestPromiseStatus, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { BACKEND_API_URL, BACKEND_PRICE_HISTORY_URL, MANTA_PAY_BALANCE_INTERVAL, REMIND_EXPORT_ACCOUNT } from '@subwallet/extension-base/constants';
+import { MANTA_PAY_BALANCE_INTERVAL, REMIND_EXPORT_ACCOUNT } from '@subwallet/extension-base/constants';
 import { convertErrorFormat, generateValidationProcess, validationAuthCardanoMiddleware, validationAuthMiddleware, validationAuthWCMiddleware, validationBitcoinConnectMiddleware, validationBitcoinSendTransactionMiddleware, validationBitcoinSignMessageMiddleware, validationBitcoinSignPsbtMiddleware, validationCardanoSignDataMiddleware, validationConnectMiddleware, validationEvmDataTransactionMiddleware, validationEvmSignMessageMiddleware } from '@subwallet/extension-base/core/logic-validation';
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
@@ -41,10 +41,9 @@ import TransactionService from '@subwallet/extension-base/services/transaction-s
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { BasicTxErrorType } from '@subwallet/extension-base/types';
-import { addLazy, isManifestV3, isSameAddress, reformatAddress, sailsCache, stripUrl, targetIsWeb } from '@subwallet/extension-base/utils';
+import { addLazy, isManifestV3, isSameAddress, reformatAddress, sailsCache, setupApiSDK, stripUrl, targetIsWeb } from '@subwallet/extension-base/utils';
 import { convertCardanoHexToBech32, validateAddressNetwork } from '@subwallet/extension-base/utils/cardano';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
-import subwalletApiSdk from '@subwallet/subwallet-api-sdk';
 import { keyring } from '@subwallet/ui-keyring';
 import BigN from 'bignumber.js';
 import * as bitcoin from 'bitcoinjs-lib';
@@ -93,10 +92,7 @@ export default class KoniState {
   waitStartingFull = null;
   constructor(providers = {}) {
     // Init subwallet api sdk
-    subwalletApiSdk.init({
-      url: BACKEND_API_URL,
-      priceHistoryUrl: BACKEND_PRICE_HISTORY_URL
-    });
+    setupApiSDK();
     this.providers = providers;
     this.eventService = new EventService();
     this.dbService = new DatabaseService(this.eventService);

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.51-0",
+  "version": "1.3.52-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2801,6 +2801,11 @@
       "require": "./cjs/utils/request.js",
       "default": "./utils/request.js"
     },
+    "./utils/setup-api-sdk": {
+      "types": "./utils/setup-api-sdk.d.ts",
+      "require": "./cjs/utils/setup-api-sdk.js",
+      "default": "./utils/setup-api-sdk.js"
+    },
     "./utils/staticData": {
       "types": "./utils/staticData/index.d.ts",
       "require": "./cjs/utils/staticData/index.js",
@@ -2865,11 +2870,12 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.110",
-    "@subwallet/extension-base": "^1.3.51-0",
-    "@subwallet/extension-chains": "^1.3.51-0",
-    "@subwallet/extension-dapp": "^1.3.51-0",
-    "@subwallet/extension-inject": "^1.3.51-0",
+    "@subwallet-monorepos/subwallet-services-sdk": "^0.1.8",
+    "@subwallet/chain-list": "0.2.111",
+    "@subwallet/extension-base": "^1.3.52-0",
+    "@subwallet/extension-chains": "^1.3.52-0",
+    "@subwallet/extension-dapp": "^1.3.52-0",
+    "@subwallet/extension-inject": "^1.3.52-0",
     "@subwallet/keyring": "^0.1.12",
     "@subwallet/subwallet-api-sdk": "^1.3.51-0",
     "@subwallet/ui-keyring": "^0.1.12",

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.51-0'
+  version: '1.3.52-0'
 };

package/services/balance-service/index.js

@@ -12,8 +12,8 @@ import DetectAccountBalanceStore from '@subwallet/extension-base/stores/DetectAc
 import { addLazy, createPromiseHandler, isAccountAll, waitTimeout } from '@subwallet/extension-base/utils';
 import { getKeypairTypeByAddress } from '@subwallet/keyring';
 import { EthereumKeypairTypes, SubstrateKeypairTypes } from '@subwallet/keyring/types';
-import subwalletApiSdk from '@subwallet/subwallet-api-sdk';
 import keyring from '@subwallet/ui-keyring';
+import subwalletApiSdk from '@subwallet-monorepos/subwallet-services-sdk';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
 import { BehaviorSubject } from 'rxjs';
@@ -448,12 +448,11 @@ export class BalanceService {
       const typeValid = [...EthereumKeypairTypes].includes(type);
       if (typeValid) {
         return new Promise(resolve => {
-          var _subwalletApiSdk$bala;
           const timeOutPromise = new Promise(_resolve => {
             setTimeout(() => _resolve([]), 30000);
           });
-          const apiPromise = ((_subwalletApiSdk$bala = subwalletApiSdk.balanceDetectionApi) === null || _subwalletApiSdk$bala === void 0 ? void 0 : _subwalletApiSdk$bala.getEvmTokenBalanceSlug(address)) || Promise.resolve([]);
-          Promise.race([timeOutPromise, apiPromise]).then(result => resolve(result)).catch(error => {
+          const balanceDetectionApi = subwalletApiSdk.balanceDetectionApi || Promise.resolve([]);
+          Promise.race([timeOutPromise, balanceDetectionApi.getEvmTokenBalanceSlug(address)]).then(result => resolve(result)).catch(error => {
             console.error(error);
             resolve(null);
           });

package/services/balance-service/transfer/cardano-transfer.js

@@ -4,7 +4,22 @@
 import * as csl from '@emurgo/cardano-serialization-lib-nodejs';
 import { _AssetType } from '@subwallet/chain-list/types';
 import { getAdaBelongUtxo, getCardanoTxFee, splitCardanoId } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/utils';
-import { subwalletApiSdk } from '@subwallet/subwallet-api-sdk';
+import { toUnit } from '@subwallet/extension-base/utils';
+import subwalletApiSdk from '@subwallet-monorepos/subwallet-services-sdk';
+var POPULAR_CARDANO_ERROR_PHRASE;
+(function (POPULAR_CARDANO_ERROR_PHRASE) {
+  POPULAR_CARDANO_ERROR_PHRASE["NOT_MATCH_MIN_AMOUNT"] = "less than the minimum UTXO value";
+  POPULAR_CARDANO_ERROR_PHRASE["INSUFFICIENT_INPUT"] = "Insufficient input in transaction";
+})(POPULAR_CARDANO_ERROR_PHRASE || (POPULAR_CARDANO_ERROR_PHRASE = {}));
+function getFirstNumberAfterSubstring(inputStr, subStr) {
+  const regex = new RegExp(`(${subStr})\\D*(\\d+)`);
+  const match = inputStr.match(regex);
+  if (match) {
+    return parseInt(match[2], 10);
+  } else {
+    return null;
+  }
+}
 export async function createCardanoTransaction(params) {
   var _tokenInfo$metadata;
   const {
@@ -22,15 +37,32 @@ export async function createCardanoTransaction(params) {
   if (!cardanoId) {
     throw new Error('Missing token policy id metadata');
   }
-  const payload = await subwalletApiSdk.fetchUnsignedPayload({
-    tokenDecimals: params.tokenInfo.decimals || 0,
-    nativeTokenSymbol: params.nativeTokenInfo.symbol,
-    cardanoId,
-    from: params.from,
-    to: params.to,
-    value: params.value,
-    cardanoTtlOffset: params.cardanoTtlOffset
-  });
+  let payload;
+  try {
+    payload = await subwalletApiSdk.cardanoApi.fetchUnsignedPayload({
+      sender: from,
+      receiver: to,
+      unit: cardanoId,
+      quantity: value
+    });
+  } catch (error) {
+    const errorMessage = error.message;
+    const tokenDecimals = params.tokenInfo.decimals || 0; // todo: review if should use nativeTokenDecimals?
+    const nativeTokenSymbol = params.nativeTokenInfo.symbol;
+    if (errorMessage.includes(POPULAR_CARDANO_ERROR_PHRASE.NOT_MATCH_MIN_AMOUNT)) {
+      const minAdaRequiredRaw = getFirstNumberAfterSubstring(errorMessage, POPULAR_CARDANO_ERROR_PHRASE.NOT_MATCH_MIN_AMOUNT);
+      const minAdaRequired = minAdaRequiredRaw ? toUnit(minAdaRequiredRaw, tokenDecimals) : 1;
+      throw new Error(`Amount too low. Increase your amount above ${minAdaRequired} ${nativeTokenSymbol} and try again`);
+    }
+    if (errorMessage.includes(POPULAR_CARDANO_ERROR_PHRASE.INSUFFICIENT_INPUT)) {
+      throw new Error(`Insufficient ${nativeTokenSymbol} balance to perform transaction. Top up ${nativeTokenSymbol} and try again`);
+    }
+    console.error(`Transaction is not built successfully: ${errorMessage}`);
+    throw new Error('Unable to perform this transaction at the moment. Try again later');
+  }
+  if (!payload) {
+    throw new Error('Build cardano payload failed!');
+  }
   console.log('Build cardano payload successfully!', payload);
   validatePayload(payload, params);
   const fee = getCardanoTxFee(payload);

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

@@ -3,7 +3,7 @@
 
 import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
 import { _isAcrossBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
-import subwalletApiSdk from '@subwallet/subwallet-api-sdk';
+import subwalletApiSdk from '@subwallet-monorepos/subwallet-services-sdk';
 // Across Bridge
 const acrossPairsMap = new Map([[COMMON_CHAIN_SLUGS.ETHEREUM, new Set(['optimism', 'base_mainnet', 'arbitrum_one'])], ['optimism', new Set([COMMON_CHAIN_SLUGS.ETHEREUM, 'base_mainnet', 'arbitrum_one'])], ['base_mainnet', new Set([COMMON_CHAIN_SLUGS.ETHEREUM, 'optimism', 'arbitrum_one'])], ['arbitrum_one', new Set([COMMON_CHAIN_SLUGS.ETHEREUM, 'optimism', 'base_mainnet'])], [COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA, new Set(['base_sepolia', 'arbitrum_sepolia'])],
 // TESTNET START HERE
@@ -37,100 +37,21 @@ export const getAcrossQuote = async ({
     throw new Error('Sender is required');
   }
   try {
-    var _subwalletApiSdk$xcmA;
-    const data = await ((_subwalletApiSdk$xcmA = subwalletApiSdk.xcmApi) === null || _subwalletApiSdk$xcmA === void 0 ? void 0 : _subwalletApiSdk$xcmA.fetchXcmData(sender, originTokenInfo.slug, destinationTokenInfo.slug, recipient, sendingValue));
+    const data = await subwalletApiSdk.xcmApi.fetchXcmData({
+      address: sender,
+      from: originTokenInfo.slug,
+      to: destinationTokenInfo.slug,
+      recipient,
+      value: sendingValue
+    });
     if (!data) {
-      throw new Error('Failed to fetch Across Bridge Data. Please try again later');
+      return Promise.reject(new Error('Failed to fetch Across Bridge Data. Please try again later'));
     }
     return data;
   } catch (error) {
-    return Promise.reject(error);
+    if (error instanceof SyntaxError) {
+      return Promise.reject(new Error('Unable to perform this transaction at the moment. Try again later'));
+    }
+    return Promise.reject(new Error((error === null || error === void 0 ? void 0 : error.message) || 'Unable to perform this transaction at the moment. Try again later'));
   }
-};
-
-// export const SpokePoolMapping: Record<number, { SpokePool: { address: string; blockNumber: number } }> = {
-//   1: {
-//     SpokePool: { address: '0x5c7BCd6E7De5423a257D81B442095A1a6ced35C5', blockNumber: 17117454 }
-//   },
-//   10: {
-//     SpokePool: { address: '0x6f26Bf09B1C792e3228e5467807a900A503c0281', blockNumber: 93903076 }
-//   },
-//   11155111: {
-//     SpokePool: { address: '0x5ef6C01E11889d86803e0B23e3cB3F9E9d97B662', blockNumber: 5288470 }
-//   },
-//   11155420: {
-//     SpokePool: { address: '0x4e8E101924eDE233C13e2D8622DC8aED2872d505', blockNumber: 7762656 }
-//   },
-//   1135: {
-//     SpokePool: { address: '0x9552a0a6624A23B848060AE5901659CDDa1f83f8', blockNumber: 2602337 }
-//   },
-//   130: {
-//     SpokePool: { address: '0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64', blockNumber: 7915488 }
-//   },
-//   137: {
-//     SpokePool: { address: '0x9295ee1d8C5b022Be115A2AD3c30C72E34e7F096', blockNumber: 41908657 }
-//   },
-//   168587773: {
-//     SpokePool: { address: '0x5545092553Cf5Bf786e87a87192E902D50D8f022', blockNumber: 7634204 }
-//   },
-//   1868: {
-//     SpokePool: { address: '0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96', blockNumber: 1709997 }
-//   },
-//   288: {
-//     SpokePool: { address: '0xBbc6009fEfFc27ce705322832Cb2068F8C1e0A58', blockNumber: 619993 }
-//   },
-//   324: {
-//     SpokePool: { address: '0xE0B015E54d54fc84a6cB9B666099c46adE9335FF', blockNumber: 10352565 }
-//   },
-//   34443: {
-//     SpokePool: { address: '0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96', blockNumber: 8043187 }
-//   },
-//   37111: {
-//     SpokePool: { address: '0x6A0a7f39530923911832Dd60667CE5da5449967B', blockNumber: 156275 }
-//   },
-//   41455: {
-//     SpokePool: { address: '0x13fDac9F9b4777705db45291bbFF3c972c6d1d97', blockNumber: 4240318 }
-//   },
-//   4202: {
-//     SpokePool: { address: '0xeF684C38F94F48775959ECf2012D7E864ffb9dd4', blockNumber: 7267988 }
-//   },
-//   42161: {
-//     SpokePool: { address: '0xe35e9842fceaCA96570B734083f4a58e8F7C5f2A', blockNumber: 83868041 }
-//   },
-//   421614: {
-//     SpokePool: { address: '0x7E63A5f1a8F0B4d0934B2f2327DAED3F6bb2ee75', blockNumber: 12411026 }
-//   },
-//   480: {
-//     SpokePool: { address: '0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64', blockNumber: 4524742 }
-//   },
-//   534352: {
-//     SpokePool: { address: '0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96', blockNumber: 7489705 }
-//   },
-//   57073: {
-//     SpokePool: { address: '0xeF684C38F94F48775959ECf2012D7E864ffb9dd4', blockNumber: 1139240 }
-//   },
-//   59144: {
-//     SpokePool: { address: '0x7E63A5f1a8F0B4d0934B2f2327DAED3F6bb2ee75', blockNumber: 2721169 }
-//   },
-//   690: {
-//     SpokePool: { address: '0x13fDac9F9b4777705db45291bbFF3c972c6d1d97', blockNumber: 5512122 }
-//   },
-//   7777777: {
-//     SpokePool: { address: '0x13fDac9F9b4777705db45291bbFF3c972c6d1d97', blockNumber: 18382867 }
-//   },
-//   80002: {
-//     SpokePool: { address: '0xd08baaE74D6d2eAb1F3320B2E1a53eeb391ce8e5', blockNumber: 7529960 }
-//   },
-//   81457: {
-//     SpokePool: { address: '0x2D509190Ed0172ba588407D4c2df918F955Cc6E1', blockNumber: 5574280 }
-//   },
-//   8453: {
-//     SpokePool: { address: '0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64', blockNumber: 2164878 }
-//   },
-//   84532: {
-//     SpokePool: { address: '0x82B564983aE7274c86695917BBf8C99ECb6F0F8F', blockNumber: 6082004 }
-//   },
-//   919: {
-//     SpokePool: { address: '0xbd886FC0725Cc459b55BbFEb3E4278610331f83b', blockNumber: 13999465 }
-//   }
-// };
+};

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

@@ -12,7 +12,7 @@ import { getExtrinsicByXtokensPallet } from '@subwallet/extension-base/services/
 import { _XCM_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { combineEthFee } from '@subwallet/extension-base/utils';
-import subwalletApiSdk from '@subwallet/subwallet-api-sdk';
+import subwalletApiSdk from '@subwallet-monorepos/subwallet-services-sdk';
 import { _createPosBridgeL1toL2Extrinsic, _createPosBridgeL2toL1Extrinsic } from "./posBridge.js";
 // SnowBridge
 export const createSnowBridgeExtrinsic = async ({
@@ -175,8 +175,13 @@ export const createAcrossBridgeExtrinsic = async ({
     throw new Error('Sender is required');
   }
   try {
-    var _subwalletApiSdk$xcmA;
-    const data = await ((_subwalletApiSdk$xcmA = subwalletApiSdk.xcmApi) === null || _subwalletApiSdk$xcmA === void 0 ? void 0 : _subwalletApiSdk$xcmA.fetchXcmData(sender, originTokenInfo.slug, destinationTokenInfo.slug, recipient, sendingValue));
+    const data = await subwalletApiSdk.xcmApi.fetchXcmData({
+      address: sender,
+      from: originTokenInfo.slug,
+      to: destinationTokenInfo.slug,
+      recipient,
+      value: sendingValue
+    });
     const _feeCustom = feeCustom;
     const feeCombine = combineEthFee(feeInfo, feeOption, _feeCustom);
     if (!data) {
@@ -193,6 +198,9 @@ export const createAcrossBridgeExtrinsic = async ({
     transactionConfig.gas = gasLimit.toString();
     return transactionConfig;
   } catch (error) {
-    return Promise.reject(error);
+    if (error instanceof SyntaxError) {
+      return Promise.reject(new Error('Unable to perform this transaction at the moment. Try again later'));
+    }
+    return Promise.reject(new Error((error === null || error === void 0 ? void 0 : error.message) || 'Unable to perform this transaction at the moment. Try again later'));
   }
 };

package/services/chain-service/utils/patch.d.ts

@@ -1,4 +1,5 @@
 import { _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
+export declare const ChainListVersion = "0.2.111";
 export interface PatchInfo {
     patchVersion: string;
     appliedVersion: string;

package/services/chain-service/utils/patch.js

@@ -5,7 +5,7 @@ const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev';
 const fetchFile = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'list.json' : 'preview.json';
-const ChainListVersion = '0.2.110'; // update this when build chainlist
+export const ChainListVersion = '0.2.111'; // update this when build chain-list
 
 // todo: move this interface to chainlist