@subwallet/extension-base 1.0.1 → 1.0.2-1

package/cjs/koni/background/subscription.js

@@ -15,6 +15,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 _util = require("@polkadot/util");
+var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -56,19 +57,22 @@ class KoniSubscription {
     }
   }
   start() {
+    var _this$state$keyringSe;
     this.logger.log('Starting subscription');
-    this.state.getCurrentAccount(currentAccountInfo => {
-      if (currentAccountInfo) {
-        const {
-          address
-        } = currentAccountInfo;
-        this.subscribeBalancesAndCrowdloans(address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
-        this.subscribeStakingOnChain(address, this.state.getSubstrateApiMap());
-      }
-    });
-    !this.serviceSubscription && (this.serviceSubscription = this.state.subscribeServiceInfo().subscribe({
-      next: serviceInfo => {
+    const currentAddress = (_this$state$keyringSe = this.state.keyringService.currentAccount) === null || _this$state$keyringSe === void 0 ? void 0 : _this$state$keyringSe.address;
+    if (currentAddress) {
+      this.subscribeBalancesAndCrowdloans(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
+      this.subscribeStakingOnChain(currentAddress, this.state.getSubstrateApiMap());
+    }
+    if (!this.eventHandler) {
+      const reloadEvents = ['account.add', 'account.remove', 'account.updateCurrent', 'chain.add', 'chain.update', 'chain.enable', 'asset.update', 'asset.enable', 'transaction.done', 'transaction.failed'];
+      this.eventHandler = (events, eventTypes) => {
         var _serviceInfo$currentA;
+        const serviceInfo = this.state.getServiceInfo();
+        const needReload = eventTypes.some(eT => reloadEvents.includes(eT));
+        if (!needReload) {
+          return;
+        }
         this.logger.log('ServiceInfo updated, restarting...');
         const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.address;
         if (!address) {
@@ -76,14 +80,14 @@ class KoniSubscription {
         }
         this.subscribeBalancesAndCrowdloans(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate, serviceInfo.chainApiMap.evm);
         this.subscribeStakingOnChain(address, serviceInfo.chainApiMap.substrate);
-      }
-    }));
+      };
+      this.state.eventService.onLazy(this.eventHandler);
+    }
   }
   stop() {
     this.logger.log('Stopping subscription');
-    if (this.serviceSubscription) {
-      this.serviceSubscription.unsubscribe();
-      this.serviceSubscription = undefined;
+    if (this.eventHandler) {
+      this.state.eventService.offLazy(this.eventHandler);
     }
     this.stopAllSubscription();
   }
@@ -110,24 +114,21 @@ class KoniSubscription {
   }
   subscribeBalancesAndCrowdloans(address, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime) {
     this.state.switchAccount(address).then(() => {
-      this.state.getDecodedAddresses(address).then(addresses => {
-        if (!addresses.length) {
-          return;
-        }
-        this.updateSubscription('balance', this.initBalanceSubscription(addresses, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime));
-        this.updateSubscription('crowdloan', this.initCrowdloanSubscription(addresses, substrateApiMap, onlyRunOnFirstTime));
-      }).catch(this.logger.error);
+      const addresses = this.state.getDecodedAddresses(address);
+      if (!addresses.length) {
+        return;
+      }
+      this.updateSubscription('balance', this.initBalanceSubscription(addresses, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime));
+      this.updateSubscription('crowdloan', this.initCrowdloanSubscription(addresses, substrateApiMap, onlyRunOnFirstTime));
     }).catch(err => this.logger.warn(err));
   }
   subscribeStakingOnChain(address, substrateApiMap, onlyRunOnFirstTime) {
-    this.state.resetStaking(address).then(() => {
-      this.state.getDecodedAddresses(address).then(addresses => {
-        if (!addresses.length) {
-          return;
-        }
-        this.updateSubscription('stakingOnChain', this.initStakingOnChainSubscription(addresses, substrateApiMap, onlyRunOnFirstTime));
-      }).catch(this.logger.error);
-    }).catch(err => this.logger.warn(err));
+    this.state.resetStaking(address);
+    const addresses = this.state.getDecodedAddresses(address);
+    if (!addresses.length) {
+      return;
+    }
+    this.updateSubscription('stakingOnChain', this.initStakingOnChainSubscription(addresses, substrateApiMap, onlyRunOnFirstTime));
   }
   initStakingOnChainSubscription(addresses, substrateApiMap, onlyRunOnFirstTime) {
     const unsub = (0, _staking.stakingOnChainApi)(addresses, substrateApiMap, (networkKey, rs) => {
@@ -143,9 +144,9 @@ class KoniSubscription {
   }
   initBalanceSubscription(addresses, chainInfoMap, chainStateMap, substrateApiMap, evmApiMap, onlyRunOnFirstTime) {
     const filteredChainInfoMap = {};
-    Object.values(chainInfoMap).forEach(chainInfo => {
-      if (chainStateMap[chainInfo.slug].active) {
-        filteredChainInfoMap[chainInfo.slug] = chainInfo;
+    Object.values(chainStateMap).forEach(chainState => {
+      if (chainState.active) {
+        filteredChainInfoMap[chainState.slug] = chainInfoMap[chainState.slug];
       }
     });
     const unsub = (0, _balance.subscribeBalance)(addresses, filteredChainInfoMap, substrateApiMap, evmApiMap, result => {
@@ -172,12 +173,11 @@ class KoniSubscription {
     };
   }
   subscribeNft(address, substrateApiMap, evmApiMap, smartContractNfts, chainInfoMap) {
-    this.state.getDecodedAddresses(address).then(addresses => {
-      if (!addresses.length) {
-        return;
-      }
-      this.initNftSubscription(addresses, substrateApiMap, evmApiMap, smartContractNfts, chainInfoMap);
-    }).catch(this.logger.error);
+    const addresses = this.state.getDecodedAddresses(address);
+    if (!addresses.length) {
+      return;
+    }
+    this.initNftSubscription(addresses, substrateApiMap, evmApiMap, smartContractNfts, chainInfoMap);
   }
   initNftSubscription(addresses, substrateApiMap, evmApiMap, smartContractNfts, chainInfoMap) {
     var _this = this;
@@ -194,7 +194,7 @@ class KoniSubscription {
     }).catch(this.logger.log);
   }
   async subscribeStakingReward(address) {
-    const addresses = await this.state.getDecodedAddresses(address);
+    const addresses = this.state.getDecodedAddresses(address);
     if (!addresses.length) {
       return;
     }
@@ -212,7 +212,7 @@ class KoniSubscription {
     this.logger.log('Set staking reward state done', result);
   }
   async subscribeStakingRewardFastInterval(address) {
-    const addresses = await this.state.getDecodedAddresses(address);
+    const addresses = this.state.getDecodedAddresses(address);
     if (!addresses.length) {
       return;
     }
@@ -262,8 +262,13 @@ class KoniSubscription {
     if (currentAddress === _constants.ALL_ACCOUNT_KEY) {
       addresses = await this.state.getStakingOwnersByChains(Object.keys(filteredChainInfoMap));
     }
-    await Promise.all(addresses.map(async address => {
+    const validAddresses = addresses.filter(address => !(0, _utilCrypto.isEthereumAddress)(address));
+    await Promise.all(validAddresses.map(async address => {
+      const isEvmAddress = (0, _utilCrypto.isEthereumAddress)(address);
       await Promise.all(Object.values(filteredChainInfoMap).map(async chainInfo => {
+        if (isEvmAddress && !(0, _utils._isChainEvmCompatible)(chainInfo)) {
+          return;
+        }
         if ((0, _utils._isSubstrateRelayChain)(chainInfo) && _constants2._STAKING_CHAIN_GROUP.nominationPool.includes(chainInfo.slug)) {
           const poolMemberMetadata = await (0, _relayChain.getRelayChainPoolMemberMetadata)(chainInfo, address, substrateApiMap[chainInfo.slug]);
           if (poolMemberMetadata) {

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

package/cjs/page/index.js

@@ -6,9 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.enable = enable;
 exports.handleResponse = handleResponse;
+exports.initEvmProvider = initEvmProvider;
 exports.sendMessage = sendMessage;
 var _ProviderError = require("@subwallet/extension-base/background/errors/ProviderError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _SubWalleEvmProvider = require("@subwallet/extension-base/page/SubWalleEvmProvider");
 var _defaults = require("../defaults");
 var _getId = require("../utils/getId");
 var _Injected = _interopRequireDefault(require("./Injected"));
@@ -62,4 +64,7 @@ function handleResponse(data) {
   } else {
     handler.resolve(data.response);
   }
+}
+function initEvmProvider(version) {
+  return new _SubWalleEvmProvider.SubWalletEvmProvider(sendMessage, version);
 }

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._XCM_TYPE = exports._XCM_CHAIN_USE_LIMITED_WEIGHT = 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._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;
 var _chainList = require("@subwallet/chain-list");
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
@@ -207,18 +207,8 @@ const _XCM_CHAIN_GROUP = {
   polkadotXcm: ['astar', 'shiden', 'statemine', 'statemint'],
   xcmPallet: ['polkadot', 'kusama']
   // default is xTokens pallet
-  // moonbeam: ['moonbeam', 'moonriver', 'moonbase'],
-  // astar: ['astar', 'shiden'],
-  // statemine: ['statemint', 'statemine'],
-  // bifrost: ['bifrost'],
-  // genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
-  // kintsugi: ['kintsugi', 'kintsugi_test', 'interlay'],
-  // acala: ['karura', 'acala', 'acala_testnet'],
-  // astarEvm: ['astarEvm', 'shidenEvm']
 };
 exports._XCM_CHAIN_GROUP = _XCM_CHAIN_GROUP;
-const _XCM_CHAIN_USE_LIMITED_WEIGHT = ['acala', 'karura', 'statemint'];
-exports._XCM_CHAIN_USE_LIMITED_WEIGHT = _XCM_CHAIN_USE_LIMITED_WEIGHT;
 const _XCM_TYPE = {
   RP: `${_types._SubstrateChainType.RELAYCHAIN}-${_types._SubstrateChainType.PARACHAIN}`,
   // DMP

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

@@ -28,8 +28,6 @@ class ChainService {
     assetRegistry: {},
     assetRefMap: {}
   };
-  // to save chain, token settings from user
-
   lockChainInfoMap = false; // prevent unwanted changes (edit, enable, disable) to chainInfoMap
 
   // TODO: consider BehaviorSubject
@@ -42,8 +40,9 @@ class ChainService {
   // Todo: Update to new store indexed DB
   store = new _AssetSetting.default();
   assetSettingSubject = new _rxjs.BehaviorSubject({});
-  constructor(dbService) {
+  constructor(dbService, eventService) {
     this.dbService = dbService;
+    this.eventService = eventService;
     this.substrateChainHandler = new _SubstrateChainHandler.SubstrateChainHandler();
     this.evmChainHandler = new _EvmChainHandler.EvmChainHandler();
     this.chainInfoMapSubject.next(this.dataMap.chainInfoMap);
@@ -217,9 +216,13 @@ class ChainService {
     return this.getAssetRegistry()[slug];
   }
   getFungibleTokensByChain(chainSlug) {
+    let checkActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     const result = {};
+    const assetSettings = this.assetSettingSubject.value;
     Object.values(this.getAssetRegistry()).forEach(chainAsset => {
-      if (chainAsset.originChain === chainSlug && (0, _utils._isAssetFungibleToken)(chainAsset)) {
+      var _assetSettings$chainA;
+      const _filterActive = !checkActive || ((_assetSettings$chainA = assetSettings[chainAsset.slug]) === null || _assetSettings$chainA === void 0 ? void 0 : _assetSettings$chainA.visible);
+      if (chainAsset.originChain === chainSlug && (0, _utils._isAssetFungibleToken)(chainAsset) && _filterActive) {
         result[chainAsset.slug] = chainAsset;
       }
     });
@@ -283,6 +286,7 @@ class ChainService {
     this.dbService.removeFromChainStore([slug]).catch(console.error);
     this.updateChainSubscription();
     this.lockChainInfoMap = false;
+    this.eventService.emit('chain.remove', slug);
     return true;
   }
   resetChainInfoMap(excludedChains) {
@@ -316,6 +320,10 @@ class ChainService {
         token.slug = `${_types3._CUSTOM_PREFIX}${defaultSlug}`;
       }
     }
+    if (token.originChain && (0, _utils._isAssetFungibleToken)(token)) {
+      var _this$getChainInfoByK;
+      token.hasValue = !((_this$getChainInfoByK = this.getChainInfoByKey(token.originChain)) !== null && _this$getChainInfoByK !== void 0 && _this$getChainInfoByK.isTestnet);
+    }
     const assetRegistry = this.getAssetRegistry();
     assetRegistry[token.slug] = token;
     this.dbService.updateAssetStore(token).catch(e => this.logger.error(e));
@@ -343,6 +351,9 @@ class ChainService {
     this.dbService.removeFromBalanceStore(targetAssets).catch(e => this.logger.error(e));
     this.dbService.removeFromAssetStore(targetAssets).catch(e => this.logger.error(e));
     this.assetRegistrySubject.next(assetRegistry);
+    targetAssets.forEach(assetSlug => {
+      this.eventService.emit('asset.remove', assetSlug);
+    });
   }
 
   // Business logic
@@ -415,6 +426,7 @@ class ChainService {
       currentProvider: chainStateMap[chainSlug].currentProvider
     }).catch(console.error);
     this.lockChainInfoMap = false;
+    this.eventService.emit('chain.enable', chainSlug);
     return true;
   }
   enableChain(chainSlug) {
@@ -449,6 +461,7 @@ class ChainService {
     }).catch(console.error);
     this.updateChainStateMapSubscription();
     this.lockChainInfoMap = false;
+    this.eventService.emit('chain.disable', chainSlug);
     return true;
   }
   checkExistedPredefinedChain(genesisHash, evmChainId) {
@@ -671,6 +684,8 @@ class ChainService {
       ...targetChainInfo,
       active: targetChainState.active,
       currentProvider: targetChainState.currentProvider
+    }).then(() => {
+      this.eventService.emit('chain.update', chainSlug);
     }).catch(e => this.logger.error(e));
   }
   insertChain(params) {
@@ -755,6 +770,8 @@ class ChainService {
       active: true,
       currentProvider: params.chainEditInfo.currentProvider,
       ...chainInfo
+    }).then(() => {
+      this.eventService.emit('chain.add', newChainSlug);
     }).catch(e => this.logger.error(e));
     return nativeTokenSlug;
   }
@@ -1100,12 +1117,26 @@ class ChainService {
           };
         }
       });
-      this.setAssetSettings(assetSettings);
+      this.setAssetSettings(assetSettings, false);
     }
+    this.eventService.emit('asset.ready', true);
     console.log('Done init asset settings');
   }
   setAssetSettings(assetSettings) {
+    let emitEvent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+    const updateAssets = [];
+    if (emitEvent) {
+      Object.keys(assetSettings).forEach(slug => {
+        var _this$assetSettingSub;
+        if (((_this$assetSettingSub = this.assetSettingSubject.value[slug]) === null || _this$assetSettingSub === void 0 ? void 0 : _this$assetSettingSub.visible) !== assetSettings[slug].visible) {
+          updateAssets.push(slug);
+        }
+      });
+    }
     this.assetSettingSubject.next(assetSettings);
+    updateAssets.forEach(slug => {
+      this.eventService.emit(assetSettings[slug].visible ? 'asset.enable' : 'asset.disable', slug);
+    });
     this.store.set('AssetSetting', assetSettings);
   }
   async getStoreAssetSettings() {
@@ -1122,6 +1153,7 @@ class ChainService {
   }
   async updateAssetSetting(assetSlug, assetSetting) {
     const currentAssetSettings = await this.getAssetSettings();
+    let needUpdateSubject;
 
     // Update settings
     currentAssetSettings[assetSlug] = assetSetting;
@@ -1133,8 +1165,10 @@ class ChainService {
       // if chain not enabled, then automatically enable
       if (chainState && !chainState.active) {
         this.enableChain(chainState.slug);
+        needUpdateSubject = true;
       }
     }
+    return needUpdateSubject;
   }
   async updateAssetSettingByChain(chainSlug, visible) {
     const storedAssetSettings = await this.getAssetSettings();

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

@@ -50,6 +50,7 @@ exports._isCustomChain = _isCustomChain;
 exports._isCustomProvider = _isCustomProvider;
 exports._isEqualContractAddress = _isEqualContractAddress;
 exports._isEqualSmartContractAsset = _isEqualSmartContractAsset;
+exports._isLocalToken = _isLocalToken;
 exports._isNativeToken = _isNativeToken;
 exports._isNativeTokenBySlug = _isNativeTokenBySlug;
 exports._isPureEvmChain = _isPureEvmChain;
@@ -272,6 +273,9 @@ function _getChainNativeTokenSlug(chainInfo) {
   }
   return `${chainInfo.slug}-${_types._AssetType.NATIVE}-${_getChainNativeTokenBasicInfo(chainInfo).symbol}`;
 }
+function _isLocalToken(tokenInfo) {
+  return tokenInfo.assetType === _types._AssetType.LOCAL;
+}
 function _isTokenEvmSmartContract(tokenInfo) {
   return [_types._AssetType.ERC721, _types._AssetType.ERC20].includes(tokenInfo.assetType);
 }

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

@@ -0,0 +1,71 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.EventService = void 0;
+var _eventemitter = _interopRequireDefault(require("eventemitter3"));
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+// Stateless service handle runtime event on background
+
+class EventService extends _eventemitter.default {
+  pendingEvents = [];
+  lazyEmitter = new _eventemitter.default();
+  constructor() {
+    let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+      lazyTime: 300
+    };
+    super();
+    this.lazyTime = options.lazyTime;
+    this.timeoutId = null;
+    this.waitKeyringReady = this.generateWaitPromise('keyring.ready');
+    this.waitAccountReady = this.generateWaitPromise('account.ready');
+    this.waitChainReady = this.generateWaitPromise('chain.ready');
+    this.waitAssetReady = this.generateWaitPromise('asset.ready');
+  }
+  generateWaitPromise(eventType) {
+    return new Promise(resolve => {
+      this.once(eventType, isReady => {
+        resolve(isReady);
+      });
+    });
+  }
+  setLazyTimeout() {
+    if (this.timeoutId) {
+      clearTimeout(this.timeoutId);
+    }
+    this.timeoutId = setTimeout(() => {
+      this.emitLazy();
+    }, this.lazyTime);
+  }
+  emitLazy() {
+    this.lazyEmitter.emit('lazy', this.pendingEvents, this.pendingEvents.map(e => e.type));
+    this.pendingEvents = [];
+    this.timeoutId = null;
+  }
+  onLazy(callback) {
+    this.lazyEmitter.on('lazy', callback);
+  }
+  offLazy(callback) {
+    this.lazyEmitter.off('lazy', callback);
+  }
+  onceLazy(callback) {
+    this.lazyEmitter.once('lazy', callback);
+  }
+  emit(eventType) {
+    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      args[_key - 1] = arguments[_key];
+    }
+    console.debug('Emit event: ', eventType, ...args);
+    this.pendingEvents.push({
+      type: eventType,
+      data: args
+    });
+    this.setLazyTimeout();
+    return super.emit(eventType, ...args);
+  }
+}
+exports.EventService = EventService;

package/cjs/services/event-service/types.js

@@ -0,0 +1 @@
+"use strict";

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 _address = require("@subwallet/extension-base/utils/address");
+var _uiKeyring = require("@subwallet/ui-keyring");
 var _accounts = require("@subwallet/ui-keyring/observable/accounts");
 var _rxjs = require("rxjs");
 var _subsquidMultiChainHistory = require("./subsquid-multi-chain-history");
@@ -13,20 +15,25 @@ var _subsquidMultiChainHistory = require("./subsquid-multi-chain-history");
 
 class HistoryService {
   historySubject = new _rxjs.BehaviorSubject([]);
-  constructor(dbService, chainService) {
+  constructor(dbService, chainService, eventService) {
     this.dbService = dbService;
     this.chainService = chainService;
-
+    this.eventService = eventService;
     // Load history from database
     this.dbService.getHistories().then(histories => {
       this.historySubject.next(histories);
     }).catch(console.error);
 
-    // Add some delay to avoid fetching many times when start extension background
-    setTimeout(() => {
-      // Create history interval and refresh it if changes accounts list
-      _accounts.accounts.subject.subscribe(this.refreshHistoryInterval.bind(this));
-    }, 3333);
+    // 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);
   }
   fetchPromise = null;
   nextFetch = undefined;
@@ -50,8 +57,8 @@ class HistoryService {
       record.fromName = accountMap[(_record$from = record.from) === null || _record$from === void 0 ? void 0 : _record$from.toLowerCase()];
       record.toName = accountMap[(_record$to = record.to) === null || _record$to === void 0 ? void 0 : _record$to.toLowerCase()];
     });
-    await this.dbService.upsertHistory(historyRecords);
-    return await this.dbService.getHistories();
+    this.dbService.upsertHistory(historyRecords).catch(console.error);
+    return historyRecords;
   }
   async fetchHistories(addresses) {
     if (!this.fetchPromise) {
@@ -67,11 +74,14 @@ class HistoryService {
     clearTimeout(this.nextFetch);
     this.invalidCache();
     this.getHistories().catch(console.error);
-    this.nextFetch = setTimeout(this.refreshHistoryInterval.bind(this), _constants.CRON_REFRESH_HISTORY_INTERVAL);
+    this.nextFetch = setTimeout(() => {
+      this.refreshHistoryInterval();
+    }, _constants.CRON_REFRESH_HISTORY_INTERVAL);
   }
   async getHistories() {
-    const addressList = Object.keys(_accounts.accounts.subject.value);
-    if (!this.fetchPromise) {
+    const addressList = _uiKeyring.keyring.getAccounts().map(a => a.address);
+    const currentHistories = this.historySubject.value;
+    if (!this.fetchPromise || currentHistories.length === 0) {
       const historyRecords = await this.fetchHistories(addressList);
       this.historySubject.next(historyRecords);
     }
@@ -81,11 +91,11 @@ class HistoryService {
     await this.getHistories();
     return this.historySubject;
   }
-  async insertHistory(historyItem) {
-    await this.dbService.upsertHistory([historyItem]);
+  async insertHistories(historyItems) {
+    await this.dbService.upsertHistory(historyItems);
     this.historySubject.next(await this.dbService.getHistories());
   }
-  async updateHistory(chain, extrinsicHash, historyItem) {
+  async updateHistories(chain, extrinsicHash, updateData) {
     const existedRecords = await this.dbService.getHistories({
       chain,
       extrinsicHash
@@ -93,13 +103,22 @@ class HistoryService {
     const updatedRecords = existedRecords.map(r => {
       return {
         ...r,
-        ...historyItem
+        ...updateData
       };
     });
     await this.addHistoryItems(updatedRecords);
   }
   async addHistoryItems(historyItems) {
-    await this.dbService.upsertHistory(historyItems);
+    // Prevent override record with original is 'app'
+    const appRecords = this.historySubject.value.filter(item => item.origin === 'app');
+    const excludeKeys = appRecords.map(item => {
+      return `${item.chain}-${(0, _address.quickFormatAddressToCompare)(item.address) || ''}-${item.extrinsicHash}`;
+    });
+    const updateRecords = historyItems.filter(item => {
+      const key = `${item.chain}-${(0, _address.quickFormatAddressToCompare)(item.address) || ''}-${item.extrinsicHash}`;
+      return item.origin === 'app' || !excludeKeys.includes(key);
+    });
+    await this.dbService.upsertHistory(updateRecords);
     this.historySubject.next(await this.dbService.getHistories());
   }
   async removeHistoryByAddress(address) {

package/cjs/services/history-service/subsquid-multi-chain-history.js

@@ -119,10 +119,15 @@ function parseSubsquidTransactionData(address, type, historyItem, chainInfo, arg
         to = autoFormatAddress(parsedArgs.to);
         from = autoFormatAddress(parsedArgs.from);
         extrinsicHash = parsedArgs.transactionHash;
-        amount = transaction.value;
+        amount = transaction.value || '0';
         fee = (parseInt(transaction.gasPrice) * parseInt(transaction.gasLimit)).toString();
         signature = generateSignature(transaction.signature);
         success = extrinsic.success;
+
+        // Special fix for moonbeam
+        if ((historyItem.chainId === 'moonbeam' || historyItem.chainId === 'moonriver') && typeof amount === 'object') {
+          amount = amount[0];
+        }
         break;
       }
 
@@ -167,7 +172,7 @@ function parseSubsquidTransactionData(address, type, historyItem, chainInfo, arg
   }
   return {
     address,
-    origin: MULTI_CHAIN_URL,
+    origin: 'subsquid',
     time: toTimestamp(historyItem.timestamp),
     chainType,
     from,