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

package/cjs/constants/environment.js

@@ -3,12 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isProductionMode = exports.SW_EXTERNAL_SERVICES_API = exports.BACKEND_PRICE_HISTORY_URL = exports.BACKEND_API_URL = void 0;
+exports.isProductionMode = exports.SW_EXTERNAL_SERVICES_API = exports.BACKEND_PRICE_HISTORY_URL = exports.BACKEND_API_URL = exports.APP_VERSION = void 0;
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
+const APP_VERSION = process.env.PKG_VERSION || '';
+exports.APP_VERSION = APP_VERSION;
 const isProductionMode = PRODUCTION_BRANCHES.indexOf(branchName) > -1;
 exports.isProductionMode = isProductionMode;
 const BACKEND_API_URL = process.env.SUBWALLET_API || (isProductionMode ? 'https://sw-services.subwallet.app/api' : 'https://be-dev.subwallet.app/api');

package/cjs/koni/background/handlers/State.js

@@ -48,7 +48,6 @@ var _types2 = require("@subwallet/extension-base/types");
 var _utils3 = require("@subwallet/extension-base/utils");
 var _cardano = require("@subwallet/extension-base/utils/cardano");
 var _promise = require("@subwallet/extension-base/utils/promise");
-var _subwalletApiSdk = _interopRequireDefault(require("@subwallet/subwallet-api-sdk"));
 var _uiKeyring = require("@subwallet/ui-keyring");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var bitcoin = _interopRequireWildcard(require("bitcoinjs-lib"));
