@subwallet/extension-base 1.0.2-1b → 1.0.2-3

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

@@ -10,7 +10,6 @@ var _EvmRequestHandler = _interopRequireDefault(require("@subwallet/extension-ba
 var _MetadataRequestHandler = _interopRequireDefault(require("@subwallet/extension-base/services/request-service/handler/MetadataRequestHandler"));
 var _PopupHandler = _interopRequireDefault(require("@subwallet/extension-base/services/request-service/handler/PopupHandler"));
 var _SubstrateRequestHandler = _interopRequireDefault(require("@subwallet/extension-base/services/request-service/handler/SubstrateRequestHandler"));
-var _accounts = require("@subwallet/ui-keyring/observable/accounts");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -24,12 +23,13 @@ class RequestService {
   #evmRequestHandler;
 
   // Common
-  constructor(chainService, settingService) {
+  constructor(chainService, settingService, keyringService) {
+    this.keyringService = keyringService;
     this.#chainService = chainService;
     this.settingService = settingService;
     this.#popupHandler = new _PopupHandler.default(this);
     this.#metadataRequestHandler = new _MetadataRequestHandler.default(this);
-    this.#authRequestHandler = new _AuthRequestHandler.default(this, this.#chainService);
+    this.#authRequestHandler = new _AuthRequestHandler.default(this, this.#chainService, this.keyringService);
     this.#substrateRequestHandler = new _SubstrateRequestHandler.default(this);
     this.#evmRequestHandler = new _EvmRequestHandler.default(this);
 
@@ -44,7 +44,7 @@ class RequestService {
   }
   getAddressList() {
     let value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    const addressList = Object.keys(_accounts.accounts.subject.value);
+    const addressList = Object.keys(this.keyringService.accounts);
     return addressList.reduce((addressList, v) => ({
       ...addressList,
       [v]: value
@@ -59,7 +59,16 @@ class RequestService {
     this.#popupHandler.popupClose();
   }
   popupOpen() {
-    this.#popupHandler.popupOpen();
+    // Not open new popup and use existed
+    const popupList = this.#popupHandler.popup;
+    if (popupList && popupList.length > 0) {
+      var _chrome$windows$updat;
+      (_chrome$windows$updat = chrome.windows.update(popupList[0], {
+        focused: true
+      })) === null || _chrome$windows$updat === void 0 ? void 0 : _chrome$windows$updat.catch(console.error);
+    } else {
+      this.#popupHandler.popupOpen();
+    }
   }
 
   // Metadata

package/cjs/services/storage-service/DatabaseService.js

@@ -130,8 +130,8 @@ class DatabaseService {
   }
   async upsertHistory(histories) {
     // this.logger.log('Updating transaction histories');
-
-    return this.stores.transaction.bulkUpsert(histories);
+    const cleanedHistory = histories.filter(x => x && x.address && x.chain && x.extrinsicHash);
+    return this.stores.transaction.bulkUpsert(cleanedHistory);
   }
 
   // NFT Collection
@@ -156,9 +156,12 @@ class DatabaseService {
     });
     return this.nftSubscription;
   }
-  async cleanUpNft(chain, owner, collectionId, nftIds) {
-    const result = await this.stores.nft.cleanUpNfts(chain, (0, _utils.reformatAddress)(owner, 42), collectionId, nftIds);
-    result > 0 && console.debug(`Clean up ${result} NFTs from collection ${collectionId} on chain ${chain} for owner ${owner}`);
+  async cleanUpNft(chain, owner, collectionIds, nftIds, ownNothing) {
+    if (ownNothing) {
+      return this.stores.nft.deleteNftsByChainAndOwner(chain, (0, _utils.reformatAddress)(owner, 42));
+    }
+    const result = await this.stores.nft.cleanUpNfts(chain, (0, _utils.reformatAddress)(owner, 42), collectionIds, nftIds);
+    result > 0 && console.debug(`Cleaned up ${result} NFTs on chain ${chain} for owner ${(0, _utils.reformatAddress)(owner, 42)}`, collectionIds, nftIds);
     return result;
   }
   async getNft(addresses, chainHashes) {

package/cjs/services/storage-service/db-stores/Nft.js

@@ -24,12 +24,17 @@ class NftStore extends _BaseStoreWithAddressAndChain.default {
     let chainList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
     return (0, _dexie.liveQuery)(() => this.getNft(addresses, chainList));
   }
-  cleanUpNfts(chain, address, collectionId, nftIds) {
+  cleanUpNfts(chain, address, collectionIds, nftIds) {
     return this.table.where({
       address,
-      chain,
-      collectionId
-    }).and(nft => !nftIds.includes(nft.id)).delete();
+      chain
+    }).and(nft => !collectionIds.includes(nft.collectionId) || collectionIds.includes(nft.collectionId) && !nftIds.includes(nft.id)).delete();
+  }
+  deleteNftsByChainAndOwner(chain, address) {
+    return this.table.where({
+      address,
+      chain
+    }).delete();
   }
   deleteNftByAddress(addresses) {
     return this.table.where('address').anyOfIgnoreCase(addresses).delete();

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

@@ -187,7 +187,6 @@ class TransactionService {
     this.transactionSubject.next({
       ...transactions
     });
-    console.log(transaction);
 
     // Send transaction
     return await this.sendTransaction(transaction);
@@ -596,6 +595,9 @@ class TransactionService {
       payload.isToContract = isToContract;
       payload.parseData = isToContract ? payload.data ? (await (0, _parseTransaction.parseContractInput)(payload.data || '', payload.to || '', chainInfo)).result : '' : payload.data || '';
     }
+    if ('data' in payload && payload.data === undefined) {
+      delete payload.data;
+    }
 
     // Set unique nonce to avoid transaction errors
     if (!payload.nonce) {

package/cjs/utils/address.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.convertSubjectInfoToAddresses = void 0;
 exports.quickFormatAddressToCompare = quickFormatAddressToCompare;
 exports.simpleAddress = void 0;
 var _index = require("@subwallet/extension-base/utils/index");
@@ -22,4 +23,12 @@ function quickFormatAddressToCompare(address) {
     return address;
   }
   return (0, _index.reformatAddress)(address, 42).toLowerCase();
-}
+}
+const convertSubjectInfoToAddresses = subjectInfo => {
+  return Object.values(subjectInfo).map(info => ({
+    address: info.json.address,
+    type: info.type,
+    ...info.json.meta
+  }));
+};
+exports.convertSubjectInfoToAddresses = convertSubjectInfoToAddresses;

package/cjs/utils/index.js

@@ -52,7 +52,8 @@ exports.isEmptyArray = isEmptyArray;
 function isAccountAll(address) {
   return address === _constants.ALL_ACCOUNT_KEY;
 }
-function reformatAddress(address, networkPrefix) {
+function reformatAddress(address) {
+  let networkPrefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 42;
   let isEthereum = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   try {
     if ((0, _utilCrypto.isEthereumAddress)(address)) {

package/koni/api/dotsama/transfer.js

@@ -59,15 +59,17 @@ export async function checkSupportTransfer(networkKey, tokenInfo, substrateApiMa
       supportTransferAll: true
     };
   }
+
+  // TODO: need review
   if (_TRANSFER_CHAIN_GROUP.acala.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxCurrenciesSupported) {
     result.supportTransfer = true;
-    result.supportTransferAll = false;
+    result.supportTransferAll = true;
   } else if (_TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxTokensSupported) {
     result.supportTransfer = true;
     result.supportTransferAll = true;
   } else if (_TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxEqBalancesSupported) {
     result.supportTransfer = true;
-    result.supportTransferAll = false;
+    result.supportTransferAll = true;
   } else if (_TRANSFER_CHAIN_GROUP.crab.includes(networkKey) && _BALANCE_TOKEN_GROUP.crab.includes(tokenInfo.symbol)) {
     result.supportTransfer = true;
     result.supportTransferAll = true;
@@ -114,11 +116,7 @@ export const createTransferExtrinsic = async ({
     }, to, value, {});
     transferAmount = value;
   } else if (_TRANSFER_CHAIN_GROUP.acala.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxCurrenciesSupported) {
-    if (transferAll) {
-      // currently Acala, Karura, Acala testnet do not have transfer all method for sub token
-    } else if (value) {
-      transfer = api.tx.currencies.transfer(to, _getTokenOnChainInfo(tokenInfo), value);
-    }
+    transfer = api.tx.currencies.transfer(to, _getTokenOnChainInfo(tokenInfo), value);
   } else if (_TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxTokensSupported) {
     if (transferAll) {
       transfer = api.tx.tokens.transferAll(to, _getTokenOnChainInfo(tokenInfo), false);
@@ -126,11 +124,7 @@ export const createTransferExtrinsic = async ({
       transfer = api.tx.tokens.transfer(to, _getTokenOnChainInfo(tokenInfo), new BN(value));
     }
   } else if (_TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxEqBalancesSupported) {
-    if (transferAll) {
-      // currently genshiro_testnet, genshiro, equilibrium_parachain do not have transfer all method for tokens
-    } else if (value) {
-      transfer = api.tx.eqBalances.transfer(_getTokenOnChainAssetId(tokenInfo), to, value);
-    }
+    transfer = api.tx.eqBalances.transfer([_getTokenOnChainAssetId(tokenInfo)], to, value);
   } else if (!_isNativeToken(tokenInfo) && (_TRANSFER_CHAIN_GROUP.crab.includes(networkKey) || _BALANCE_TOKEN_GROUP.crab.includes(tokenInfo.symbol))) {
     if (transferAll) {
       transfer = api.tx.kton.transferAll(to, false);

package/koni/api/nft/acala_nft/index.js

@@ -72,21 +72,21 @@ export class AcalaNftApi extends BaseNftApi {
     return (await this.substrateApi.api.query.ormlNFT.tokens(assetId.classId, assetId.tokenId)).toHuman();
   }
   async handleNft(address, params) {
-    // const start = performance.now();
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
+        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
-      const collectionNftIds = {};
+      const collectionIds = [];
+      const nftIds = [];
       await Promise.all(assetIds.map(async assetId => {
         const parsedClassId = this.parseTokenId(assetId.classId);
         const parsedTokenId = this.parseTokenId(assetId.tokenId);
-        if (collectionNftIds[parsedClassId]) {
-          collectionNftIds[parsedClassId].push(parsedTokenId);
-        } else {
-          collectionNftIds[parsedClassId] = [parsedTokenId];
+        if (!collectionIds.includes(parsedClassId)) {
+          collectionIds.push(parsedClassId);
         }
+        nftIds.push(parsedTokenId);
         const [tokenInfo, collectionMeta] = await Promise.all([this.getTokenDetails(assetId), this.getCollectionDetails(parseInt(parsedClassId))]);
         const parsedNft = {
           id: parsedTokenId,
@@ -111,9 +111,7 @@ export class AcalaNftApi extends BaseNftApi {
         params.updateItem(this.chain, parsedNft, address);
         params.updateCollection(this.chain, parsedCollection);
       }));
-      Object.entries(collectionNftIds).forEach(([collectionId, nftIds]) => {
-        params.cleanUpNfts(this.chain, address, collectionId, nftIds);
-      });
+      params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
       console.error('Failed to fetch acala nft', e);
     }

package/koni/api/nft/bit.country/index.js

@@ -73,17 +73,18 @@ export class BitCountryNftApi extends BaseNftApi {
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
+        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
-      const collectionNftIds = {};
+      const collectionIds = [];
+      const nftIds = [];
       await Promise.all(assetIds.map(async assetId => {
         const parsedClassId = this.parseTokenId(assetId.classId);
         const parsedTokenId = this.parseTokenId(assetId.tokenId);
-        if (collectionNftIds[parsedClassId]) {
-          collectionNftIds[parsedClassId].push(parsedTokenId);
-        } else {
-          collectionNftIds[parsedClassId] = [parsedTokenId];
+        if (!collectionIds.includes(parsedClassId)) {
+          collectionIds.push(parsedClassId);
         }
+        nftIds.push(parsedTokenId);
         const [tokenInfo, collectionMeta] = await Promise.all([this.getTokenDetails(assetId), this.getCollectionDetails(parsedClassId)]);
         const parsedNft = {
           id: parsedTokenId,
@@ -108,9 +109,7 @@ export class BitCountryNftApi extends BaseNftApi {
         params.updateItem(this.chain, parsedNft, address);
         params.updateCollection(this.chain, parsedCollection);
       }));
-      Object.entries(collectionNftIds).forEach(([collectionId, nftIds]) => {
-        params.cleanUpNfts(this.chain, address, collectionId, nftIds);
-      });
+      params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
       console.error('Failed to fetch bit.country nft', e);
     }

package/koni/api/nft/evm_nft/index.js

@@ -85,6 +85,7 @@ export class EvmNftApi extends BaseNftApi {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
       const balance = await contract.methods.balanceOf(address).call();
       if (Number(balance) === 0) {
+        nftParams.cleanUpNfts(this.chain, address, [smartContract], []);
         return;
       }
       const itemIndexes = [];
@@ -141,7 +142,7 @@ export class EvmNftApi extends BaseNftApi {
       };
       nftParams.updateCollection(this.chain, nftCollection);
       Object.entries(nftOwnerMap).forEach(([owner, nftIds]) => {
-        nftParams.cleanUpNfts(this.chain, owner, smartContract, nftIds);
+        nftParams.cleanUpNfts(this.chain, owner, [smartContract], nftIds);
       });
     }
   }

package/koni/api/nft/index.d.ts

@@ -17,5 +17,5 @@ export declare class NftHandler {
     setAddresses(addresses: string[]): void;
     private setupNftContracts;
     private setupApi;
-    handleNfts(nftContracts: _ChainAsset[], updateItem: (chain: string, data: NftItem, owner: string) => void, updateCollection: (chain: string, data: NftCollection) => void, cleanUpNfts: (chain: string, owner: string, collectionId: string, nftIds: string[]) => void): Promise<void>;
+    handleNfts(nftContracts: _ChainAsset[], updateItem: (chain: string, data: NftItem, owner: string) => void, updateCollection: (chain: string, data: NftCollection) => void, cleanUpNfts: (chain: string, owner: string, collectionId: string[], nftIds: string[], ownNothing?: boolean) => void): Promise<void>;
 }

package/koni/api/nft/karura_nft/index.js

@@ -82,17 +82,18 @@ export class KaruraNftApi extends BaseNftApi {
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
+        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
-      const collectionNftIds = {};
+      const collectionIds = [];
+      const nftIds = [];
       await Promise.all(assetIds.map(async assetId => {
         const parsedClassId = this.parseTokenId(assetId.classId);
         const parsedTokenId = this.parseTokenId(assetId.tokenId);
-        if (collectionNftIds[parsedClassId]) {
-          collectionNftIds[parsedClassId].push(parsedTokenId);
-        } else {
-          collectionNftIds[parsedClassId] = [parsedTokenId];
+        if (!collectionIds.includes(parsedClassId)) {
+          collectionIds.push(parsedClassId);
         }
+        nftIds.push(parsedTokenId);
         const [tokenInfo, collectionMeta] = await Promise.all([this.getTokenDetails(assetId), this.getCollectionDetails(parseInt(parsedClassId))]);
         const parsedNft = {
           id: parsedTokenId,
@@ -115,9 +116,7 @@ export class KaruraNftApi extends BaseNftApi {
         params.updateItem(this.chain, parsedNft, address);
         params.updateCollection(this.chain, parsedCollection);
       }));
-      Object.entries(collectionNftIds).forEach(([collectionId, nftIds]) => {
-        params.cleanUpNfts(this.chain, address, collectionId, nftIds);
-      });
+      params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
       console.error('Failed to fetch karura nft', e);
     }

package/koni/api/nft/nft.d.ts

@@ -3,7 +3,7 @@ import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain
 export interface HandleNftParams {
     updateItem: (chain: string, data: NftItem, owner: string) => void;
     updateCollection: (chain: string, data: NftCollection) => void;
-    cleanUpNfts: (chain: string, owner: string, collectionId: string, nftIds: string[]) => void;
+    cleanUpNfts: (chain: string, owner: string, collectionId: string[], nftIds: string[], ownNothing?: boolean) => void;
 }
 export declare abstract class BaseNftApi {
     chain: string;

package/koni/api/nft/rmrk_nft/index.js

@@ -132,6 +132,7 @@ export class RmrkNftApi extends BaseNftApi {
       const kusamaAddress = reformatAddress(address, 2);
       allNfts = await this.getAllByAccount(kusamaAddress);
       if (allNfts.length <= 0) {
+        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
       const collectionInfoUrl = [];
@@ -239,8 +240,10 @@ export class RmrkNftApi extends BaseNftApi {
           }
         });
         params.updateCollection(this.chain, parsedCollection);
-        params.cleanUpNfts(this.chain, address, item.collectionId, nftIds);
       });
+      const allCollectionIds = allCollections.map(item => item.collectionId);
+      const allNftIds = allNfts.map(nft => nft === null || nft === void 0 ? void 0 : nft.id);
+      params.cleanUpNfts(this.chain, address, allCollectionIds, allNftIds);
     } catch (e) {
       console.error('Failed to fetch rmrk nft', e);
     }

package/koni/api/nft/statemine_nft/index.js

@@ -86,17 +86,18 @@ export default class StatemineNftApi extends BaseNftApi {
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
+        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
-      const collectionNftIds = {};
+      const collectionIds = [];
+      const nftIds = [];
       await Promise.all(assetIds.map(async assetId => {
         const parsedClassId = this.parseTokenId(assetId.classId);
         const parsedTokenId = this.parseTokenId(assetId.tokenId);
-        if (collectionNftIds[parsedClassId]) {
-          collectionNftIds[parsedClassId].push(parsedTokenId);
-        } else {
-          collectionNftIds[parsedClassId] = [parsedTokenId];
+        if (!collectionIds.includes(parsedClassId)) {
+          collectionIds.push(parsedClassId);
         }
+        nftIds.push(parsedTokenId);
         const [tokenInfo, collectionMeta] = await Promise.all([this.getTokenDetails(assetId), this.getCollectionDetail(parseInt(parsedClassId))]);
         const parsedNft = {
           id: parsedTokenId,
@@ -116,9 +117,7 @@ export default class StatemineNftApi extends BaseNftApi {
         };
         params.updateCollection(this.chain, parsedCollection);
       }));
-      Object.entries(collectionNftIds).forEach(([collectionId, nftIds]) => {
-        params.cleanUpNfts(this.chain, address, collectionId, nftIds);
-      });
+      params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
       console.error('Failed to fetch statemine nft', e);
     }

package/koni/api/nft/unique_nft/index.js

@@ -133,7 +133,8 @@ export default class UniqueNftApi extends BaseNftApi {
           }
         }
       }));
-      const nftCollectionMap = {};
+      const collectionIds = [];
+      let allNftIds = [];
       await Promise.all(allCollectionId.map(async collectionId => {
         const collectionIdStr = collectionId.toString();
 
@@ -141,7 +142,8 @@ export default class UniqueNftApi extends BaseNftApi {
         const collection = (await this.substrateApi.api.query.nft.collectionById(collectionId)).toJSON();
         collectionMap[collectionIdStr] = collection;
         const nftIds = Object.entries(nftMap).filter(item => item[1] === collectionId).map(item => item[0]);
-        nftCollectionMap[collectionIdStr] = nftIds;
+        collectionIds.push(collectionIdStr);
+        allNftIds = allNftIds.concat(nftIds);
         const parsedCollection = {
           collectionId: collectionIdStr,
           chain: this.chain
@@ -171,9 +173,7 @@ export default class UniqueNftApi extends BaseNftApi {
           }
         }));
       }));
-      Object.entries(nftCollectionMap).forEach(([collectionId, nftIds]) => {
-        params.cleanUpNfts(this.chain, address, collectionId, nftIds);
-      });
+      params.cleanUpNfts(this.chain, address, collectionIds, allNftIds);
     } catch (e) {
       console.error('Failed to fetch unique nft', e);
     }

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

@@ -261,6 +261,7 @@ export class WasmNftApi extends BaseNftApi {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
       const balance = _balance.output ? balanceJson.ok || balanceJson.Ok : '0';
       if (parseInt(balance) === 0) {
+        nftParams.cleanUpNfts(this.chain, address, [smartContract], []);
         return;
       }
       const itemIndexes = [];
@@ -316,7 +317,7 @@ export class WasmNftApi extends BaseNftApi {
       };
       nftParams.updateCollection(this.chain, nftCollection);
       Object.entries(nftOwnerMap).forEach(([owner, nftIds]) => {
-        nftParams.cleanUpNfts(this.chain, owner, smartContract, nftIds);
+        nftParams.cleanUpNfts(this.chain, owner, [smartContract], nftIds);
       });
     }
   }

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

@@ -28,6 +28,9 @@ export function validatePoolBondingCondition(chainInfo, amount, selectedPool, ad
   const errors = [];
   let bnTotalStake = new BN(amount);
   const bnMinStake = new BN(chainStakingMetadata.minPoolBonding || '0');
+  if (selectedPool.state !== 'Open') {
+    errors.push(new TransactionError(StakingTxErrorType.INACTIVE_NOMINATION_POOL));
+  }
   if (nominatorMetadata) {
     const bnCurrentActiveStake = new BN(nominatorMetadata.activeStake);
     bnTotalStake = bnTotalStake.add(bnCurrentActiveStake);

package/koni/background/cron.js

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, CRON_GET_API_MAP_STATUS, CRON_REFRESH_CHAIN_NOMINATOR_METADATA, CRON_REFRESH_CHAIN_STAKING_METADATA, CRON_REFRESH_NFT_INTERVAL, CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL, CRON_REFRESH_STAKING_REWARD_INTERVAL } from '@subwallet/extension-base/constants';
-import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
 import { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportSubstrateStaking, _isChainSupportWasmNft } from '@subwallet/extension-base/services/chain-service/utils';
 import { waitTimeout } from '@subwallet/extension-base/utils';
 import { Subject } from 'rxjs';
@@ -74,23 +73,7 @@ export class KoniCron {
     if (this.status === 'running') {
       return;
     }
-    this.logger.log('Starting cron jobs');
     const currentAccountInfo = this.state.keyringService.currentAccount;
-    if (!(currentAccountInfo !== null && currentAccountInfo !== void 0 && currentAccountInfo.address)) {
-      return;
-    }
-    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()), CRON_REFRESH_NFT_INTERVAL);
-      this.addCron('checkStatusApiMap', this.updateApiMapStatus, CRON_GET_API_MAP_STATUS);
-      this.addCron('recoverApiMap', this.recoverApiMap, CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, false);
-      this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
-      this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
-      this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), CRON_REFRESH_CHAIN_STAKING_METADATA);
-      this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(currentAccountInfo.address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), CRON_REFRESH_CHAIN_NOMINATOR_METADATA);
-    } else {
-      this.setStakingRewardReady();
-    }
     const commonReloadEvents = ['account.add', 'account.remove', 'account.updateCurrent', 'chain.add', 'asset.updateState'];
     this.eventHandler = (events, eventTypes) => {
       var _serviceInfo$currentA;
@@ -136,7 +119,7 @@ export class KoniCron {
       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()), CRON_REFRESH_NFT_INTERVAL);
-        chainUpdated && this.addCron('checkStatusApiMap', this.updateApiMapStatus, CRON_GET_API_MAP_STATUS);
+        chainUpdated && this.addCron('checkStatusApiMap', this.updateApiMapStatus, CRON_GET_API_MAP_STATUS, false);
         chainUpdated && this.addCron('recoverApiMap', this.recoverApiMap, CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, false);
         (commonReload || needUpdateStaking || stakingSubmitted) && this.addCron('refreshStakingReward', this.refreshStakingReward(address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
         (commonReload || needUpdateStaking || stakingSubmitted) && this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
@@ -147,6 +130,22 @@ export class KoniCron {
       }
     };
     this.state.eventService.onLazy(this.eventHandler);
+    if (!(currentAccountInfo !== null && currentAccountInfo !== void 0 && currentAccountInfo.address)) {
+      return;
+    }
+    this.logger.log('Starting cron jobs');
+    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()), CRON_REFRESH_NFT_INTERVAL);
+      this.addCron('checkStatusApiMap', this.updateApiMapStatus, CRON_GET_API_MAP_STATUS);
+      this.addCron('recoverApiMap', this.recoverApiMap, CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, false);
+      this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
+      this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
+      this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), CRON_REFRESH_CHAIN_STAKING_METADATA);
+      this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(currentAccountInfo.address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), CRON_REFRESH_CHAIN_NOMINATOR_METADATA);
+    } else {
+      this.setStakingRewardReady();
+    }
     this.status = 'running';
   };
   stop = () => {
@@ -168,35 +167,43 @@ export class KoniCron {
     this.status = 'stopped';
   };
   updateApiMapStatus = () => {
-    const apiMap = this.state.getApiMap();
-    const networkMap = this.state.getChainStateMap();
-    for (const [key, substrateApi] of Object.entries(apiMap.substrate)) {
-      let status = _ChainConnectionStatus.CONNECTING;
-      if (substrateApi.isApiConnected) {
-        status = _ChainConnectionStatus.CONNECTED;
-      }
-      if (!networkMap[key].connectionStatus) {
-        this.state.updateChainConnectionStatus(key, status);
-      } else if (networkMap[key].connectionStatus && networkMap[key].connectionStatus !== status) {
-        this.state.updateChainConnectionStatus(key, status);
-      }
-    }
-    for (const [key, evmApi] of Object.entries(apiMap.evm)) {
-      evmApi.api.eth.net.isListening().then(() => {
-        if (!networkMap[key].connectionStatus) {
-          this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTED);
-        } else if (networkMap[key].connectionStatus && networkMap[key].connectionStatus !== _ChainConnectionStatus.CONNECTED) {
-          this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTED);
-        }
-      }).catch(() => {
-        if (!networkMap[key].connectionStatus) {
-          this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTING);
-        } else if (networkMap[key].connectionStatus && networkMap[key].connectionStatus !== _ChainConnectionStatus.CONNECTING) {
-          this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTING);
-        }
-      });
-    }
+    this.state.chainService.updateApiMapStatus().catch(console.error);
+    // const apiMap = this.state.getApiMap();
+    // const networkMap = this.state.getChainStateMap();
+    //
+    // for (const [key, substrateApi] of Object.entries(apiMap.substrate)) {
+    //   let status: _ChainConnectionStatus = _ChainConnectionStatus.CONNECTING;
+    //
+    //   if (substrateApi.isApiConnected) {
+    //     status = _ChainConnectionStatus.CONNECTED;
+    //   }
+    //
+    //   if (!networkMap[key].connectionStatus) {
+    //     this.state.updateChainConnectionStatus(key, status);
+    //   } else if (networkMap[key].connectionStatus && networkMap[key].connectionStatus !== status) {
+    //     this.state.updateChainConnectionStatus(key, status);
+    //   }
+    // }
+    //
+    // for (const [key, evmApi] of Object.entries(apiMap.evm)) {
+    //   evmApi.api.eth.net.isListening()
+    //     .then(() => {
+    //       if (!networkMap[key].connectionStatus) {
+    //         this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTED);
+    //       } else if (networkMap[key].connectionStatus && networkMap[key].connectionStatus !== _ChainConnectionStatus.CONNECTED) {
+    //         this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTED);
+    //       }
+    //     })
+    //     .catch(() => {
+    //       if (!networkMap[key].connectionStatus) {
+    //         this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTING);
+    //       } else if (networkMap[key].connectionStatus && networkMap[key].connectionStatus !== _ChainConnectionStatus.CONNECTING) {
+    //         this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTING);
+    //       }
+    //     });
+    // }
   };
+
   recoverApiMap = () => {
     var _this$subscriptions;
     const apiMap = this.state.getApiMap();

package/koni/background/handlers/Extension.d.ts

@@ -39,7 +39,10 @@ export default class KoniExtension {
     private checkPublicAndSecretKey;
     private accountsGetAllWithCurrentAddress;
     private accountsGetAll;
-    private saveRecentAccountId;
+    private subscribeAddresses;
+    private saveRecentAccount;
+    private editContactAccount;
+    private deleteContactAccount;
     private _getAuthListV2;
     private authorizeSubscribeV2;
     private getAuthListV2;
@@ -107,6 +110,7 @@ export default class KoniExtension {
     private getStaking;
     private subscribeStaking;
     private subscribeHistory;
+    private addContact;
     private validateTransfer;
     private makeTransfer;
     private validateCrossChainTransfer;
@@ -123,6 +127,7 @@ export default class KoniExtension {
     private deleteCustomAsset;
     private validateCustomAsset;
     private getAddressFreeBalance;
+    private transferGetMaxTransferable;
     private subscribeAddressFreeBalance;
     private transferCheckReferenceCount;
     private transferCheckSupporting;