@subwallet/extension-base 1.0.2-3 → 1.0.4-0

package/background/KoniTypes.d.ts

@@ -342,14 +342,16 @@ export interface ExtrinsicDataTypeMap {
     [ExtrinsicType.STAKING_CANCEL_COMPOUNDING]: RequestTuringCancelStakeCompound;
     [ExtrinsicType.STAKING_CANCEL_UNSTAKE]: RequestStakeCancelWithdrawal;
     [ExtrinsicType.STAKING_POOL_WITHDRAW]: any;
-    [ExtrinsicType.EVM_EXECUTE]: any;
+    [ExtrinsicType.EVM_EXECUTE]: TransactionConfig;
     [ExtrinsicType.UNKNOWN]: any;
 }
 export declare enum ExtrinsicStatus {
-    PENDING = "pending",
+    QUEUED = "queued",
+    SUBMITTING = "submitting",
     PROCESSING = "processing",
     SUCCESS = "success",
     FAIL = "fail",
+    CANCELLED = "cancelled",
     UNKNOWN = "unknown"
 }
 export interface TxHistoryItem {
@@ -398,6 +400,7 @@ export interface TransactionHistoryItem<ET extends ExtrinsicType = ExtrinsicType
     toName?: string;
     address: string;
     status: ExtrinsicStatus;
+    transactionId?: string;
     extrinsicHash: string;
     time: number;
     data?: string;
@@ -1357,6 +1360,10 @@ export declare type NotificationParams = Omit<Notification, 'id'>;
 export interface CronReloadRequest {
     data: 'nft' | 'staking';
 }
+export interface AllLogoMap {
+    chainLogoMap: Record<string, string>;
+    assetLogoMap: Record<string, string>;
+}
 export interface KoniRequestSignatures {
     'pri(staking.submitTuringCancelCompound)': [RequestTuringCancelStakeCompound, SWTransactionResponse];
     'pri(staking.submitTuringCompound)': [RequestTuringStakeCompound, SWTransactionResponse];
@@ -1450,6 +1457,7 @@ export interface KoniRequestSignatures {
     'pri(settings.saveTheme)': [ThemeNames, boolean, UiSettings];
     'pri(settings.saveBrowserConfirmationType)': [BrowserConfirmationType, boolean, UiSettings];
     'pri(settings.saveCamera)': [RequestCameraSettings, boolean];
+    'pri(settings.getLogoMaps)': [null, AllLogoMap];
     'pri(transaction.history.getSubscription)': [null, TransactionHistoryItem[], TransactionHistoryItem[]];
     'pri(transfer.checkReferenceCount)': [RequestTransferCheckReferenceCount, boolean];
     'pri(transfer.checkSupporting)': [RequestTransferCheckSupporting, SupportTransferResponse];

package/background/KoniTypes.js

@@ -82,10 +82,12 @@ export let ExtrinsicType;
 })(ExtrinsicType || (ExtrinsicType = {}));
 export let ExtrinsicStatus;
 (function (ExtrinsicStatus) {
-  ExtrinsicStatus["PENDING"] = "pending";
+  ExtrinsicStatus["QUEUED"] = "queued";
+  ExtrinsicStatus["SUBMITTING"] = "submitting";
   ExtrinsicStatus["PROCESSING"] = "processing";
   ExtrinsicStatus["SUCCESS"] = "success";
   ExtrinsicStatus["FAIL"] = "fail";
+  ExtrinsicStatus["CANCELLED"] = "cancelled";
   ExtrinsicStatus["UNKNOWN"] = "unknown";
 })(ExtrinsicStatus || (ExtrinsicStatus = {}));
 export let BasicTxErrorType;

package/cjs/background/KoniTypes.js

@@ -86,10 +86,12 @@ exports.ExtrinsicType = ExtrinsicType;
 let ExtrinsicStatus;
 exports.ExtrinsicStatus = ExtrinsicStatus;
 (function (ExtrinsicStatus) {
-  ExtrinsicStatus["PENDING"] = "pending";
+  ExtrinsicStatus["QUEUED"] = "queued";
+  ExtrinsicStatus["SUBMITTING"] = "submitting";
   ExtrinsicStatus["PROCESSING"] = "processing";
   ExtrinsicStatus["SUCCESS"] = "success";
   ExtrinsicStatus["FAIL"] = "fail";
+  ExtrinsicStatus["CANCELLED"] = "cancelled";
   ExtrinsicStatus["UNKNOWN"] = "unknown";
 })(ExtrinsicStatus || (exports.ExtrinsicStatus = ExtrinsicStatus = {}));
 let BasicTxErrorType;

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

@@ -2892,6 +2892,13 @@ class KoniExtension {
     }
     return Promise.resolve(false);
   }