@@ -102,10 +101,7 @@ class KoniState {
   constructor() {
     let providers = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     // Init subwallet api sdk
-    _subwalletApiSdk.default.init({
-      url: _constants.BACKEND_API_URL,
-      priceHistoryUrl: _constants.BACKEND_PRICE_HISTORY_URL
-    });
+    (0, _utils3.setupApiSDK)();
     this.providers = providers;
     this.eventService = new _eventService.EventService();
     this.dbService = new _DatabaseService.default(this.eventService);

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.3.50-0'
+  version: '1.3.52-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -16,8 +16,8 @@ var _DetectAccountBalance = _interopRequireDefault(require("@subwallet/extension
 var _utils2 = require("@subwallet/extension-base/utils");
 var _keyring = require("@subwallet/keyring");
 var _types2 = require("@subwallet/keyring/types");
-var _subwalletApiSdk = _interopRequireDefault(require("@subwallet/subwallet-api-sdk"));
 var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
+var _subwalletServicesSdk = _interopRequireDefault(require("@subwallet-monorepos/subwallet-services-sdk"));
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
 var _rxjs = require("rxjs");
@@ -457,12 +457,11 @@ class BalanceService {
       const typeValid = [..._types2.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.default.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 = _subwalletServicesSdk.default.balanceDetectionApi || Promise.resolve([]);
+          Promise.race([timeOutPromise, balanceDetectionApi.getEvmTokenBalanceSlug(address)]).then(result => resolve(result)).catch(error => {
             console.error(error);
             resolve(null);
           });

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

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -7,12 +8,26 @@ exports.createCardanoTransaction = createCardanoTransaction;
 var csl = _interopRequireWildcard(require("@emurgo/cardano-serialization-lib-nodejs"));
 var _types = require("@subwallet/chain-list/types");
 var _utils = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/utils");
-var _subwalletApiSdk = require("@subwallet/subwallet-api-sdk");
+var _utils2 = require("@subwallet/extension-base/utils");
+var _subwalletServicesSdk = _interopRequireDefault(require("@subwallet-monorepos/subwallet-services-sdk"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
-
+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;
+  }
+}
 async function createCardanoTransaction(params) {
   var _tokenInfo$metadata;
   const {
@@ -30,15 +45,32 @@ async function createCardanoTransaction(params) {
   if (!cardanoId) {
     throw new Error('Missing token policy id metadata');
   }
-  const payload = await _subwalletApiSdk.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 _subwalletServicesSdk.default.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 ? (0, _utils2.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 = (0, _utils.getCardanoTxFee)(payload);

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

@@ -10,7 +10,7 @@ exports._isAcrossTestnetBridge = _isAcrossTestnetBridge;
 exports.getAcrossQuote = void 0;
 var _chainList = require("@subwallet/chain-list");
 var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
-var _subwalletApiSdk = _interopRequireDefault(require("@subwallet/subwallet-api-sdk"));
+var _subwalletServicesSdk = _interopRequireDefault(require("@subwallet-monorepos/subwallet-services-sdk"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -49,101 +49,22 @@ const getAcrossQuote = async _ref => {
     throw new Error('Sender is required');
   }
   try {
-    var _subwalletApiSdk$xcmA;
-    const data = await ((_subwalletApiSdk$xcmA = _subwalletApiSdk.default.xcmApi) === null || _subwalletApiSdk$xcmA === void 0 ? void 0 : _subwalletApiSdk$xcmA.fetchXcmData(sender, originTokenInfo.slug, destinationTokenInfo.slug, recipient, sendingValue));
+    const data = await _subwalletServicesSdk.default.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 }
-//   }
-// };
 exports.getAcrossQuote = getAcrossQuote;

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

@@ -16,7 +16,7 @@ var _xTokens = require("@subwallet/extension-base/services/balance-service/trans
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 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 _posBridge = require("./posBridge");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -195,8 +195,13 @@ const createAcrossBridgeExtrinsic = async _ref6 => {
     throw new Error('Sender is required');
   }
   try {
-    var _subwalletApiSdk$xcmA;
-    const data = await ((_subwalletApiSdk$xcmA = _subwalletApiSdk.default.xcmApi) === null || _subwalletApiSdk$xcmA === void 0 ? void 0 : _subwalletApiSdk$xcmA.fetchXcmData(sender, originTokenInfo.slug, destinationTokenInfo.slug, recipient, sendingValue));
+    const data = await _subwalletServicesSdk.default.xcmApi.fetchXcmData({
+      address: sender,
+      from: originTokenInfo.slug,
+      to: destinationTokenInfo.slug,
+      recipient,
+      value: sendingValue
+    });
     const _feeCustom = feeCustom;
     const feeCombine = (0, _utils3.combineEthFee)(feeInfo, feeOption, _feeCustom);
     if (!data) {
@@ -213,7 +218,10 @@ const createAcrossBridgeExtrinsic = async _ref6 => {
     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'));
   }
 };
 exports.createAcrossBridgeExtrinsic = createAcrossBridgeExtrinsic;

package/cjs/services/chain-service/handler/bitcoin/BitcoinApi.js

@@ -37,10 +37,11 @@ class BitcoinApi {
     return this.isApiConnectedSubject.getValue();
   }
   createApiStrategy(apiUrl) {
+    const _apiUrl = 'https://blockstream.info/testnet/api/'; // todo: for test
     const isTestnet = apiUrl.includes('testnet');
     const isBlockstreamUrl = apiUrl.includes('blockstream');
     if (isTestnet) {
-      return isBlockstreamUrl ? new _BlockStreamTestnet.BlockStreamTestnetRequestStrategy(apiUrl) : new _BlockStreamTestnet.MempoolTestnetRequestStrategy(apiUrl);
+      return isBlockstreamUrl ? new _BlockStreamTestnet.BlockStreamTestnetRequestStrategy(_apiUrl) : new _BlockStreamTestnet.MempoolTestnetRequestStrategy(_apiUrl);
     }
     return new _SubWalletMainnet.SubWalletMainnetRequestStrategy(apiUrl);
   }
@@ -57,6 +58,7 @@ class BitcoinApi {
     }
   }
   get isReady() {
+    // todo: recheck if bitcoinApi need this
     return this.isReadyHandler.promise;
   }
   async updateApiUrl(apiUrl) {

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

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.ChainListVersion = void 0;
 exports.fetchPatchData = fetchPatchData;
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -11,10 +12,10 @@ 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
+const ChainListVersion = '0.2.111'; // update this when build chain-list
 
 // todo: move this interface to chainlist
-
+exports.ChainListVersion = ChainListVersion;
 async function fetchPatchData() {
   try {
     const fetchPromise = fetch(`${fetchDomain}/patch/${ChainListVersion}/${fetchFile}`);