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

package/cjs/services/keyring-service/context/handlers/Json.js

@@ -162,7 +162,17 @@ class AccountJsonHandler extends _Base.AccountBaseHandler {
           accountProxies,
           modifyPairs
         } = json;
-        const pairs = jsons.map(pair => _uiKeyring.keyring.createFromJson(pair));
+        const pairs = jsons.reduce((rs, pair) => {
+          try {
+            rs.push(_uiKeyring.keyring.createFromJson(pair));
+          } catch (e) {
+            console.error(e);
+          }
+          return rs;
+        }, []);
+        if (!(pairs !== null && pairs !== void 0 && pairs.length)) {
+          throw new Error((0, _i18next.t)('No valid accounts found to import'));
+        }
         const accountProxyMap = (0, _utils.combineAccountsWithKeyPair)(pairs, modifyPairs, accountProxies);
         const result = Object.values(accountProxyMap).map(proxy => {
           const rs = {
@@ -205,9 +215,24 @@ class AccountJsonHandler extends _Base.AccountBaseHandler {
       try {
         const {
           accountProxies,
-          modifyPairs
+          modifyPairs: modifyPairsRestored
         } = file;
-        const pairs = jsons.map(pair => _uiKeyring.keyring.createFromJson(pair));
+        const modifyPairs = {};
+        const pairs = jsons.reduce((rs, pairJson) => {
+          try {
+            const pair = _uiKeyring.keyring.createFromJson(pairJson);
+            if (modifyPairsRestored !== null && modifyPairsRestored !== void 0 && modifyPairsRestored[pair.address]) {
+              modifyPairs[pair.address] = modifyPairsRestored[pair.address];
+            }
+            rs.push(pair);
+          } catch (e) {
+            console.error(e);
+          }
+          return rs;
+        }, []);
+        if (!(pairs !== null && pairs !== void 0 && pairs.length)) {
+          throw new Error((0, _i18next.t)('No valid accounts found to import'));
+        }
         const accountProxyMap = (0, _utils.combineAccountsWithKeyPair)(pairs, modifyPairs, accountProxies);
         const rawProxyIds = _proxyIds && _proxyIds.length ? _proxyIds : Object.keys(accountProxyMap);
         let _exists;

package/cjs/services/price-service/coingecko.js

@@ -1,12 +1,13 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getPriceMap = exports.getHistoryPrice = exports.getExchangeRateMap = void 0;
 var _constants = require("@subwallet/extension-base/constants");
 var _staticData = require("@subwallet/extension-base/utils/staticData");
-var _subwalletApiSdk = require("@subwallet/subwallet-api-sdk");
+var _subwalletServicesSdk = _interopRequireDefault(require("@subwallet-monorepos/subwallet-services-sdk"));
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -155,8 +156,7 @@ const getPriceMap = async function (priceIds) {
 exports.getPriceMap = getPriceMap;
 const getHistoryPrice = async (priceId, type) => {
   try {
-    var _subwalletApiSdk$pric;
-    const response = await ((_subwalletApiSdk$pric = _subwalletApiSdk.subwalletApiSdk.priceHistoryApi) === null || _subwalletApiSdk$pric === void 0 ? void 0 : _subwalletApiSdk$pric.getPriceHistory(priceId, type));
+    const response = await _subwalletServicesSdk.default.priceHistoryApi.getPriceHistory(priceId, type);
     if (response) {
       return response;
     }

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/services/wallet-connect-service/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WALLET_CONNECT_SUPPORT_NAMESPACES = exports.WALLET_CONNECT_SUPPORTED_METHODS = exports.WALLET_CONNECT_REQUEST_KEY = exports.WALLET_CONNECT_POLKADOT_NAMESPACE = exports.WALLET_CONNECT_EIP155_NAMESPACE = exports.RELAY_URL = exports.PROJECT_ID_MOBILE = exports.PROJECT_ID_EXTENSION = exports.DEFAULT_WALLET_CONNECT_OPTIONS = exports.ALL_WALLET_CONNECT_EVENT = void 0;
+exports.WALLET_CONNECT_SUPPORT_NAMESPACES = exports.WALLET_CONNECT_SUPPORTED_METHODS = exports.WALLET_CONNECT_SESSION_TIMEOUT = exports.WALLET_CONNECT_REQUEST_KEY = exports.WALLET_CONNECT_POLKADOT_NAMESPACE = exports.WALLET_CONNECT_EIP155_NAMESPACE = exports.RELAY_URL = exports.RELAY_FALLBACK_URL = exports.PROJECT_ID_MOBILE = exports.PROJECT_ID_EXTENSION = exports.DEFAULT_WALLET_CONNECT_OPTIONS = exports.ALL_WALLET_CONNECT_EVENT = void 0;
 var _types = require("@subwallet/extension-base/services/wallet-connect-service/types");
 var _utils = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
@@ -15,6 +15,8 @@ const PROJECT_ID_MOBILE = '6da34c0b48164d27681924dd9a46d6be';
 exports.PROJECT_ID_MOBILE = PROJECT_ID_MOBILE;
 const RELAY_URL = 'wss://relay.walletconnect.com';
 exports.RELAY_URL = RELAY_URL;
+const RELAY_FALLBACK_URL = 'wss://relay.walletconnect.org';
+exports.RELAY_FALLBACK_URL = RELAY_FALLBACK_URL;
 const DEFAULT_WALLET_CONNECT_OPTIONS = {
   logger: 'error',
   projectId: _utils.targetIsMobile ? PROJECT_ID_MOBILE : PROJECT_ID_EXTENSION,
@@ -38,4 +40,6 @@ exports.WALLET_CONNECT_EIP155_NAMESPACE = WALLET_CONNECT_EIP155_NAMESPACE;
 const WALLET_CONNECT_POLKADOT_NAMESPACE = 'polkadot';
 exports.WALLET_CONNECT_POLKADOT_NAMESPACE = WALLET_CONNECT_POLKADOT_NAMESPACE;
 const WALLET_CONNECT_SUPPORT_NAMESPACES = [WALLET_CONNECT_EIP155_NAMESPACE, WALLET_CONNECT_POLKADOT_NAMESPACE];
-exports.WALLET_CONNECT_SUPPORT_NAMESPACES = WALLET_CONNECT_SUPPORT_NAMESPACES;
+exports.WALLET_CONNECT_SUPPORT_NAMESPACES = WALLET_CONNECT_SUPPORT_NAMESPACES;
+const WALLET_CONNECT_SESSION_TIMEOUT = 20000; // 20 seconds
+exports.WALLET_CONNECT_SESSION_TIMEOUT = WALLET_CONNECT_SESSION_TIMEOUT;

package/cjs/services/wallet-connect-service/index.js

@@ -10,8 +10,9 @@ var _classPrivateFieldLooseKey2 = _interopRequireDefault(require("@babel/runtime
 var _utils = require("@json-rpc-tools/utils");
 var _Eip155RequestHandler = _interopRequireDefault(require("@subwallet/extension-base/services/wallet-connect-service/handler/Eip155RequestHandler"));
 var _storage = require("@subwallet/extension-base/storage");
+var _utils2 = require("@subwallet/extension-base/utils");
 var _signClient = _interopRequireDefault(require("@walletconnect/sign-client"));
-var _utils2 = require("@walletconnect/utils");
+var _utils3 = require("@walletconnect/utils");
 var _rxjs = require("rxjs");
 var _PolkadotRequestHandler = _interopRequireDefault(require("./handler/PolkadotRequestHandler"));
 var _constants = require("./constants");
@@ -130,7 +131,19 @@ class WalletConnectService {
   async initClient(force) {
     (0, _classPrivateFieldLooseBase2.default)(this, _removeListener)[_removeListener]();
     if (force || (await this.haveData())) {
-      (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client] = await _signClient.default.init((0, _classPrivateFieldLooseBase2.default)(this, _option)[_option]);
+      try {
+        (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client] = await _signClient.default.init((0, _classPrivateFieldLooseBase2.default)(this, _option)[_option]);
+      } catch (e) {
+        if ((0, _classPrivateFieldLooseBase2.default)(this, _option)[_option].relayUrl === _constants.RELAY_URL) {
+          (0, _classPrivateFieldLooseBase2.default)(this, _option)[_option] = {
+            ...(0, _classPrivateFieldLooseBase2.default)(this, _option)[_option],
+            relayUrl: _constants.RELAY_FALLBACK_URL
+          };
+          (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client] = await _signClient.default.init((0, _classPrivateFieldLooseBase2.default)(this, _option)[_option]);
+        } else {
+          throw e;
+        }
+      }
     }
     (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions]();
     (0, _classPrivateFieldLooseBase2.default)(this, _createListener)[_createListener]();
@@ -143,7 +156,7 @@ class WalletConnectService {
     var _classPrivateFieldLoo2;
     const session = (_classPrivateFieldLoo2 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo2 === void 0 ? void 0 : _classPrivateFieldLoo2.session.get(topic);
     if (!session) {
-      throw new Error((0, _utils2.getInternalError)('MISMATCHED_TOPIC').message);
+      throw new Error((0, _utils3.getInternalError)('MISMATCHED_TOPIC').message);
     } else {
       return session;
     }
@@ -153,17 +166,21 @@ class WalletConnectService {
     await this.initClient();
   }
   async connect(uri) {
-    var _classPrivateFieldLoo3;
-    if (!(await this.haveData())) {
+    var _classPrivateFieldLoo3, _classPrivateFieldLoo4;
+    if (!(await this.haveData()) || !((_classPrivateFieldLoo3 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) !== null && _classPrivateFieldLoo3 !== void 0 && _classPrivateFieldLoo3.core.relayer.connected)) {
       await this.initClient(true);
     }
     (0, _classPrivateFieldLooseBase2.default)(this, _checkClient)[_checkClient]();
-    await ((_classPrivateFieldLoo3 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo3 === void 0 ? void 0 : _classPrivateFieldLoo3.pair({
+
+    // The purpose of designing a timeout for pairing is to prevent the promise from not being resolved if there are issues during the pairing process.
+    await Promise.race([(_classPrivateFieldLoo4 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo4 === void 0 ? void 0 : _classPrivateFieldLoo4.pair({
       uri
-    }));
+    }), (0, _utils2.wait)(_constants.WALLET_CONNECT_SESSION_TIMEOUT).then(() => {
+      throw new Error((0, _utils3.getInternalError)('EXPIRED').message);
+    })]);
   }
   async approveSession(result) {
-    var _classPrivateFieldLoo4;
+    var _classPrivateFieldLoo5;
     (0, _classPrivateFieldLooseBase2.default)(this, _checkClient)[_checkClient]();
     Object.entries(result.namespaces).forEach(_ref3 => {
       let [namespace, {
@@ -172,34 +189,34 @@ class WalletConnectService {
       methods = [...methods, ...this.findMethodsMissing(_constants.WALLET_CONNECT_EIP155_NAMESPACE === namespace ? methodEVMRequire : methodDOTRequire, methods)];
       result.namespaces[namespace].methods = methods;
     });
-    await ((_classPrivateFieldLoo4 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo4 === void 0 ? void 0 : _classPrivateFieldLoo4.approve(result));
+    await ((_classPrivateFieldLoo5 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo5 === void 0 ? void 0 : _classPrivateFieldLoo5.approve(result));
     (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions]();
   }
   async rejectSession(id) {
-    var _classPrivateFieldLoo5;
+    var _classPrivateFieldLoo6;
     (0, _classPrivateFieldLooseBase2.default)(this, _checkClient)[_checkClient]();
-    await ((_classPrivateFieldLoo5 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo5 === void 0 ? void 0 : _classPrivateFieldLoo5.reject({
+    await ((_classPrivateFieldLoo6 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo6 === void 0 ? void 0 : _classPrivateFieldLoo6.reject({
       id: id,
-      reason: (0, _utils2.getSdkError)('USER_REJECTED')
+      reason: (0, _utils3.getSdkError)('USER_REJECTED')
     }));
   }
   async responseRequest(response) {
-    var _classPrivateFieldLoo6;
+    var _classPrivateFieldLoo7;
     (0, _classPrivateFieldLooseBase2.default)(this, _checkClient)[_checkClient]();
-    await ((_classPrivateFieldLoo6 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo6 === void 0 ? void 0 : _classPrivateFieldLoo6.respond(response));
+    await ((_classPrivateFieldLoo7 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo7 === void 0 ? void 0 : _classPrivateFieldLoo7.respond(response));
   }
   async resetWallet(resetAll) {
-    var _classPrivateFieldLoo7, _classPrivateFieldLoo9, _classPrivateFieldLoo11;
+    var _classPrivateFieldLoo8, _classPrivateFieldLoo10, _classPrivateFieldLoo12;
     (0, _classPrivateFieldLooseBase2.default)(this, _removeListener)[_removeListener]();
 
     // Disconnect session
-    const sessions = ((_classPrivateFieldLoo7 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo7 === void 0 ? void 0 : _classPrivateFieldLoo7.session.values) || [];
+    const sessions = ((_classPrivateFieldLoo8 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo8 === void 0 ? void 0 : _classPrivateFieldLoo8.session.values) || [];
     for (const session of sessions) {
       try {
-        var _classPrivateFieldLoo8;
-        await ((_classPrivateFieldLoo8 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo8 === void 0 ? void 0 : _classPrivateFieldLoo8.disconnect({
+        var _classPrivateFieldLoo9;
+        await ((_classPrivateFieldLoo9 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo9 === void 0 ? void 0 : _classPrivateFieldLoo9.disconnect({
           topic: session.topic,
-          reason: (0, _utils2.getSdkError)('USER_DISCONNECTED')
+          reason: (0, _utils3.getSdkError)('USER_DISCONNECTED')
         }));
       } catch (e) {
         console.error(e);
@@ -207,24 +224,24 @@ class WalletConnectService {
     }
 
     // Disconnect pair
-    const pairs = ((_classPrivateFieldLoo9 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo9 === void 0 ? void 0 : _classPrivateFieldLoo9.pairing.values) || [];
+    const pairs = ((_classPrivateFieldLoo10 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo10 === void 0 ? void 0 : _classPrivateFieldLoo10.pairing.values) || [];
     for (const pair of pairs) {
       try {
-        var _classPrivateFieldLoo10;
-        await ((_classPrivateFieldLoo10 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo10 === void 0 ? void 0 : _classPrivateFieldLoo10.disconnect({
+        var _classPrivateFieldLoo11;
+        await ((_classPrivateFieldLoo11 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo11 === void 0 ? void 0 : _classPrivateFieldLoo11.disconnect({
           topic: pair.topic,
-          reason: (0, _utils2.getSdkError)('USER_DISCONNECTED')
+          reason: (0, _utils3.getSdkError)('USER_DISCONNECTED')
         }));
       } catch (e) {
         console.error(e);
       }
     }
-    const keys = (await ((_classPrivateFieldLoo11 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo11 === void 0 ? void 0 : _classPrivateFieldLoo11.core.storage.getKeys())) || [];
+    const keys = (await ((_classPrivateFieldLoo12 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo12 === void 0 ? void 0 : _classPrivateFieldLoo12.core.storage.getKeys())) || [];
     const deleteKeys = resetAll ? keys : keys.filter(key => key.startsWith('wc@'));
     for (const key of deleteKeys) {
       try {
-        var _classPrivateFieldLoo12;
-        await ((_classPrivateFieldLoo12 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo12 === void 0 ? void 0 : _classPrivateFieldLoo12.core.storage.removeItem(key));
+        var _classPrivateFieldLoo13;
+        await ((_classPrivateFieldLoo13 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo13 === void 0 ? void 0 : _classPrivateFieldLoo13.core.storage.removeItem(key));
       } catch (e) {
         console.error(e);
       }
@@ -233,10 +250,10 @@ class WalletConnectService {
     (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions]();
   }
   async disconnect(topic) {
-    var _classPrivateFieldLoo13;
-    await ((_classPrivateFieldLoo13 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo13 === void 0 ? void 0 : _classPrivateFieldLoo13.disconnect({
+    var _classPrivateFieldLoo14;
+    await ((_classPrivateFieldLoo14 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo14 === void 0 ? void 0 : _classPrivateFieldLoo14.disconnect({
       topic: topic,
-      reason: (0, _utils2.getSdkError)('USER_DISCONNECTED')
+      reason: (0, _utils3.getSdkError)('USER_DISCONNECTED')
     }));
     (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions]();
   }
@@ -279,19 +296,19 @@ function _onSessionRequest2(requestEvent) {
     const chainInfoMap = (0, _classPrivateFieldLooseBase2.default)(this, _koniState)[_koniState].getChainInfoMap();
     const [requestNamespace] = chainId.split(':');
     if (!namespaces.includes(requestNamespace)) {
-      throw Error((0, _utils2.getSdkError)('UNSUPPORTED_NAMESPACE_KEY').message);
+      throw Error((0, _utils3.getSdkError)('UNSUPPORTED_NAMESPACE_KEY').message);
     }
     if (!chains.includes(chainId)) {
-      throw Error((0, _utils2.getSdkError)('UNSUPPORTED_CHAINS').message + ' ' + chainId);
+      throw Error((0, _utils3.getSdkError)('UNSUPPORTED_CHAINS').message + ' ' + chainId);
     }
     if (!(0, _helpers.isSupportWalletConnectChain)(chainId, chainInfoMap)) {
-      throw Error((0, _utils2.getSdkError)('UNSUPPORTED_CHAINS').message + ' ' + chainId);
+      throw Error((0, _utils3.getSdkError)('UNSUPPORTED_CHAINS').message + ' ' + chainId);
     }
     if (!methods.includes(method)) {
-      throw Error((0, _utils2.getSdkError)('UNAUTHORIZED_METHOD').message + ' ' + method);
+      throw Error((0, _utils3.getSdkError)('UNAUTHORIZED_METHOD').message + ' ' + method);
     }
     if (!_constants.WALLET_CONNECT_SUPPORTED_METHODS.includes(method)) {
-      throw Error((0, _utils2.getSdkError)('UNSUPPORTED_METHODS').message + ' ' + method);
+      throw Error((0, _utils3.getSdkError)('UNSUPPORTED_METHODS').message + ' ' + method);
     }
     switch (method) {
       case _types.POLKADOT_SIGNING_METHODS.POLKADOT_SIGN_MESSAGE:
@@ -307,7 +324,7 @@ function _onSessionRequest2(requestEvent) {
         (0, _classPrivateFieldLooseBase2.default)(this, _eip155RequestHandler)[_eip155RequestHandler].handleRequest(requestEvent);
         break;
       default:
-        throw Error((0, _utils2.getSdkError)('INVALID_METHOD').message + ' ' + method);
+        throw Error((0, _utils3.getSdkError)('INVALID_METHOD').message + ' ' + method);
     }
   } catch (e) {
     console.log(e);
@@ -343,22 +360,22 @@ async function _onPingReply2(_ref4) {
   }
 }
 function _createListener2() {
-  var _classPrivateFieldLoo14, _classPrivateFieldLoo15, _classPrivateFieldLoo16, _classPrivateFieldLoo17, _classPrivateFieldLoo18, _classPrivateFieldLoo19;
-  (_classPrivateFieldLoo14 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo14 === void 0 ? void 0 : _classPrivateFieldLoo14.on('session_proposal', (0, _classPrivateFieldLooseBase2.default)(this, _onSessionProposal)[_onSessionProposal].bind(this));
-  (_classPrivateFieldLoo15 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo15 === void 0 ? void 0 : _classPrivateFieldLoo15.on('session_request', (0, _classPrivateFieldLooseBase2.default)(this, _onSessionRequest)[_onSessionRequest].bind(this));
-  (_classPrivateFieldLoo16 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo16 === void 0 ? void 0 : _classPrivateFieldLoo16.on('session_ping', (0, _classPrivateFieldLooseBase2.default)(this, _onPingReply)[_onPingReply].bind(this));
-  (_classPrivateFieldLoo17 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo17 === void 0 ? void 0 : _classPrivateFieldLoo17.on('session_event', data => console.log('event', data));
-  (_classPrivateFieldLoo18 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo18 === void 0 ? void 0 : _classPrivateFieldLoo18.on('session_update', data => console.log('update', data));
-  (_classPrivateFieldLoo19 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo19 === void 0 ? void 0 : _classPrivateFieldLoo19.on('session_delete', (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions].bind(this));
+  var _classPrivateFieldLoo15, _classPrivateFieldLoo16, _classPrivateFieldLoo17, _classPrivateFieldLoo18, _classPrivateFieldLoo19, _classPrivateFieldLoo20;
+  (_classPrivateFieldLoo15 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo15 === void 0 ? void 0 : _classPrivateFieldLoo15.on('session_proposal', (0, _classPrivateFieldLooseBase2.default)(this, _onSessionProposal)[_onSessionProposal].bind(this));
+  (_classPrivateFieldLoo16 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo16 === void 0 ? void 0 : _classPrivateFieldLoo16.on('session_request', (0, _classPrivateFieldLooseBase2.default)(this, _onSessionRequest)[_onSessionRequest].bind(this));
+  (_classPrivateFieldLoo17 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo17 === void 0 ? void 0 : _classPrivateFieldLoo17.on('session_ping', (0, _classPrivateFieldLooseBase2.default)(this, _onPingReply)[_onPingReply].bind(this));
+  (_classPrivateFieldLoo18 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo18 === void 0 ? void 0 : _classPrivateFieldLoo18.on('session_event', data => console.log('event', data));
+  (_classPrivateFieldLoo19 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo19 === void 0 ? void 0 : _classPrivateFieldLoo19.on('session_update', data => console.log('update', data));
+  (_classPrivateFieldLoo20 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo20 === void 0 ? void 0 : _classPrivateFieldLoo20.on('session_delete', (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions].bind(this));
 }
 function _removeListener2() {
   _constants.ALL_WALLET_CONNECT_EVENT.forEach(event => {
-    var _classPrivateFieldLoo20;
-    (_classPrivateFieldLoo20 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo20 === void 0 ? void 0 : _classPrivateFieldLoo20.removeAllListeners(event);
+    var _classPrivateFieldLoo21;
+    (_classPrivateFieldLoo21 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo21 === void 0 ? void 0 : _classPrivateFieldLoo21.removeAllListeners(event);
   });
 }
 function _checkClient2() {
   if (!(0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) {
-    throw new Error((0, _utils2.getInternalError)('NOT_INITIALIZED').message);
+    throw new Error((0, _utils3.getInternalError)('NOT_INITIALIZED').message);
   }
 }

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);