@subwallet/extension-base 1.1.52-0 → 1.1.53-beta.0

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

@@ -32,6 +32,7 @@ var _SettingService = _interopRequireDefault(require("@subwallet/extension-base/
 var _DatabaseService = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/DatabaseService"));
 var _subscanService = require("@subwallet/extension-base/services/subscan-service");
 var _subscanChainMap = require("@subwallet/extension-base/services/subscan-service/subscan-chain-map");
+var _swapService = require("@subwallet/extension-base/services/swap-service");
 var _transactionService = _interopRequireDefault(require("@subwallet/extension-base/services/transaction-service"));
 var _walletConnectService = _interopRequireDefault(require("@subwallet/extension-base/services/wallet-connect-service"));
 var _AccountRef = _interopRequireDefault(require("@subwallet/extension-base/stores/AccountRef"));
@@ -111,6 +112,7 @@ class KoniState {
     this.transactionService = new _transactionService.default(this);
     this.earningService = new _service.default(this);
     this.feeService = new _service2.default(this);
+    this.swapService = new _swapService.SwapService(this);
     this.subscription = new _subscription.KoniSubscription(this, this.dbService);
     this.cron = new _cron.KoniCron(this, this.subscription, this.dbService);
     this.logger = (0, _util.logger)('State');
@@ -234,6 +236,7 @@ class KoniState {
     this.eventService.emit('chain.ready', true);
     await this.balanceService.init();
     await this.earningService.init();
+    await this.swapService.init();
     this.onReady();
     this.onAccountAdd();
     this.onAccountRemove();
@@ -1224,17 +1227,34 @@ class KoniState {
       maxFeePerGas: autoFormatNumber(transactionParams.maxFeePerGas),
       data: transactionParams.data
     };
+    const getTransactionGas = async () => {
+      try {
+        transaction.gas = await web3.eth.estimateGas({
+          ...transaction
+        });
+      } catch (e) {
+        // @ts-ignore
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
+      }
+    };
 
     // Calculate transaction data
     try {
-      transaction.gas = await web3.eth.estimateGas({
-        ...transaction
-      });
+      await Promise.race([getTransactionGas(), (0, _utils3.wait)(3000).then(async () => {
+        if (!transaction.gas) {
+          await this.chainService.initSingleApi(networkKey);
+          await getTransactionGas();
+        }
+      })]);
     } catch (e) {
       // @ts-ignore
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
     }
+    if (!transaction.gas) {
+      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS);
+    }
     let estimateGas;
 
     // TODO: Review, If not override, transaction maybe fail because fee too low
@@ -1419,7 +1439,7 @@ class KoniState {
     // Stopping services
     await Promise.all([this.cron.stop(), this.subscription.stop()]);
     await this.pauseAllNetworks(undefined, 'IDLE mode');
-    await Promise.all([this.historyService.stop(), this.priceService.stop(), this.balanceService.stop(), this.earningService.stop()]);
+    await Promise.all([this.historyService.stop(), this.priceService.stop(), this.balanceService.stop(), this.earningService.stop(), this.swapService.stop()]);
 
     // Complete sleeping
     sleeping.resolve();
@@ -1452,7 +1472,7 @@ class KoniState {
     }
 
     // Start services
-    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start(), this.balanceService.start(), this.earningService.start()]);
+    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start(), this.balanceService.start(), this.earningService.start(), this.swapService.start()]);
 
     // Complete starting
     starting.resolve();

package/cjs/packageInfo.js

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

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

