@subwallet/extension-base 1.1.65-0 → 1.1.67-0

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

@@ -22,6 +22,18 @@ var _logger = require("@polkadot/util/logger");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+const filterChainInfoMap = data => {
+  return Object.fromEntries(Object.entries(data).filter(_ref => {
+    let [, info] = _ref;
+    return !info.bitcoinInfo;
+  }));
+};
+const filterAssetInfoMap = (chainInfo, assets) => {
+  return Object.fromEntries(Object.entries(assets).filter(_ref2 => {
+    let [, info] = _ref2;
+    return chainInfo[info.originChain];
+  }));
+};
 class ChainService {
   dataMap = {
     chainInfoMap: {},
@@ -74,8 +86,8 @@ class ChainService {
   // Getter
   get xcmRefMap() {
     const result = {};
-    Object.entries(this.dataMap.assetRefMap).forEach(_ref => {
-      let [key, assetRef] = _ref;
+    Object.entries(this.dataMap.assetRefMap).forEach(_ref3 => {
+      let [key, assetRef] = _ref3;
       if (assetRef.path === _types._AssetRefPath.XCM) {
         result[key] = assetRef;
       }
@@ -84,8 +96,8 @@ class ChainService {
   }
   get swapRefMap() {
     const result = {};
-    Object.entries(this.dataMap.assetRefMap).forEach(_ref2 => {
-      let [key, assetRef] = _ref2;
+    Object.entries(this.dataMap.assetRefMap).forEach(_ref4 => {
+      let [key, assetRef] = _ref4;
       if (assetRef.path === _types._AssetRefPath.SWAP) {
         result[key] = assetRef;
       }
@@ -215,16 +227,16 @@ class ChainService {
     return this.getChainStatusMap()[key];
   }
   getActiveChains() {
-    return Object.entries(this.dataMap.chainStateMap).filter(_ref3 => {
-      let [, chainState] = _ref3;
+    return Object.entries(this.dataMap.chainStateMap).filter(_ref5 => {
+      let [, chainState] = _ref5;
       return (0, _utils._isChainEnabled)(chainState);
-    }).map(_ref4 => {
-      let [key] = _ref4;
+    }).map(_ref6 => {
+      let [key] = _ref6;
       return key;
     });
   }
   getSupportedSmartContractTypes() {
-    return [_types._AssetType.ERC20, _types._AssetType.ERC721, _types._AssetType.PSP22, _types._AssetType.PSP34];
+    return [_types._AssetType.ERC20, _types._AssetType.ERC721, _types._AssetType.PSP22, _types._AssetType.PSP34, _types._AssetType.GRC20, _types._AssetType.GRC721];
   }
   getActiveChainInfoMap() {
     const result = {};
@@ -379,8 +391,8 @@ class ChainService {
     (0, _utils2.addLazy)('updateChainConnectionStatus', () => {
       const chainStatusMap = this.getChainStatusMap();
       let update = false;
-      Object.entries(this.connectionStatusQueueMap).forEach(_ref5 => {
-        let [slug, status] = _ref5;
+      Object.entries(this.connectionStatusQueueMap).forEach(_ref7 => {
+        let [slug, status] = _ref7;
         if (chainStatusMap[slug]) {
           if (chainStatusMap[slug].connectionStatus !== status) {
             chainStatusMap[slug].connectionStatus = status;
@@ -517,8 +529,8 @@ class ChainService {
   }
   handleLatestPriceId(latestPriceIds) {
     let isUpdated = false;
-    Object.entries(latestPriceIds).forEach(_ref6 => {
-      let [slug, priceId] = _ref6;
+    Object.entries(latestPriceIds).forEach(_ref8 => {
+      let [slug, priceId] = _ref8;
       if (this.dataMap.assetRegistry[slug] && this.dataMap.assetRegistry[slug].priceId !== priceId) {
         isUpdated = true;
         this.dataMap.assetRegistry[slug].priceId = priceId;
@@ -535,10 +547,10 @@ class ChainService {
       if (latestAssetInfo) {
         const latestAssetPatch = JSON.stringify(latestAssetInfo);
         if (this.assetMapPatch !== latestAssetPatch) {
-          const assetRegistry = {
+          const assetRegistry = filterAssetInfoMap(this.getChainInfoMap(), {
             ..._chainList.ChainAssetMap,
             ...latestAssetInfo
-          };
+          });
           this.assetMapPatch = latestAssetPatch;
           this.dataMap.assetRegistry = assetRegistry;
           this.assetRegistrySubject.next(assetRegistry);
@@ -597,8 +609,8 @@ class ChainService {
     }
   }
   handleLatestData() {
-    this.fetchLatestAssetData().then(_ref7 => {
-      let [latestAssetInfo, latestAssetLogoMap] = _ref7;
+    this.fetchLatestAssetData().then(_ref9 => {
+      let [latestAssetInfo, latestAssetLogoMap] = _ref9;
       this.eventService.waitAssetReady.then(() => {
         this.handleLatestAssetData(latestAssetInfo, latestAssetLogoMap);
       }).catch(console.error);
@@ -606,8 +618,8 @@ class ChainService {
     this.fetchLatestChainData().then(latestChainInfo => {
       this.handleLatestChainData(latestChainInfo);
     }).catch(console.error);
-    this.fetchLatestAssetRef().then(_ref8 => {
-      let [latestAssetRef, latestAssetRefMap] = _ref8;
+    this.fetchLatestAssetRef().then(_ref10 => {
+      let [latestAssetRef, latestAssetRefMap] = _ref10;
       this.handleLatestAssetRef(latestAssetRef, latestAssetRefMap);
     }).catch(console.error);
     this.fetchLatestPriceIdsData().then(latestPriceIds => {
@@ -617,12 +629,12 @@ class ChainService {
   async initApis() {
     const chainInfoMap = this.getChainInfoMap();
     const chainStateMap = this.getChainStateMap();
-    await Promise.all(Object.entries(chainInfoMap).filter(_ref9 => {
+    await Promise.all(Object.entries(chainInfoMap).filter(_ref11 => {
       var _chainStateMap$slug;
-      let [slug] = _ref9;
+      let [slug] = _ref11;
       return (_chainStateMap$slug = chainStateMap[slug]) === null || _chainStateMap$slug === void 0 ? void 0 : _chainStateMap$slug.active;
-    }).map(_ref10 => {
-      let [, chainInfo] = _ref10;
+    }).map(_ref12 => {
+      let [, chainInfo] = _ref12;
       try {
         return this.initApiForChain(chainInfo);
       } catch (e) {
@@ -847,7 +859,7 @@ class ChainService {
   }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
-    const defaultChainInfoMap = _chainList.ChainInfoMap;
+    const defaultChainInfoMap = filterChainInfoMap(_chainList.ChainInfoMap);
     const storedChainSettingMap = {};
     storedChainSettings.forEach(chainStoredSetting => {
       storedChainSettingMap[chainStoredSetting.slug] = chainStoredSetting;
@@ -957,6 +969,7 @@ class ChainService {
             deprecatedChainMap[storedSlug] = duplicatedDefaultSlug;
             deprecatedChains.push(storedSlug);
           } else {
+            var _storedChainInfo$bitc;
             mergedChainInfoMap[storedSlug] = {
               slug: storedSlug,
               name: storedChainInfo.name,
@@ -964,6 +977,7 @@ class ChainService {
               // TODO: review
               evmInfo: storedChainInfo.evmInfo,
               substrateInfo: storedChainInfo.substrateInfo,
+              bitcoinInfo: (_storedChainInfo$bitc = storedChainInfo.bitcoinInfo) !== null && _storedChainInfo$bitc !== void 0 ? _storedChainInfo$bitc : null,
               isTestnet: storedChainInfo.isTestnet,
               chainStatus: storedChainInfo.chainStatus,
               icon: storedChainInfo.icon,
@@ -991,8 +1005,8 @@ class ChainService {
       }
 
       // Fill in the missing chainState and storageData (new chains never before seen)
-      Object.entries(mergedChainInfoMap).forEach(_ref11 => {
-        let [slug, chainInfo] = _ref11;
+      Object.entries(mergedChainInfoMap).forEach(_ref13 => {
+        let [slug, chainInfo] = _ref13;
         if (!(slug in this.dataMap.chainStateMap)) {
           this.dataMap.chainStateMap[slug] = {
             currentProvider: Object.keys(chainInfo.providers)[0],
@@ -1017,7 +1031,7 @@ class ChainService {
   }
   async initAssetRegistry(deprecatedCustomChainMap) {
     const storedAssetRegistry = await this.dbService.getAllAssetStore();
-    const latestAssetRegistry = _chainList.ChainAssetMap;
+    const latestAssetRegistry = filterAssetInfoMap(this.getChainInfoMap(), _chainList.ChainAssetMap);
     const availableChains = Object.values(this.dataMap.chainInfoMap).filter(info => info.chainStatus === _types._ChainStatus.ACTIVE).map(chainInfo => chainInfo.slug);
 
     // Fill out zk assets from latestAssetRegistry if not supported
@@ -1172,6 +1186,7 @@ class ChainService {
       providers: params.chainEditInfo.providers,
       substrateInfo,
       evmInfo,
+      bitcoinInfo: null,
       isTestnet: false,
       chainStatus: _types._ChainStatus.ACTIVE,
       icon: '',
@@ -1416,9 +1431,9 @@ class ChainService {
   }
   async getSmartContractTokenInfo(contractAddress, tokenType, originChain, contractCaller) {
     if ([_types._AssetType.ERC721, _types._AssetType.ERC20].includes(tokenType)) {
-      return await this.evmChainHandler.getSmartContractTokenInfo(contractAddress, tokenType, originChain);
-    } else if ([_types._AssetType.PSP34, _types._AssetType.PSP22].includes(tokenType)) {
-      return await this.substrateChainHandler.getSmartContractTokenInfo(contractAddress, tokenType, originChain, contractCaller);
+      return await this.evmChainHandler.getEvmContractTokenInfo(contractAddress, tokenType, originChain);
+    } else if ([_types._AssetType.PSP34, _types._AssetType.PSP22, _types._AssetType.GRC20].includes(tokenType)) {
+      return await this.substrateChainHandler.getSubstrateContractTokenInfo(contractAddress, tokenType, originChain, contractCaller);
     }
     return {
       decimals: -1,

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

@@ -18,7 +18,7 @@ exports._ChainConnectionStatus = _ChainConnectionStatus;
 })(_ChainConnectionStatus || (exports._ChainConnectionStatus = _ChainConnectionStatus = {}));
 const _CUSTOM_PREFIX = 'custom-';
 exports._CUSTOM_PREFIX = _CUSTOM_PREFIX;
-const _FUNGIBLE_CONTRACT_STANDARDS = [_types._AssetType.ERC20, _types._AssetType.PSP22];
+const _FUNGIBLE_CONTRACT_STANDARDS = [_types._AssetType.ERC20, _types._AssetType.PSP22, _types._AssetType.GRC20];
 exports._FUNGIBLE_CONTRACT_STANDARDS = _FUNGIBLE_CONTRACT_STANDARDS;
 const _NFT_CONTRACT_STANDARDS = [_types._AssetType.PSP34, _types._AssetType.ERC721];
 exports._NFT_CONTRACT_STANDARDS = _NFT_CONTRACT_STANDARDS;

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

@@ -35,6 +35,9 @@ var _exportNames = {
   _isChainSupportNativeNft: true,
   _isChainSupportEvmNft: true,
   _isChainSupportWasmNft: true,
+  _isChainSupportEvmERC20: true,
+  _isChainSupportWasmPSP22: true,
+  _isChainSupportGRC20: true,
   _isSupportOrdinal: true,
   _getNftTypesSupportedByChain: true,
   _getTokenTypesSupportedByChain: true,
@@ -44,6 +47,7 @@ var _exportNames = {
   _isTokenEvmSmartContract: true,
   _isTokenWasmSmartContract: true,
   _isAssetSmartContractNft: true,
+  _isTokenGearSmartContract: true,
   _parseAssetRefKey: true,
   _isXcmPathSupported: true,
   _getXcmAssetType: true,
@@ -119,10 +123,13 @@ exports._isAssetValuable = _isAssetValuable;
 exports._isBridgedToken = _isBridgedToken;
 exports._isChainEnabled = _isChainEnabled;
 exports._isChainEvmCompatible = _isChainEvmCompatible;
+exports._isChainSupportEvmERC20 = _isChainSupportEvmERC20;
 exports._isChainSupportEvmNft = _isChainSupportEvmNft;
+exports._isChainSupportGRC20 = _isChainSupportGRC20;
 exports._isChainSupportNativeNft = _isChainSupportNativeNft;
 exports._isChainSupportSubstrateStaking = _isChainSupportSubstrateStaking;
 exports._isChainSupportWasmNft = _isChainSupportWasmNft;
+exports._isChainSupportWasmPSP22 = _isChainSupportWasmPSP22;
 exports._isChainTestNet = _isChainTestNet;
 exports._isCustomAsset = _isCustomAsset;
 exports._isCustomChain = _isCustomChain;
@@ -142,6 +149,7 @@ exports._isSubstrateParaChain = _isSubstrateParaChain;
 exports._isSubstrateRelayChain = _isSubstrateRelayChain;
 exports._isSupportOrdinal = void 0;
 exports._isTokenEvmSmartContract = _isTokenEvmSmartContract;
+exports._isTokenGearSmartContract = _isTokenGearSmartContract;
 exports._isTokenTransferredByEvm = _isTokenTransferredByEvm;
 exports._isTokenWasmSmartContract = _isTokenWasmSmartContract;
 exports._isXcmPathSupported = _isXcmPathSupported;
@@ -333,6 +341,18 @@ function _isChainSupportWasmNft(chainInfo) {
   var _chainInfo$substrateI8, _chainInfo$substrateI9;
   return ((_chainInfo$substrateI8 = chainInfo.substrateInfo) === null || _chainInfo$substrateI8 === void 0 ? void 0 : (_chainInfo$substrateI9 = _chainInfo$substrateI8.supportSmartContract) === null || _chainInfo$substrateI9 === void 0 ? void 0 : _chainInfo$substrateI9.includes(_types._AssetType.PSP34)) || false;
 }
+function _isChainSupportEvmERC20(chainInfo) {
+  var _chainInfo$evmInfo3, _chainInfo$evmInfo3$s;
+  return ((_chainInfo$evmInfo3 = chainInfo.evmInfo) === null || _chainInfo$evmInfo3 === void 0 ? void 0 : (_chainInfo$evmInfo3$s = _chainInfo$evmInfo3.supportSmartContract) === null || _chainInfo$evmInfo3$s === void 0 ? void 0 : _chainInfo$evmInfo3$s.includes(_types._AssetType.ERC20)) || false;
+}
+function _isChainSupportWasmPSP22(chainInfo) {
+  var _chainInfo$substrateI10, _chainInfo$substrateI11;
+  return ((_chainInfo$substrateI10 = chainInfo.substrateInfo) === null || _chainInfo$substrateI10 === void 0 ? void 0 : (_chainInfo$substrateI11 = _chainInfo$substrateI10.supportSmartContract) === null || _chainInfo$substrateI11 === void 0 ? void 0 : _chainInfo$substrateI11.includes(_types._AssetType.PSP22)) || false;
+}
+function _isChainSupportGRC20(chainInfo) {
+  var _chainInfo$substrateI12, _chainInfo$substrateI13;
+  return ((_chainInfo$substrateI12 = chainInfo.substrateInfo) === null || _chainInfo$substrateI12 === void 0 ? void 0 : (_chainInfo$substrateI13 = _chainInfo$substrateI12.supportSmartContract) === null || _chainInfo$substrateI13 === void 0 ? void 0 : _chainInfo$substrateI13.includes(_types._AssetType.GRC20)) || false;
+}
 const _isSupportOrdinal = chain => {
   const chains = ['polkadot', 'astar', 'bifrost_dot', 'moonbeam'];
   return chains.includes(chain);
@@ -360,7 +380,7 @@ function _getTokenTypesSupportedByChain(chainInfo) {
   const result = [];
   if (chainInfo.substrateInfo && chainInfo.substrateInfo.supportSmartContract) {
     chainInfo.substrateInfo.supportSmartContract.forEach(assetType => {
-      if ([_types._AssetType.PSP22].includes(assetType)) {
+      if ([_types._AssetType.PSP22, _types._AssetType.GRC20].includes(assetType)) {
         result.push(assetType);
       }
     });
@@ -416,6 +436,9 @@ function _isTokenWasmSmartContract(tokenInfo) {
 function _isAssetSmartContractNft(assetInfo) {
   return [_types._AssetType.PSP34, _types._AssetType.ERC721].includes(assetInfo.assetType);
 }
+function _isTokenGearSmartContract(tokenInfo) {
+  return [_types._AssetType.GRC20, _types._AssetType.GRC721].includes(tokenInfo.assetType);
+}
 function _parseAssetRefKey(originTokenSlug, destinationTokenSlug) {
   return `${originTokenSlug}___${destinationTokenSlug}`;
 }
@@ -443,16 +466,16 @@ function _getXcmTransferType(originChainInfo, destinationChainInfo) {
   return `${((_originChainInfo$subs = originChainInfo.substrateInfo) === null || _originChainInfo$subs === void 0 ? void 0 : _originChainInfo$subs.chainType) || ''}-${((_destinationChainInfo = destinationChainInfo.substrateInfo) === null || _destinationChainInfo === void 0 ? void 0 : _destinationChainInfo.chainType) || ''}`;
 }
 function _isSubstrateRelayChain(chainInfo) {
-  var _chainInfo$substrateI10;
-  return ((_chainInfo$substrateI10 = chainInfo.substrateInfo) === null || _chainInfo$substrateI10 === void 0 ? void 0 : _chainInfo$substrateI10.chainType) === _types._SubstrateChainType.RELAYCHAIN;
+  var _chainInfo$substrateI14;
+  return ((_chainInfo$substrateI14 = chainInfo.substrateInfo) === null || _chainInfo$substrateI14 === void 0 ? void 0 : _chainInfo$substrateI14.chainType) === _types._SubstrateChainType.RELAYCHAIN;
 }
 function _isSubstrateParaChain(chainInfo) {
-  var _chainInfo$substrateI11;
-  return chainInfo.substrateInfo !== null && chainInfo.substrateInfo.paraId !== null && ((_chainInfo$substrateI11 = chainInfo.substrateInfo) === null || _chainInfo$substrateI11 === void 0 ? void 0 : _chainInfo$substrateI11.chainType) === _types._SubstrateChainType.PARACHAIN;
+  var _chainInfo$substrateI15;
+  return chainInfo.substrateInfo !== null && chainInfo.substrateInfo.paraId !== null && ((_chainInfo$substrateI15 = chainInfo.substrateInfo) === null || _chainInfo$substrateI15 === void 0 ? void 0 : _chainInfo$substrateI15.chainType) === _types._SubstrateChainType.PARACHAIN;
 }
 function _getEvmAbiExplorer(chainInfo) {
-  var _chainInfo$evmInfo3;
-  return ((_chainInfo$evmInfo3 = chainInfo.evmInfo) === null || _chainInfo$evmInfo3 === void 0 ? void 0 : _chainInfo$evmInfo3.abiExplorer) || '';
+  var _chainInfo$evmInfo4;
+  return ((_chainInfo$evmInfo4 = chainInfo.evmInfo) === null || _chainInfo$evmInfo4 === void 0 ? void 0 : _chainInfo$evmInfo4.abiExplorer) || '';
 }
 function _isAssetValuable(assetInfo) {
   return assetInfo.hasValue;
@@ -490,11 +513,11 @@ function _getBlockExplorerFromChain(chainInfo) {
     return;
   }
   if (_isPureEvmChain(chainInfo)) {
-    var _chainInfo$evmInfo4;
-    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$evmInfo4 = chainInfo.evmInfo) === null || _chainInfo$evmInfo4 === void 0 ? void 0 : _chainInfo$evmInfo4.blockExplorer;
+    var _chainInfo$evmInfo5;
+    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$evmInfo5 = chainInfo.evmInfo) === null || _chainInfo$evmInfo5 === void 0 ? void 0 : _chainInfo$evmInfo5.blockExplorer;
   } else {
-    var _chainInfo$substrateI12;
-    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI12 = chainInfo.substrateInfo) === null || _chainInfo$substrateI12 === void 0 ? void 0 : _chainInfo$substrateI12.blockExplorer;
+    var _chainInfo$substrateI16;
+    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI16 = chainInfo.substrateInfo) === null || _chainInfo$substrateI16 === void 0 ? void 0 : _chainInfo$substrateI16.blockExplorer;
   }
   if (!blockExplorer) {
     return undefined;
@@ -521,8 +544,8 @@ const _isAssetAutoEnable = chainAsset => {
 };
 exports._isAssetAutoEnable = _isAssetAutoEnable;
 function _getCrowdloanUrlFromChain(chainInfo) {
-  var _chainInfo$substrateI13;
-  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI13 = chainInfo.substrateInfo) === null || _chainInfo$substrateI13 === void 0 ? void 0 : _chainInfo$substrateI13.crowdloanUrl) || '';
+  var _chainInfo$substrateI17;
+  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI17 = chainInfo.substrateInfo) === null || _chainInfo$substrateI17 === void 0 ? void 0 : _chainInfo$substrateI17.crowdloanUrl) || '';
 }
 function _isCustomProvider(providerKey) {
   return providerKey.startsWith(_types2._CUSTOM_PREFIX);
@@ -548,8 +571,8 @@ const findChainInfoByChainId = (chainMap, chainId) => {
     return null;
   }
   for (const chainInfo of Object.values(chainMap)) {
-    var _chainInfo$evmInfo5;
-    if (((_chainInfo$evmInfo5 = chainInfo.evmInfo) === null || _chainInfo$evmInfo5 === void 0 ? void 0 : _chainInfo$evmInfo5.evmChainId) === chainId) {
+    var _chainInfo$evmInfo6;
+    if (((_chainInfo$evmInfo6 = chainInfo.evmInfo) === null || _chainInfo$evmInfo6 === void 0 ? void 0 : _chainInfo$evmInfo6.evmChainId) === chainId) {
       return chainInfo;
     }
   }

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.59';
+const ChainListVersion = '0.2.62';
 async function fetchPatchData(slug) {
   try {
     const fetchPromise = (0, _crossFetch.default)(`${fetchDomain}/patch/${ChainListVersion}/${slug}`);

package/cjs/services/earning-service/constants/chains.js

@@ -8,13 +8,13 @@ exports._UPDATED_RUNTIME_STAKING_GROUP = exports._STAKING_CHAIN_GROUP = exports.
 // SPDX-License-Identifier: Apache-2.0
 
 const _STAKING_CHAIN_GROUP = {
-  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin', 'vara_network', 'goldberg_testnet', 'availTuringTest', 'avail_mainnet'],
+  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin', 'vara_network', 'goldberg_testnet', 'availTuringTest', 'avail_mainnet', 'vara_testnet'],
   para: ['moonbeam', 'moonriver', 'moonbase', 'turing', 'turingStaging', 'bifrost', 'bifrost_testnet', 'calamari_test', 'calamari', 'manta_network', 'polimec'],
   astar: ['astar', 'shiden', 'shibuya'],
   amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum', 'krest_network'],
   // amplitude and kilt only share some common logic
   kilt: ['kilt', 'kilt_peregrine'],
-  nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph', 'kate', 'vara_network', 'goldberg_testnet', 'availTuringTest', 'avail_mainnet'],
+  nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph', 'kate', 'vara_network', 'goldberg_testnet', 'availTuringTest', 'avail_mainnet', 'vara_testnet'],
   bifrost: ['bifrost', 'bifrost_testnet'],
   aleph: ['aleph', 'alephTest'],
   // A0 has distinct tokenomics

package/cjs/services/earning-service/handlers/native-staking/relay-chain.js

@@ -510,6 +510,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
       if (paramsCount === 2) {
         bondTx = chainApi.api.tx.staking.bond(binaryAmount, bondDest);
       } else {
+        // @ts-ignore
         bondTx = chainApi.api.tx.staking.bond(address, binaryAmount, bondDest);
       }
       nominateTx = chainApi.api.tx.staking.nominate(validatorParamList);
@@ -520,6 +521,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
       if (paramsCount === 2) {
         bondTx = chainApi.api.tx.staking.bond(binaryAmount, bondDest);
       } else {
+        // @ts-ignore
         bondTx = chainApi.api.tx.staking.bond(address, binaryAmount, bondDest);
       }
       nominateTx = chainApi.api.tx.staking.nominate(validatorParamList);
@@ -627,6 +629,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
       const slashingSpanCount = _slashingSpans !== null ? _slashingSpans.spanIndex : '0';
       return chainApi.api.tx.staking.withdrawUnbonded(slashingSpanCount);
     } else {
+      // @ts-ignore
       return chainApi.api.tx.staking.withdrawUnbonded();
     }
   }

package/cjs/services/earning-service/handlers/nomination-pool/index.js

@@ -574,6 +574,7 @@ class NominationPoolHandler extends _base.default {
         Id: address
       }, slashingSpanCount);
     } else {
+      // @ts-ignore
       return chainApi.api.tx.nominationPools.withdrawUnbonded({
         Id: address
       });

package/cjs/services/earning-service/service.js

@@ -197,7 +197,7 @@ class EarningService {
     this.status = _types.ServiceStatus.STARTING;
 
     // Start subscribe pools' info
-    await this.runSubscribePoolsInfo();
+    // await this.runSubscribePoolsInfo();
 
     // Start subscribe pools' position
     await this.runSubscribePoolsPosition();
@@ -224,7 +224,7 @@ class EarningService {
     await this.persistData();
 
     // Stop subscribe pools' info
-    this.runUnsubscribePoolsInfo();
+    // this.runUnsubscribePoolsInfo();
 
     // Stop subscribe pools' position
     this.runUnsubscribePoolsPosition();

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

@@ -8,6 +8,7 @@ var _constants = require("@subwallet/extension-base/constants");
 var _types = require("@subwallet/extension-base/services/base/types");
 var _coingecko = require("@subwallet/extension-base/services/price-service/coingecko");
 var _storage = require("@subwallet/extension-base/storage");
+var _stores = require("@subwallet/extension-base/stores");
 var _promise = require("@subwallet/extension-base/utils/promise");
 var _staticData = require("@subwallet/extension-base/utils/staticData");
 var _rxjs = require("rxjs");
@@ -29,12 +30,10 @@ const DEFAULT_PRICE_SUBJECT = {
 };
 class PriceService {
   priceIds = new Set();
+  currency = new _stores.CurrentCurrencyStore();
   constructor(dbService, eventService, chainService) {
-    const currency = _storage.SWStorage.instance.getItem(_constants.CURRENCY);
-    this.currency = new _rxjs.BehaviorSubject(currency || DEFAULT_CURRENCY);
     this.priceSubject = new _rxjs.BehaviorSubject({
-      ...DEFAULT_PRICE_SUBJECT,
-      currency: this.currency.value
+      ...DEFAULT_PRICE_SUBJECT
     });
     this.rawPriceSubject = new _rxjs.BehaviorSubject({});
     this.rawExchangeRateMap = new _rxjs.BehaviorSubject({});
@@ -42,7 +41,11 @@ class PriceService {
     this.dbService = dbService;
     this.eventService = eventService;
     this.chainService = chainService;
-    this.init().catch(console.error);
+    const updateCurrency = currentCurrency => {
+      const currency = _storage.SWStorage.instance.getItem(_constants.CURRENCY);
+      this.setCurrentCurrency(currency || currentCurrency || DEFAULT_CURRENCY);
+    };
+    this.init().then(() => this.getCurrentCurrency(updateCurrency)).catch(console.error);
   }
   async getTokenPrice(priceIds, currency, resolve, reject) {
     await Promise.all([(0, _coingecko.getExchangeRateMap)(), (0, _coingecko.getPriceMap)(priceIds, currency)]).then(_ref => {
@@ -51,12 +54,29 @@ class PriceService {
       this.rawPriceSubject.next(priceMap);
     });
   }
+  getCurrentCurrencySubject() {
+    return this.currency.getSubject();
+  }
+  setCurrentCurrency(currency) {
+    this.currency.set('Currency', currency);
+  }
+  getCurrentCurrency(update) {
+    this.currency.get('Currency', value => {
+      update(value || DEFAULT_CURRENCY);
+    });
+  }
   refreshPromise = null;
   refreshPriceMapByAction() {
     this.refreshPromise = (async () => {
       try {
         await this.refreshPromise;
-        const newPriceMap = await this.calculatePriceMap();
+        const {
+          promise,
+          resolve
+        } = (0, _promise.createPromiseHandler)();
+        this.getCurrentCurrency(resolve);
+        const currencyKey = await promise;
+        const newPriceMap = await this.calculatePriceMap(currencyKey || DEFAULT_CURRENCY);
         if (newPriceMap) {
           this.priceSubject.next(newPriceMap);
         }
@@ -67,16 +87,13 @@ class PriceService {
       }
     })();
   }
-  async calculatePriceMap() {
+  async calculatePriceMap(currency) {
     const {
       price24hMap,
       priceMap
     } = this.rawPriceSubject.value;
     const exchangeRateData = this.rawExchangeRateMap.value;
-    const currencyKey = this.currency.value;
-    if (Object.keys(this.rawPriceSubject.value).length === 0) {
-      return;
-    }
+    const currencyKey = currency || DEFAULT_CURRENCY;
     if (Object.keys(exchangeRateData).length === 0) {
       return;
     }
@@ -112,10 +129,7 @@ class PriceService {
     return new Set(priceIdList);
   }
   async setPriceCurrency(newCurrencyCode) {
-    if (newCurrencyCode === this.currency.value) {
-      return false;
-    }
-    this.currency.next(newCurrencyCode);
+    this.setCurrentCurrency(newCurrencyCode);
 
     // Await 1s to get the latest exchange rate
     await new Promise(resolve => setTimeout(resolve, 300));
@@ -147,9 +161,9 @@ class PriceService {
         this.refreshPriceMapByAction();
       }
     };
-    this.currency.subscribe(currency => {
+    this.getCurrentCurrencySubject().subscribe(currency => {
       console.log('Currency changed', currency);
-      this.calculatePriceMap().then(data => {
+      this.calculatePriceMap(currency).then(data => {
         if (data) {
           this.priceSubject.next(data);
         }

package/cjs/stores/CurrentCurrencyStore.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _defaults = require("@subwallet/extension-base/defaults");
+var _SubscribableStore = _interopRequireDefault(require("@subwallet/extension-base/stores/SubscribableStore"));
+// Copyright 2019-2022 @subwallet/extension-koni-ui authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class CurrentCurrencyStore extends _SubscribableStore.default {
+  constructor() {
+    super(_defaults.EXTENSION_PREFIX ? `${_defaults.EXTENSION_PREFIX}current_currency` : null);
+  }
+}
+exports.default = CurrentCurrencyStore;

package/cjs/stores/index.js

@@ -16,6 +16,12 @@ Object.defineProperty(exports, "CurrentAccountStore", {
     return _CurrentAccountStore.default;
   }
 });
+Object.defineProperty(exports, "CurrentCurrencyStore", {
+  enumerable: true,
+  get: function () {
+    return _CurrentCurrencyStore.default;
+  }
+});
 Object.defineProperty(exports, "MetadataStore", {
   enumerable: true,
   get: function () {
@@ -24,4 +30,5 @@ Object.defineProperty(exports, "MetadataStore", {
 });
 var _Accounts = _interopRequireDefault(require("./Accounts"));
 var _Metadata = _interopRequireDefault(require("./Metadata"));
-var _CurrentAccountStore = _interopRequireDefault(require("./CurrentAccountStore"));
+var _CurrentAccountStore = _interopRequireDefault(require("./CurrentAccountStore"));
+var _CurrentCurrencyStore = _interopRequireDefault(require("./CurrentCurrencyStore"));