@subwallet/extension-base 1.1.25-0 → 1.1.26-0

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

@@ -11,7 +11,7 @@ var _subscriptions = require("@subwallet/extension-base/background/handlers/subs
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
 var _balanceService = require("@subwallet/extension-base/services/balance-service");
-var _group = require("@subwallet/extension-base/services/balance-service/helpers/group");
+var _BalanceMapImpl = require("@subwallet/extension-base/services/balance-service/BalanceMapImpl");
 var _types = require("@subwallet/extension-base/services/base/types");
 var _buyService = _interopRequireDefault(require("@subwallet/extension-base/services/buy-service"));
 var _campaignService = _interopRequireDefault(require("@subwallet/extension-base/services/campaign-service"));
@@ -67,8 +67,7 @@ class KoniState {
   unsubscriptionMap = {};
   accountRefStore = new _AccountRef.default();
   externalRequest = {};
-  balanceMap = {};
-  balanceSubject = new _rxjs.Subject();
+  balanceMap = new _BalanceMapImpl.BalanceMapImpl();
   crowdloanMap = generateDefaultCrowdloanMap();
   crowdloanSubject = new _rxjs.Subject();
   nftSubject = new _rxjs.Subject();
@@ -194,11 +193,11 @@ class KoniState {
   get authSubjectV2() {
     return this.requestService.authSubjectV2;
   }
-  generateDefaultBalanceMap() {
+  generateDefaultBalanceMap(_addresses) {
     const balanceMap = {};
     const activeChains = this.chainService.getActiveChainInfoMap();
     const isAllAccount = (0, _utils2.isAccountAll)(this.keyringService.currentAccount.address);
-    const addresses = isAllAccount ? Object.keys(this.keyringService.accounts) : [this.keyringService.currentAccount.address];
+    const addresses = _addresses || (isAllAccount ? Object.keys(this.keyringService.accounts) : [this.keyringService.currentAccount.address]);
     addresses.forEach(address => {
       const temp = {};
       Object.values(activeChains).forEach(chainInfo => {
@@ -225,6 +224,7 @@ class KoniState {
     await this.chainService.init();
     this.afterChainServiceInit();
     await this.migrationService.run();
+    this.campaignService.init();
     this.eventService.emit('chain.ready', true);
     this.onReady();
     this.onAccountAdd();
@@ -687,72 +687,29 @@ class KoniState {
   getAllAddresses() {
     return _uiKeyring.keyring.getAccounts().map(account => account.address);
   }
-  removeInactiveChainBalances(balanceMap) {
-    const activeBalanceMap = {};
-    Object.entries(balanceMap).forEach(_ref5 => {
-      let [address, balances] = _ref5;
-      activeBalanceMap[address] = {};
-      Object.entries(balances).forEach(_ref6 => {
-        let [tokenSlug, item] = _ref6;
-        const tokenInfo = this.chainService.getAssetBySlug(tokenSlug);
-        if (tokenInfo) {
-          const chainInfo = this.chainService.getChainInfoByKey(tokenInfo.originChain);
-          if (chainInfo && this.getChainStateByKey(chainInfo.slug).active) {
-            activeBalanceMap[address][tokenSlug] = item;
-          }
-        }
-      });
+  async removeInactiveChainBalances() {
+    const assetSettings = await this.chainService.getAssetSettings();
+    this.balanceMap.removeBalanceItemByFilter(item => {
+      return !assetSettings[item.tokenSlug];
     });
-    return activeBalanceMap;
   }
-  getBalance(reset) {
-    const activeData = this.removeInactiveChainBalances(this.balanceMap);
+  async getBalance(reset) {
+    await this.removeInactiveChainBalances();
     return {
-      details: activeData,
+      details: this.balanceMap.map,
       reset
     };
   }
   async getStoredBalance(address) {
-    const items = await this.dbService.stores.balance.getBalanceMapByAddresses(address);
-    return items || {};
+    return await this.dbService.stores.balance.getBalanceMapByAddresses(address);
   }
+  isFirstLoad = true;
   async handleSwitchAccount(newAddress) {
-    await Promise.all([this.resetBalanceMap(newAddress), this.resetCrowdloanMap(newAddress)]);
-  }
-  async resetBalanceMap(newAddress) {
-    const defaultData = this.generateDefaultBalanceMap();
-    let storedData = await this.getStoredBalance(newAddress);
-    storedData = this.removeInactiveChainBalances(storedData);
-    const result = {};
-    for (const [address, balanceInfo] of Object.entries(defaultData)) {
-      result[address] = {
-        ...balanceInfo
-      };
-    }
-    for (const [address, balanceInfo] of Object.entries(storedData)) {
-      if (!result[address]) {
-        result[address] = {
-          ...balanceInfo
-        };
-      } else {
-        const temp = {
-          ...result[address]
-        };
-        for (const [slug, item] of Object.entries(balanceInfo)) {
-          temp[slug] = {
-            ...item
-          };
-        }
-        result[address] = {
-          ...temp
-        };
-      }
+    if (this.isFirstLoad) {
+      const backupBalanceData = await this.dbService.getStoredBalance();
+      this.balanceMap.updateBalanceItems(backupBalanceData, (0, _utils2.isAccountAll)(newAddress));
     }
-    this.balanceMap = {
-      ...defaultData,
-      ...storedData
-    };
-    this.publishBalance(true);
+    await Promise.all([this.resetCrowdloanMap(newAddress), this.removeInactiveChainBalances()]);
   }
   async resetCrowdloanMap(newAddress) {
     const defaultData = generateDefaultCrowdloanMap();
@@ -775,62 +732,35 @@ class KoniState {
       });
     });
   }
+  balanceUpdateCache = [];
 
   /** Note: items must be same tokenSlug */
   setBalanceItem(items) {
     if (items.length) {
-      const tokens = [];
-      const updates = [];
+      const nowTime = new Date().getTime();
       for (const item of items) {
-        const address = item.address;
-        const tokenSlug = item.tokenSlug;
-        if (!tokens.includes(tokenSlug)) {
-          tokens.push(tokenSlug);
-        }
-        if (!this.balanceMap[address]) {
-          this.balanceMap[address] = {};
-        }
-        const data = {
-          timestamp: +new Date(),
+        const balance = {
+          timestamp: nowTime,
           ...item
         };
-        this.balanceMap[address][tokenSlug] = data;
-        updates.push(data);
+        this.balanceUpdateCache.push(balance);
       }
-      const isAllAccount = (0, _utils2.isAccountAll)(this.keyringService.currentAccount.address);
-      if (isAllAccount) {
-        const address = _constants.ALL_ACCOUNT_KEY;
-        for (const token of tokens) {
-          const items = [];
-          for (const [_adr, balanceInfo] of Object.entries(this.balanceMap)) {
-            if (!(0, _utils2.isSameAddress)(_adr, address)) {
-              const item = balanceInfo[token];
-              item && items.push(item);
-            }
-          }
-          const _balance = (0, _group.groupBalance)(items, address, token);
-          const balance = {
-            timestamp: +new Date(),
-            ..._balance
-          };
-          if (!this.balanceMap[address]) {
-            this.balanceMap[address] = {};
-          }
-          this.balanceMap[address][token] = balance;
-          updates.push(balance);
+      (0, _utils2.addLazy)('updateBalanceStore', () => {
+        const isAllAccount = (0, _utils2.isAccountAll)(this.keyringService.currentAccount.address);
+        this.balanceMap.updateBalanceItems(this.balanceUpdateCache, isAllAccount);
+        if (isAllAccount) {
+          this.balanceUpdateCache = [...this.balanceUpdateCache, ...Object.values(this.balanceMap.map[_constants.ALL_ACCOUNT_KEY])];
         }
-      }
-      this.updateBalanceStore(updates);
-      this.lazyNext('setBalanceItem', () => {
-        this.publishBalance();
-      });
+        this.updateBalanceStore(this.balanceUpdateCache);
+        this.balanceUpdateCache = [];
+      }, 300, 1800);
     }
   }
   updateBalanceStore(items) {
     this.dbService.updateBulkBalanceStore(items).catch(e => this.logger.warn(e));
   }
   subscribeBalance() {
-    return this.balanceSubject;
+    return this.balanceMap.mapSubject;
   }
   getCrowdloan(reset) {
     return {
@@ -1081,9 +1011,6 @@ class KoniState {
   async resumeAllNetworks() {
     return this.chainService.resumeAllChainApis();
   }
-  publishBalance(reset) {
-    this.balanceSubject.next(this.getBalance(reset));
-  }
   publishCrowdloan(reset) {
     this.crowdloanSubject.next(this.getCrowdloan(reset));
   }
@@ -1108,8 +1035,8 @@ class KoniState {
     if (!genesisHash) {
       return [undefined, undefined];
     }
-    const rs = Object.entries(this.chainService.getChainInfoMap()).find(_ref7 => {
-      let [networkKey, chainInfo] = _ref7;
+    const rs = Object.entries(this.chainService.getChainInfoMap()).find(_ref5 => {
+      let [networkKey, chainInfo] = _ref5;
       return (0, _utils._getSubstrateGenesisHash)(chainInfo) === genesisHash;
     });
     if (rs) {
@@ -1126,9 +1053,9 @@ class KoniState {
     if (!chainId) {
       return [undefined, undefined];
     }
-    const rs = Object.entries(this.chainService.getChainInfoMap()).find(_ref8 => {
+    const rs = Object.entries(this.chainService.getChainInfoMap()).find(_ref6 => {
       var _chainInfo$evmInfo;
-      let [networkKey, chainInfo] = _ref8;
+      let [networkKey, chainInfo] = _ref6;
       return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$evmInfo = chainInfo.evmInfo) === null || _chainInfo$evmInfo === void 0 ? void 0 : _chainInfo$evmInfo.evmChainId) === chainId;
     });
     if (rs) {
@@ -1144,11 +1071,11 @@ class KoniState {
     }
     return Object.values(_constants2._PREDEFINED_SINGLE_MODES).find(item => item.networkKeys.includes(networkKey));
   }
-  accountExportPrivateKey(_ref9) {
+  accountExportPrivateKey(_ref7) {
     let {
       address,
       password
-    } = _ref9;
+    } = _ref7;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
     const exportedJson = _uiKeyring.keyring.backupAccount(_uiKeyring.keyring.getPair(address), password);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
@@ -1158,11 +1085,11 @@ class KoniState {
       publicKey: (0, _util.u8aToHex)(decoded.publicKey)
     };
   }
-  checkPublicAndSecretKey(_ref10) {
+  checkPublicAndSecretKey(_ref8) {
     let {
       publicKey,
       secretKey
-    } = _ref10;
+    } = _ref8;
     try {
       const _secret = (0, _util.hexStripPrefix)(secretKey);
       if (_secret.length === 64) {
@@ -1280,11 +1207,11 @@ class KoniState {
     return this.requestService.addConfirmation(id, url, 'evmSignatureRequest', signPayload, {
       requiredPassword: false,
       address
-    }).then(_ref11 => {
+    }).then(_ref9 => {
       let {
         isApproved,
         payload
-      } = _ref11;
+      } = _ref9;
       if (isApproved) {
         if (payload) {
           return payload;
@@ -1569,7 +1496,7 @@ class KoniState {
     const chainMap = this.chainService.getChainInfoMap();
     const balanceDataList = await Promise.all(promiseList);
     balanceDataList.forEach(balanceData => {
-      balanceData && balanceData.forEach(_ref12 => {
+      balanceData && balanceData.forEach(_ref10 => {
         var _currentAssetSettings;
         let {
           balance,
@@ -1578,7 +1505,7 @@ class KoniState {
           locked,
           network,
           symbol
-        } = _ref12;
+        } = _ref10;
         const chain = _subscanChainMap.SUBSCAN_BALANCE_CHAIN_MAP_REVERSE[network];
         const chainInfo = chain ? chainMap[chain] : null;
         const balanceIsEmpty = (!balance || balance === '0') && (!locked || locked === '0') && (!bonded || bonded === '0');
@@ -1619,6 +1546,7 @@ class KoniState {
       // Remove Balance
       stores.balance.removeAllByAddress(address).catch(console.error);
       stores.balance.removeAllByAddress(_constants.ALL_ACCOUNT_KEY).catch(console.error);
+      this.balanceMap.removeBalanceItems([address, _constants.ALL_ACCOUNT_KEY]);
 
       // Remove NFT
       stores.nft.deleteNftByAddress([address]).catch(console.error);

package/cjs/koni/background/subscription.js

@@ -56,7 +56,7 @@ class KoniSubscription {
   }
   async start() {
     var _this$state$keyringSe;
-    await Promise.all([this.state.eventService.waitKeyringReady, this.state.eventService.waitAssetReady]);
+    await Promise.all([this.state.eventService.waitCryptoReady, this.state.eventService.waitKeyringReady, this.state.eventService.waitAssetReady]);
     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());
@@ -76,7 +76,7 @@ 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);
+    this.state.eventService.onLazy(this.eventHandler.bind(this));
   }
   async stop() {
     if (this.eventHandler) {

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.25-0'
+  version: '1.1.26-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/balance-service/BalanceMapImpl.js

@@ -0,0 +1,114 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BalanceMapImpl = void 0;
+var _constants = require("@subwallet/extension-base/constants");
+var _group = require("@subwallet/extension-base/services/balance-service/helpers/group");
+var _utils = require("@subwallet/extension-base/utils");
+var _rxjs = require("rxjs");
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class BalanceMapImpl {
+  constructor() {
+    let _map = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    this._map = _map;
+    this._mapSubject = new _rxjs.BehaviorSubject(_map);
+  }
+  get map() {
+    return this._mapSubject.getValue();
+  }
+  get mapSubject() {
+    return this._mapSubject;
+  }
+  setData(map) {
+    this._map = map;
+    this.triggerChange();
+  }
+  setAddressData(address, data) {
+    this._map[address] = data;
+    this.triggerChange();
+  }
+  triggerChange(computeAll) {
+    if (computeAll) {
+      this.computeAllAccountBalance();
+    }
+    this._mapSubject.next(this._map);
+  }
+  updateBalanceItem(balanceItem) {
+    let trigger = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    const {
+      address,
+      tokenSlug
+    } = balanceItem;
+    if (!address.startsWith('5') && !address.startsWith('0x')) {
+      console.log('check address', address);
+    }
+    if (!this._map[address]) {
+      this._map[address] = {};
+    }
+    this._map[address][tokenSlug] = balanceItem;
+    trigger && this.triggerChange();
+  }
+  updateBalanceItems(balanceItems, computeAll) {
+    balanceItems.forEach(balanceItem => {
+      this.updateBalanceItem(balanceItem);
+    });
+    this.triggerChange(computeAll);
+  }
+  removeBalanceItemByFilter(filter) {
+    Object.keys(this._map).forEach(address => {
+      Object.keys(this._map[address]).forEach(tokenSlug => {
+        if (filter(this._map[address][tokenSlug])) {
+          delete this._map[address][tokenSlug];
+        }
+      });
+    });
+    this.triggerChange();
+  }
+  computeAllAccountBalance() {
+    const allAccountBalanceInfo = {};
+    const allAccountBalance = {};
+    Object.keys(this._map).filter(a => !(0, _utils.isAccountAll)(a)).forEach(address => {
+      Object.keys(this._map[address]).forEach(tokenSlug => {
+        if (!allAccountBalance[tokenSlug]) {
+          allAccountBalance[tokenSlug] = [];
+        }
+        allAccountBalance[tokenSlug].push(this._map[address][tokenSlug]);
+      });
+    });
+    Object.entries(allAccountBalance).forEach(_ref => {
+      let [tokenSlug, balanceItems] = _ref;
+      allAccountBalanceInfo[tokenSlug] = (0, _group.groupBalance)(balanceItems, _constants.ALL_ACCOUNT_KEY, tokenSlug);
+    });
+    this._map[_constants.ALL_ACCOUNT_KEY] = allAccountBalanceInfo;
+  }
+
+  // Remove balance items buy address or tokenSlug
+  removeBalanceItems(addresses, tokenSlugs) {
+    // If addresses is empty, remove all
+    if (addresses && tokenSlugs) {
+      addresses.forEach(address => {
+        tokenSlugs.forEach(tokenSlug => {
+          this._map[address] && this._map[address][tokenSlug] && delete this._map[address][tokenSlug];
+        });
+      });
+    } else if (addresses && !tokenSlugs) {
+      addresses.forEach(address => {
+        this._map[address] && delete this._map[address];
+      });
+    } else if (!addresses && tokenSlugs) {
+      Object.keys(this._map).forEach(address => {
+        tokenSlugs.forEach(tokenSlug => {
+          this._map[address][tokenSlug] && delete this._map[address][tokenSlug];
+        });
+      });
+    } else {
+      this._map = {};
+    }
+    this.triggerChange();
+  }
+}
+exports.BalanceMapImpl = BalanceMapImpl;

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

@@ -15,6 +15,8 @@ class CampaignService {
   #state;
   constructor(state) {
     this.#state = state;
+  }
+  init() {
     this.fetchCampaign().catch(e => {
       console.error('Error on fetch campaigns', e);
     });

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._ZK_ASSET_PREFIX = 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._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._DEFAULT_MANTA_ZK_CHAIN = 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.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_MAX_RETRY = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
+exports._ZK_ASSET_PREFIX = 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._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._EXPECTED_BLOCK_TIME = exports._DEFAULT_MANTA_ZK_CHAIN = 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.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_MAX_RETRY = exports.API_CONNECT_TIMEOUT = 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");
@@ -113,6 +113,23 @@ const _STAKING_ERA_LENGTH_MAP = {
   goldberg_testnet: 24
 };
 exports._STAKING_ERA_LENGTH_MAP = _STAKING_ERA_LENGTH_MAP;
+const _EXPECTED_BLOCK_TIME = {
+  // in seconds
+  alephTest: 1,
+  aleph: 1,
+  polkadot: 6,
+  kusama: 6,
+  polkadex: 12,
+  ternoa: 6,
+  ternoa_alphanet: 6,
+  westend: 6,
+  kate: 20,
+  edgeware: 6,
+  creditcoin: 12,
+  vara_network: 3,
+  goldberg_testnet: 20
+};
+exports._EXPECTED_BLOCK_TIME = _EXPECTED_BLOCK_TIME;
 const _PARACHAIN_INFLATION_DISTRIBUTION = {
   moonbeam: {
     // https://docs.moonbeam.network/learn/features/staking/#annual-inflation
@@ -197,6 +214,10 @@ const _KNOWN_CHAIN_INFLATION_PARAMS = {
   polkadot: {
     ..._SUBSTRATE_DEFAULT_INFLATION_PARAMS,
     stakeTarget: 0.75
+  },
+  vara_network: {
+    ..._SUBSTRATE_DEFAULT_INFLATION_PARAMS,
+    stakeTarget: 0.8
   }
 };
 
@@ -206,7 +227,7 @@ const _TRANSFER_NOT_SUPPORTED_CHAINS = ['subspace_gemini_3a', 'kulupu', 'joystre
 exports._TRANSFER_NOT_SUPPORTED_CHAINS = _TRANSFER_NOT_SUPPORTED_CHAINS;
 const _TRANSFER_CHAIN_GROUP = {
   acala: ['karura', 'acala', 'acala_testnet'],
-  kintsugi: ['kintsugi', 'kintsugi_test', 'interlay', 'hydradx_main', 'mangatax_para'],
+  kintsugi: ['kintsugi', 'kintsugi_test', 'interlay', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   crab: ['crab', 'pangolin'],
   bitcountry: ['pioneer', 'bitcountry', 'bifrost', 'bifrost_dot'],
@@ -214,7 +235,7 @@ const _TRANSFER_CHAIN_GROUP = {
   riochain: ['riochain'],
   sora_substrate: ['sora_substrate'],
   avail: ['kate', 'goldberg_testnet'],
-  pendulum: ['pendulum', 'amplitude', 'amplitude_test'],
+  pendulum: ['pendulum', 'amplitude', 'amplitude_test', 'hydradx_main'],
   centrifuge: ['centrifuge']
 };
 exports._TRANSFER_CHAIN_GROUP = _TRANSFER_CHAIN_GROUP;

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

@@ -11,15 +11,14 @@ var _eventemitter = _interopRequireDefault(require("eventemitter3"));
 
 // Stateless service handle runtime event on background
 
+const DEFAULT_LAZY_TIME = 300;
+const LONG_LAZY_TIME = 900;
+const LONG_LAZY_EVENTS = ['account.add', 'chain.add'];
 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.waitCryptoReady = this.generateWaitPromise('crypto.ready');
     this.waitDatabaseReady = this.generateWaitPromise('database.ready');
@@ -39,13 +38,14 @@ class EventService extends _eventemitter.default {
       });
     });
   }
-  setLazyTimeout() {
+  setLazyTimeout(eventType) {
     if (this.timeoutId) {
       clearTimeout(this.timeoutId);
     }
+    const timeout = LONG_LAZY_EVENTS.includes(eventType) ? LONG_LAZY_TIME : DEFAULT_LAZY_TIME;
     this.timeoutId = setTimeout(() => {
       this.emitLazy();
-    }, this.lazyTime);
+    }, timeout);
   }
   emitLazy() {
     try {
@@ -74,7 +74,7 @@ class EventService extends _eventemitter.default {
       type: eventType,
       data: args
     });
-    this.setLazyTimeout();
+    this.setLazyTimeout(eventType);
     return super.emit(eventType, ...args);
   }
 }

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

@@ -7,7 +7,7 @@ exports.COMMON_RELOAD_EVENTS = void 0;
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const COMMON_RELOAD_EVENTS = ['account.updateCurrent', 'asset.updateState', 'account.add', 'chain.updateState', 'account.remove', 'chain.add', 'mantaPay.initSync',
+const COMMON_RELOAD_EVENTS = ['account.updateCurrent', 'account.add', 'account.remove', 'asset.updateState', 'chain.updateState', 'chain.add', 'mantaPay.initSync',
 // TODO: re-check this
 'mantaPay.enable'];
 exports.COMMON_RELOAD_EVENTS = COMMON_RELOAD_EVENTS;

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

@@ -247,6 +247,7 @@ class HistoryService {
   startPromiseHandler = (0, _promise.createPromiseHandler)();
   async init() {
     this.status = _types.ServiceStatus.INITIALIZING;
+    await this.eventService.waitCryptoReady;
     await this.loadData();
     Promise.all([this.eventService.waitKeyringReady, this.eventService.waitChainReady]).then(() => {
       this.getHistories().catch(console.log);

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

@@ -28,10 +28,12 @@ class KeyringService {
   });
   constructor(eventService) {
     this.eventService = eventService;
-    this.currentAccountStore.get('CurrentAccountInfo', rs => {
-      rs && this.currentAccountSubject.next(rs);
-    });
-    this.subscribeAccounts().catch(console.error);
+    this.eventService.waitCryptoReady.then(() => {
+      this.currentAccountStore.get('CurrentAccountInfo', rs => {
+        rs && this.currentAccountSubject.next(rs);
+      });
+      this.subscribeAccounts().catch(console.error);
+    }).catch(console.error);
   }
   async subscribeAccounts() {
     // Wait until account ready
@@ -72,8 +74,10 @@ class KeyringService {
     var _keyring$keyring, _keyring$keyring2;
     let isReady = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
     if (!this.keyringState.isReady && isReady) {
-      this.eventService.emit('keyring.ready', true);
-      this.eventService.emit('account.ready', true);
+      this.eventService.waitCryptoReady.then(() => {
+        this.eventService.emit('keyring.ready', true);
+        this.eventService.emit('account.ready', true);
+      }).catch(console.error);
     }
     this.keyringStateSubject.next({
       hasMasterPassword: !!((_keyring$keyring = _uiKeyring.keyring.keyring) !== null && _keyring$keyring !== void 0 && _keyring$keyring.hasMasterPassword),

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

@@ -8,6 +8,7 @@ exports.default = exports.EVERYTIME = void 0;
 var _MigrateEthProvider = _interopRequireDefault(require("./providers/MigrateEthProvider"));
 var _MigratePioneerProvider = _interopRequireDefault(require("./providers/MigratePioneerProvider"));
 var _MigrateProvidersV1M1P = _interopRequireDefault(require("./providers/MigrateProvidersV1M1P24"));
+var _MigratePolygonUSDCProvider = _interopRequireDefault(require("./tokens/MigratePolygonUSDCProvider"));
 var _AutoEnableChainsTokens = _interopRequireDefault(require("./AutoEnableChainsTokens"));
 var _DeleteChain = _interopRequireDefault(require("./DeleteChain"));
 var _EnableVaraChain = _interopRequireDefault(require("./EnableVaraChain"));
@@ -42,7 +43,8 @@ var _default = {
   '1.1.13-01': _MigrateTokenDecimals.default,
   '1.1.17-01': _MigratePioneerProvider.default,
   '1.1.17-03': _EnableVaraChain.default,
-  '1.1.24-01': _MigrateProvidersV1M1P.default
+  '1.1.24-01': _MigrateProvidersV1M1P.default,
+  '1.1.26-01': _MigratePolygonUSDCProvider.default
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };
 exports.default = _default;

package/cjs/services/migration-service/scripts/tokens/MigratePolygonUSDCProvider.js

@@ -0,0 +1,16 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _MigrateToken = _interopRequireDefault(require("./MigrateToken"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigratePolygonUSDCProvider extends _MigrateToken.default {
+  oldToken = 'polygon-ERC20-USDC-0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174';
+  newTokens = ['polygon-ERC20-USDC.e-0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174', 'polygon-ERC20-USDC-0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359'];
+}
+exports.default = MigratePolygonUSDCProvider;