@@ -0,0 +1,140 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getAccountJsonByAddress = void 0;
+exports.subscribeBalance = subscribeBalance;
+var _types = require("@subwallet/chain-list/types");
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _handlers = require("@subwallet/extension-base/koni/background/handlers");
+var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils2 = require("@subwallet/extension-base/utils");
+var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
+var _evm = require("./evm");
+var _substrate = require("./substrate");
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * @function getAccountJsonByAddress
+ * @desc Get account info by address
+ * <p>
+ *   Note: Use on the background only
+ * </p>
+ * @param {string} address - Address
+ * @returns {AccountJson|null}  - Account info or null if not found
+ */
+const getAccountJsonByAddress = address => {
+  try {
+    const pair = _uiKeyring.default.getPair(address);
+    if (pair) {
+      return {
+        address: pair.address,
+        type: pair.type,
+        ...pair.meta
+      };
+    } else {
+      return null;
+    }
+  } catch (e) {
+    console.warn(e);
+    return null;
+  }
+};
+exports.getAccountJsonByAddress = getAccountJsonByAddress;
+const filterAddress = (addresses, chainInfo) => {
+  const isEvmChain = (0, _utils._isChainEvmCompatible)(chainInfo);
+  const [substrateAddresses, evmAddresses] = (0, _utils2.categoryAddresses)(addresses);
+  if (isEvmChain) {
+    return [evmAddresses, substrateAddresses];
+  } else {
+    const fetchList = [];
+    const unfetchList = [];
+    substrateAddresses.forEach(address => {
+      const account = getAccountJsonByAddress(address);
+      if (account) {
+        if (account.isHardware) {
+          const availGen = account.availableGenesisHashes || [];
+          const gen = (0, _utils._getSubstrateGenesisHash)(chainInfo);
+          if (availGen.includes(gen)) {
+            fetchList.push(address);
+          } else {
+            unfetchList.push(address);
+          }
+        } else {
+          fetchList.push(address);
+        }
+      } else {
+        fetchList.push(address);
+      }
+    });
+    return [fetchList, [...unfetchList, ...evmAddresses]];
+  }
+};
+
+// main subscription
+function subscribeBalance(addresses, chainInfoMap, substrateApiMap, evmApiMap, callback) {
+  // Looping over each chain
+  const unsubList = Object.entries(chainInfoMap).map(async _ref => {
+    let [chainSlug, chainInfo] = _ref;
+    const [useAddresses, notSupportAddresses] = filterAddress(addresses, chainInfo);
+    if (notSupportAddresses.length) {
+      const tokens = _handlers.state.chainService.getAssetByChainAndType(chainSlug, [_types._AssetType.NATIVE, _types._AssetType.ERC20, _types._AssetType.PSP22, _types._AssetType.LOCAL]);
+      const assetSetting = await _handlers.state.chainService.getAssetSettings();
+      const filtered = Object.values(tokens).filter(_ref2 => {
+        var _assetSetting$slug;
+        let {
+          slug
+        } = _ref2;
+        return (_assetSetting$slug = assetSetting[slug]) === null || _assetSetting$slug === void 0 ? void 0 : _assetSetting$slug.visible;
+      });
+      const now = new Date().getTime();
+      notSupportAddresses.forEach(address => {
+        const items = filtered.map(token => {
+          return {
+            address,
+            tokenSlug: token.slug,
+            free: '0',
+            locked: '0',
+            state: _KoniTypes.APIItemState.NOT_SUPPORT,
+            timestamp: now
+          };
+        });
+        callback(items);
+      });
+    }
+    if ((0, _utils._isPureEvmChain)(chainInfo)) {
+      const nativeTokenInfo = _handlers.state.getNativeTokenInfo(chainSlug);
+      return (0, _evm.subscribeEVMBalance)(chainSlug, useAddresses, evmApiMap, callback, nativeTokenInfo);
+    }
+
+    // if (!useAddresses || useAddresses.length === 0 || _PURE_EVM_CHAINS.indexOf(chainSlug) > -1) {
+    //   const fungibleTokensByChain = state.chainService.getFungibleTokensByChain(chainSlug, true);
+    //   const now = new Date().getTime();
+    //
+    //   Object.values(fungibleTokensByChain).map((token) => {
+    //     return {
+    //       tokenSlug: token.slug,
+    //       free: '0',
+    //       locked: '0',
+    //       state: APIItemState.READY,
+    //       timestamp: now
+    //     } as BalanceItem;
+    //   }).forEach(callback);
+    //
+    //   return undefined;
+    // }
+
+    const networkAPI = await substrateApiMap[chainSlug].isReady;
+    return (0, _substrate.subscribeSubstrateBalance)(useAddresses, chainInfo, chainSlug, networkAPI, evmApiMap, callback);
+  });
+  return () => {
+    unsubList.forEach(subProm => {
+      subProm.then(unsub => {
+        unsub && unsub();
+      }).catch(console.error);
+    });
+  };
+}

