@subwallet/extension-base 1.0.9-2 → 1.0.11-0

package/background/KoniTypes.d.ts

@@ -15,6 +15,7 @@ import { RequestArguments, TransactionConfig } from 'web3-core';
 import { JsonRpcPayload, JsonRpcResponse } from 'web3-core-helpers';
 import { SignerResult } from '@polkadot/types/types/extrinsic';
 import { BN } from '@polkadot/util';
+import { HexString } from '@polkadot/util/types';
 import { KeypairType } from '@polkadot/util-crypto/types';
 import { TransactionWarning } from './warnings/TransactionWarning';
 export interface ServiceInfo {
@@ -167,6 +168,11 @@ export interface NftCollectionJson {
     ready: boolean;
     nftCollectionList: Array<NftCollection>;
 }
+export interface MetadataItem {
+    genesisHash: string;
+    specVersion: string;
+    hexValue: HexString;
+}
 export interface TokenBalanceRaw {
     reserved: BN;
     frozen: BN;

package/cjs/koni/api/dotsama/transfer.js

@@ -75,9 +75,11 @@ async function checkSupportTransfer(networkKey, tokenInfo, substrateApiMap, chai
   } else if (_constants._TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo) && isTxTokensSupported) {
     result.supportTransfer = true;
     result.supportTransferAll = true;
-  } else if (_constants._TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo) && isTxEqBalancesSupported) {
-    result.supportTransfer = true;
-    result.supportTransferAll = true;
+  } else if (_constants._TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey)
+  // && !_isNativeToken(tokenInfo) && isTxEqBalancesSupported
+  ) {
+    result.supportTransfer = false;
+    result.supportTransferAll = false;
   } else if (_constants._TRANSFER_CHAIN_GROUP.crab.includes(networkKey) && _constants._BALANCE_TOKEN_GROUP.crab.includes(tokenInfo.symbol)) {
     result.supportTransfer = true;
     result.supportTransferAll = true;
@@ -96,8 +98,10 @@ async function checkSupportTransfer(networkKey, tokenInfo, substrateApiMap, chai
     // } else if (_TRANSFER_CHAIN_GROUP.riochain.includes(networkKey) && _isNativeToken(tokenInfo)) {
     //   result.supportTransfer = true;
     //   result.supportTransferAll = true;
+  } else if (_constants._TRANSFER_CHAIN_GROUP.avail.includes(networkKey)) {
+    result.supportTransfer = false;
+    result.supportTransferAll = false;
   }
-
   return result;
 }
 const createTransferExtrinsic = async _ref => {
@@ -117,7 +121,7 @@ const createTransferExtrinsic = async _ref => {
   const isTxCurrenciesSupported = !!api && !!api.tx && !!api.tx.currencies;
   const isTxBalancesSupported = !!api && !!api.tx && !!api.tx.balances;
   const isTxTokensSupported = !!api && !!api.tx && !!api.tx.tokens;
-  const isTxEqBalancesSupported = !!api && !!api.tx && !!api.tx.eqBalances;
+  // const isTxEqBalancesSupported = !!api && !!api.tx && !!api.tx.eqBalances;
   const isTxAssetsSupported = !!api && !!api.tx && !!api.tx.assets;
   let transferAmount; // for PSP-22 tokens, might be deprecated in the future
 
@@ -139,8 +143,11 @@ const createTransferExtrinsic = async _ref => {
     } else if (value) {
       transfer = api.tx.tokens.transfer(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo) || (0, _utils2._getTokenOnChainAssetId)(tokenInfo), new _util.BN(value));
     }
-  } else if (_constants._TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey) && isTxEqBalancesSupported) {
-    transfer = api.tx.eqBalances.transfer((0, _utils2._getTokenOnChainAssetId)(tokenInfo), to, value);
+  } else if (_constants._TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey)
+  // && isTxEqBalancesSupported
+  ) {
+    // transfer = api.tx.eqBalances.transfer(_getTokenOnChainAssetId(tokenInfo), to, value);
+    /* empty */
   } else if (!(0, _utils2._isNativeToken)(tokenInfo) && (_constants._TRANSFER_CHAIN_GROUP.crab.includes(networkKey) || _constants._BALANCE_TOKEN_GROUP.crab.includes(tokenInfo.symbol))) {
     if (transferAll) {
       transfer = api.tx.kton.transferAll(to, false);
@@ -157,6 +164,8 @@ const createTransferExtrinsic = async _ref => {
     //   }
   } else if (_constants._TRANSFER_CHAIN_GROUP.sora_substrate.includes(networkKey) && isTxAssetsSupported) {
     transfer = api.tx.assets.transfer((0, _utils2._getTokenOnChainAssetId)(tokenInfo), to, value);
+  } else if (_constants._TRANSFER_CHAIN_GROUP.avail.includes(networkKey)) {
+    /* empty */
   } else if (isTxBalancesSupported && (0, _utils2._isNativeToken)(tokenInfo)) {
     if (transferAll) {
       transfer = api.tx.balances.transferAll(to, false);

package/cjs/koni/api/nft/wasm_nft/index.js

@@ -67,7 +67,10 @@ class WasmNftApi extends _nft.BaseNftApi {
     });
     const _attributeCount = _onChainAttributeCount === null || _onChainAttributeCount === void 0 ? void 0 : (_onChainAttributeCoun = _onChainAttributeCount.output) === null || _onChainAttributeCoun === void 0 ? void 0 : _onChainAttributeCoun.toJSON();
     const onChainAttributeCount = _onChainAttributeCount.output ? (_attributeCount === null || _attributeCount === void 0 ? void 0 : _attributeCount.ok) || (_attributeCount === null || _attributeCount === void 0 ? void 0 : _attributeCount.Ok) : '0';
-    return parseInt(onChainAttributeCount) !== 0;
+    if (!_onChainAttributeCount.result.isOk) {
+      return false;
+    }
+    return !!onChainAttributeCount && parseInt(onChainAttributeCount) !== 0;
   }
   parseFeaturedTokenUri(tokenUri) {
     if (!tokenUri || tokenUri.length === 0) {

package/cjs/koni/api/staking/bonding/index.js

@@ -124,6 +124,9 @@ function subscribeEssentialChainStakingMetadata(substrateApiMap, chainInfoMap, c
 
   // eslint-disable-next-line @typescript-eslint/no-misused-promises
   Object.values(chainInfoMap).forEach(async chainInfo => {
+    if (!substrateApiMap[chainInfo.slug]) {
+      return;
+    }
     const substrateApi = await substrateApiMap[chainInfo.slug].isReady;
     if (_constants._STAKING_CHAIN_GROUP.astar.includes(chainInfo.slug)) {
       const unsub = await (0, _astar.subscribeAstarStakingMetadata)(chainInfo.slug, substrateApi, callback);

package/cjs/koni/api/staking/bonding/paraChain.js

@@ -165,10 +165,11 @@ async function subscribeParaChainNominatorMetadata(chainInfo, address, substrate
   const roundInfo = _roundInfo.toPrimitive();
   const currentRound = roundInfo.current;
   await Promise.all(delegatorState.delegations.map(async delegation => {
-    const [_delegationScheduledRequests, _identity, _collatorInfo] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), substrateApi.api.query.identity.identityOf(delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
+    var _substrateApi$api$que;
+    const [_delegationScheduledRequests, _identity, _collatorInfo] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), (_substrateApi$api$que = substrateApi.api.query.identity) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.identityOf(delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
     const collatorInfo = _collatorInfo.toPrimitive();
     const minDelegation = collatorInfo === null || collatorInfo === void 0 ? void 0 : collatorInfo.lowestTopDelegationAmount.toString();
-    const identityInfo = _identity.toHuman();
+    const identityInfo = _identity === null || _identity === void 0 ? void 0 : _identity.toHuman();
     const delegationScheduledRequests = _delegationScheduledRequests.toPrimitive();
     const identity = (0, _utils.parseIdentity)(identityInfo);
     let hasUnstaking = false;

package/cjs/koni/api/staking/bonding/relayChain.js

@@ -195,10 +195,11 @@ async function subscribeRelayChainNominatorMetadata(chainInfo, address, substrat
   if (nominations) {
     const validatorList = nominations.targets;
     await Promise.all(validatorList.map(async validatorAddress => {
+      var _chainApi$api$query$i;
       let nominationStatus = _KoniTypes.StakingStatus.NOT_EARNING;
-      const [_identityInfo, _eraStaker] = await Promise.all([chainApi.api.query.identity.identityOf(validatorAddress), chainApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
+      const [_identityInfo, _eraStaker] = await Promise.all([(_chainApi$api$query$i = chainApi.api.query.identity) === null || _chainApi$api$query$i === void 0 ? void 0 : _chainApi$api$query$i.identityOf(validatorAddress), chainApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
       const eraStaker = _eraStaker.toPrimitive();
-      const identityInfo = _identityInfo.toHuman();
+      const identityInfo = _identityInfo === null || _identityInfo === void 0 ? void 0 : _identityInfo.toHuman();
       const identity = (0, _utils.parseIdentity)(identityInfo);
       const topNominators = eraStaker.others.map(nominator => {
         return nominator.who;

package/cjs/koni/api/staking/bonding/utils.js

@@ -54,7 +54,7 @@ function transformPoolName(input) {
 }
 function parseIdentity(identityInfo) {
   let identity;
-  if (identityInfo !== null) {
+  if (identityInfo) {
     var _identityInfo$info, _identityInfo$info$di, _identityInfo$info2, _identityInfo$info2$w, _identityInfo$info3, _identityInfo$info3$r, _identityInfo$info4, _identityInfo$info4$t;
     const displayName = identityInfo === null || identityInfo === void 0 ? void 0 : (_identityInfo$info = identityInfo.info) === null || _identityInfo$info === void 0 ? void 0 : (_identityInfo$info$di = _identityInfo$info.display) === null || _identityInfo$info$di === void 0 ? void 0 : _identityInfo$info$di.Raw;
     const web = identityInfo === null || identityInfo === void 0 ? void 0 : (_identityInfo$info2 = identityInfo.info) === null || _identityInfo$info2 === void 0 ? void 0 : (_identityInfo$info2$w = _identityInfo$info2.web) === null || _identityInfo$info2$w === void 0 ? void 0 : _identityInfo$info2$w.Raw;

package/cjs/koni/api/xcm/polkadotXcm.js

@@ -11,15 +11,16 @@ var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 
 function getExtrinsicByPolkadotXcmPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   const weightParam = (0, _utils.getDestWeight)();
-  const beneficiary = (0, _utils.getBeneficiary)(destinationChainInfo, recipientAddress);
-  const destination = (0, _utils.getDestinationChainLocation)(originChainInfo, destinationChainInfo);
-  let assetLocation = (0, _utils.getTokenLocation)(tokenInfo, value);
+  const version = ['statemint', 'statemine', 'shiden'].includes(originChainInfo.slug) ? 'V3' : 'V1';
+  const beneficiary = (0, _utils.getBeneficiary)(destinationChainInfo, recipientAddress, version);
+  const destination = (0, _utils.getDestinationChainLocation)(originChainInfo, destinationChainInfo, version);
+  let assetLocation = (0, _utils.getTokenLocation)(tokenInfo, value, version);
   let method = 'limitedReserveTransferAssets';
   if (['astar', 'shiden'].includes(originChainInfo.slug) && !(0, _utils2._isNativeToken)(tokenInfo)) {
     method = 'limitedReserveWithdrawAssets';
   } else if (['statemint', 'statemine'].includes(originChainInfo.slug) && (0, _utils2._isSubstrateRelayChain)(destinationChainInfo)) {
     assetLocation = {
-      V1: [{
+      [version]: [{
         id: {
           Concrete: {
             parents: 1,

package/cjs/koni/api/xcm/xTokens.js

@@ -25,6 +25,6 @@ function getCurrencyId(tokenInfo) {
 }
 function getExtrinsicByXtokensPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   const weightParam = ['pioneer', 'hydradx_main'].includes(originChainInfo.slug) ? _utils.FOUR_INSTRUCTIONS_WEIGHT : (0, _utils.getDestWeight)();
-  const destVersion = ['moonbeam', 'moonriver'].includes(originChainInfo.slug) ? 'V3' : undefined;
+  const destVersion = ['moonbeam', 'moonriver', 'bifrost_dot'].includes(originChainInfo.slug) ? 'V3' : undefined;
   return api.tx.xTokens.transfer(getCurrencyId(tokenInfo), value, (0, _utils.getDestMultilocation)(destinationChainInfo, recipientAddress, destVersion), weightParam);
 }

package/cjs/koni/api/xcm/xcmPallet.js

@@ -11,7 +11,7 @@ var _utils = require("@subwallet/extension-base/koni/api/xcm/utils");
 // this pallet is only used by Relaychains
 function getExtrinsicByXcmPalletPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   const weightParam = (0, _utils.getDestWeight)();
-  const xcmVer = ['kusama'].includes(originChainInfo.slug) ? 'V3' : 'V1';
+  const xcmVer = 'V3';
   const destination = (0, _utils.getDestinationChainLocation)(originChainInfo, destinationChainInfo, xcmVer);
   const beneficiary = (0, _utils.getBeneficiary)(destinationChainInfo, recipientAddress, xcmVer);
   const tokenLocation = (0, _utils.getTokenLocation)(tokenInfo, value, xcmVer);

package/cjs/koni/background/cron.js

@@ -60,10 +60,11 @@ class KoniCron {
       delete this.cronMap[key];
     });
   };
-  start = () => {
+  start = async () => {
     if (this.status === 'running') {
       return;
     }
+    await Promise.all([this.state.eventService.waitKeyringReady, this.state.eventService.waitAssetReady]);
     const currentAccountInfo = this.state.keyringService.currentAccount;
     const commonReloadEvents = ['account.add', 'account.remove', 'account.updateCurrent', 'chain.add', 'asset.updateState'];
     this.eventHandler = (events, eventTypes) => {
@@ -103,13 +104,9 @@ class KoniCron {
       needUpdateStaking && this.removeCron('updateChainStakingMetadata');
 
       // Chains
-      chainUpdated && this.removeCron('checkStatusApiMap');
-      chainUpdated && this.removeCron('recoverApiMap');
       if (this.checkNetworkAvailable(serviceInfo)) {
         // only add cron job if there's at least 1 active network
         (commonReload || needUpdateNft) && this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), _constants.CRON_REFRESH_NFT_INTERVAL);
-        chainUpdated && this.addCron('checkStatusApiMap', this.updateApiMapStatus, _constants.CRON_GET_API_MAP_STATUS, false);
-        chainUpdated && this.addCron('recoverApiMap', this.recoverApiMap, _constants.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, false);
         (commonReload || needUpdateStaking || stakingSubmitted) && this.addCron('refreshStakingReward', this.refreshStakingReward(address), _constants.CRON_REFRESH_STAKING_REWARD_INTERVAL);
         (commonReload || needUpdateStaking || stakingSubmitted) && this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(address), _constants.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
         needUpdateStaking && this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), _constants.CRON_REFRESH_CHAIN_STAKING_METADATA);
@@ -124,8 +121,6 @@ class KoniCron {
     if (Object.keys(this.state.getSubstrateApiMap()).length !== 0 || Object.keys(this.state.getEvmApiMap()).length !== 0) {
       this.resetNft(currentAccountInfo.address);
       this.addCron('refreshNft', this.refreshNft(currentAccountInfo.address, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), _constants.CRON_REFRESH_NFT_INTERVAL);
-      this.addCron('checkStatusApiMap', this.updateApiMapStatus, _constants.CRON_GET_API_MAP_STATUS);
-      this.addCron('recoverApiMap', this.recoverApiMap, _constants.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, false);
       this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), _constants.CRON_REFRESH_STAKING_REWARD_INTERVAL);
       this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), _constants.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
       this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), _constants.CRON_REFRESH_CHAIN_STAKING_METADATA);
@@ -134,7 +129,7 @@ class KoniCron {
     }
     this.status = 'running';
   };
-  stop = () => {
+  stop = async () => {
     if (this.status === 'stopped') {
       return;
     }
@@ -150,27 +145,7 @@ class KoniCron {
     }
     this.removeAllCrons();
     this.status = 'stopped';
-  };
-  updateApiMapStatus = () => {
-    this.state.chainService.updateApiMapStatus().catch(console.error);
-  };
-  recoverApiMap = () => {
-    var _this$subscriptions;
-    const apiMap = this.state.getApiMap();
-    for (const [networkKey, apiProp] of Object.entries(apiMap.substrate)) {
-      if (!apiProp.isApiConnected) {
-        this.state.refreshSubstrateApi(networkKey);
-      }
-    }
-    for (const [key, evmApi] of Object.entries(apiMap.evm)) {
-      evmApi.api.eth.net.isListening().catch(() => {
-        this.state.refreshWeb3Api(key);
-      });
-    }
-    const {
-      address
-    } = this.state.keyringService.currentAccount;
-    ((_this$subscriptions = this.subscriptions) === null || _this$subscriptions === void 0 ? void 0 : _this$subscriptions.subscribeBalancesAndCrowdloans) && this.subscriptions.subscribeBalancesAndCrowdloans(address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
+    return Promise.resolve();
   };
   refreshNft = (address, apiMap, smartContractNfts, chainInfoMap) => {
     return () => {

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

@@ -1391,14 +1391,18 @@ class KoniExtension {
     });
     return historySubject.getValue();
   }
-  addContact(to) {
-    const toAddress = (0, _utils2.reformatAddress)(to);
-    const account = _uiKeyring.keyring.getAccount(toAddress);
-    const contact = _uiKeyring.keyring.getAddress(toAddress);
-    if (!account && (!contact || contact.meta.isRecent)) {
-      _uiKeyring.keyring.saveAddress(toAddress, {});
-    }
-  }
+
+  // Save address to contact
+  // private addContact (to: string) {
+  //   const toAddress = reformatAddress(to);
+  //   const account = keyring.getAccount(toAddress);
+  //   const contact = keyring.getAddress(toAddress);
+  //
+  //   if (!account && (!contact || contact.meta.isRecent)) {
+  //     keyring.saveAddress(toAddress, {});
+  //   }
+  // }
+
   validateTransfer(tokenSlug, from, to, value, transferAll) {
     const errors = [];
     const keypair = _uiKeyring.keyring.getPair(from);
@@ -1481,7 +1485,9 @@ class KoniExtension {
       throw error;
     }
     const transferNativeAmount = isTransferNativeToken ? transferAmount.value : '0';
-    this.addContact(to);
+
+    // this.addContact(to);
+
     const additionalValidator = async inputTransaction => {
       const minAmount = tokenInfo.minAmount || '0';
       if (!isTransferNativeToken) {
@@ -1590,7 +1596,9 @@ class KoniExtension {
         });
       };
     }
-    this.addContact(to);
+
+    // this.addContact(to);
+
     return await this.#koniState.transactionService.handleTransaction({
       url: _constants2.EXTENSION_REQUEST_URL,
       address: from,
@@ -1617,7 +1625,9 @@ class KoniExtension {
     const contractAddress = params.contractAddress;
     const tokenId = params.tokenId;
     const transaction = await (0, _transfer3.getERC721Transaction)(this.#koniState.getEvmApi(networkKey), contractAddress, senderAddress, recipientAddress, tokenId);
-    this.addContact(recipientAddress);
+
+    // this.addContact(recipientAddress);
+
     return await this.#koniState.transactionService.handleTransaction({
       address: senderAddress,
       chain: networkKey,
@@ -1827,7 +1837,9 @@ class KoniExtension {
     const networkKey = params === null || params === void 0 ? void 0 : params.networkKey;
     const apiProps = this.#koniState.getSubstrateApi(networkKey);
     const extrinsic = !isPSP34 ? (0, _transfer2.getNftTransferExtrinsic)(networkKey, apiProps, senderAddress, recipientAddress, params || {}) : await (0, _wasm.getPSP34TransferExtrinsic)(networkKey, apiProps, senderAddress, recipientAddress, params || {});
-    this.addContact(recipientAddress);
+
+    // this.addContact(recipientAddress);
+
     const rs = await this.#koniState.transactionService.handleTransaction({
       address: senderAddress,
       chain: networkKey,

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

@@ -12,6 +12,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 _types = require("@subwallet/extension-base/services/base/types");
 var _chainService = require("@subwallet/extension-base/services/chain-service");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
@@ -29,6 +30,7 @@ var _subscanChainMap = require("@subwallet/extension-base/services/subscan-servi
 var _transactionService = _interopRequireDefault(require("@subwallet/extension-base/services/transaction-service"));
 var _AccountRef = _interopRequireDefault(require("@subwallet/extension-base/stores/AccountRef"));
 var _parseTransaction = require("@subwallet/extension-base/utils/eth/parseTransaction");
+var _promise = require("@subwallet/extension-base/utils/promise");
 var _decode = require("@subwallet/keyring/pair/decode");
 var _uiKeyring = require("@subwallet/ui-keyring");
 var _ethSimpleKeyring = _interopRequireDefault(require("eth-simple-keyring"));
@@ -80,14 +82,17 @@ class KoniState {
     data: {}
   };
   lazyMap = {};
-  ready = false;
+  // Handle the general status of the extension
+  generalStatus = _types.ServiceStatus.INITIALIZING;
+  waitSleeping = null;
+  waitStarting = null;
   constructor() {
     let providers = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     this.providers = providers;
-    this.dbService = new _DatabaseService.default();
     this.eventService = new _eventService.EventService();
-    this.subscanService = new _subscanService.SubscanService();
+    this.dbService = new _DatabaseService.default(this.eventService);
     this.keyringService = new _keyringService.KeyringService(this.eventService);
+    this.subscanService = new _subscanService.SubscanService();
     this.notificationService = new _NotificationService.default();
     this.chainService = new _chainService.ChainService(this.dbService, this.eventService);
     this.settingService = new _SettingService.default();
@@ -200,6 +205,7 @@ class KoniState {
     return balanceMap;
   }
   async init() {
+    await this.eventService.waitCryptoReady;
     await this.chainService.init();
     await this.migrationService.run();
     this.eventService.emit('chain.ready', true);
@@ -223,14 +229,9 @@ class KoniState {
     });
   }
   onReady() {
-    this.subscription.start();
-    this.cron.start();
-    this.historyService.start().catch(console.error);
-    this.priceService.start().catch(console.error);
-    this.ready = true;
-  }
-  isReady() {
-    return this.ready;
+    // Todo: Need optimize in the future to, only run important services onetime to save resources
+    // Todo: If optimize must check activity of web-runner of mobile
+    this._start().catch(console.error);
   }
   updateKeyringState() {
     let isReady = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
@@ -853,7 +854,7 @@ class KoniState {
     return this.chainService.getActiveChainInfoMap();
   }
   async upsertChainInfo(data) {
-    const newNativeTokenSlug = this.chainService.upsertChain(data);
+    const newNativeTokenSlug = await this.chainService.upsertChain(data);
     if (newNativeTokenSlug) {
       await this.chainService.updateAssetSetting(newNativeTokenSlug, {
         visible: true
@@ -1361,19 +1362,69 @@ class KoniState {
     });
   }
   async sleep() {
-    this.cron.stop();
-    this.subscription.stop();
+    // Wait starting finish before sleep to avoid conflict
+    this.generalStatus === _types.ServiceStatus.STARTING && this.waitStarting && (await this.waitStarting);
+    this.eventService.emit('general.sleep', true);
+
+    // Avoid sleep multiple times
+    if (this.generalStatus === _types.ServiceStatus.STOPPED) {
+      return;
+    }
+
+    // Continue wait existed stopping process
+    if (this.generalStatus === _types.ServiceStatus.STOPPING) {
+      await this.waitSleeping;
+      return;
+    }
+    const sleeping = (0, _promise.createPromiseHandler)();
+    this.generalStatus = _types.ServiceStatus.STOPPING;
+    this.waitSleeping = sleeping.promise;
+
+    // Stopping services
+    await Promise.all([this.cron.stop(), this.subscription.stop()]);
     await this.pauseAllNetworks(undefined, 'IDLE mode');
-    await this.historyService.stop();
-    await this.priceService.stop();
+    await Promise.all([this.historyService.stop(), this.priceService.stop()]);
+
+    // Complete sleeping
+    sleeping.resolve();
+    this.generalStatus = _types.ServiceStatus.STOPPED;
+    this.waitSleeping = null;
+  }
+  async _start() {
+    let isWakeup = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+    // Wait sleep finish before start to avoid conflict
+    this.generalStatus === _types.ServiceStatus.STOPPING && this.waitSleeping && (await this.waitSleeping);
+
+    // Avoid start multiple times
+    if (this.generalStatus === _types.ServiceStatus.STARTED) {
+      return;
+    }
+
+    // Continue wait existed starting process
+    if (this.generalStatus === _types.ServiceStatus.STARTING) {
+      await this.waitStarting;
+      return;
+    }
+    const starting = (0, _promise.createPromiseHandler)();
+    this.generalStatus = _types.ServiceStatus.STARTING;
+    this.waitStarting = starting.promise;
+
+    // Resume all networks if wakeup from sleep
+    if (isWakeup) {
+      await this.resumeAllNetworks();
+      this.eventService.emit('general.wakeup', true);
+    }
+
+    // Start services
+    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start()]);
+
+    // Complete starting
+    starting.resolve();
+    this.waitStarting = null;
+    this.generalStatus = _types.ServiceStatus.STARTED;
   }
   async wakeup() {
-    await this.eventService.waitChainReady;
-    await this.resumeAllNetworks();
-    this.cron.start();
-    this.subscription.start();
-    await this.historyService.start();
-    await this.priceService.start();
+    await this._start(true);
   }
   cancelSubscription(id) {
     if ((0, _subscriptions.isSubscriptionRunning)(id)) {
@@ -1434,7 +1485,7 @@ class KoniState {
       });
     });
     if (needActiveTokens.length) {
-      this.chainService.enableChains(needEnableChains);
+      await this.chainService.enableChains(needEnableChains);
       this.chainService.setAssetSettings({
         ...currentAssetSettings
       });

package/cjs/koni/background/subscription.js

@@ -59,8 +59,9 @@ class KoniSubscription {
       delete this.subscriptionMap.stakingOnChain;
     }
   }
-  start() {
+  async start() {
     var _this$state$keyringSe;
+    await Promise.all([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());
@@ -82,12 +83,13 @@ class KoniSubscription {
     };
     this.state.eventService.onLazy(this.eventHandler);
   }
-  stop() {
+  async stop() {
     if (this.eventHandler) {
       this.state.eventService.offLazy(this.eventHandler);
       this.eventHandler = undefined;
     }
     this.stopAllSubscription();
+    return Promise.resolve();
   }
   subscribeBalancesAndCrowdloans(address, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime) {
     this.state.handleSwitchAccount(address).then(() => {

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.9-2'
+  version: '1.0.11-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._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;
+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_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");
@@ -12,6 +12,8 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 
 const API_AUTO_CONNECT_MS = 3000;
 exports.API_AUTO_CONNECT_MS = API_AUTO_CONNECT_MS;
+const API_CONNECT_TIMEOUT = 30000;
+exports.API_CONNECT_TIMEOUT = API_CONNECT_TIMEOUT;
 const API_MAX_RETRY = 2;
 exports.API_MAX_RETRY = API_MAX_RETRY;
 const _API_OPTIONS_CHAIN_GROUP = {
@@ -198,7 +200,8 @@ const _TRANSFER_CHAIN_GROUP = {
   bitcountry: ['pioneer', 'bitcountry', 'bifrost', 'bifrost_dot'],
   statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel'],
   riochain: ['riochain'],
-  sora_substrate: ['sora_substrate']
+  sora_substrate: ['sora_substrate'],
+  avail: ['kate']
 };
 exports._TRANSFER_CHAIN_GROUP = _TRANSFER_CHAIN_GROUP;
 const _BALANCE_PARSING_CHAIN_GROUP = {

package/cjs/services/chain-service/handler/AbstractChainHandler.js

@@ -0,0 +1,93 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SHORT_RETRY_TIME = exports.LONG_RETRY_TIME = exports.FIRST_RECONNECT_TIME = exports.AbstractChainHandler = void 0;
+var _rxjs = require("rxjs");
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const SHORT_RECOVER_RETRY = 3;
+const FIRST_RECONNECT_TIME = 3000;
+exports.FIRST_RECONNECT_TIME = FIRST_RECONNECT_TIME;
+const SHORT_RETRY_TIME = 15000;
+exports.SHORT_RETRY_TIME = SHORT_RETRY_TIME;
+const LONG_RETRY_TIME = 60000;
+exports.LONG_RETRY_TIME = LONG_RETRY_TIME;
+class AbstractChainHandler {
+  apiStateMapSubject = new _rxjs.BehaviorSubject({});
+  // Recover retry times
+
+  isSleeping = false;
+  constructor(parent) {
+    this.parent = parent;
+    this.recoverMap = {};
+  }
+  handleConnect(chain, isConnected) {
+    const currentMap = this.apiStateMapSubject.getValue();
+    const currentStatus = currentMap[chain];
+
+    // Update api state
+    if (currentStatus !== isConnected) {
+      this.apiStateMapSubject.next({
+        ...currentMap,
+        [chain]: isConnected
+      });
+    }
+
+    // Handle connection change
+    if (!isConnected) {
+      this.handleRecover(chain);
+    }
+  }
+
+  // Recover api if it is disconnected
+  handleRecover(chain) {
+    var _this$parent, _this$parent$getChain;
+    // Not recover inactive chain
+    if (!((_this$parent = this.parent) !== null && _this$parent !== void 0 && (_this$parent$getChain = _this$parent.getChainStateByKey(chain)) !== null && _this$parent$getChain !== void 0 && _this$parent$getChain.active)) {
+      this.cancelRecover(chain);
+      return;
+    }
+
+    // Get retry record
+    const retryRecord = this.recoverMap[chain] || {
+      retryTimes: 0
+    };
+    clearTimeout(retryRecord.timeout);
+    const retryTimes = retryRecord.retryTimes;
+    // Slow down recover frequency if increasing recover times
+    const retryTimeout = retryTimes === 0 ? FIRST_RECONNECT_TIME : retryTimes >= SHORT_RECOVER_RETRY ? LONG_RETRY_TIME : SHORT_RETRY_TIME;
+
+    // Recover api after retry timeout
+    const timeout = setTimeout(() => {
+      var _this$getApiByChain;
+      if ((_this$getApiByChain = this.getApiByChain(chain)) !== null && _this$getApiByChain !== void 0 && _this$getApiByChain.isApiConnected || this.isSleeping) {
+        // Cancel recover if api is connected
+        this.cancelRecover(chain);
+      } else {
+        this.recoverApi(chain);
+        this.handleRecover(chain); // This will be cancel if api is connected
+      }
+    }, retryTimeout);
+    this.recoverMap[chain] = {
+      ...retryRecord,
+      retryTimes: retryTimes + 1,
+      timeout
+    };
+  }
+  cancelRecover(chain) {
+    const retryRecord = this.recoverMap[chain];
+    if (retryRecord) {
+      clearTimeout(retryRecord.timeout);
+      delete this.recoverMap[chain];
+    }
+  }
+  cancelAllRecover() {
+    Object.keys(this.recoverMap).forEach(chain => {
+      this.cancelRecover(chain);
+    });
+  }
+}
+exports.AbstractChainHandler = AbstractChainHandler;