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

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.39-0",
+  "version": "1.1.39-beta.0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1802,4 +1802,4 @@
     "web3-eth-contract": "^1.10.0",
     "web3-utils": "^1.10.0"
   }
-}
+}

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 { _ChainConnectionStatus, _ChainState, _NetworkUpsertParams, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse } from '@subwallet/extension-base/services/chain-service/types';
+import { _ChainApiStatus, _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,6 +19,7 @@ export declare class ChainService {
     get mantaPay(): MantaPrivateHandler | undefined;
     private chainInfoMapSubject;
     private chainStateMapSubject;
+    private chainStatusMapSubject;
     private assetRegistrySubject;
     private multiChainAssetMapSubject;
     private xcmRefMapSubject;
@@ -40,6 +41,7 @@ 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>;
@@ -51,6 +53,8 @@ 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>;
@@ -66,7 +70,8 @@ export declare class ChainService {
     forceRemoveChain(slug: string): boolean;
     removeCustomChain(slug: string): boolean;
     resetChainInfoMap(excludedChains?: string[]): boolean;
-    setChainConnectionStatus(slug: string, connectionStatus: _ChainConnectionStatus): void;
+    private connectionStatusQueueMap;
+    updateChainConnectionStatus(slug: string, connectionStatus: _ChainConnectionStatus): void;
     upsertCustomToken(token: _ChainAsset): string;
     deleteAssetsByChain(chainSlug: string): void;
     deleteCustomAssets(targetAssets: string[]): void;
@@ -109,7 +114,6 @@ 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,6 +31,7 @@ export class ChainService {
   // TODO: consider BehaviorSubject
   chainInfoMapSubject = new Subject();
   chainStateMapSubject = new Subject();
+  chainStatusMapSubject = new BehaviorSubject({});
   assetRegistrySubject = new Subject();
   multiChainAssetMapSubject = new Subject();
   xcmRefMapSubject = new Subject();
@@ -104,6 +105,9 @@ export class ChainService {
   subscribeChainStateMap() {
     return this.chainStateMapSubject;
   }
+  subscribeChainStatusMap() {
+    return this.chainStatusMapSubject;
+  }
   getAssetRegistry() {
     return this.dataMap.assetRegistry;
   }
@@ -181,6 +185,12 @@ 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);
   }
@@ -339,9 +349,31 @@ export class ChainService {
     this.lockChainInfoMap = false;
     return true;
   }
-  setChainConnectionStatus(slug, connectionStatus) {
-    const chainStateMap = this.getChainStateMap();
-    chainStateMap[slug].connectionStatus = connectionStatus;
+  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);
+    });
   }
   upsertCustomToken(token) {
     if (token.slug.length === 0) {
@@ -513,13 +545,8 @@ export class ChainService {
       providerName
     } = this.getChainCurrentProviderByKey(chainInfo.slug);
     const onUpdateStatus = 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();
-      }
+      const slug = chainInfo.slug;
+      this.updateChainConnectionStatus(slug, status);
     };
     if (chainInfo.substrateInfo !== null && chainInfo.substrateInfo !== undefined) {
       if (_MANTA_ZK_CHAIN_GROUP.includes(chainInfo.slug) && MODULE_SUPPORT.MANTA_ZK && this.mantaChainHandler) {
@@ -618,7 +645,7 @@ export class ChainService {
     this.lockChainInfoMap = true;
     chainStateMap[chainSlug].active = false;
     // Set disconnect state for inactive chain
-    chainStateMap[chainSlug].connectionStatus = _ChainConnectionStatus.DISCONNECTED;
+    this.updateChainConnectionStatus(chainSlug, _ChainConnectionStatus.DISCONNECTED);
     this.destroyApiForChain(chainInfo);
     this.dbService.updateChainStore({
       ...chainInfo,
@@ -711,9 +738,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({
@@ -764,9 +791,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,
@@ -786,9 +813,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,
@@ -813,9 +840,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,
@@ -833,9 +860,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),
@@ -910,9 +937,7 @@ export class ChainService {
     }
   }
   updateChainStateMapSubscription() {
-    addLazy('updateChainStateMapSubscription', () => {
-      this.chainStateMapSubject.next(this.getChainStateMap());
-    }, 300, 900);
+    this.chainStateMapSubject.next(this.getChainStateMap());
   }
   updateChainInfoMapSubscription() {
     this.chainInfoMapSubject.next(this.getChainInfoMap());
@@ -1021,10 +1046,17 @@ 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
@@ -1309,29 +1341,6 @@ 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,7 +22,11 @@ export interface _ChainState {
     slug: string;
     active: boolean;
     currentProvider: string;
+}
+export interface _ChainApiStatus {
+    slug: string;
     connectionStatus: _ChainConnectionStatus;
+    lastUpdated: number;
 }
 export interface _SubstrateDefaultFormatBalance {
     decimals?: number[] | number;