+  async getLogoMap() {
+    const [chainLogoMap, assetLogoMap] = await Promise.all([this.#koniState.chainService.getChainLogoMap(), this.#koniState.chainService.getAssetLogoMap()]);
+    return {
+      chainLogoMap,
+      assetLogoMap
+    };
+  }
 
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
@@ -3251,6 +3258,8 @@ class KoniExtension {
         return this.subscribeNotifications(id, port);
       case 'pri(cron.reload)':
         return await this.reloadCron(request);
+      case 'pri(settings.getLogoMaps)':
+        return await this.getLogoMap();
 
       // Default
       default:

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

@@ -221,6 +221,8 @@ class KoniState {
   onReady() {
     this.subscription.start();
     this.cron.start();
+    this.historyService.start().catch(console.error);
+    this.priceService.start().catch(console.error);
     this.ready = true;
     this.logger.log('State is ready');
   }
@@ -572,7 +574,8 @@ class KoniState {
           assetType: tokenInfo.type,
           metadata: (0, _utils._parseMetadataForSmartContractAsset)(tokenInfo.contractAddress),
           multiChainAsset: null,
-          hasValue: (0, _utils._isChainTestNet)(this.chainService.getChainInfoByKey(tokenInfo.originChain))
+          hasValue: (0, _utils._isChainTestNet)(this.chainService.getChainInfoByKey(tokenInfo.originChain)),
+          icon: ''
         });
         return isApproved;
       } else {
@@ -1348,11 +1351,15 @@ class KoniState {
     this.cron.stop();
     this.subscription.stop();
     await this.pauseAllNetworks(undefined, 'IDLE mode');
+    await this.historyService.stop();
+    await this.priceService.stop();
   }
   async wakeup() {
     await this.resumeAllNetworks();
     this.cron.start();
     this.subscription.start();
+    await this.historyService.start();
+    await this.priceService.start();
   }
   cancelSubscription(id) {
     if ((0, _subscriptions.isSubscriptionRunning)(id)) {

package/cjs/koni/background/subscription.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -15,6 +16,7 @@ var _handlers = require("@subwallet/extension-base/koni/background/handlers");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _types = require("@subwallet/extension-base/services/event-service/types");
+var _axios = _interopRequireDefault(require("axios"));
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -238,6 +240,17 @@ class KoniSubscription {
     const result = [...poolingStakingRewards, ...amplitudeUnclaimedStakingRewards];
     this.state.updateStakingReward(result, 'fastInterval');
   }
+  async fetchingStakingFromApi() {
+    try {
+      const response = await _axios.default.get('https://staking-data.subwallet.app/api/staking/get');
+      if (response.status === 200) {
+        return response.data;
+      }
+    } catch (e) {
+      this.logger.error(e);
+    }
+    return {};
+  }
   async fetchChainStakingMetadata(chainInfoMap, chainStateMap, substrateApiMap) {
     const filteredChainInfoMap = {};
     Object.values(chainInfoMap).forEach(chainInfo => {
@@ -249,9 +262,18 @@ class KoniSubscription {
     if (Object.values(filteredChainInfoMap).length === 0) {
       return;
     }
+
+    // Fetch data from helper API
+    const dataFromApi = await this.fetchingStakingFromApi();
     await Promise.all(Object.values(filteredChainInfoMap).map(async chainInfo => {
-      const chainStakingMetadata = await (0, _bonding.getChainStakingMetadata)(chainInfo, substrateApiMap[chainInfo.slug]);
-      this.state.updateChainStakingMetadata(chainStakingMetadata);
+      // Use fetch API data if available
+      if (dataFromApi[chainInfo.slug]) {
+        this.state.updateChainStakingMetadata(dataFromApi[chainInfo.slug]);
+      } else {
+        console.warn('Not found staking data from api', chainInfo.slug);
+        const chainStakingMetadata = await (0, _bonding.getChainStakingMetadata)(chainInfo, substrateApiMap[chainInfo.slug]);
+        this.state.updateChainStakingMetadata(chainStakingMetadata);
+      }
     }));
   }
   async fetchNominatorMetadata(currentAddress, chainInfoMap, chainStateMap, substrateApiMap) {

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

package/cjs/services/base/types.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ServiceStatus = void 0;
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+// 'init' | 'started' | 'starting' | 'stopped' | 'stopping'
+let ServiceStatus;
+exports.ServiceStatus = ServiceStatus;
+(function (ServiceStatus) {
+  ServiceStatus["NOT_INITIALIZED"] = "not_initialized";
+  ServiceStatus["INITIALIZING"] = "initializing";
+  ServiceStatus["INITIALIZED"] = "initialized";
+  ServiceStatus["STARTED"] = "started";
+  ServiceStatus["STARTING"] = "starting";
+  ServiceStatus["STOPPED"] = "stopped";
+  ServiceStatus["STOPPING"] = "stopping";
+})(ServiceStatus || (exports.ServiceStatus = ServiceStatus = {}));

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);
@@ -157,7 +156,8 @@ class ChainService {
       priceId: '',
       slug: '',
       symbol: '',
-      hasValue: true
+      hasValue: true,
+      icon: ''
     };
     for (const assetInfo of Object.values(this.getAssetRegistry())) {
       if (assetInfo.assetType === _types._AssetType.NATIVE && assetInfo.originChain === chainSlug) {
@@ -358,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());
@@ -463,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;
         }
@@ -480,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;
@@ -490,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,
@@ -507,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
@@ -530,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 = {
@@ -558,7 +587,8 @@ class ChainService {
               evmInfo: storedChainInfo.evmInfo,
               substrateInfo: storedChainInfo.substrateInfo,
               isTestnet: storedChainInfo.isTestnet,
-              chainStatus: storedChainInfo.chainStatus
+              chainStatus: storedChainInfo.chainStatus,
+              icon: storedChainInfo.icon
             };
             this.dataMap.chainStateMap[storedSlug] = {
               currentProvider: storedChainInfo.currentProvider,
@@ -600,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 = [];
 
@@ -625,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;
@@ -730,7 +761,8 @@ class ChainService {
       substrateInfo,
       evmInfo,
       isTestnet: false,
-      chainStatus: _types._ChainStatus.ACTIVE
+      chainStatus: _types._ChainStatus.ACTIVE,
+      icon: '' // Todo: Allow update with custom chain
     };
 
     // insert new chainInfo
@@ -758,7 +790,8 @@ class ChainService {
       priceId: params.chainEditInfo.priceId || null,
       slug: '',
       symbol: params.chainEditInfo.symbol,
-      hasValue: true
+      hasValue: true,
+      icon: ''
     });
 
     // update subscription
@@ -1198,5 +1231,11 @@ class ChainService {
   subscribeAssetSettings() {
     return this.assetSettingSubject;
   }
+  async getChainLogoMap() {
+    return await this.fetchLatestData(_constants._CHAIN_LOGO_MAP_SRC, _chainList.ChainLogoMap);
+  }
+  async getAssetLogoMap() {
+    return await this.fetchLatestData(_constants._ASSET_LOGO_MAP_SRC, _chainList.AssetLogoMap);
+  }
 }
 exports.ChainService = ChainService;

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.HistoryService = void 0;
 var _constants = require("@subwallet/extension-base/constants");
+var _types = require("@subwallet/extension-base/services/base/types");
+var _promise = require("@subwallet/extension-base/utils/promise");
 var _uiKeyring = require("@subwallet/ui-keyring");
 var _rxjs = require("rxjs");
 var _subsquidMultiChainHistory = require("./subsquid-multi-chain-history");
@@ -18,24 +20,10 @@ class HistoryService {
     this.chainService = chainService;
     this.eventService = eventService;
     this.keyringService = keyringService;
-    // Load history from database
-    this.dbService.getHistories().then(histories => {
-      this.historySubject.next(histories);
-    }).catch(console.error);
-
-    // Wait for keyring and chain ready and start
-    Promise.all([this.eventService.waitKeyringReady, this.eventService.waitChainReady]).then(() => {
-      this.getHistories().catch(console.log);
-      this.eventService.on('account.add', () => {
-        this.refreshHistoryInterval();
-      });
-      this.eventService.on('account.remove', address => {
-        this.removeHistoryByAddress(address).catch(console.error);
-      });
-    }).catch(console.error);
+    this.init().catch(console.error);
   }
   fetchPromise = null;
-  nextFetch = undefined;
+  interval = undefined;
   async fetchAndLoadHistories(addresses) {
     if (!addresses || addresses.length === 0) {
       return [];
@@ -59,32 +47,16 @@ class HistoryService {
     await this.addHistoryItems(historyRecords);
     return historyRecords;
   }
-  async fetchHistories(addresses) {
-    if (!this.fetchPromise) {
-      // Fetch another histories data data indexer and merge it with stored in database
-      this.fetchPromise = this.fetchAndLoadHistories(addresses);
-    }
-    return this.fetchPromise;
-  }
-  invalidCache() {
-    this.fetchPromise = null;
-  }
-  refreshHistoryInterval() {
-    clearTimeout(this.nextFetch);
-    this.invalidCache();
-    this.getHistories().catch(console.error);
-    this.nextFetch = setTimeout(() => {
-      this.refreshHistoryInterval();
-    }, _constants.CRON_REFRESH_HISTORY_INTERVAL);
-  }
   async getHistories() {
     const addressList = _uiKeyring.keyring.getAccounts().map(a => a.address);
-    const currentHistories = this.historySubject.value;
-    if (!this.fetchPromise || currentHistories.length === 0) {
-      await this.fetchHistories(addressList);
-      this.historySubject.next(await this.dbService.getHistories());
+    if (!this.fetchPromise) {
+      this.fetchPromise = (async () => {
+        await this.fetchAndLoadHistories(addressList);
+        const histories = await this.dbService.getHistories();
+        this.historySubject.next(histories);
+      })();
     }
-    return this.historySubject.getValue();
+    return Promise.resolve(this.historySubject.getValue());
   }
   async getHistorySubject() {
     await this.getHistories();
@@ -103,6 +75,10 @@ class HistoryService {
     });
     await this.addHistoryItems(updatedRecords);
   }
+  async updateHistoryByExtrinsicHash(extrinsicHash, updateData) {
+    await this.dbService.updateHistoryByNewExtrinsicHash(extrinsicHash, updateData);
+    this.historySubject.next(await this.dbService.getHistories());
+  }
 
   // Insert history without check override origin 'app'
   async insertHistories(historyItems) {
@@ -131,5 +107,74 @@ class HistoryService {
     await this.dbService.stores.transaction.removeAllByAddress(address);
     this.historySubject.next(await this.dbService.getHistories());
   }
+  status = _types.ServiceStatus.NOT_INITIALIZED;
+  async loadData() {
+    const histories = await this.dbService.getHistories();
+    this.historySubject.next(histories);
+  }
+  async persistData() {
+    await this.dbService.upsertHistory(this.historySubject.value);
+  }
+  async startCron() {
+    await this.getHistories();
+    this.interval = setInterval(() => {
+      this.getHistories().catch(console.error);
+    }, _constants.CRON_REFRESH_HISTORY_INTERVAL);
+  }
+  stopCron() {
+    clearTimeout(this.interval);
+    this.fetchPromise = null;
+    return Promise.resolve();
+  }
+  startPromiseHandler = (0, _promise.createPromiseHandler)();
+  async init() {
+    this.status = _types.ServiceStatus.INITIALIZING;
+    await this.loadData();
+    Promise.all([this.eventService.waitKeyringReady, this.eventService.waitChainReady]).then(() => {
+      this.getHistories().catch(console.log);
+      this.eventService.on('account.add', () => {
+        (async () => {
+          await this.stopCron();
+          await this.startCron();
+        })().catch(console.error);
+      });
+      this.eventService.on('account.remove', address => {
+        this.removeHistoryByAddress(address).catch(console.error);
+      });
+    }).catch(console.error);
+    this.status = _types.ServiceStatus.INITIALIZED;
+  }
+  async start() {
+    try {
+      console.debug('Start history service');
+      this.startPromiseHandler = (0, _promise.createPromiseHandler)();
+      this.status = _types.ServiceStatus.STARTING;
+      await this.startCron();
+      this.status = _types.ServiceStatus.STARTED;
+      this.startPromiseHandler.resolve();
+    } catch (e) {
+      this.startPromiseHandler.reject(e);
+    }
+  }
+  waitForStarted() {
+    return this.startPromiseHandler.promise;
+  }
+  stopPromiseHandler = (0, _promise.createPromiseHandler)();
+  async stop() {
+    console.debug('Stop history service');
+    try {
+      this.stopPromiseHandler = (0, _promise.createPromiseHandler)();
+      this.status = _types.ServiceStatus.STOPPING;
+      await this.persistData();
+      await this.stopCron();
+      this.stopPromiseHandler.resolve();
+      this.status = _types.ServiceStatus.STOPPED;
+    } catch (e) {
+      this.stopPromiseHandler.reject(e);
+    }
+  }
+  waitForStopped() {
+    return this.stopPromiseHandler.promise;
+  }
 }
 exports.HistoryService = HistoryService;

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

@@ -33,7 +33,8 @@ class MigrateImportedToken extends _Base.default {
                   originChain: item.chain,
                   priceId: null,
                   slug: '',
-                  symbol: item.symbol || ''
+                  symbol: item.symbol || '',
+                  icon: ''
                 });
               } catch (e) {
                 console.log(e);