@subwallet/extension-base 1.1.51-0 → 1.1.51-2

package/background/KoniTypes.d.ts

@@ -337,6 +337,7 @@ export declare type RequestChangeLanguage = {
 export declare type RequestChangeShowBalance = {
     enable: boolean;
 };
+export declare type DetectBalanceCache = Record<string, number>;
 export interface RandomTestRequest {
     start: number;
     end: number;

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

@@ -1535,59 +1535,21 @@ class KoniState {
   createUnsubscriptionHandle(id, unsubscribe) {
     this.unsubscriptionMap[id] = unsubscribe;
   }
-  async autoEnableChains(addresses) {
-    const assetMap = this.chainService.getAssetRegistry();
-    const promiseList = addresses.map(address => {
-      return this.subscanService.getMultiChainBalance(address).catch(e => {
-        console.error(e);
-        return null;
-      });
-    });
-    const needEnableChains = [];
-    const needActiveTokens = [];
-    const currentAssetSettings = await this.chainService.getAssetSettings();
-    const chainMap = this.chainService.getChainInfoMap();
-    const balanceDataList = await Promise.all(promiseList);
-    balanceDataList.forEach(balanceData => {
-      balanceData && balanceData.forEach(_ref10 => {
-        var _currentAssetSettings;
-        let {
-          balance,
-          bonded,
-          category,
-          locked,
-          network,
-          symbol
-        } = _ref10;
-        const chain = _subscanChainMap.SUBSCAN_BALANCE_CHAIN_MAP_REVERSE[network];
-        const chainInfo = chain ? chainMap[chain] : null;
-        const balanceIsEmpty = (!balance || balance === '0') && (!locked || locked === '0') && (!bonded || bonded === '0');
-
-        // Cancel if chain is not supported or is testnet or balance is 0
-        if (!chainInfo || chainInfo.isTestnet || balanceIsEmpty) {
-          return;
-        }
-        const tokenKey = `${chain}-${category === 'native' ? 'NATIVE' : 'LOCAL'}-${symbol.toUpperCase()}`;
-        const existedKey = Object.keys(assetMap).find(v => v.toLowerCase() === tokenKey.toLowerCase());
-        if (existedKey && !((_currentAssetSettings = currentAssetSettings[existedKey]) !== null && _currentAssetSettings !== void 0 && _currentAssetSettings.visible)) {
-          needEnableChains.push(chain);
-          needActiveTokens.push(existedKey);
-          currentAssetSettings[existedKey] = {
-            visible: true
-          };
-        }
-      });
-    });
-    if (needActiveTokens.length) {
-      await this.chainService.enableChains(needEnableChains);
-      this.chainService.setAssetSettings({
-        ...currentAssetSettings
-      });
+  get detectBalanceChainSlugMap() {
+    const result = {};
+    const chainInfoMap = this.getChainInfoMap();
+    for (const [key, chainInfo] of Object.entries(chainInfoMap)) {
+      var _chainInfo$extraInfo;
+      const chainBalanceSlug = ((_chainInfo$extraInfo = chainInfo.extraInfo) === null || _chainInfo$extraInfo === void 0 ? void 0 : _chainInfo$extraInfo.chainBalanceSlug) || '';
+      if (chainBalanceSlug) {
+        result[chainBalanceSlug] = key;
+      }
     }
+    return result;
   }
   onAccountAdd() {
     this.eventService.on('account.add', address => {
-      this.autoEnableChains([address]).catch(this.logger.error);
+      this.balanceService.autoEnableChains([address]).catch(this.logger.error);
     });
   }
   onAccountRemove() {
@@ -1815,12 +1777,12 @@ class KoniState {
       specVersion: parseInt((metadata === null || metadata === void 0 ? void 0 : metadata.specVersion) || '0')
     };
   }
-  getCrowdloanContributions(_ref11) {
+  getCrowdloanContributions(_ref10) {
     let {
       address,
       page,
       relayChain
-    } = _ref11;
+    } = _ref10;
     return this.subscanService.getCrowdloanContributions(relayChain, address, page);
   }
 }

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.51-0'
+  version: '1.1.51-2'
 };
 exports.packageInfo = packageInfo;

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

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -11,8 +12,12 @@ var _evm = require("@subwallet/extension-base/services/balance-service/helpers/s
 var _substrate = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/substrate");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _DetectAccountBalance = _interopRequireDefault(require("@subwallet/extension-base/stores/DetectAccountBalance"));
 var _utils2 = require("@subwallet/extension-base/utils");
+var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
 var _i18next = require("i18next");
+var _rxjs = require("rxjs");
+var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -21,6 +26,10 @@ var _i18next = require("i18next");
  * @class
 */
 class BalanceService {
+  detectAccountBalanceStore = new _DetectAccountBalance.default();
+  balanceDetectSubject = new _rxjs.BehaviorSubject({});
+  intervalTime = 3 * 60 * 1000;
+  cacheTime = 15 * 60 * 1000;
   /**
    * @constructor
    * @param {KoniState} state - The state of extension.
@@ -35,6 +44,54 @@ class BalanceService {
     // Todo: Add new account
     // Todo: Optimize get balance for single account and chain with cache
     // Todo: Move everything of fetching balance to this service
+
+    this.startHandler = (0, _utils2.createPromiseHandler)();
+    const updateBalanceDetectCache = value => {
+      this.startHandler.resolve();
+      this.balanceDetectSubject.next(value || {});
+    };
+    this.getBalanceDetectCache(updateBalanceDetectCache);
+    this.detectAccountBalanceStore.getSubject().subscribe({
+      next: updateBalanceDetectCache
+    });
+    this.startDetectBalance().catch(console.error);
+  }
+  async startDetectBalance() {
+    const scanBalance = () => {
+      const addresses = _uiKeyring.default.getPairs().map(account => account.address);
+      const cache = this.balanceDetectSubject.value;
+      const now = Date.now();
+      const needDetectAddresses = [];
+      for (const address of addresses) {
+        if (!cache[address] || now - cache[address] > this.cacheTime) {
+          needDetectAddresses.push(address);
+        }
+      }
+      if (needDetectAddresses.length) {
+        this.autoEnableChains(needDetectAddresses).finally(_util.noop);
+      }
+    };
+    await this.state.eventService.waitAccountReady;
+    await this.state.eventService.waitChainReady;
+    await this.startHandler.promise;
+    scanBalance();
+    setInterval(scanBalance, this.intervalTime);
+  }
+  getBalanceDetectCache(update) {
+    this.detectAccountBalanceStore.get('DetectBalanceCache', value => {
+      update(value);
+    });
+  }
+  setBalanceDetectCache(addresses) {
+    this.detectAccountBalanceStore.get('DetectBalanceCache', value => {
+      const rs = {
+        ...value
+      };
+      for (const address of addresses) {
+        rs[address] = Date.now();
+      }
+      this.detectAccountBalanceStore.set('DetectBalanceCache', rs);
+    });
   }
 
   /* Subscribe token free balance on chain */
@@ -138,5 +195,73 @@ class BalanceService {
       });
     };
   }
+  async autoEnableChains(addresses) {
+    this.setBalanceDetectCache(addresses);
+    const assetMap = this.state.chainService.getAssetRegistry();
+    const promiseList = addresses.map(address => {
+      return this.state.subscanService.getMultiChainBalance(address).catch(e => {
+        console.error(e);
+        return null;
+      });
+    });
+    const needEnableChains = [];
+    const needActiveTokens = [];
+    const balanceDataList = await Promise.all(promiseList);
+    const currentAssetSettings = await this.state.chainService.getAssetSettings();
+    const chainInfoMap = this.state.chainService.getChainInfoMap();
+    const detectBalanceChainSlugMap = this.state.chainService.detectBalanceChainSlugMap;
+    for (const balanceData of balanceDataList) {
+      if (balanceData) {
+        for (const balanceDatum of balanceData) {
+          var _currentAssetSettings;
+          const {
+            balance,
+            bonded,
+            category,
+            locked,
+            network,
+            symbol
+          } = balanceDatum;
+          const chain = detectBalanceChainSlugMap[network];
+          const chainInfo = chain ? chainInfoMap[chain] : null;
+          const chainState = this.state.chainService.getChainStateByKey(chain);
+          const balanceIsEmpty = (!balance || balance === '0') && (!locked || locked === '0') && (!bonded || bonded === '0');
+          const tokenKey = `${chain}-${category === 'native' ? 'NATIVE' : 'LOCAL'}-${symbol.toUpperCase()}`;
+          const existedKey = Object.keys(assetMap).find(v => v.toLowerCase() === tokenKey.toLowerCase());
+
+          // Cancel if chain is not supported or is testnet
+          if (!chainInfo || chainInfo.isTestnet) {
+            continue;
+          }
+
+          // Cancel is balance is 0
+          if (balanceIsEmpty) {
+            continue;
+          }
+
+          // Cancel is chain is turned off by user
+          if (chainState && chainState.manualTurnOff) {
+            continue;
+          }
+
+          // const a = this.state.chainService.getChainStateByKey(chain);
+
+          if (existedKey && !((_currentAssetSettings = currentAssetSettings[existedKey]) !== null && _currentAssetSettings !== void 0 && _currentAssetSettings.visible)) {
+            needEnableChains.push(chain);
+            needActiveTokens.push(existedKey);
+            currentAssetSettings[existedKey] = {
+              visible: true
+            };
+          }
+        }
+      }
+    }
+    if (needActiveTokens.length) {
+      await this.state.chainService.enableChains(needEnableChains);
+      this.state.chainService.setAssetSettings({
+        ...currentAssetSettings
+      });
+    }
+  }
 }
 exports.BalanceService = BalanceService;

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

@@ -470,7 +470,7 @@ class ChainService {
   stopCheckLatestChainData() {
     clearInterval(this.refreshLatestChainDataTimeOut);
   }
-  handleLatestProviderData(latestChainInfo) {
+  handleLatestChainData(latestChainInfo) {
     try {
       if (latestChainInfo && latestChainInfo.length > 0) {
         const {
@@ -548,6 +548,17 @@ class ChainService {
           this.assetLogoMapSubject.next(logoMap);
         }
       }
+      if (latestAssetLogoMap) {
+        const latestAssetLogoPatch = JSON.stringify(latestAssetLogoMap);
+        if (this.assetLogoPatch !== latestAssetLogoPatch) {
+          const logoMap = {
+            ..._chainList.AssetLogoMap,
+            ...latestAssetLogoMap
+          };
+          this.assetLogoPatch = latestAssetLogoPatch;
+          this.assetLogoMapSubject.next(logoMap);
+        }
+      }
     } catch (e) {
       console.error('Error fetching latest asset data');
     }
@@ -585,7 +596,7 @@ class ChainService {
       }).catch(console.error);
     }).catch(console.error);
     this.fetchLatestChainData().then(latestChainInfo => {
-      this.handleLatestProviderData(latestChainInfo);
+      this.handleLatestChainData(latestChainInfo);
     }).catch(console.error);
     this.fetchLatestAssetRef().then(_ref7 => {
       let [latestAssetRef, latestAssetRefMap] = _ref7;
@@ -665,7 +676,8 @@ class ChainService {
     this.dbService.updateChainStore({
       ...chainInfo,
       active: true,
-      currentProvider: chainStateMap[chainSlug].currentProvider
+      currentProvider: chainStateMap[chainSlug].currentProvider,
+      manualTurnOff: !!chainStateMap[chainSlug].manualTurnOff
     }).catch(console.error);
     chainStateMap[chainSlug].active = true;
     await this.initApiForChain(chainInfo);
@@ -690,7 +702,8 @@ class ChainService {
         this.dbService.updateChainStore({
           ...chainInfo,
           active: true,
-          currentProvider: chainStateMap[chainSlug].currentProvider
+          currentProvider: chainStateMap[chainSlug].currentProvider,
+          manualTurnOff: !!chainStateMap[chainSlug].manualTurnOff
         }).catch(console.error);
         chainStateMap[chainSlug].active = true;
         await this.initApiForChain(chainInfo);
@@ -717,13 +730,15 @@ class ChainService {
     }
     this.lockChainInfoMap = true;
     chainStateMap[chainSlug].active = false;
+    chainStateMap[chainSlug].manualTurnOff = true;
     // Set disconnect state for inactive chain
     this.updateChainConnectionStatus(chainSlug, _types3._ChainConnectionStatus.DISCONNECTED);
     this.destroyApiForChain(chainInfo);
     this.dbService.updateChainStore({
       ...chainInfo,
       active: false,
-      currentProvider: chainStateMap[chainSlug].currentProvider
+      currentProvider: chainStateMap[chainSlug].currentProvider,
+      manualTurnOff: true
     }).catch(console.error);
     this.updateChainStateMapSubscription();
     this.lockChainInfoMap = false;
@@ -815,7 +830,8 @@ class ChainService {
         this.dataMap.chainStateMap[chainInfo.slug] = {
           currentProvider: providerKey,
           slug: chainInfo.slug,
-          active: _constants._DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug)
+          active: _constants._DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug),
+          manualTurnOff: false
         };
         this.updateChainConnectionStatus(chainInfo.slug, _types3._ChainConnectionStatus.DISCONNECTED);
 
@@ -823,13 +839,15 @@ class ChainService {
         newStorageData.push({
           ...chainInfo,
           active: _constants._DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug),
-          currentProvider: providerKey
+          currentProvider: providerKey,
+          manualTurnOff: false
         });
       });
     } else {
       const mergedChainInfoMap = defaultChainInfoMap;
       for (const [storedSlug, storedChainInfo] of Object.entries(storedChainSettingMap)) {
         const chainInfo = defaultChainInfoMap[storedSlug];
+        const manualTurnOff = !!storedChainInfo.manualTurnOff;
 
         // Network existed on change list
         // check predefined chains first, keep setting for providers and currentProvider
@@ -868,13 +886,15 @@ class ChainService {
           this.dataMap.chainStateMap[storedSlug] = {
             currentProvider: selectedProvider,
             slug: storedSlug,
-            active: canActive && storedChainInfo.active
+            active: canActive && storedChainInfo.active,
+            manualTurnOff
           };
           this.updateChainConnectionStatus(storedSlug, _types3._ChainConnectionStatus.DISCONNECTED);
           newStorageData.push({
             ...mergedChainInfoMap[storedSlug],
             active: canActive && storedChainInfo.active,
-            currentProvider: selectedProvider
+            currentProvider: selectedProvider,
+            manualTurnOff
           });
         } else if ((0, _utils._isCustomChain)(storedSlug)) {
           var _storedChainInfo$subs, _storedChainInfo$evmI;
@@ -890,13 +910,15 @@ class ChainService {
             this.dataMap.chainStateMap[duplicatedDefaultSlug] = {
               currentProvider: storedChainInfo.currentProvider,
               slug: duplicatedDefaultSlug,
-              active: storedChainInfo.active
+              active: storedChainInfo.active,
+              manualTurnOff
             };
             this.updateChainConnectionStatus(duplicatedDefaultSlug, _types3._ChainConnectionStatus.DISCONNECTED);
             newStorageData.push({
               ...mergedChainInfoMap[duplicatedDefaultSlug],
               active: storedChainInfo.active,
-              currentProvider: storedChainInfo.currentProvider
+              currentProvider: storedChainInfo.currentProvider,
+              manualTurnOff
             });
             deprecatedChainMap[storedSlug] = duplicatedDefaultSlug;
             deprecatedChains.push(storedSlug);
@@ -917,13 +939,16 @@ class ChainService {
               currentProvider: storedChainInfo.currentProvider,
               // TODO: review
               slug: storedSlug,
-              active: storedChainInfo.active
+              active: storedChainInfo.active,
+              manualTurnOff
             };
             this.updateChainConnectionStatus(storedSlug, _types3._ChainConnectionStatus.DISCONNECTED);
             newStorageData.push({
               ...mergedChainInfoMap[storedSlug],
               active: storedChainInfo.active,
-              currentProvider: storedChainInfo.currentProvider // TODO: review
+              currentProvider: storedChainInfo.currentProvider,
+              // TODO: review
+              manualTurnOff
             });
           }
         } else {
@@ -938,13 +963,15 @@ class ChainService {
           this.dataMap.chainStateMap[slug] = {
             currentProvider: Object.keys(chainInfo.providers)[0],
             slug,
-            active: _constants._DEFAULT_ACTIVE_CHAINS.includes(slug)
+            active: _constants._DEFAULT_ACTIVE_CHAINS.includes(slug),
+            manualTurnOff: false
           };
           this.updateChainConnectionStatus(slug, _types3._ChainConnectionStatus.DISCONNECTED);
           newStorageData.push({
             ...mergedChainInfoMap[slug],
             active: _constants._DEFAULT_ACTIVE_CHAINS.includes(slug),
-            currentProvider: Object.keys(chainInfo.providers)[0]
+            currentProvider: Object.keys(chainInfo.providers)[0],
+            manualTurnOff: false
           });
         }
       });
@@ -1061,7 +1088,8 @@ class ChainService {
     this.dbService.updateChainStore({
       ...targetChainInfo,
       active: targetChainState.active,
-      currentProvider: targetChainState.currentProvider
+      currentProvider: targetChainState.currentProvider,
+      manualTurnOff: !targetChainState.active || !!targetChainState.manualTurnOff
     }).then(() => {
       this.eventService.emit('chain.updateState', chainSlug);
     }).catch(e => this.logger.error(e));
@@ -1125,7 +1153,8 @@ class ChainService {
     chainStateMap[newChainSlug] = {
       active: true,
       currentProvider: params.chainEditInfo.currentProvider,
-      slug: newChainSlug
+      slug: newChainSlug,
+      manualTurnOff: false
     };
 
     // const chainStatusMap = this.getChainStatusMap();
@@ -1160,6 +1189,7 @@ class ChainService {
     this.dbService.updateChainStore({
       active: true,
       currentProvider: params.chainEditInfo.currentProvider,
+      manualTurnOff: false,
       ...chainInfo
     }).then(() => {
       this.eventService.emit('chain.add', newChainSlug);
@@ -1599,5 +1629,17 @@ class ChainService {
     });
     return result;
   }
+  get detectBalanceChainSlugMap() {
+    const result = {};
+    const chainInfoMap = this.getChainInfoMap();
+    for (const [key, chainInfo] of Object.entries(chainInfoMap)) {
+      var _chainInfo$extraInfo;
+      const chainBalanceSlug = ((_chainInfo$extraInfo = chainInfo.extraInfo) === null || _chainInfo$extraInfo === void 0 ? void 0 : _chainInfo$extraInfo.chainBalanceSlug) || '';
+      if (chainBalanceSlug) {
+        result[chainBalanceSlug] = key;
+      }
+    }
+    return result;
+  }
 }
 exports.ChainService = ChainService;

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

@@ -562,10 +562,11 @@ function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
   const currentChainStateMap = currentDataMap.chainStateMap;
   const storedChainInfoList = [];
   const needUpdateChainApiList = [];
-  latestChainInfoList.forEach(latestChainInfo => {
+  for (const latestChainInfo of latestChainInfoList) {
     const currentChainInfo = currentChainInfoMap[latestChainInfo.slug];
     const currentChainState = currentChainStateMap[latestChainInfo.slug];
     const currentChainProviderValue = currentChainInfo === null || currentChainInfo === void 0 ? void 0 : currentChainInfo.providers[currentChainState === null || currentChainState === void 0 ? void 0 : currentChainState.currentProvider];
+    let needUpdate = false;
     if (currentChainInfo && currentChainState) {
       const preservedProvider = {};
       Object.entries(currentChainInfo.providers).forEach(_ref => {
@@ -587,12 +588,19 @@ function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
         currentChainState.currentProvider = providerKey;
         needUpdateChainApiList.push(currentChainInfo);
       }
+      needUpdate = true;
+    }
+    if (currentChainInfo) {
+      needUpdate = true;
+      currentChainInfo.extraInfo = latestChainInfo.extraInfo;
+    }
+    if (needUpdate) {
       storedChainInfoList.push({
         ...currentChainInfo,
         ...currentChainState
       });
     }
-  });
+  }
   return {
     storedChainInfoList,
     needUpdateChainApiList

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.fetchPatchData = fetchPatchData;
-var _packageInfo = require("@subwallet/chain-list/packageInfo");
 var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -13,9 +12,10 @@ 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.53';
 async function fetchPatchData(slug) {
   try {
-    const fetchPromise = (0, _crossFetch.default)(`${fetchDomain}/patch/${_packageInfo.packageInfo.version}/${slug}`);
+    const fetchPromise = (0, _crossFetch.default)(`${fetchDomain}/patch/${ChainListVersion}/${slug}`);
     const timeout = new Promise(resolve => {
       const id = setTimeout(() => {
         clearTimeout(id);

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

@@ -156,7 +156,7 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
         for (const scheduledRequest of delegationScheduledRequests) {
           if ((0, _utils3.reformatAddress)(scheduledRequest.delegator, 0) === (0, _utils3.reformatAddress)(address, 0)) {
             // add network prefix
-            const isClaimable = scheduledRequest.whenExecutable - currentRound < 0;
+            const isClaimable = scheduledRequest.whenExecutable - currentRound <= 0;
             const remainingEra = scheduledRequest.whenExecutable - currentRound;
             const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug];
             const claimable = Object.values(scheduledRequest.action)[0];

package/cjs/services/migration-service/scripts/AutoEnableChainsTokens.js

@@ -13,7 +13,7 @@ var _uiKeyring = require("@subwallet/ui-keyring");
 class AutoEnableChainsTokens extends _Base.default {
   async run() {
     const accounts = _uiKeyring.keyring.getAccounts();
-    await this.state.autoEnableChains(accounts.map(_ref => {
+    await this.state.balanceService.autoEnableChains(accounts.map(_ref => {
       let {
         address
       } = _ref;

package/cjs/stores/DetectAccountBalance.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-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class DetectAccountBalanceStore extends _SubscribableStore.default {
+  constructor() {
+    super(_defaults.EXTENSION_PREFIX ? `${_defaults.EXTENSION_PREFIX}DetectBalanceCache` : null);
+  }
+}
+exports.default = DetectAccountBalanceStore;

package/koni/background/handlers/State.d.ts

@@ -237,7 +237,7 @@ export default class KoniState {
     wakeup(): Promise<void>;
     cancelSubscription(id: string): boolean;
     createUnsubscriptionHandle(id: string, unsubscribe: () => void): void;
-    autoEnableChains(addresses: string[]): Promise<void>;
+    get detectBalanceChainSlugMap(): Record<string, string>;
     onAccountAdd(): void;
     onAccountRemove(): void;
     reloadNft(): Promise<boolean>;

package/koni/background/handlers/State.js

@@ -28,7 +28,7 @@ import RequestService from '@subwallet/extension-base/services/request-service';
 import SettingService from '@subwallet/extension-base/services/setting-service/SettingService';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { SubscanService } from '@subwallet/extension-base/services/subscan-service';
-import { SUBSCAN_API_CHAIN_MAP, SUBSCAN_BALANCE_CHAIN_MAP_REVERSE } from '@subwallet/extension-base/services/subscan-service/subscan-chain-map';
+import { SUBSCAN_API_CHAIN_MAP } from '@subwallet/extension-base/services/subscan-service/subscan-chain-map';
 import TransactionService from '@subwallet/extension-base/services/transaction-service';
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
 import AccountRefStore from '@subwallet/extension-base/stores/AccountRef';
@@ -1511,58 +1511,21 @@ export default class KoniState {
   createUnsubscriptionHandle(id, unsubscribe) {
     this.unsubscriptionMap[id] = unsubscribe;
   }
-  async autoEnableChains(addresses) {
-    const assetMap = this.chainService.getAssetRegistry();
-    const promiseList = addresses.map(address => {
-      return this.subscanService.getMultiChainBalance(address).catch(e => {
-        console.error(e);
-        return null;
-      });
-    });
-    const needEnableChains = [];
-    const needActiveTokens = [];
-    const currentAssetSettings = await this.chainService.getAssetSettings();
-    const chainMap = this.chainService.getChainInfoMap();
-    const balanceDataList = await Promise.all(promiseList);
-    balanceDataList.forEach(balanceData => {
-      balanceData && balanceData.forEach(({
-        balance,
-        bonded,
-        category,
-        locked,
-        network,
-        symbol
-      }) => {
-        var _currentAssetSettings;
-        const chain = SUBSCAN_BALANCE_CHAIN_MAP_REVERSE[network];
-        const chainInfo = chain ? chainMap[chain] : null;
-        const balanceIsEmpty = (!balance || balance === '0') && (!locked || locked === '0') && (!bonded || bonded === '0');
-
-        // Cancel if chain is not supported or is testnet or balance is 0
-        if (!chainInfo || chainInfo.isTestnet || balanceIsEmpty) {
-          return;
-        }
-        const tokenKey = `${chain}-${category === 'native' ? 'NATIVE' : 'LOCAL'}-${symbol.toUpperCase()}`;
-        const existedKey = Object.keys(assetMap).find(v => v.toLowerCase() === tokenKey.toLowerCase());
-        if (existedKey && !((_currentAssetSettings = currentAssetSettings[existedKey]) !== null && _currentAssetSettings !== void 0 && _currentAssetSettings.visible)) {
-          needEnableChains.push(chain);
-          needActiveTokens.push(existedKey);
-          currentAssetSettings[existedKey] = {
-            visible: true
-          };
-        }
-      });
-    });
-    if (needActiveTokens.length) {
-      await this.chainService.enableChains(needEnableChains);
-      this.chainService.setAssetSettings({
-        ...currentAssetSettings
-      });
+  get detectBalanceChainSlugMap() {
+    const result = {};
+    const chainInfoMap = this.getChainInfoMap();
+    for (const [key, chainInfo] of Object.entries(chainInfoMap)) {
+      var _chainInfo$extraInfo;
+      const chainBalanceSlug = ((_chainInfo$extraInfo = chainInfo.extraInfo) === null || _chainInfo$extraInfo === void 0 ? void 0 : _chainInfo$extraInfo.chainBalanceSlug) || '';
+      if (chainBalanceSlug) {
+        result[chainBalanceSlug] = key;
+      }
     }
+    return result;
   }
   onAccountAdd() {
     this.eventService.on('account.add', address => {
-      this.autoEnableChains([address]).catch(this.logger.error);
+      this.balanceService.autoEnableChains([address]).catch(this.logger.error);
     });
   }
   onAccountRemove() {

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.51-0",
+  "version": "1.1.51-2",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1480,6 +1480,11 @@
       "require": "./cjs/stores/CurrentAccountStore.js",
       "default": "./stores/CurrentAccountStore.js"
     },
+    "./stores/DetectAccountBalance": {
+      "types": "./stores/DetectAccountBalance.d.ts",
+      "require": "./cjs/stores/DetectAccountBalance.js",
+      "default": "./stores/DetectAccountBalance.js"
+    },
     "./stores/Keyring": {
       "types": "./stores/Keyring.d.ts",
       "require": "./cjs/stores/Keyring.js",
@@ -1802,10 +1807,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
     "@subwallet/chain-list": "0.2.53",
-    "@subwallet/extension-base": "^1.1.51-0",
-    "@subwallet/extension-chains": "^1.1.51-0",
-    "@subwallet/extension-dapp": "^1.1.51-0",
-    "@subwallet/extension-inject": "^1.1.51-0",
+    "@subwallet/extension-base": "^1.1.51-2",
+    "@subwallet/extension-chains": "^1.1.51-2",
+    "@subwallet/extension-dapp": "^1.1.51-2",
+    "@subwallet/extension-inject": "^1.1.51-2",
     "@subwallet/keyring": "^0.1.3",
     "@subwallet/ui-keyring": "^0.1.3",
     "@walletconnect/sign-client": "^2.8.4",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.1.51-0'
+  version: '1.1.51-2'
 };

package/services/balance-service/index.d.ts

@@ -1,4 +1,4 @@
-import { AmountData } from '@subwallet/extension-base/background/KoniTypes';
+import { AmountData, DetectBalanceCache } from '@subwallet/extension-base/background/KoniTypes';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import { BalanceItem } from '@subwallet/extension-base/types';
 /**
@@ -6,12 +6,20 @@ import { BalanceItem } from '@subwallet/extension-base/types';
  * @class
 */
 export declare class BalanceService {
-    private state;
+    private readonly state;
+    private readonly detectAccountBalanceStore;
+    private readonly balanceDetectSubject;
+    private readonly intervalTime;
+    private readonly cacheTime;
+    private readonly startHandler;
     /**
      * @constructor
      * @param {KoniState} state - The state of extension.
      */
     constructor(state: KoniState);
+    startDetectBalance(): Promise<void>;
+    getBalanceDetectCache(update: (value: DetectBalanceCache) => void): void;
+    setBalanceDetectCache(addresses: string[]): void;
     subscribeTokenFreeBalance(address: string, chain: string, tokenSlug: string | undefined, callback?: (rs: AmountData) => void): Promise<[() => void, AmountData]>;
     /**
      * @public
@@ -25,4 +33,5 @@ export declare class BalanceService {
     */
     getTokenFreeBalance(address: string, chain: string, tokenSlug?: string): Promise<AmountData>;
     subscribeBalance(addresses: string[], chains: string[] | null, _callback: (rs: BalanceItem) => void): () => void;
+    autoEnableChains(addresses: string[]): Promise<void>;
 }

package/services/balance-service/index.js

@@ -8,14 +8,22 @@ import { subscribeEVMBalance } from '@subwallet/extension-base/services/balance-
 import { subscribeSubstrateBalance } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/substrate';
 import { _PURE_EVM_CHAINS } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getChainNativeTokenSlug, _isChainEvmCompatible, _isPureEvmChain } from '@subwallet/extension-base/services/chain-service/utils';
-import { categoryAddresses } from '@subwallet/extension-base/utils';
+import DetectAccountBalanceStore from '@subwallet/extension-base/stores/DetectAccountBalance';
+import { categoryAddresses, createPromiseHandler } from '@subwallet/extension-base/utils';
+import keyring from '@subwallet/ui-keyring';
 import { t } from 'i18next';
+import { BehaviorSubject } from 'rxjs';
+import { noop } from '@polkadot/util';
 
 /**
  * Balance service
  * @class
 */
 export class BalanceService {
+  detectAccountBalanceStore = new DetectAccountBalanceStore();
+  balanceDetectSubject = new BehaviorSubject({});
+  intervalTime = 3 * 60 * 1000;
+  cacheTime = 15 * 60 * 1000;
   /**
    * @constructor
    * @param {KoniState} state - The state of extension.
@@ -30,6 +38,54 @@ export class BalanceService {
     // Todo: Add new account
     // Todo: Optimize get balance for single account and chain with cache
     // Todo: Move everything of fetching balance to this service
+
+    this.startHandler = createPromiseHandler();
+    const updateBalanceDetectCache = value => {
+      this.startHandler.resolve();
+      this.balanceDetectSubject.next(value || {});
+    };
+    this.getBalanceDetectCache(updateBalanceDetectCache);
+    this.detectAccountBalanceStore.getSubject().subscribe({
+      next: updateBalanceDetectCache
+    });
+    this.startDetectBalance().catch(console.error);
+  }
+  async startDetectBalance() {
+    const scanBalance = () => {
+      const addresses = keyring.getPairs().map(account => account.address);
+      const cache = this.balanceDetectSubject.value;
+      const now = Date.now();
+      const needDetectAddresses = [];
+      for (const address of addresses) {
+        if (!cache[address] || now - cache[address] > this.cacheTime) {
+          needDetectAddresses.push(address);
+        }
+      }
+      if (needDetectAddresses.length) {
+        this.autoEnableChains(needDetectAddresses).finally(noop);
+      }
+    };
+    await this.state.eventService.waitAccountReady;
+    await this.state.eventService.waitChainReady;
+    await this.startHandler.promise;
+    scanBalance();
+    setInterval(scanBalance, this.intervalTime);
+  }
+  getBalanceDetectCache(update) {
+    this.detectAccountBalanceStore.get('DetectBalanceCache', value => {
+      update(value);
+    });
+  }
+  setBalanceDetectCache(addresses) {
+    this.detectAccountBalanceStore.get('DetectBalanceCache', value => {
+      const rs = {
+        ...value
+      };
+      for (const address of addresses) {
+        rs[address] = Date.now();
+      }
+      this.detectAccountBalanceStore.set('DetectBalanceCache', rs);
+    });
   }
 
   /* Subscribe token free balance on chain */
@@ -133,4 +189,72 @@ export class BalanceService {
       });
     };
   }
+  async autoEnableChains(addresses) {
+    this.setBalanceDetectCache(addresses);
+    const assetMap = this.state.chainService.getAssetRegistry();
+    const promiseList = addresses.map(address => {
+      return this.state.subscanService.getMultiChainBalance(address).catch(e => {
+        console.error(e);
+        return null;
+      });
+    });
+    const needEnableChains = [];
+    const needActiveTokens = [];
+    const balanceDataList = await Promise.all(promiseList);
+    const currentAssetSettings = await this.state.chainService.getAssetSettings();
+    const chainInfoMap = this.state.chainService.getChainInfoMap();
+    const detectBalanceChainSlugMap = this.state.chainService.detectBalanceChainSlugMap;
+    for (const balanceData of balanceDataList) {
+      if (balanceData) {
+        for (const balanceDatum of balanceData) {
+          var _currentAssetSettings;
+          const {
+            balance,
+            bonded,
+            category,
+            locked,
+            network,
+            symbol
+          } = balanceDatum;
+          const chain = detectBalanceChainSlugMap[network];
+          const chainInfo = chain ? chainInfoMap[chain] : null;
+          const chainState = this.state.chainService.getChainStateByKey(chain);
+          const balanceIsEmpty = (!balance || balance === '0') && (!locked || locked === '0') && (!bonded || bonded === '0');
+          const tokenKey = `${chain}-${category === 'native' ? 'NATIVE' : 'LOCAL'}-${symbol.toUpperCase()}`;
+          const existedKey = Object.keys(assetMap).find(v => v.toLowerCase() === tokenKey.toLowerCase());
+
+          // Cancel if chain is not supported or is testnet
+          if (!chainInfo || chainInfo.isTestnet) {
+            continue;
+          }
+
+          // Cancel is balance is 0
+          if (balanceIsEmpty) {
+            continue;
+          }
+
+          // Cancel is chain is turned off by user
+          if (chainState && chainState.manualTurnOff) {
+            continue;
+          }
+
+          // const a = this.state.chainService.getChainStateByKey(chain);
+
+          if (existedKey && !((_currentAssetSettings = currentAssetSettings[existedKey]) !== null && _currentAssetSettings !== void 0 && _currentAssetSettings.visible)) {
+            needEnableChains.push(chain);
+            needActiveTokens.push(existedKey);
+            currentAssetSettings[existedKey] = {
+              visible: true
+            };
+          }
+        }
+      }
+    }
+    if (needActiveTokens.length) {
+      await this.state.chainService.enableChains(needEnableChains);
+      this.state.chainService.setAssetSettings({
+        ...currentAssetSettings
+      });
+    }
+  }
 }

package/services/chain-service/index.d.ts

@@ -83,7 +83,7 @@ export declare class ChainService {
     initAssetRefMap(): void;
     checkLatestData(): void;
     stopCheckLatestChainData(): void;
-    handleLatestProviderData(latestChainInfo: _ChainInfo[]): void;
+    handleLatestChainData(latestChainInfo: _ChainInfo[]): void;
     handleLatestAssetRef(latestBlockedAssetRefList: string[], latestAssetRefMap: Record<string, _AssetRef> | null): void;
     handleLatestPriceId(latestPriceIds: Record<string, string | null>): void;
     handleLatestAssetData(latestAssetInfo: Record<string, _ChainAsset> | null, latestAssetLogoMap: Record<string, string> | null): void;
@@ -138,4 +138,5 @@ export declare class ChainService {
     upsertMetadata(chain: string, metadata: IMetadataItem): import("dexie").PromiseExtended<unknown>;
     getMetadataByHash(hash: string): import("dexie").PromiseExtended<IMetadataItem | undefined>;
     getSubscanChainMap(reverse?: boolean): Record<string, string>;
+    get detectBalanceChainSlugMap(): Record<string, string>;
 }

package/services/chain-service/index.js

@@ -454,7 +454,7 @@ export class ChainService {
   stopCheckLatestChainData() {
     clearInterval(this.refreshLatestChainDataTimeOut);
   }
-  handleLatestProviderData(latestChainInfo) {
+  handleLatestChainData(latestChainInfo) {
     try {
       if (latestChainInfo && latestChainInfo.length > 0) {
         const {
@@ -531,6 +531,17 @@ export class ChainService {
           this.assetLogoMapSubject.next(logoMap);
         }
       }
+      if (latestAssetLogoMap) {
+        const latestAssetLogoPatch = JSON.stringify(latestAssetLogoMap);
+        if (this.assetLogoPatch !== latestAssetLogoPatch) {
+          const logoMap = {
+            ...AssetLogoMap,
+            ...latestAssetLogoMap
+          };
+          this.assetLogoPatch = latestAssetLogoPatch;
+          this.assetLogoMapSubject.next(logoMap);
+        }
+      }
     } catch (e) {
       console.error('Error fetching latest asset data');
     }
@@ -567,7 +578,7 @@ export class ChainService {
       }).catch(console.error);
     }).catch(console.error);
     this.fetchLatestChainData().then(latestChainInfo => {
-      this.handleLatestProviderData(latestChainInfo);
+      this.handleLatestChainData(latestChainInfo);
     }).catch(console.error);
     this.fetchLatestAssetRef().then(([latestAssetRef, latestAssetRefMap]) => {
       this.handleLatestAssetRef(latestAssetRef, latestAssetRefMap);
@@ -644,7 +655,8 @@ export class ChainService {
     this.dbService.updateChainStore({
       ...chainInfo,
       active: true,
-      currentProvider: chainStateMap[chainSlug].currentProvider
+      currentProvider: chainStateMap[chainSlug].currentProvider,
+      manualTurnOff: !!chainStateMap[chainSlug].manualTurnOff
     }).catch(console.error);
     chainStateMap[chainSlug].active = true;
     await this.initApiForChain(chainInfo);
@@ -669,7 +681,8 @@ export class ChainService {
         this.dbService.updateChainStore({
           ...chainInfo,
           active: true,
-          currentProvider: chainStateMap[chainSlug].currentProvider
+          currentProvider: chainStateMap[chainSlug].currentProvider,
+          manualTurnOff: !!chainStateMap[chainSlug].manualTurnOff
         }).catch(console.error);
         chainStateMap[chainSlug].active = true;
         await this.initApiForChain(chainInfo);
@@ -696,13 +709,15 @@ export class ChainService {
     }
     this.lockChainInfoMap = true;
     chainStateMap[chainSlug].active = false;
+    chainStateMap[chainSlug].manualTurnOff = true;
     // Set disconnect state for inactive chain
     this.updateChainConnectionStatus(chainSlug, _ChainConnectionStatus.DISCONNECTED);
     this.destroyApiForChain(chainInfo);
     this.dbService.updateChainStore({
       ...chainInfo,
       active: false,
-      currentProvider: chainStateMap[chainSlug].currentProvider
+      currentProvider: chainStateMap[chainSlug].currentProvider,
+      manualTurnOff: true
     }).catch(console.error);
     this.updateChainStateMapSubscription();
     this.lockChainInfoMap = false;
@@ -794,7 +809,8 @@ export class ChainService {
         this.dataMap.chainStateMap[chainInfo.slug] = {
           currentProvider: providerKey,
           slug: chainInfo.slug,
-          active: _DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug)
+          active: _DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug),
+          manualTurnOff: false
         };
         this.updateChainConnectionStatus(chainInfo.slug, _ChainConnectionStatus.DISCONNECTED);
 
@@ -802,13 +818,15 @@ export class ChainService {
         newStorageData.push({
           ...chainInfo,
           active: _DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug),
-          currentProvider: providerKey
+          currentProvider: providerKey,
+          manualTurnOff: false
         });
       });
     } else {
       const mergedChainInfoMap = defaultChainInfoMap;
       for (const [storedSlug, storedChainInfo] of Object.entries(storedChainSettingMap)) {
         const chainInfo = defaultChainInfoMap[storedSlug];
+        const manualTurnOff = !!storedChainInfo.manualTurnOff;
 
         // Network existed on change list
         // check predefined chains first, keep setting for providers and currentProvider
@@ -847,13 +865,15 @@ export class ChainService {
           this.dataMap.chainStateMap[storedSlug] = {
             currentProvider: selectedProvider,
             slug: storedSlug,
-            active: canActive && storedChainInfo.active
+            active: canActive && storedChainInfo.active,
+            manualTurnOff
           };
           this.updateChainConnectionStatus(storedSlug, _ChainConnectionStatus.DISCONNECTED);
           newStorageData.push({
             ...mergedChainInfoMap[storedSlug],
             active: canActive && storedChainInfo.active,
-            currentProvider: selectedProvider
+            currentProvider: selectedProvider,
+            manualTurnOff
           });
         } else if (_isCustomChain(storedSlug)) {
           var _storedChainInfo$subs, _storedChainInfo$evmI;
@@ -869,13 +889,15 @@ export class ChainService {
             this.dataMap.chainStateMap[duplicatedDefaultSlug] = {
               currentProvider: storedChainInfo.currentProvider,
               slug: duplicatedDefaultSlug,
-              active: storedChainInfo.active
+              active: storedChainInfo.active,
+              manualTurnOff
             };
             this.updateChainConnectionStatus(duplicatedDefaultSlug, _ChainConnectionStatus.DISCONNECTED);
             newStorageData.push({
               ...mergedChainInfoMap[duplicatedDefaultSlug],
               active: storedChainInfo.active,
-              currentProvider: storedChainInfo.currentProvider
+              currentProvider: storedChainInfo.currentProvider,
+              manualTurnOff
             });
             deprecatedChainMap[storedSlug] = duplicatedDefaultSlug;
             deprecatedChains.push(storedSlug);
@@ -896,13 +918,16 @@ export class ChainService {
               currentProvider: storedChainInfo.currentProvider,
               // TODO: review
               slug: storedSlug,
-              active: storedChainInfo.active
+              active: storedChainInfo.active,
+              manualTurnOff
             };
             this.updateChainConnectionStatus(storedSlug, _ChainConnectionStatus.DISCONNECTED);
             newStorageData.push({
               ...mergedChainInfoMap[storedSlug],
               active: storedChainInfo.active,
-              currentProvider: storedChainInfo.currentProvider // TODO: review
+              currentProvider: storedChainInfo.currentProvider,
+              // TODO: review
+              manualTurnOff
             });
           }
         } else {
@@ -916,13 +941,15 @@ export class ChainService {
           this.dataMap.chainStateMap[slug] = {
             currentProvider: Object.keys(chainInfo.providers)[0],
             slug,
-            active: _DEFAULT_ACTIVE_CHAINS.includes(slug)
+            active: _DEFAULT_ACTIVE_CHAINS.includes(slug),
+            manualTurnOff: false
           };
           this.updateChainConnectionStatus(slug, _ChainConnectionStatus.DISCONNECTED);
           newStorageData.push({
             ...mergedChainInfoMap[slug],
             active: _DEFAULT_ACTIVE_CHAINS.includes(slug),
-            currentProvider: Object.keys(chainInfo.providers)[0]
+            currentProvider: Object.keys(chainInfo.providers)[0],
+            manualTurnOff: false
           });
         }
       });
@@ -1039,7 +1066,8 @@ export class ChainService {
     this.dbService.updateChainStore({
       ...targetChainInfo,
       active: targetChainState.active,
-      currentProvider: targetChainState.currentProvider
+      currentProvider: targetChainState.currentProvider,
+      manualTurnOff: !targetChainState.active || !!targetChainState.manualTurnOff
     }).then(() => {
       this.eventService.emit('chain.updateState', chainSlug);
     }).catch(e => this.logger.error(e));
@@ -1103,7 +1131,8 @@ export class ChainService {
     chainStateMap[newChainSlug] = {
       active: true,
       currentProvider: params.chainEditInfo.currentProvider,
-      slug: newChainSlug
+      slug: newChainSlug,
+      manualTurnOff: false
     };
 
     // const chainStatusMap = this.getChainStatusMap();
@@ -1138,6 +1167,7 @@ export class ChainService {
     this.dbService.updateChainStore({
       active: true,
       currentProvider: params.chainEditInfo.currentProvider,
+      manualTurnOff: false,
       ...chainInfo
     }).then(() => {
       this.eventService.emit('chain.add', newChainSlug);
@@ -1576,4 +1606,16 @@ export class ChainService {
     });
     return result;
   }
+  get detectBalanceChainSlugMap() {
+    const result = {};
+    const chainInfoMap = this.getChainInfoMap();
+    for (const [key, chainInfo] of Object.entries(chainInfoMap)) {
+      var _chainInfo$extraInfo;
+      const chainBalanceSlug = ((_chainInfo$extraInfo = chainInfo.extraInfo) === null || _chainInfo$extraInfo === void 0 ? void 0 : _chainInfo$extraInfo.chainBalanceSlug) || '';
+      if (chainBalanceSlug) {
+        result[chainBalanceSlug] = key;
+      }
+    }
+    return result;
+  }
 }

package/services/chain-service/types.d.ts

@@ -22,6 +22,7 @@ export interface _ChainState {
     slug: string;
     active: boolean;
     currentProvider: string;
+    manualTurnOff: boolean;
 }
 export interface _ChainApiStatus {
     slug: string;

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

@@ -400,10 +400,11 @@ export function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
   const currentChainStateMap = currentDataMap.chainStateMap;
   const storedChainInfoList = [];
   const needUpdateChainApiList = [];
-  latestChainInfoList.forEach(latestChainInfo => {
+  for (const latestChainInfo of latestChainInfoList) {
     const currentChainInfo = currentChainInfoMap[latestChainInfo.slug];
     const currentChainState = currentChainStateMap[latestChainInfo.slug];
     const currentChainProviderValue = currentChainInfo === null || currentChainInfo === void 0 ? void 0 : currentChainInfo.providers[currentChainState === null || currentChainState === void 0 ? void 0 : currentChainState.currentProvider];
+    let needUpdate = false;
     if (currentChainInfo && currentChainState) {
       const preservedProvider = {};
       Object.entries(currentChainInfo.providers).forEach(([providerKey, providerValue]) => {
@@ -424,12 +425,19 @@ export function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
         currentChainState.currentProvider = providerKey;
         needUpdateChainApiList.push(currentChainInfo);
       }
+      needUpdate = true;
+    }
+    if (currentChainInfo) {
+      needUpdate = true;
+      currentChainInfo.extraInfo = latestChainInfo.extraInfo;
+    }
+    if (needUpdate) {
       storedChainInfoList.push({
         ...currentChainInfo,
         ...currentChainState
       });
     }
-  });
+  }
   return {
     storedChainInfoList,
     needUpdateChainApiList

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

@@ -1,14 +1,14 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { packageInfo as chainListInfo } from '@subwallet/chain-list/packageInfo';
 import fetch from '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.53';
 export async function fetchPatchData(slug) {
   try {
-    const fetchPromise = fetch(`${fetchDomain}/patch/${chainListInfo.version}/${slug}`);
+    const fetchPromise = fetch(`${fetchDomain}/patch/${ChainListVersion}/${slug}`);
     const timeout = new Promise(resolve => {
       const id = setTimeout(() => {
         clearTimeout(id);

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

@@ -149,7 +149,7 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
         for (const scheduledRequest of delegationScheduledRequests) {
           if (reformatAddress(scheduledRequest.delegator, 0) === reformatAddress(address, 0)) {
             // add network prefix
-            const isClaimable = scheduledRequest.whenExecutable - currentRound < 0;
+            const isClaimable = scheduledRequest.whenExecutable - currentRound <= 0;
             const remainingEra = scheduledRequest.whenExecutable - currentRound;
             const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chainInfo.slug];
             const claimable = Object.values(scheduledRequest.action)[0];

package/services/migration-service/scripts/AutoEnableChainsTokens.js

@@ -6,7 +6,7 @@ import { keyring } from '@subwallet/ui-keyring';
 export default class AutoEnableChainsTokens extends BaseMigrationJob {
   async run() {
     const accounts = keyring.getAccounts();
-    await this.state.autoEnableChains(accounts.map(({
+    await this.state.balanceService.autoEnableChains(accounts.map(({
       address
     }) => address));
   }

package/services/storage-service/databases/index.d.ts

@@ -15,6 +15,7 @@ export interface IBalance extends BalanceItem, DefaultAddressDoc {
 export interface IChain extends _ChainInfo {
     active: boolean;
     currentProvider: string;
+    manualTurnOff: boolean;
 }
 export interface ICrowdloanItem extends CrowdloanItem, DefaultAddressDoc, DefaultChainDoc {
 }

package/stores/DetectAccountBalance.d.ts

@@ -0,0 +1,5 @@
+import { DetectBalanceCache } from '@subwallet/extension-base/background/KoniTypes';
+import SubscribableStore from '@subwallet/extension-base/stores/SubscribableStore';
+export default class DetectAccountBalanceStore extends SubscribableStore<DetectBalanceCache> {
+    constructor();
+}

package/stores/DetectAccountBalance.js

@@ -0,0 +1,10 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { EXTENSION_PREFIX } from '@subwallet/extension-base/defaults';
+import SubscribableStore from '@subwallet/extension-base/stores/SubscribableStore';
+export default class DetectAccountBalanceStore extends SubscribableStore {
+  constructor() {
+    super(EXTENSION_PREFIX ? `${EXTENSION_PREFIX}DetectBalanceCache` : null);
+  }
+}