@subwallet/extension-base 1.1.39-beta.0 → 1.1.40-1

package/background/KoniTypes.d.ts

@@ -1645,7 +1645,6 @@ export interface KoniRequestSignatures {
     'pri(bonding.nominationPool.submitUnbonding)': [RequestStakePoolingUnbonding, SWTransactionResponse];
     'pri(chainService.subscribeChainInfoMap)': [null, Record<string, any>, Record<string, any>];
     'pri(chainService.subscribeChainStateMap)': [null, Record<string, any>, Record<string, any>];
-    'pri(chainService.subscribeChainStatusMap)': [null, Record<string, any>, Record<string, any>];
     'pri(chainService.subscribeAssetRegistry)': [null, Record<string, any>, Record<string, any>];
     'pri(chainService.subscribeMultiChainAssetMap)': [null, Record<string, _MultiChainAsset>, Record<string, _MultiChainAsset>];
     'pri(chainService.subscribeXcmRefMap)': [null, Record<string, _AssetRef>, Record<string, _AssetRef>];

package/cjs/constants/staking.js

@@ -10,7 +10,7 @@ exports.PREDEFINED_STAKING_POOL = exports.MAX_NOMINATIONS = void 0;
 const PREDEFINED_STAKING_POOL = {
   kusama: 80,
   polkadot: 39,
-  vara_network: 29,
+  vara_network: 50,
   aleph: 82
 };
 exports.PREDEFINED_STAKING_POOL = PREDEFINED_STAKING_POOL;

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

@@ -3255,19 +3255,6 @@ class KoniExtension {
     });
     return this.#koniState.getChainStateMap();
   }
