@subwallet/extension-base 1.0.3-0 → 1.0.4-0

package/cjs/packageInfo.js

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

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._XCM_TYPE = exports._XCM_CHAIN_GROUP = exports._TRANSFER_NOT_SUPPORTED_CHAINS = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._STAKING_CHAIN_GROUP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._DEFAULT_ACTIVE_CHAINS = exports._BALANCE_TOKEN_GROUP = exports._BALANCE_PARSING_CHAIN_GROUP = exports._BALANCE_CHAIN_GROUP = exports._API_OPTIONS_CHAIN_GROUP = exports.API_MAX_RETRY = exports.API_AUTO_CONNECT_MS = void 0;
+exports._XCM_TYPE = exports._XCM_CHAIN_GROUP = exports._TRANSFER_NOT_SUPPORTED_CHAINS = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._STAKING_CHAIN_GROUP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MULTI_CHAIN_ASSET_SRC = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._DEFAULT_ACTIVE_CHAINS = exports._CHAIN_LOGO_MAP_SRC = exports._CHAIN_INFO_SRC = exports._CHAIN_ASSET_SRC = exports._BALANCE_TOKEN_GROUP = exports._BALANCE_PARSING_CHAIN_GROUP = exports._BALANCE_CHAIN_GROUP = exports._ASSET_REF_SRC = exports._ASSET_LOGO_MAP_SRC = exports._API_OPTIONS_CHAIN_GROUP = exports.API_MAX_RETRY = exports.API_AUTO_CONNECT_MS = void 0;
 var _chainList = require("@subwallet/chain-list");
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
@@ -218,4 +218,19 @@ const _XCM_TYPE = {
 };
 exports._XCM_TYPE = _XCM_TYPE;
 const _DEFAULT_ACTIVE_CHAINS = [..._chainList._DEFAULT_CHAINS];
-exports._DEFAULT_ACTIVE_CHAINS = _DEFAULT_ACTIVE_CHAINS;
+
+// TODO: review
+exports._DEFAULT_ACTIVE_CHAINS = _DEFAULT_ACTIVE_CHAINS;
+const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni-dev' : 'master';
+const _CHAIN_INFO_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainInfo.json`;
+exports._CHAIN_INFO_SRC = _CHAIN_INFO_SRC;
+const _CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainAsset.json`;
+exports._CHAIN_ASSET_SRC = _CHAIN_ASSET_SRC;
+const _ASSET_REF_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetRef.json`;
+exports._ASSET_REF_SRC = _ASSET_REF_SRC;
+const _MULTI_CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetRef.json`;
+exports._MULTI_CHAIN_ASSET_SRC = _MULTI_CHAIN_ASSET_SRC;
+const _CHAIN_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainLogoMap.json`;
+exports._CHAIN_LOGO_MAP_SRC = _CHAIN_LOGO_MAP_SRC;
+const _ASSET_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetLogoMap.json`;
+exports._ASSET_LOGO_MAP_SRC = _ASSET_LOGO_MAP_SRC;

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