package/cjs/services/balance-service/helpers/subscribe/substrate/index.js

@@ -98,7 +98,8 @@ const subscribeWithSystemAccountPallet = async _ref => {
   if ((0, _utils2._isSubstrateRelayChain)(chainInfo) && substrateApi.query.nominationPools) {
     var _substrateApi$rx$quer;
     poolSubscribe = (_substrateApi$rx$quer = substrateApi.rx.query.nominationPools.poolMembers) === null || _substrateApi$rx$quer === void 0 ? void 0 : _substrateApi$rx$quer.multi(addresses);
-  } else {
+  }
+  if (!poolSubscribe) {
     poolSubscribe = new _rxjs.Observable(subscriber => {
       subscriber.next(addresses.map(() => ({
         toPrimitive() {

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

@@ -191,7 +191,8 @@ class BalanceService {
       const chainInfoMap = this.state.chainService.getChainInfoMap();
       const evmApiMap = this.state.chainService.getEvmApiMap();
       const substrateApiMap = this.state.chainService.getSubstrateApiMap();
-      const unsub = (0, _helpers.subscribeBalance)([address], [chain], [tSlug], assetMap, chainInfoMap, substrateApiMap, evmApiMap, result => {
+      let unsub = _util.noop;
+      unsub = (0, _helpers.subscribeBalance)([address], [chain], [tSlug], assetMap, chainInfoMap, substrateApiMap, evmApiMap, result => {
         const rs = result[0];
         if (rs.tokenSlug === tSlug) {
           hasError = false;
@@ -203,15 +204,17 @@ class BalanceService {
           if (callback) {
             callback(balance);
           } else {
+            var _unsub;
             // Auto unsubscribe if no callback
-            unsub();
+            (_unsub = unsub) === null || _unsub === void 0 ? void 0 : _unsub();
           }
           resolve([unsub, balance]);
         }
       });
       setTimeout(() => {
         if (hasError) {
-          unsub();
+          var _unsub2;
+          (_unsub2 = unsub) === null || _unsub2 === void 0 ? void 0 : _unsub2();
           reject(new Error((0, _i18next.t)('Failed to get balance. Please check your internet connection or change your network endpoint')));
         }
       }, 9999);

package/cjs/services/chain-service/constants.js

@@ -39,7 +39,7 @@ const _BALANCE_CHAIN_GROUP = {
   kintsugi: ['kintsugi', 'interlay', 'kintsugi_test', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
-  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum', 'amplitude', 'continuum_network'],
+  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'hydradx_rococo', 'pendulum', 'amplitude', 'continuum_network'],
   statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates

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

@@ -42,6 +42,7 @@ class ChainService {
   assetRegistrySubject = new _rxjs.Subject();
   multiChainAssetMapSubject = new _rxjs.Subject();
   xcmRefMapSubject = new _rxjs.Subject();
+  swapRefMapSubject = new _rxjs.Subject();
   assetLogoMapSubject = new _rxjs.BehaviorSubject(_chainList.AssetLogoMap);
   chainLogoMapSubject = new _rxjs.BehaviorSubject(_chainList.ChainLogoMap);
   assetMapPatch = JSON.stringify({});
@@ -57,6 +58,7 @@ class ChainService {
     this.chainStateMapSubject.next(this.dataMap.chainStateMap);
     this.assetRegistrySubject.next(this.dataMap.assetRegistry);
     this.xcmRefMapSubject.next(this.xcmRefMap);
+    this.swapRefMapSubject.next(this.swapRefMap);
     if (_utils2.MODULE_SUPPORT.MANTA_ZK) {
       console.log('Init Manta ZK');
       this.mantaChainHandler = new _MantaPrivateHandler.MantaPrivateHandler(dbService);
@@ -65,6 +67,9 @@ class ChainService {
     this.evmChainHandler = new _EvmChainHandler.EvmChainHandler(this);
     this.logger = (0, _logger.logger)('chain-service');
   }
+  subscribeSwapRefMap() {
+    return this.swapRefMapSubject;
+  }
 
   // Getter
   get xcmRefMap() {
@@ -77,6 +82,16 @@ class ChainService {
     });
     return result;
   }
+  get swapRefMap() {
+    const result = {};
+    Object.entries(this.dataMap.assetRefMap).forEach(_ref2 => {
+      let [key, assetRef] = _ref2;
+      if (assetRef.path === _types._AssetRefPath.SWAP) {
+        result[key] = assetRef;
+      }
+    });
+    return result;
+  }
   getEvmApi(slug) {
     return this.evmChainHandler.getEvmApiByChain(slug);
   }
@@ -200,11 +215,11 @@ class ChainService {
     return this.getChainStatusMap()[key];
   }
   getActiveChains() {
-    return Object.entries(this.dataMap.chainStateMap).filter(_ref2 => {
-      let [, chainState] = _ref2;
+    return Object.entries(this.dataMap.chainStateMap).filter(_ref3 => {
+      let [, chainState] = _ref3;
       return (0, _utils._isChainEnabled)(chainState);
-    }).map(_ref3 => {
-      let [key] = _ref3;
+    }).map(_ref4 => {
+      let [key] = _ref4;
       return key;
     });
   }
@@ -364,8 +379,8 @@ class ChainService {
     (0, _utils2.addLazy)('updateChainConnectionStatus', () => {
       const chainStatusMap = this.getChainStatusMap();
       let update = false;
-      Object.entries(this.connectionStatusQueueMap).forEach(_ref4 => {
-        let [slug, status] = _ref4;
+      Object.entries(this.connectionStatusQueueMap).forEach(_ref5 => {
+        let [slug, status] = _ref5;
         if (chainStatusMap[slug]) {
           if (chainStatusMap[slug].connectionStatus !== status) {
             chainStatusMap[slug].connectionStatus = status;
@@ -497,12 +512,13 @@ class ChainService {
     });
     this.dataMap.assetRefMap = updatedAssetRefMap;
     this.xcmRefMapSubject.next(this.xcmRefMap);
+    this.swapRefMapSubject.next(this.swapRefMap);
     this.logger.log('Finished updating latest asset ref');
   }
   handleLatestPriceId(latestPriceIds) {
     let isUpdated = false;
-    Object.entries(latestPriceIds).forEach(_ref5 => {
-      let [slug, priceId] = _ref5;
+    Object.entries(latestPriceIds).forEach(_ref6 => {
+      let [slug, priceId] = _ref6;
       if (this.dataMap.assetRegistry[slug] && this.dataMap.assetRegistry[slug].priceId !== priceId) {
         isUpdated = true;
         this.dataMap.assetRegistry[slug].priceId = priceId;
@@ -581,8 +597,8 @@ class ChainService {
     }
   }
   handleLatestData() {
-    this.fetchLatestAssetData().then(_ref6 => {
-      let [latestAssetInfo, latestAssetLogoMap] = _ref6;
+    this.fetchLatestAssetData().then(_ref7 => {
+      let [latestAssetInfo, latestAssetLogoMap] = _ref7;
       this.eventService.waitAssetReady.then(() => {
         this.handleLatestAssetData(latestAssetInfo, latestAssetLogoMap);
       }).catch(console.error);
@@ -590,8 +606,8 @@ class ChainService {
     this.fetchLatestChainData().then(latestChainInfo => {
       this.handleLatestChainData(latestChainInfo);
     }).catch(console.error);
-    this.fetchLatestAssetRef().then(_ref7 => {
-      let [latestAssetRef, latestAssetRefMap] = _ref7;
+    this.fetchLatestAssetRef().then(_ref8 => {
+      let [latestAssetRef, latestAssetRefMap] = _ref8;
       this.handleLatestAssetRef(latestAssetRef, latestAssetRefMap);
     }).catch(console.error);
     this.fetchLatestPriceIdsData().then(latestPriceIds => {
@@ -601,12 +617,12 @@ class ChainService {
   async initApis() {
     const chainInfoMap = this.getChainInfoMap();
     const chainStateMap = this.getChainStateMap();
-    await Promise.all(Object.entries(chainInfoMap).filter(_ref8 => {
+    await Promise.all(Object.entries(chainInfoMap).filter(_ref9 => {
       var _chainStateMap$slug;
-      let [slug] = _ref8;
+      let [slug] = _ref9;
       return (_chainStateMap$slug = chainStateMap[slug]) === null || _chainStateMap$slug === void 0 ? void 0 : _chainStateMap$slug.active;
-    }).map(_ref9 => {
-      let [, chainInfo] = _ref9;
+    }).map(_ref10 => {
+      let [, chainInfo] = _ref10;
       try {
         return this.initApiForChain(chainInfo);
       } catch (e) {
@@ -615,6 +631,15 @@ class ChainService {
       }
     }));
   }
+  async initSingleApi(slug) {
+    const chainInfoMap = this.getChainInfoMap();
+    const chainStateMap = this.getChainStateMap();
+    if (!chainStateMap[slug].active) {
+      return false;
+    }
+    await this.initApiForChain(chainInfoMap[slug]);
+    return true;
+  }
   async initApiForChain(chainInfo) {
     const {
       endpoint,
@@ -949,8 +974,8 @@ class ChainService {
       }
 
       // Fill in the missing chainState and storageData (new chains never before seen)
-      Object.entries(mergedChainInfoMap).forEach(_ref10 => {
-        let [slug, chainInfo] = _ref10;
+      Object.entries(mergedChainInfoMap).forEach(_ref11 => {
+        let [slug, chainInfo] = _ref11;
         if (!(slug in this.dataMap.chainStateMap)) {
           this.dataMap.chainStateMap[slug] = {
             currentProvider: Object.keys(chainInfo.providers)[0],

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

@@ -55,6 +55,7 @@ var _exportNames = {
   _isAssetValuable: true,
   _getMultiChainAsset: true,
   _getAssetPriceId: true,
+  _getAssetName: true,
   _getMultiChainAssetPriceId: true,
   _getAssetSymbol: true,
   _getMultiChainAssetSymbol: true,
@@ -78,6 +79,7 @@ var _exportNames = {
 exports._checkSmartContractSupportByChain = _checkSmartContractSupportByChain;
 exports._generateCustomProviderKey = _generateCustomProviderKey;
 exports._getAssetDecimals = _getAssetDecimals;
+exports._getAssetName = _getAssetName;
 exports._getAssetOriginChain = _getAssetOriginChain;
 exports._getAssetPriceId = _getAssetPriceId;
 exports._getAssetSymbol = _getAssetSymbol;
@@ -439,6 +441,9 @@ function _getMultiChainAsset(assetInfo) {
 function _getAssetPriceId(assetInfo) {
   return (assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo.priceId) || '';
 }
+function _getAssetName(assetInfo) {
+  return (assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo.name) || '';
+}
 function _getMultiChainAssetPriceId(multiChainAsset) {
   return (multiChainAsset === null || multiChainAsset === void 0 ? void 0 : multiChainAsset.priceId) || '';
 }
@@ -449,13 +454,13 @@ function _getMultiChainAssetSymbol(multiChainAsset) {
   return multiChainAsset.symbol;
 }
 function _getAssetOriginChain(assetInfo) {
-  return assetInfo.originChain;
+  return (assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo.originChain) || '';
 }
 function _getChainName(chainInfo) {
   return chainInfo.name;
 }
 function _getAssetDecimals(assetInfo) {
-  return assetInfo.decimals || 0;
+  return (assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo.decimals) || 0;
 }
 function _getBlockExplorerFromChain(chainInfo) {
   let blockExplorer;

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

@@ -12,7 +12,7 @@ var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 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 ChainListVersion = '0.2.54';
+const ChainListVersion = '0.2.55-beta.3';
 async function fetchPatchData(slug) {
   try {
     const fetchPromise = (0, _crossFetch.default)(`${fetchDomain}/patch/${ChainListVersion}/${slug}`);