-  subscribeChainStatusMap(id, port) {
-    const cb = (0, _subscriptions.createSubscription)(id, port);
-    const chainStateMapSubscription = this.#koniState.chainService.subscribeChainStatusMap().subscribe({
-      next: rs => {
-        cb(rs);
-      }
-    });
-    this.createUnsubscriptionHandle(id, chainStateMapSubscription.unsubscribe);
-    port.onDisconnect.addListener(() => {
-      this.cancelSubscription(id);
-    });
-    return this.#koniState.chainService.getChainStatusMap();
-  }
   async subscribeAssetRegistry(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     let ready = false;
@@ -3571,7 +3558,7 @@ class KoniExtension {
       });
       const {
         connectionStatus
-      } = this.#koniState.chainService.getChainStatusByKey(_constants2._DEFAULT_MANTA_ZK_CHAIN);
+      } = this.#koniState.chainService.getChainStateByKey(_constants2._DEFAULT_MANTA_ZK_CHAIN);
       if (connectionStatus !== _types2._ChainConnectionStatus.CONNECTED) {
         // TODO: do better
         await timeout();
@@ -4311,8 +4298,6 @@ class KoniExtension {
         return this.subscribeChainInfoMap(id, port);
       case 'pri(chainService.subscribeChainStateMap)':
         return this.subscribeChainStateMap(id, port);
-      case 'pri(chainService.subscribeChainStatusMap)':
-        return this.subscribeChainStatusMap(id, port);
       case 'pri(chainService.subscribeXcmRefMap)':
         return this.subscribeXcmRefMap(id, port);
       case 'pri(chainService.getSupportedContractTypes)':

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.39-0'
+  version: '1.1.40-1'
 };
 exports.packageInfo = packageInfo;

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

@@ -38,7 +38,6 @@ class ChainService {
   // TODO: consider BehaviorSubject
   chainInfoMapSubject = new _rxjs.Subject();
   chainStateMapSubject = new _rxjs.Subject();
-  chainStatusMapSubject = new _rxjs.BehaviorSubject({});
   assetRegistrySubject = new _rxjs.Subject();
   multiChainAssetMapSubject = new _rxjs.Subject();
   xcmRefMapSubject = new _rxjs.Subject();
@@ -112,9 +111,6 @@ class ChainService {
   subscribeChainStateMap() {
     return this.chainStateMapSubject;
   }
-  subscribeChainStatusMap() {
-    return this.chainStatusMapSubject;
-  }
   getAssetRegistry() {
     return this.dataMap.assetRegistry;
   }
@@ -192,12 +188,6 @@ class ChainService {
   getChainStateByKey(key) {
     return this.dataMap.chainStateMap[key];
   }
-  getChainStatusMap() {
-    return this.chainStatusMapSubject.getValue();
-  }
-  getChainStatusByKey(key) {
-    return this.getChainStatusMap()[key];
-  }
   getActiveChains() {
     return Object.entries(this.dataMap.chainStateMap).filter(_ref => {
       let [, chainState] = _ref;
@@ -363,32 +353,9 @@ class ChainService {
     this.lockChainInfoMap = false;
     return true;
   }
-  connectionStatusQueueMap = {};
-  updateChainConnectionStatus(slug, connectionStatus) {
-    this.connectionStatusQueueMap[slug] = connectionStatus;
-    (0, _utils2.addLazy)('updateChainConnectionStatus', () => {
-      const chainStatusMap = this.getChainStatusMap();
-      let update = false;
-      Object.entries(this.connectionStatusQueueMap).forEach(_ref3 => {
-        let [slug, status] = _ref3;
-        if (chainStatusMap[slug]) {
-          if (chainStatusMap[slug].connectionStatus !== status) {
-            chainStatusMap[slug].connectionStatus = status;
-            chainStatusMap[slug].lastUpdated = Date.now();
-            update = true;
-          }
-        } else {
-          chainStatusMap[slug] = {
-            slug,
-            connectionStatus: status,
-            lastUpdated: Date.now()
-          };
-          update = true;
-        }
-      });
-      this.connectionStatusQueueMap = {};
-      update && this.chainStatusMapSubject.next(chainStatusMap);
-    });
+  setChainConnectionStatus(slug, connectionStatus) {
+    const chainStateMap = this.getChainStateMap();
+    chainStateMap[slug].connectionStatus = connectionStatus;
   }
   upsertCustomToken(token) {
     if (token.slug.length === 0) {
@@ -517,8 +484,8 @@ class ChainService {
     this.logger.log('Finished updating latest asset ref');
   }
   handleLatestPriceId(latestPriceIds) {
-    Object.entries(latestPriceIds).forEach(_ref4 => {
-      let [slug, priceId] = _ref4;
+    Object.entries(latestPriceIds).forEach(_ref3 => {
+      let [slug, priceId] = _ref3;
       if (this.dataMap.assetRegistry[slug]) {
         this.dataMap.assetRegistry[slug].priceId = priceId;
       }
@@ -543,12 +510,12 @@ class ChainService {
   async initApis() {
     const chainInfoMap = this.getChainInfoMap();
     const chainStateMap = this.getChainStateMap();
-    await Promise.all(Object.entries(chainInfoMap).filter(_ref5 => {
+    await Promise.all(Object.entries(chainInfoMap).filter(_ref4 => {
       var _chainStateMap$slug;
-      let [slug] = _ref5;
+      let [slug] = _ref4;
       return (_chainStateMap$slug = chainStateMap[slug]) === null || _chainStateMap$slug === void 0 ? void 0 : _chainStateMap$slug.active;
-    }).map(_ref6 => {
-      let [, chainInfo] = _ref6;
+    }).map(_ref5 => {
+      let [, chainInfo] = _ref5;
       try {
         return this.initApiForChain(chainInfo);
       } catch (e) {
@@ -563,8 +530,13 @@ class ChainService {
       providerName
     } = this.getChainCurrentProviderByKey(chainInfo.slug);
     const onUpdateStatus = status => {
-      const slug = chainInfo.slug;
-      this.updateChainConnectionStatus(slug, status);
+      const currentStatus = this.getChainStateByKey(chainInfo.slug).connectionStatus;
+
+      // Avoid unnecessary update in case disable chain
+      if (currentStatus !== status) {
+        this.setChainConnectionStatus(chainInfo.slug, status);
+        this.updateChainStateMapSubscription();
+      }
     };
     if (chainInfo.substrateInfo !== null && chainInfo.substrateInfo !== undefined) {
       if (_constants._MANTA_ZK_CHAIN_GROUP.includes(chainInfo.slug) && _utils2.MODULE_SUPPORT.MANTA_ZK && this.mantaChainHandler) {
@@ -663,7 +635,7 @@ class ChainService {
     this.lockChainInfoMap = true;
     chainStateMap[chainSlug].active = false;
     // Set disconnect state for inactive chain
-    this.updateChainConnectionStatus(chainSlug, _types3._ChainConnectionStatus.DISCONNECTED);
+    chainStateMap[chainSlug].connectionStatus = _types3._ChainConnectionStatus.DISCONNECTED;
     this.destroyApiForChain(chainInfo);
     this.dbService.updateChainStore({
       ...chainInfo,
@@ -756,9 +728,9 @@ class ChainService {
         this.dataMap.chainStateMap[chainInfo.slug] = {
           currentProvider: providerKey,
           slug: chainInfo.slug,
+          connectionStatus: _types3._ChainConnectionStatus.DISCONNECTED,
           active: _constants._DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug)
         };
-        this.updateChainConnectionStatus(chainInfo.slug, _types3._ChainConnectionStatus.DISCONNECTED);
 
         // create data for storage
         newStorageData.push({
@@ -809,9 +781,9 @@ class ChainService {
           this.dataMap.chainStateMap[storedSlug] = {
             currentProvider: selectedProvider,
             slug: storedSlug,
+            connectionStatus: _types3._ChainConnectionStatus.DISCONNECTED,
             active: canActive && storedChainInfo.active
           };
-          this.updateChainConnectionStatus(storedSlug, _types3._ChainConnectionStatus.DISCONNECTED);
           newStorageData.push({
             ...mergedChainInfoMap[storedSlug],
             active: canActive && storedChainInfo.active,
@@ -831,9 +803,9 @@ class ChainService {
             this.dataMap.chainStateMap[duplicatedDefaultSlug] = {
               currentProvider: storedChainInfo.currentProvider,
               slug: duplicatedDefaultSlug,
+              connectionStatus: _types3._ChainConnectionStatus.DISCONNECTED,
               active: storedChainInfo.active
             };
-            this.updateChainConnectionStatus(duplicatedDefaultSlug, _types3._ChainConnectionStatus.DISCONNECTED);
             newStorageData.push({
               ...mergedChainInfoMap[duplicatedDefaultSlug],
               active: storedChainInfo.active,
@@ -858,9 +830,9 @@ class ChainService {
               currentProvider: storedChainInfo.currentProvider,
               // TODO: review
               slug: storedSlug,
+              connectionStatus: _types3._ChainConnectionStatus.DISCONNECTED,
               active: storedChainInfo.active
             };
-            this.updateChainConnectionStatus(storedSlug, _types3._ChainConnectionStatus.DISCONNECTED);
             newStorageData.push({
               ...mergedChainInfoMap[storedSlug],
               active: storedChainInfo.active,
@@ -873,15 +845,15 @@ class ChainService {
       }
 
       // Fill in the missing chainState and storageData (new chains never before seen)
-      Object.entries(mergedChainInfoMap).forEach(_ref7 => {
-        let [slug, chainInfo] = _ref7;
+      Object.entries(mergedChainInfoMap).forEach(_ref6 => {
+        let [slug, chainInfo] = _ref6;
         if (!(slug in this.dataMap.chainStateMap)) {
           this.dataMap.chainStateMap[slug] = {
             currentProvider: Object.keys(chainInfo.providers)[0],
             slug,
+            connectionStatus: _types3._ChainConnectionStatus.DISCONNECTED,
             active: _constants._DEFAULT_ACTIVE_CHAINS.includes(slug)
           };
-          this.updateChainConnectionStatus(slug, _types3._ChainConnectionStatus.DISCONNECTED);
           newStorageData.push({
             ...mergedChainInfoMap[slug],
             active: _constants._DEFAULT_ACTIVE_CHAINS.includes(slug),
@@ -956,7 +928,9 @@ class ChainService {
     }
   }
   updateChainStateMapSubscription() {
-    this.chainStateMapSubject.next(this.getChainStateMap());
+    (0, _utils2.addLazy)('updateChainStateMapSubscription', () => {
+      this.chainStateMapSubject.next(this.getChainStateMap());
+    }, 300, 900);
   }
   updateChainInfoMapSubscription() {
     this.chainInfoMapSubject.next(this.getChainInfoMap());
@@ -1065,17 +1039,10 @@ class ChainService {
     const chainStateMap = this.getChainStateMap();
     chainStateMap[newChainSlug] = {
       active: true,
+      connectionStatus: _types3._ChainConnectionStatus.DISCONNECTED,
       currentProvider: params.chainEditInfo.currentProvider,
       slug: newChainSlug
     };
-
-    // const chainStatusMap = this.getChainStatusMap();
-    // const chainStatusMap[newChainSlug] = {
-    //   slug: newChainSlug,
-    //   connectionStatus: _ChainConnectionStatus.DISCONNECTED,
-    //   lastUpdated: Date.now()
-    // };
-
     await this.initApiForChain(chainInfo);
 
     // create a record in assetRegistry for native token and update store/subscription
@@ -1360,6 +1327,29 @@ class ChainService {
     await Promise.all([this.substrateChainHandler.wakeUp(), this.evmChainHandler.wakeUp()]);
     this.checkLatestData();
   }
+  checkAndUpdateStatusMapForChain(chainSlug) {
+    const substrateApiMap = this.getSubstrateApiMap();
+    const evmApiMap = this.getEvmApiMap();
+    const chainState = this.getChainStateByKey(chainSlug);
+    let update = false;
+    function updateState(current, status) {
+      if (current.connectionStatus !== status) {
+        current.connectionStatus = status;
+        update = true;
+      }
+    }
+    if (chainState.active) {
+      const api = substrateApiMap[chainSlug] || evmApiMap[chainSlug];
+      if (api) {
+        updateState(chainState, api.isApiConnected ? _types3._ChainConnectionStatus.CONNECTED : _types3._ChainConnectionStatus.DISCONNECTED);
+      }
+    } else {
+      updateState(chainState, _types3._ChainConnectionStatus.DISCONNECTED);
+    }
+    if (update) {
+      this.dataMap.chainStateMap[chainSlug] = chainState;
+    }
+  }
   async initAssetSettings() {
     const assetSettings = await this.getAssetSettings();
     const activeChainSlugs = this.getActiveChainSlugs();

package/constants/staking.js

@@ -4,7 +4,7 @@
 export const PREDEFINED_STAKING_POOL = {
   kusama: 80,
   polkadot: 39,
-  vara_network: 29,
+  vara_network: 50,
   aleph: 82
 };
 export const MAX_NOMINATIONS = '16';

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

@@ -185,7 +185,6 @@ export default class KoniExtension {
     private getListDeriveAccounts;
     private subscribeChainInfoMap;
     private subscribeChainStateMap;
-    private subscribeChainStatusMap;
     private subscribeAssetRegistry;
     private subscribeMultiChainAssetMap;
     private subscribeXcmRefMap;

package/koni/background/handlers/Extension.js

@@ -3169,19 +3169,6 @@ export default class KoniExtension {
     });
     return this.#koniState.getChainStateMap();
   }
-  subscribeChainStatusMap(id, port) {
-    const cb = createSubscription(id, port);
-    const chainStateMapSubscription = this.#koniState.chainService.subscribeChainStatusMap().subscribe({
-      next: rs => {
-        cb(rs);
-      }
-    });
-    this.createUnsubscriptionHandle(id, chainStateMapSubscription.unsubscribe);
-    port.onDisconnect.addListener(() => {
-      this.cancelSubscription(id);
-    });
-    return this.#koniState.chainService.getChainStatusMap();
-  }
   async subscribeAssetRegistry(id, port) {
     const cb = createSubscription(id, port);
     let ready = false;
@@ -3471,7 +3458,7 @@ export default class KoniExtension {
       });
       const {
         connectionStatus
-      } = this.#koniState.chainService.getChainStatusByKey(_DEFAULT_MANTA_ZK_CHAIN);
+      } = this.#koniState.chainService.getChainStateByKey(_DEFAULT_MANTA_ZK_CHAIN);
       if (connectionStatus !== _ChainConnectionStatus.CONNECTED) {
         // TODO: do better
         await timeout();
@@ -4207,8 +4194,6 @@ export default class KoniExtension {
         return this.subscribeChainInfoMap(id, port);
       case 'pri(chainService.subscribeChainStateMap)':
         return this.subscribeChainStateMap(id, port);
-      case 'pri(chainService.subscribeChainStatusMap)':
-        return this.subscribeChainStatusMap(id, port);
       case 'pri(chainService.subscribeXcmRefMap)':
         return this.subscribeXcmRefMap(id, port);
       case 'pri(chainService.getSupportedContractTypes)':

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.39-beta.0",
+  "version": "1.1.40-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1745,7 +1745,7 @@
     "@metaverse-network-sdk/type-definitions": "^0.0.1-13",
     "@oak-foundation/types": "^0.0.23",
     "@polkadot/api": "^10.11.2",
-    "@polkadot/api-base": "^10.9.1",
+    "@polkadot/api-base": "^10.11.2",
     "@polkadot/api-contract": "^10.11.2",
     "@polkadot/api-derive": "^10.11.2",
     "@polkadot/apps-config": "^0.133.1",
@@ -1762,10 +1762,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
     "@subwallet/chain-list": "0.2.42-beta.0",
-    "@subwallet/extension-base": "^1.1.39-0",
-    "@subwallet/extension-chains": "^1.1.39-0",
-    "@subwallet/extension-dapp": "^1.1.39-0",
-    "@subwallet/extension-inject": "^1.1.39-0",
+    "@subwallet/extension-base": "^1.1.40-1",
+    "@subwallet/extension-chains": "^1.1.40-1",
+    "@subwallet/extension-dapp": "^1.1.40-1",
+    "@subwallet/extension-inject": "^1.1.40-1",
     "@subwallet/keyring": "^0.1.3",
     "@subwallet/ui-keyring": "^0.1.3",
     "@walletconnect/sign-client": "^2.8.4",
@@ -1802,4 +1802,4 @@
     "web3-eth-contract": "^1.10.0",
     "web3-utils": "^1.10.0"
   }
-}
+}

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.39-0'
+  version: '1.1.40-1'
 };

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

@@ -2,7 +2,7 @@
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
 import { AssetSetting, ValidateNetworkResponse } from '@subwallet/extension-base/background/KoniTypes';
 import { MantaPrivateHandler } from '@subwallet/extension-base/services/chain-service/handler/manta/MantaPrivateHandler';
-import { _ChainApiStatus, _ChainConnectionStatus, _ChainState, _NetworkUpsertParams, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse } from '@subwallet/extension-base/services/chain-service/types';
+import { _ChainConnectionStatus, _ChainState, _NetworkUpsertParams, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse } from '@subwallet/extension-base/services/chain-service/types';
 import { EventService } from '@subwallet/extension-base/services/event-service';
 import { IMetadataItem } from '@subwallet/extension-base/services/storage-service/databases';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
@@ -19,7 +19,6 @@ export declare class ChainService {
     get mantaPay(): MantaPrivateHandler | undefined;
     private chainInfoMapSubject;
     private chainStateMapSubject;
-    private chainStatusMapSubject;
     private assetRegistrySubject;
     private multiChainAssetMapSubject;
     private xcmRefMapSubject;
@@ -41,7 +40,6 @@ export declare class ChainService {
     subscribeMultiChainAssetMap(): Subject<Record<string, _MultiChainAsset>>;
     subscribeXcmRefMap(): Subject<Record<string, _AssetRef>>;
     subscribeChainStateMap(): Subject<Record<string, _ChainState>>;
-    subscribeChainStatusMap(): BehaviorSubject<Record<string, _ChainApiStatus>>;
     getAssetRegistry(): Record<string, _ChainAsset>;
     getMultiChainAssetMap(): Record<string, _MultiChainAsset>;
     getSmartContractTokens(): Record<string, _ChainAsset>;
@@ -53,8 +51,6 @@ export declare class ChainService {
     getAssetRefMap(): Record<string, _AssetRef>;
     getChainStateMap(): Record<string, _ChainState>;
     getChainStateByKey(key: string): _ChainState;
-    getChainStatusMap(): Record<string, _ChainApiStatus>;
-    getChainStatusByKey(key: string): _ChainApiStatus;
     getActiveChains(): string[];
     getSupportedSmartContractTypes(): _AssetType[];
     getActiveChainInfoMap(): Record<string, _ChainInfo>;
@@ -70,8 +66,7 @@ export declare class ChainService {
     forceRemoveChain(slug: string): boolean;
     removeCustomChain(slug: string): boolean;
     resetChainInfoMap(excludedChains?: string[]): boolean;
-    private connectionStatusQueueMap;
-    updateChainConnectionStatus(slug: string, connectionStatus: _ChainConnectionStatus): void;
+    setChainConnectionStatus(slug: string, connectionStatus: _ChainConnectionStatus): void;
     upsertCustomToken(token: _ChainAsset): string;
     deleteAssetsByChain(chainSlug: string): void;
     deleteCustomAssets(targetAssets: string[]): void;
@@ -114,6 +109,7 @@ export declare class ChainService {
     refreshEvmApi(slug: string): void;
     stopAllChainApis(): Promise<void>;
     resumeAllChainApis(): Promise<void>;
+    checkAndUpdateStatusMapForChain(chainSlug: string): void;
     initAssetSettings(): Promise<void>;
     setAssetSettings(assetSettings: Record<string, AssetSetting>, emitEvent?: boolean): void;
     setMantaZkAssetSettings(visible: boolean): void;

package/services/chain-service/index.js

@@ -31,7 +31,6 @@ export class ChainService {
   // TODO: consider BehaviorSubject
   chainInfoMapSubject = new Subject();
   chainStateMapSubject = new Subject();
-  chainStatusMapSubject = new BehaviorSubject({});
   assetRegistrySubject = new Subject();
   multiChainAssetMapSubject = new Subject();
   xcmRefMapSubject = new Subject();
@@ -105,9 +104,6 @@ export class ChainService {
   subscribeChainStateMap() {
     return this.chainStateMapSubject;
   }
-  subscribeChainStatusMap() {
-    return this.chainStatusMapSubject;
-  }
   getAssetRegistry() {
     return this.dataMap.assetRegistry;
   }
@@ -185,12 +181,6 @@ export class ChainService {
   getChainStateByKey(key) {
     return this.dataMap.chainStateMap[key];
   }
-  getChainStatusMap() {
-    return this.chainStatusMapSubject.getValue();
-  }
-  getChainStatusByKey(key) {
-    return this.getChainStatusMap()[key];
-  }
   getActiveChains() {
     return Object.entries(this.dataMap.chainStateMap).filter(([, chainState]) => _isChainEnabled(chainState)).map(([key]) => key);
   }
@@ -349,31 +339,9 @@ export class ChainService {
     this.lockChainInfoMap = false;
     return true;
   }
-  connectionStatusQueueMap = {};
-  updateChainConnectionStatus(slug, connectionStatus) {
-    this.connectionStatusQueueMap[slug] = connectionStatus;
-    addLazy('updateChainConnectionStatus', () => {
-      const chainStatusMap = this.getChainStatusMap();
-      let update = false;
-      Object.entries(this.connectionStatusQueueMap).forEach(([slug, status]) => {
-        if (chainStatusMap[slug]) {
-          if (chainStatusMap[slug].connectionStatus !== status) {
-            chainStatusMap[slug].connectionStatus = status;
-            chainStatusMap[slug].lastUpdated = Date.now();
-            update = true;
-          }
-        } else {
-          chainStatusMap[slug] = {
-            slug,
-            connectionStatus: status,
-            lastUpdated: Date.now()
-          };
-          update = true;
-        }
-      });
-      this.connectionStatusQueueMap = {};
-      update && this.chainStatusMapSubject.next(chainStatusMap);
-    });
+  setChainConnectionStatus(slug, connectionStatus) {
+    const chainStateMap = this.getChainStateMap();
+    chainStateMap[slug].connectionStatus = connectionStatus;
   }
   upsertCustomToken(token) {
     if (token.slug.length === 0) {
@@ -545,8 +513,13 @@ export class ChainService {
       providerName
     } = this.getChainCurrentProviderByKey(chainInfo.slug);
     const onUpdateStatus = status => {
-      const slug = chainInfo.slug;
-      this.updateChainConnectionStatus(slug, status);
+      const currentStatus = this.getChainStateByKey(chainInfo.slug).connectionStatus;
+
+      // Avoid unnecessary update in case disable chain
+      if (currentStatus !== status) {
+        this.setChainConnectionStatus(chainInfo.slug, status);
+        this.updateChainStateMapSubscription();
+      }
     };
     if (chainInfo.substrateInfo !== null && chainInfo.substrateInfo !== undefined) {
       if (_MANTA_ZK_CHAIN_GROUP.includes(chainInfo.slug) && MODULE_SUPPORT.MANTA_ZK && this.mantaChainHandler) {
@@ -645,7 +618,7 @@ export class ChainService {
     this.lockChainInfoMap = true;
     chainStateMap[chainSlug].active = false;
     // Set disconnect state for inactive chain
-    this.updateChainConnectionStatus(chainSlug, _ChainConnectionStatus.DISCONNECTED);
+    chainStateMap[chainSlug].connectionStatus = _ChainConnectionStatus.DISCONNECTED;
     this.destroyApiForChain(chainInfo);
     this.dbService.updateChainStore({
       ...chainInfo,
@@ -738,9 +711,9 @@ export class ChainService {
         this.dataMap.chainStateMap[chainInfo.slug] = {
           currentProvider: providerKey,
           slug: chainInfo.slug,
+          connectionStatus: _ChainConnectionStatus.DISCONNECTED,
           active: _DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug)
         };
-        this.updateChainConnectionStatus(chainInfo.slug, _ChainConnectionStatus.DISCONNECTED);
 
         // create data for storage
         newStorageData.push({
@@ -791,9 +764,9 @@ export class ChainService {
           this.dataMap.chainStateMap[storedSlug] = {
             currentProvider: selectedProvider,
             slug: storedSlug,
+            connectionStatus: _ChainConnectionStatus.DISCONNECTED,
             active: canActive && storedChainInfo.active
           };
-          this.updateChainConnectionStatus(storedSlug, _ChainConnectionStatus.DISCONNECTED);
           newStorageData.push({
             ...mergedChainInfoMap[storedSlug],
             active: canActive && storedChainInfo.active,
@@ -813,9 +786,9 @@ export class ChainService {
             this.dataMap.chainStateMap[duplicatedDefaultSlug] = {
               currentProvider: storedChainInfo.currentProvider,
               slug: duplicatedDefaultSlug,
+              connectionStatus: _ChainConnectionStatus.DISCONNECTED,
               active: storedChainInfo.active
             };
-            this.updateChainConnectionStatus(duplicatedDefaultSlug, _ChainConnectionStatus.DISCONNECTED);
             newStorageData.push({
               ...mergedChainInfoMap[duplicatedDefaultSlug],
               active: storedChainInfo.active,
@@ -840,9 +813,9 @@ export class ChainService {
               currentProvider: storedChainInfo.currentProvider,
               // TODO: review
               slug: storedSlug,
+              connectionStatus: _ChainConnectionStatus.DISCONNECTED,
               active: storedChainInfo.active
             };
-            this.updateChainConnectionStatus(storedSlug, _ChainConnectionStatus.DISCONNECTED);
             newStorageData.push({
               ...mergedChainInfoMap[storedSlug],
               active: storedChainInfo.active,
@@ -860,9 +833,9 @@ export class ChainService {
           this.dataMap.chainStateMap[slug] = {
             currentProvider: Object.keys(chainInfo.providers)[0],
             slug,
+            connectionStatus: _ChainConnectionStatus.DISCONNECTED,
             active: _DEFAULT_ACTIVE_CHAINS.includes(slug)
           };
-          this.updateChainConnectionStatus(slug, _ChainConnectionStatus.DISCONNECTED);
           newStorageData.push({
             ...mergedChainInfoMap[slug],
             active: _DEFAULT_ACTIVE_CHAINS.includes(slug),
@@ -937,7 +910,9 @@ export class ChainService {
     }
   }
   updateChainStateMapSubscription() {
-    this.chainStateMapSubject.next(this.getChainStateMap());
+    addLazy('updateChainStateMapSubscription', () => {
+      this.chainStateMapSubject.next(this.getChainStateMap());
+    }, 300, 900);
   }
   updateChainInfoMapSubscription() {
     this.chainInfoMapSubject.next(this.getChainInfoMap());
@@ -1046,17 +1021,10 @@ export class ChainService {
     const chainStateMap = this.getChainStateMap();
     chainStateMap[newChainSlug] = {
       active: true,
+      connectionStatus: _ChainConnectionStatus.DISCONNECTED,
       currentProvider: params.chainEditInfo.currentProvider,
       slug: newChainSlug
     };
-
-    // const chainStatusMap = this.getChainStatusMap();
-    // const chainStatusMap[newChainSlug] = {
-    //   slug: newChainSlug,
-    //   connectionStatus: _ChainConnectionStatus.DISCONNECTED,
-    //   lastUpdated: Date.now()
-    // };
-
     await this.initApiForChain(chainInfo);
 
     // create a record in assetRegistry for native token and update store/subscription
@@ -1341,6 +1309,29 @@ export class ChainService {
     await Promise.all([this.substrateChainHandler.wakeUp(), this.evmChainHandler.wakeUp()]);
     this.checkLatestData();
   }
+  checkAndUpdateStatusMapForChain(chainSlug) {
+    const substrateApiMap = this.getSubstrateApiMap();
+    const evmApiMap = this.getEvmApiMap();
+    const chainState = this.getChainStateByKey(chainSlug);
+    let update = false;
+    function updateState(current, status) {
+      if (current.connectionStatus !== status) {
+        current.connectionStatus = status;
+        update = true;
+      }
+    }
+    if (chainState.active) {
+      const api = substrateApiMap[chainSlug] || evmApiMap[chainSlug];
+      if (api) {
+        updateState(chainState, api.isApiConnected ? _ChainConnectionStatus.CONNECTED : _ChainConnectionStatus.DISCONNECTED);
+      }
+    } else {
+      updateState(chainState, _ChainConnectionStatus.DISCONNECTED);
+    }
+    if (update) {
+      this.dataMap.chainStateMap[chainSlug] = chainState;
+    }
+  }
   async initAssetSettings() {
     const assetSettings = await this.getAssetSettings();
     const activeChainSlugs = this.getActiveChainSlugs();

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

@@ -22,11 +22,7 @@ export interface _ChainState {
     slug: string;
     active: boolean;
     currentProvider: string;
-}
-export interface _ChainApiStatus {
-    slug: string;
     connectionStatus: _ChainConnectionStatus;
-    lastUpdated: number;
 }
 export interface _SubstrateDefaultFormatBalance {
     decimals?: number[] | number;