@@ -47,7 +47,6 @@ class ChainService {
     this.chainInfoMapSubject.next(this.dataMap.chainInfoMap);
     this.chainStateMapSubject.next(this.dataMap.chainStateMap);
     this.assetRegistrySubject.next(this.dataMap.assetRegistry);
-    this.multiChainAssetMapSubject.next(_chainList.MultiChainAssetMap);
     this.xcmRefMapSubject.next(this.getXcmRefMap());
     this.logger = (0, _logger.logger)('chain-service');
     this.refreshChainStateInterval(3000, 6);
@@ -359,7 +358,9 @@ class ChainService {
   // Business logic
   async init() {
     // TODO: reconsider the flow of initiation
-    this.dataMap.assetRefMap = _chainList.AssetRefMap;
+    const [latestAssetRefMap, latestMultiChainAssetMap] = await Promise.all([this.fetchLatestData(_constants._ASSET_REF_SRC, _chainList.AssetRefMap), this.fetchLatestData(_constants._MULTI_CHAIN_ASSET_SRC, _chainList.MultiChainAssetMap)]);
+    this.multiChainAssetMapSubject.next(latestMultiChainAssetMap);
+    this.dataMap.assetRefMap = latestAssetRefMap;
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
     this.chainStateMapSubject.next(this.getChainStateMap());
@@ -464,16 +465,16 @@ class ChainService {
     this.eventService.emit('chain.updateState', chainSlug);
     return true;
   }
-  checkExistedPredefinedChain(genesisHash, evmChainId) {
+  checkExistedPredefinedChain(latestChainInfoMap, genesisHash, evmChainId) {
     let duplicatedSlug = '';
     if (genesisHash) {
-      Object.values(_chainList.ChainInfoMap).forEach(chainInfo => {
+      Object.values(latestChainInfoMap).forEach(chainInfo => {
         if (chainInfo.substrateInfo && chainInfo.substrateInfo.genesisHash === genesisHash) {
           duplicatedSlug = chainInfo.slug;
         }
       });
     } else if (evmChainId) {
-      Object.values(_chainList.ChainInfoMap).forEach(chainInfo => {
+      Object.values(latestChainInfoMap).forEach(chainInfo => {
         if (chainInfo.evmInfo && chainInfo.evmInfo.evmChainId === evmChainId) {
           duplicatedSlug = chainInfo.slug;
         }
@@ -481,8 +482,35 @@ class ChainService {
     }
     return duplicatedSlug;
   }
+  async fetchLatestData(src, defaultValue) {
+    try {
+      const timeout = await new Promise(resolve => {
+        const id = setTimeout(() => {
+          clearTimeout(id);
+          resolve(null);
+        }, 1000);
+      });
+      let result = defaultValue;
+      const resp = (await Promise.race([timeout, fetch(src)])) || null;
+      if (!resp) {
+        return result;
+      }
+      if (resp.ok) {
+        try {
+          result = await resp.json();
+        } catch (err) {
+          console.warn('Error parsing latest data', src, err);
+        }
+      }
+      return result;
+    } catch (e) {
+      console.warn('Error fetching latest data', src, e);
+      return defaultValue;
+    }
+  }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
+    const latestChainInfoMap = await this.fetchLatestData(_constants._CHAIN_INFO_SRC, _chainList.ChainInfoMap);
     const storedChainSettingMap = {};
     storedChainSettings.forEach(chainStoredSetting => {
       storedChainSettingMap[chainStoredSetting.slug] = chainStoredSetting;
@@ -491,8 +519,8 @@ class ChainService {
     const deprecatedChains = [];
     const deprecatedChainMap = {};
     if (storedChainSettings.length === 0) {
-      this.dataMap.chainInfoMap = _chainList.ChainInfoMap;
-      Object.values(_chainList.ChainInfoMap).forEach(chainInfo => {
+      this.dataMap.chainInfoMap = latestChainInfoMap;
+      Object.values(latestChainInfoMap).forEach(chainInfo => {
         this.dataMap.chainStateMap[chainInfo.slug] = {
           currentProvider: Object.keys(chainInfo.providers)[0],
           slug: chainInfo.slug,
@@ -508,10 +536,10 @@ class ChainService {
         });
       });
     } else {
-      const mergedChainInfoMap = _chainList.ChainInfoMap;
+      const mergedChainInfoMap = latestChainInfoMap;
       for (const [storedSlug, storedChainInfo] of Object.entries(storedChainSettingMap)) {
-        if (storedSlug in _chainList.ChainInfoMap) {
-          // check predefined chains first, update providers and currentProvider
+        if (storedSlug in latestChainInfoMap) {
+          // check predefined chains first, keep setting for providers and currentProvider
           mergedChainInfoMap[storedSlug].providers = {
             ...storedChainInfo.providers,
             ...mergedChainInfoMap[storedSlug].providers
@@ -531,7 +559,7 @@ class ChainService {
           var _storedChainInfo$subs, _storedChainInfo$evmI;
           // only custom chains are left
           // check custom chain duplicated with predefined chain => merge into predefined chain
-          const duplicatedDefaultSlug = this.checkExistedPredefinedChain((_storedChainInfo$subs = storedChainInfo.substrateInfo) === null || _storedChainInfo$subs === void 0 ? void 0 : _storedChainInfo$subs.genesisHash, (_storedChainInfo$evmI = storedChainInfo.evmInfo) === null || _storedChainInfo$evmI === void 0 ? void 0 : _storedChainInfo$evmI.evmChainId);
+          const duplicatedDefaultSlug = this.checkExistedPredefinedChain(latestChainInfoMap, (_storedChainInfo$subs = storedChainInfo.substrateInfo) === null || _storedChainInfo$subs === void 0 ? void 0 : _storedChainInfo$subs.genesisHash, (_storedChainInfo$evmI = storedChainInfo.evmInfo) === null || _storedChainInfo$evmI === void 0 ? void 0 : _storedChainInfo$evmI.evmChainId);
           if (duplicatedDefaultSlug.length > 0) {
             // merge custom chain with existed chain
             mergedChainInfoMap[duplicatedDefaultSlug].providers = {
@@ -602,10 +630,11 @@ class ChainService {
   }
   async initAssetRegistry(deprecatedCustomChainMap) {
     const storedAssetRegistry = await this.dbService.getAllAssetStore();
+    const latestAssetRegistry = await this.fetchLatestData(_constants._CHAIN_ASSET_SRC, _chainList.ChainAssetMap);
     if (storedAssetRegistry.length === 0) {
-      this.dataMap.assetRegistry = _chainList.ChainAssetMap;
+      this.dataMap.assetRegistry = latestAssetRegistry;
     } else {
-      const mergedAssetRegistry = _chainList.ChainAssetMap;
+      const mergedAssetRegistry = latestAssetRegistry;
       const parsedStoredAssetRegistry = {};
       const deprecatedAssets = [];
 
@@ -627,7 +656,7 @@ class ChainService {
       });
       for (const assetInfo of Object.values(parsedStoredAssetRegistry)) {
         let duplicated = false;
-        for (const defaultChainAsset of Object.values(_chainList.ChainAssetMap)) {
+        for (const defaultChainAsset of Object.values(latestAssetRegistry)) {
           // case merge custom asset with default asset
           if ((0, _utils._isEqualSmartContractAsset)(assetInfo, defaultChainAsset)) {
             duplicated = true;
@@ -1203,10 +1232,10 @@ class ChainService {
     return this.assetSettingSubject;
   }
   async getChainLogoMap() {
-    return Promise.resolve(_chainList.ChainLogoMap);
+    return await this.fetchLatestData(_constants._CHAIN_LOGO_MAP_SRC, _chainList.ChainLogoMap);
   }
   async getAssetLogoMap() {
-    return Promise.resolve(_chainList.AssetLogoMap);
+    return await this.fetchLatestData(_constants._ASSET_LOGO_MAP_SRC, _chainList.AssetLogoMap);
   }
 }
 exports.ChainService = ChainService;

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.3-0",
+  "version": "1.0.4-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -530,10 +530,10 @@
       "require": "./cjs/services/chain-service/handler/types.js",
       "default": "./services/chain-service/handler/types.js"
     },
-    "./services/chain-service/heath-check": {
-      "types": "./services/chain-service/heath-check/index.d.ts",
-      "require": "./cjs/services/chain-service/heath-check/index.js",
-      "default": "./services/chain-service/heath-check/index.js"
+    "./services/chain-service/health-check": {
+      "types": "./services/chain-service/health-check/index.d.ts",
+      "require": "./cjs/services/chain-service/health-check/index.js",
+      "default": "./services/chain-service/health-check/index.js"
     },
     "./services/chain-service/helper": {
       "types": "./services/chain-service/helper/index.d.ts",
@@ -1649,7 +1649,7 @@
     "@polkadot/hw-ledger": "^10.1.9",
     "@polkadot/keyring": "^10.2.1",
     "@polkadot/networks": "^10.2.1",
-    "@polkadot/phishing": "^0.21.1",
+    "@polkadot/phishing": "^0.21.2",
     "@polkadot/react-identicon": "^2.9.14",
     "@polkadot/react-qr": "^2.9.14",
     "@polkadot/rpc-provider": "^9.10.3",
@@ -1667,10 +1667,10 @@
     "@subsocial/types": "^0.6.8",
     "@substrate/connect": "^0.7.18",
     "@subwallet/chain-list": "^0.1.2",
-    "@subwallet/extension-base": "^1.0.3-0",
-    "@subwallet/extension-chains": "^1.0.3-0",
-    "@subwallet/extension-dapp": "^1.0.3-0",
-    "@subwallet/extension-inject": "^1.0.3-0",
+    "@subwallet/extension-base": "^1.0.4-0",
+    "@subwallet/extension-chains": "^1.0.4-0",
+    "@subwallet/extension-dapp": "^1.0.4-0",
+    "@subwallet/extension-inject": "^1.0.4-0",
     "@subwallet/keyring": "^0.0.5",
     "@subwallet/ui-keyring": "^0.0.3",
     "@unique-nft/types": "^0.6.0-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.0.3-0'
+  version: '1.0.4-0'
 };

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

@@ -75,3 +75,9 @@ export declare const _XCM_TYPE: {
     PR: string;
 };
 export declare const _DEFAULT_ACTIVE_CHAINS: string[];
+export declare const _CHAIN_INFO_SRC: string;
+export declare const _CHAIN_ASSET_SRC: string;
+export declare const _ASSET_REF_SRC: string;
+export declare const _MULTI_CHAIN_ASSET_SRC: string;
+export declare const _CHAIN_LOGO_MAP_SRC: string;
+export declare const _ASSET_LOGO_MAP_SRC: string;

package/services/chain-service/constants.js

@@ -201,4 +201,13 @@ export const _XCM_TYPE = {
   PR: `${_SubstrateChainType.PARACHAIN}-${_SubstrateChainType.RELAYCHAIN}` // UMP
 };
 
-export const _DEFAULT_ACTIVE_CHAINS = [..._DEFAULT_CHAINS];
+export const _DEFAULT_ACTIVE_CHAINS = [..._DEFAULT_CHAINS];
+
+// TODO: review
+const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni-dev' : 'master';
+export const _CHAIN_INFO_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainInfo.json`;
+export const _CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainAsset.json`;
+export const _ASSET_REF_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetRef.json`;
+export const _MULTI_CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetRef.json`;
+export const _CHAIN_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainLogoMap.json`;
+export const _ASSET_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetLogoMap.json`;

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

@@ -71,6 +71,7 @@ export declare class ChainService {
     enableChains(chainSlugs: string[]): boolean;
     disableChain(chainSlug: string): boolean;
     private checkExistedPredefinedChain;
+    private fetchLatestData;
     private initChains;
     private initAssetRegistry;
     private updateChainStateMapSubscription;

package/services/chain-service/index.js

@@ -3,7 +3,7 @@
 
 import { AssetLogoMap, AssetRefMap, ChainAssetMap, ChainInfoMap, ChainLogoMap, MultiChainAssetMap } from '@subwallet/chain-list';
 import { _AssetRefPath, _AssetType, _ChainStatus, _SubstrateChainType } from '@subwallet/chain-list/types';
-import { _DEFAULT_ACTIVE_CHAINS } from '@subwallet/extension-base/services/chain-service/constants';
+import { _ASSET_LOGO_MAP_SRC, _ASSET_REF_SRC, _CHAIN_ASSET_SRC, _CHAIN_INFO_SRC, _CHAIN_LOGO_MAP_SRC, _DEFAULT_ACTIVE_CHAINS, _MULTI_CHAIN_ASSET_SRC } from '@subwallet/extension-base/services/chain-service/constants';
 import { EvmChainHandler } from '@subwallet/extension-base/services/chain-service/handler/EvmChainHandler';
 import { SubstrateChainHandler } from '@subwallet/extension-base/services/chain-service/handler/SubstrateChainHandler';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
@@ -40,7 +40,6 @@ export class ChainService {
     this.chainInfoMapSubject.next(this.dataMap.chainInfoMap);
     this.chainStateMapSubject.next(this.dataMap.chainStateMap);
     this.assetRegistrySubject.next(this.dataMap.assetRegistry);
-    this.multiChainAssetMapSubject.next(MultiChainAssetMap);
     this.xcmRefMapSubject.next(this.getXcmRefMap());
     this.logger = createLogger('chain-service');
     this.refreshChainStateInterval(3000, 6);
@@ -350,7 +349,9 @@ export class ChainService {
   // Business logic
   async init() {
     // TODO: reconsider the flow of initiation
-    this.dataMap.assetRefMap = AssetRefMap;
+    const [latestAssetRefMap, latestMultiChainAssetMap] = await Promise.all([this.fetchLatestData(_ASSET_REF_SRC, AssetRefMap), this.fetchLatestData(_MULTI_CHAIN_ASSET_SRC, MultiChainAssetMap)]);
+    this.multiChainAssetMapSubject.next(latestMultiChainAssetMap);
+    this.dataMap.assetRefMap = latestAssetRefMap;
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
     this.chainStateMapSubject.next(this.getChainStateMap());
@@ -452,16 +453,16 @@ export class ChainService {
     this.eventService.emit('chain.updateState', chainSlug);
     return true;
   }
-  checkExistedPredefinedChain(genesisHash, evmChainId) {
+  checkExistedPredefinedChain(latestChainInfoMap, genesisHash, evmChainId) {
     let duplicatedSlug = '';
     if (genesisHash) {
-      Object.values(ChainInfoMap).forEach(chainInfo => {
+      Object.values(latestChainInfoMap).forEach(chainInfo => {
         if (chainInfo.substrateInfo && chainInfo.substrateInfo.genesisHash === genesisHash) {
           duplicatedSlug = chainInfo.slug;
         }
       });
     } else if (evmChainId) {
-      Object.values(ChainInfoMap).forEach(chainInfo => {
+      Object.values(latestChainInfoMap).forEach(chainInfo => {
         if (chainInfo.evmInfo && chainInfo.evmInfo.evmChainId === evmChainId) {
           duplicatedSlug = chainInfo.slug;
         }
@@ -469,8 +470,35 @@ export class ChainService {
     }
     return duplicatedSlug;
   }
+  async fetchLatestData(src, defaultValue) {
+    try {
+      const timeout = await new Promise(resolve => {
+        const id = setTimeout(() => {
+          clearTimeout(id);
+          resolve(null);
+        }, 1000);
+      });
+      let result = defaultValue;
+      const resp = (await Promise.race([timeout, fetch(src)])) || null;
+      if (!resp) {
+        return result;
+      }
+      if (resp.ok) {
+        try {
+          result = await resp.json();
+        } catch (err) {
+          console.warn('Error parsing latest data', src, err);
+        }
+      }
+      return result;
+    } catch (e) {
+      console.warn('Error fetching latest data', src, e);
+      return defaultValue;
+    }
+  }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
+    const latestChainInfoMap = await this.fetchLatestData(_CHAIN_INFO_SRC, ChainInfoMap);
     const storedChainSettingMap = {};
     storedChainSettings.forEach(chainStoredSetting => {
       storedChainSettingMap[chainStoredSetting.slug] = chainStoredSetting;
@@ -479,8 +507,8 @@ export class ChainService {
     const deprecatedChains = [];
     const deprecatedChainMap = {};
     if (storedChainSettings.length === 0) {
-      this.dataMap.chainInfoMap = ChainInfoMap;
-      Object.values(ChainInfoMap).forEach(chainInfo => {
+      this.dataMap.chainInfoMap = latestChainInfoMap;
+      Object.values(latestChainInfoMap).forEach(chainInfo => {
         this.dataMap.chainStateMap[chainInfo.slug] = {
           currentProvider: Object.keys(chainInfo.providers)[0],
           slug: chainInfo.slug,
@@ -496,10 +524,10 @@ export class ChainService {
         });
       });
     } else {
-      const mergedChainInfoMap = ChainInfoMap;
+      const mergedChainInfoMap = latestChainInfoMap;
       for (const [storedSlug, storedChainInfo] of Object.entries(storedChainSettingMap)) {
-        if (storedSlug in ChainInfoMap) {
-          // check predefined chains first, update providers and currentProvider
+        if (storedSlug in latestChainInfoMap) {
+          // check predefined chains first, keep setting for providers and currentProvider
           mergedChainInfoMap[storedSlug].providers = {
             ...storedChainInfo.providers,
             ...mergedChainInfoMap[storedSlug].providers
@@ -519,7 +547,7 @@ export class ChainService {
           var _storedChainInfo$subs, _storedChainInfo$evmI;
           // only custom chains are left
           // check custom chain duplicated with predefined chain => merge into predefined chain
-          const duplicatedDefaultSlug = this.checkExistedPredefinedChain((_storedChainInfo$subs = storedChainInfo.substrateInfo) === null || _storedChainInfo$subs === void 0 ? void 0 : _storedChainInfo$subs.genesisHash, (_storedChainInfo$evmI = storedChainInfo.evmInfo) === null || _storedChainInfo$evmI === void 0 ? void 0 : _storedChainInfo$evmI.evmChainId);
+          const duplicatedDefaultSlug = this.checkExistedPredefinedChain(latestChainInfoMap, (_storedChainInfo$subs = storedChainInfo.substrateInfo) === null || _storedChainInfo$subs === void 0 ? void 0 : _storedChainInfo$subs.genesisHash, (_storedChainInfo$evmI = storedChainInfo.evmInfo) === null || _storedChainInfo$evmI === void 0 ? void 0 : _storedChainInfo$evmI.evmChainId);
           if (duplicatedDefaultSlug.length > 0) {
             // merge custom chain with existed chain
             mergedChainInfoMap[duplicatedDefaultSlug].providers = {
@@ -589,10 +617,11 @@ export class ChainService {
   }
   async initAssetRegistry(deprecatedCustomChainMap) {
     const storedAssetRegistry = await this.dbService.getAllAssetStore();
+    const latestAssetRegistry = await this.fetchLatestData(_CHAIN_ASSET_SRC, ChainAssetMap);
     if (storedAssetRegistry.length === 0) {
-      this.dataMap.assetRegistry = ChainAssetMap;
+      this.dataMap.assetRegistry = latestAssetRegistry;
     } else {
-      const mergedAssetRegistry = ChainAssetMap;
+      const mergedAssetRegistry = latestAssetRegistry;
       const parsedStoredAssetRegistry = {};
       const deprecatedAssets = [];
 
@@ -614,7 +643,7 @@ export class ChainService {
       });
       for (const assetInfo of Object.values(parsedStoredAssetRegistry)) {
         let duplicated = false;
-        for (const defaultChainAsset of Object.values(ChainAssetMap)) {
+        for (const defaultChainAsset of Object.values(latestAssetRegistry)) {
           // case merge custom asset with default asset
           if (_isEqualSmartContractAsset(assetInfo, defaultChainAsset)) {
             duplicated = true;
@@ -1186,9 +1215,9 @@ export class ChainService {
     return this.assetSettingSubject;
   }
   async getChainLogoMap() {
-    return Promise.resolve(ChainLogoMap);
+    return await this.fetchLatestData(_CHAIN_LOGO_MAP_SRC, ChainLogoMap);
   }
   async getAssetLogoMap() {
-    return Promise.resolve(AssetLogoMap);
+    return await this.fetchLatestData(_ASSET_LOGO_MAP_SRC, AssetLogoMap);
   }
 }