@subwallet/extension-base 1.0.2-2 → 1.0.2-3

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

@@ -10,6 +10,7 @@ var _databases = _interopRequireDefault(require("@subwallet/extension-base/servi
 var _dbStores = require("@subwallet/extension-base/services/storage-service/db-stores");
 var _ChainStakingMetadata = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/ChainStakingMetadata"));
 var _NominatorMetadata = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/NominatorMetadata"));
+var _utils = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -54,7 +55,8 @@ class DatabaseService {
   }
   async updateBalanceStore(address, item) {
     if (item.state === _KoniTypes.APIItemState.READY) {
-      this.logger.log(`Updating balance for [${item.tokenSlug}]`);
+      // this.logger.log(`Updating balance for [${item.tokenSlug}]`);
+
       return this.stores.balance.upsert({
         address,
         ...item
@@ -69,14 +71,16 @@ class DatabaseService {
   // Crowdloan
   async updateCrowdloanStore(chain, address, item) {
     if (item.state === _KoniTypes.APIItemState.READY && item.contribute !== '0') {
-      this.logger.log(`Updating crowdloan for [${chain}]`);
+      // this.logger.log(`Updating crowdloan for [${chain}]`);
+
       return this.stores.crowdloan.upsert({
         chain,
         address,
         ...item
       });
     } else {
-      this.logger.debug(`Removing crowdloan for [${chain}]`);
+      // this.logger.debug(`Removing crowdloan for [${chain}]`);
+
       return this.stores.crowdloan.deleteByChainAndAddress(chain, address);
     }
   }
@@ -84,22 +88,23 @@ class DatabaseService {
   // Staking
   async updateStaking(chain, address, item) {
     if (item.state === _KoniTypes.APIItemState.READY) {
-      this.logger.log(`Updating staking for [${chain}]`);
+      // this.logger.log(`Updating staking for [${chain}]`);
+
       return this.stores.staking.upsert(item);
     }
   }
   async getStakings(addresses, chains) {
-    const stakings = await this.stores.staking.getStakings(addresses, chains);
-    this.logger.log('Get Stakings: ', stakings);
-    return stakings;
+    // this.logger.log('Get Stakings: ', stakings);
+
+    return this.stores.staking.getStakings(addresses, chains);
   }
   async getStakingsByChains(chains) {
     return this.stores.staking.getStakingsByChains(chains);
   }
   async getPooledStakings(addresses, chainHashes) {
-    const stakings = await this.stores.staking.getPooledStakings(addresses, chainHashes);
-    this.logger.log('Get Pooled Stakings: ', stakings);
-    return stakings;
+    // this.logger.log('Get Pooled Stakings: ', stakings);
+
+    return this.stores.staking.getPooledStakings(addresses, chainHashes);
   }
   subscribeStaking(addresses, chainList, callback) {
     this.stakingSubscription && this.stakingSubscription.unsubscribe();
@@ -121,18 +126,18 @@ class DatabaseService {
 
   // Transaction histories
   async getHistories(query) {
-    const histories = await this.stores.transaction.queryHistory(query);
-    this.logger.log('Get histories: ', histories);
-    return histories;
+    return this.stores.transaction.queryHistory(query);
   }
   async upsertHistory(histories) {
-    this.logger.log('Updating transaction histories');
-    return this.stores.transaction.bulkUpsert(histories);
+    // this.logger.log('Updating transaction histories');
+    const cleanedHistory = histories.filter(x => x && x.address && x.chain && x.extrinsicHash);
+    return this.stores.transaction.bulkUpsert(cleanedHistory);
   }
 
   // NFT Collection
   async addNftCollection(collection) {
-    this.logger.log(`Updating NFT collection for [${collection.chain}]`);
+    // this.logger.log(`Updating NFT collection for [${collection.chain}]`);
+
     return this.stores.nftCollection.upsert(collection);
   }
   async deleteNftCollection(chain, collectionId) {
@@ -151,13 +156,22 @@ class DatabaseService {
     });
     return this.nftSubscription;
   }
+  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) {
-    const nfts = await this.stores.nft.getNft(addresses, chainHashes);
-    this.logger.log('Get NFTs: ', nfts);
-    return nfts;
+    // this.logger.log('Get NFTs: ', nfts);
+
+    return this.stores.nft.getNft(addresses, chainHashes);
   }
   async addNft(address, nft) {
-    this.logger.log(`Updating NFT for [${nft.chain}]`);
+    // this.logger.log(`Updating NFT for [${nft.chain}]`);
+
     return this.stores.nft.upsert({
       ...nft,
       address
@@ -167,47 +181,54 @@ class DatabaseService {
     return this.stores.nft.deleteNftItem(chain, addresses, nftItem);
   }
   removeNfts(chain, address, collectionId, nftIds) {
-    this.logger.log(`Remove NFTs [${nftIds.join(', ')}]`);
+    // this.logger.log(`Remove NFTs [${nftIds.join(', ')}]`);
+
     return this.stores.nft.removeNfts(chain, address, collectionId, nftIds);
   }
 
   // Chain
   async updateChainStore(item) {
-    this.logger.log(`Updating storageInfo for chain [${item.slug}]`);
+    // this.logger.log(`Updating storageInfo for chain [${item.slug}]`);
+
     return this.stores.chain.upsert(item);
   }
   async bulkUpdateChainStore(data) {
-    this.logger.log('Bulk updating ChainStore');
+    // this.logger.log('Bulk updating ChainStore');
+
     return this.stores.chain.bulkUpsert(data);
   }
   async removeFromChainStore(chains) {
-    this.logger.log('Bulk removing ChainStore');
+    // this.logger.log('Bulk removing ChainStore');
+
     return this.stores.chain.removeChains(chains);
   }
   async getAllChainStore() {
-    const allChains = await this.stores.chain.getAll();
-    this.logger.log('Get all chains: ', allChains);
-    return allChains;
+    // this.logger.log('Get all chains: ', allChains);
+
+    return this.stores.chain.getAll();
   }
 
   // Asset
   async updateAssetStore(item) {
-    this.logger.log(`Updating storageInfo for chainAsset [${item.originChain}]`);
+    // this.logger.log(`Updating storageInfo for chainAsset [${item.originChain}]`);
+
     return this.stores.asset.upsert(item);
   }
   async getAllAssetStore() {
-    const allAssets = await this.stores.asset.getAll();
-    this.logger.log('Get all stored assets: ', allAssets);
-    return allAssets;
+    // this.logger.log('Get all stored assets: ', allAssets);
+
+    return this.stores.asset.getAll();
   }
   async removeFromAssetStore(items) {
-    this.logger.log('Bulk removing AssetStore');
+    // this.logger.log('Bulk removing AssetStore');
+
     return this.stores.asset.removeAssets(items);
   }
 
   // Staking
   async updateChainStakingMetadata(item) {
-    this.logger.log('Update ChainStakingMetadata: ', item.chain);
+    // this.logger.log('Update ChainStakingMetadata: ', item.chain);
+
     return this.stores.chainStakingMetadata.upsert(item);
   }
   async getChainStakingMetadata() {
@@ -218,7 +239,8 @@ class DatabaseService {
     return this.stores.chainStakingMetadata.getByChainAndType(chain, type);
   }
   async updateNominatorMetadata(item) {
-    this.logger.log('Update NominatorMetadata: ', item.address, item.chain);
+    // this.logger.log('Update NominatorMetadata: ', item.address, item.chain);
+
     return this.stores.nominatorMetadata.upsert(item);
   }
   async getNominatorMetadata() {

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

@@ -24,25 +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));
   }
-  deleteRemovedNftsFromCollection(chainHash, address, collection) {
-    let nftIds = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
-    const conditions = {
-      chainHash,
-      address
-    };
-    if (!collection && nftIds && nftIds.length) {
-      return this.logger.warn('Missing collection id');
-    }
-    if (collection) {
-      conditions.collectionId = collection;
-    }
-    return this.table.where(conditions).and(item => !nftIds.some(nft => nft === item.id)).delete();
+  cleanUpNfts(chain, address, collectionIds, nftIds) {
+    return this.table.where({
+      address,
+      chain
+    }).and(nft => !collectionIds.includes(nft.collectionId) || collectionIds.includes(nft.collectionId) && !nftIds.includes(nft.id)).delete();
   }
-  deleteNftsFromRemovedCollection(chain, address, collectionIds) {
+  deleteNftsByChainAndOwner(chain, address) {
     return this.table.where({
       address,
       chain
-    }).and(nft => !collectionIds.some(item => item === nft.collectionId));
+    }).delete();
   }
   deleteNftByAddress(addresses) {
     return this.table.where('address').anyOfIgnoreCase(addresses).delete();

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

@@ -10,43 +10,28 @@ var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 // SPDX-License-Identifier: Apache-2.0
 
 function parseXcmEventLogs(historyItem, eventLogs, chain, sendingTokenInfo, chainInfo) {
-  let isFeeUseMainTokenSymbol = true;
   for (let index = 0; index < eventLogs.length; index++) {
     const record = eventLogs[index];
-    if (['karura', 'acala', 'acala_testnet'].includes(chain) && sendingTokenInfo && !(0, _utils._isNativeToken)(sendingTokenInfo)) {
-      if (record.event.section === 'currencies' && record.event.method.toLowerCase() === 'transferred') {
-        if (index === 0) {
-          var _record$event$data$;
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-          historyItem.fee = {
-            value: ((_record$event$data$ = record.event.data[3]) === null || _record$event$data$ === void 0 ? void 0 : _record$event$data$.toString()) || '0',
-            symbol: sendingTokenInfo.symbol,
-            decimals: (0, _utils._getAssetDecimals)(sendingTokenInfo)
-          };
-          isFeeUseMainTokenSymbol = false;
-        }
-      }
-    }
     const {
       decimals: nativeDecimals,
       symbol: nativeSymbol
     } = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
-    if (isFeeUseMainTokenSymbol && record.event.section === 'balances' && record.event.method.toLowerCase() === 'withdraw') {
-      var _record$event$data$2;
-      if ((_record$event$data$2 = record.event.data[1]) !== null && _record$event$data$2 !== void 0 && _record$event$data$2.toString()) {
-        var _record$event$data$3;
+    if (record.event.section === 'balances' && record.event.method.toLowerCase() === 'withdraw') {
+      var _record$event$data$;
+      if ((_record$event$data$ = record.event.data[1]) !== null && _record$event$data$ !== void 0 && _record$event$data$.toString()) {
+        var _record$event$data$2;
         historyItem.fee = {
-          value: (_record$event$data$3 = record.event.data[1]) === null || _record$event$data$3 === void 0 ? void 0 : _record$event$data$3.toString(),
+          value: (_record$event$data$2 = record.event.data[1]) === null || _record$event$data$2 === void 0 ? void 0 : _record$event$data$2.toString(),
           symbol: nativeSymbol,
           decimals: nativeDecimals
         };
       }
-    } else if (isFeeUseMainTokenSymbol && record.event.section === 'tokens' && record.event.method.toLowerCase() === 'withdrawn') {
-      var _record$event$data$4;
-      if ((_record$event$data$4 = record.event.data[2]) !== null && _record$event$data$4 !== void 0 && _record$event$data$4.toString()) {
-        var _record$event$data$5;
+    } else if (record.event.section === 'tokens' && record.event.method.toLowerCase() === 'withdrawn') {
+      var _record$event$data$3;
+      if (!historyItem.fee && (_record$event$data$3 = record.event.data[2]) !== null && _record$event$data$3 !== void 0 && _record$event$data$3.toString()) {
+        var _record$event$data$4;
         historyItem.fee = {
-          value: (_record$event$data$5 = record.event.data[2]) === null || _record$event$data$5 === void 0 ? void 0 : _record$event$data$5.toString(),
+          value: (_record$event$data$4 = record.event.data[2]) === null || _record$event$data$4 === void 0 ? void 0 : _record$event$data$4.toString(),
           symbol: nativeSymbol,
           decimals: nativeDecimals
         };
@@ -55,28 +40,15 @@ function parseXcmEventLogs(historyItem, eventLogs, chain, sendingTokenInfo, chai
   }
 }
 function parseTransferEventLogs(historyItem, eventLogs, chain, sendingTokenInfo, chainInfo) {
-  let isFeeUseMainTokenSymbol = true;
   for (let index = 0; index < eventLogs.length; index++) {
     const record = eventLogs[index];
-    if (['karura', 'acala', 'acala_testnet'].includes(chain) && !(0, _utils._isNativeToken)(sendingTokenInfo)) {
-      if (record.event.section === 'currencies' && record.event.method.toLowerCase() === 'transferred') {
-        if (index === 0) {
-          var _record$event$data$6;
-          historyItem.fee = {
-            value: ((_record$event$data$6 = record.event.data[3]) === null || _record$event$data$6 === void 0 ? void 0 : _record$event$data$6.toString()) || '0',
-            symbol: sendingTokenInfo.symbol,
-            decimals: (0, _utils._getAssetDecimals)(sendingTokenInfo)
-          };
-          isFeeUseMainTokenSymbol = false;
-        }
-      }
-    } else if (['genshiro_testnet', 'genshiro', 'equilibrium_parachain'].includes(chain) && sendingTokenInfo) {
+    if (['genshiro_testnet', 'genshiro', 'equilibrium_parachain'].includes(chain) && sendingTokenInfo) {
       if (record.event.section === 'transactionPayment' && record.event.method.toLowerCase() === 'transactionfeepaid') {
-        var _record$event$data$7;
-        if ((_record$event$data$7 = record.event.data[1]) !== null && _record$event$data$7 !== void 0 && _record$event$data$7.toString()) {
-          var _record$event$data$8;
+        var _record$event$data$5;
+        if ((_record$event$data$5 = record.event.data[1]) !== null && _record$event$data$5 !== void 0 && _record$event$data$5.toString()) {
+          var _record$event$data$6;
           historyItem.fee = {
-            value: ((_record$event$data$8 = record.event.data[1]) === null || _record$event$data$8 === void 0 ? void 0 : _record$event$data$8.toString()) || '0',
+            value: ((_record$event$data$6 = record.event.data[1]) === null || _record$event$data$6 === void 0 ? void 0 : _record$event$data$6.toString()) || '0',
             symbol: sendingTokenInfo.symbol,
             decimals: (0, _utils._getAssetDecimals)(sendingTokenInfo)
           };
@@ -87,13 +59,13 @@ function parseTransferEventLogs(historyItem, eventLogs, chain, sendingTokenInfo,
       decimals: nativeDecimals,
       symbol: nativeSymbol
     } = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
-    if (isFeeUseMainTokenSymbol && record.event.section === 'balances' && record.event.method.toLowerCase() === 'withdraw') {
-      var _record$event$data$9;
-      if ((_record$event$data$9 = record.event.data[1]) !== null && _record$event$data$9 !== void 0 && _record$event$data$9.toString()) {
-        var _record$event$data$10;
+    if (record.event.section === 'balances' && record.event.method.toLowerCase() === 'withdraw') {
+      var _record$event$data$7;
+      if ((_record$event$data$7 = record.event.data[1]) !== null && _record$event$data$7 !== void 0 && _record$event$data$7.toString()) {
+        var _record$event$data$8;
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         historyItem.fee = {
-          value: ((_record$event$data$10 = record.event.data[1]) === null || _record$event$data$10 === void 0 ? void 0 : _record$event$data$10.toString()) || '0',
+          value: ((_record$event$data$8 = record.event.data[1]) === null || _record$event$data$8 === void 0 ? void 0 : _record$event$data$8.toString()) || '0',
           symbol: nativeSymbol,
           decimals: nativeDecimals
         };

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);
@@ -434,11 +433,11 @@ class TransactionService {
     }
     try {
       // Return one more history record if transaction send to account in the wallets
-      const toAccount = (historyItem === null || historyItem === void 0 ? void 0 : historyItem.to) && _uiKeyring.default.getAccount(historyItem.to);
+      const toAccount = (historyItem === null || historyItem === void 0 ? void 0 : historyItem.to) && _uiKeyring.default.getPair(historyItem.to);
       if (toAccount) {
         return [historyItem, {
           ...historyItem,
-          address: historyItem.to,
+          address: toAccount.address,
           direction: _KoniTypes.TransactionDirection.RECEIVED
         }];
       }
@@ -464,18 +463,27 @@ class TransactionService {
   handlePostProcessing(id) {
     // must be done after success/failure to make sure the transaction is finalized
     const transaction = this.getTransaction(id);
-    switch (transaction.extrinsicType) {
-      case _KoniTypes.ExtrinsicType.SEND_NFT:
-        {
-          const inputData = (0, _utils2.parseTransactionData)(transaction.data);
-          const sender = _uiKeyring.default.getAccount(inputData.senderAddress);
-          const recipient = _uiKeyring.default.getAccount(inputData.recipientAddress);
-          sender && this.databaseService.handleNftTransfer(transaction.chain, [sender.address, _constants.ALL_ACCOUNT_KEY], inputData.nftItem).catch(console.error);
-          recipient && this.databaseService.addNft(recipient.address, {
-            ...inputData.nftItem,
-            owner: recipient.address
-          }).catch(console.error);
-        }
+    if (transaction.extrinsicType === _KoniTypes.ExtrinsicType.SEND_NFT) {
+      const inputData = (0, _utils2.parseTransactionData)(transaction.data);
+      try {
+        const sender = _uiKeyring.default.getPair(inputData.senderAddress);
+        sender && this.databaseService.handleNftTransfer(transaction.chain, [sender.address, _constants.ALL_ACCOUNT_KEY], inputData.nftItem).then(() => {
+          this.eventService.emit('transaction.transferNft', undefined);
+        }).catch(console.error);
+      } catch (e) {
+        console.error(e);
+      }
+      try {
+        const recipient = _uiKeyring.default.getPair(inputData.recipientAddress);
+        recipient && this.databaseService.addNft(recipient.address, {
+          ...inputData.nftItem,
+          owner: recipient.address
+        }).catch(console.error);
+      } catch (e) {
+        console.error(e);
+      }
+    } else if ([_KoniTypes.ExtrinsicType.STAKING_BOND, _KoniTypes.ExtrinsicType.STAKING_UNBOND, _KoniTypes.ExtrinsicType.STAKING_WITHDRAW, _KoniTypes.ExtrinsicType.STAKING_CANCEL_UNSTAKE, _KoniTypes.ExtrinsicType.STAKING_CLAIM_REWARD, _KoniTypes.ExtrinsicType.STAKING_JOIN_POOL, _KoniTypes.ExtrinsicType.STAKING_POOL_WITHDRAW, _KoniTypes.ExtrinsicType.STAKING_LEAVE_POOL].includes(transaction.extrinsicType)) {
+      this.eventService.emit('transaction.submitStaking', transaction.chain);
     }
   }
   onSuccess(_ref2) {
@@ -587,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

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -28,15 +27,14 @@ exports.isUrl = isUrl;
 exports.isValidSubstrateAddress = exports.isValidProvider = void 0;
 exports.mergeNetworkProviders = mergeNetworkProviders;
 exports.parseIpfsLink = exports.notDef = exports.nonEmptyArr = void 0;
-exports.parseNumberToDisplay = parseNumberToDisplay;
 exports.parseRawNumber = parseRawNumber;
 exports.reformatAddress = reformatAddress;
 exports.sumBN = sumBN;
 exports.toUnit = void 0;
 exports.utf16ToString = utf16ToString;
+exports.waitTimeout = waitTimeout;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
-var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 var _canDerive = require("./canDerive");
@@ -54,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)) {
@@ -315,21 +314,16 @@ exports.filterAndSortingAccountByAuthType = filterAndSortingAccountByAuthType;
 function parseRawNumber(value) {
   return parseFloat(value.replaceAll(',', ''));
 }
-function parseNumberToDisplay(amount, decimals) {
-  if (!decimals) {
-    return '0';
-  }
-  const parsedAmount = parseRawNumber(amount.toString());
-  const bigN = new _bignumber.default(parsedAmount / 10 ** decimals);
-  const roundedString = bigN.toFixed(9);
-  const formattedString = parseFloat(roundedString); // remove excess zeros at the end
-
-  return formattedString.toString();
-}
 function isSameAddress(address1, address2) {
+  if ((0, _utilCrypto.isEthereumAddress)(address1)) {
+    return address1.toLowerCase() === address2.toLowerCase();
+  }
   return reformatAddress(address1, 0) === reformatAddress(address2, 0); // TODO: maybe there's a better way
 }
 
 function getDomainFromUrl(url) {
   return url.replace(/^(https?:\/\/)?(www\.)?/, '').split('/')[0];
+}
+async function waitTimeout(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
 }

package/constants/index.d.ts

@@ -1,22 +1,16 @@
 export declare const CRON_REFRESH_PRICE_INTERVAL = 30000;
-export declare const DOTSAMA_API_TIMEOUT = 30000;
-export declare const DOTSAMA_AUTO_CONNECT_MS = 3000;
-export declare const DOTSAMA_MAX_CONTINUE_RETRY = 2;
 export declare const CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = 60000;
 export declare const CRON_AUTO_RECOVER_WEB3_INTERVAL = 90000;
 export declare const ACALA_REFRESH_CROWDLOAN_INTERVAL = 300000;
-export declare const ACALA_REFRESH_BALANCE_INTERVAL = 30000;
-export declare const ASTAR_REFRESH_BALANCE_INTERVAL = 30000;
-export declare const SUB_TOKEN_REFRESH_BALANCE_INTERVAL = 30000;
-export declare const SUBSCRIBE_BALANCE_FAST_INTERVAL = 9000;
-export declare const CRON_REFRESH_NFT_INTERVAL = 900000;
+export declare const ASTAR_REFRESH_BALANCE_INTERVAL = 60000;
+export declare const SUB_TOKEN_REFRESH_BALANCE_INTERVAL = 60000;
+export declare const CRON_REFRESH_NFT_INTERVAL = 7200000;
 export declare const CRON_REFRESH_STAKING_REWARD_INTERVAL = 900000;
-export declare const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 10000;
-export declare const CRON_REFRESH_HISTORY_INTERVAL = 90000;
-export declare const CRON_GET_API_MAP_STATUS = 5000;
-export declare const CRON_REFRESH_STAKING_DATA = 30000;
+export declare const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 300000;
+export declare const CRON_REFRESH_HISTORY_INTERVAL = 900000;
+export declare const CRON_GET_API_MAP_STATUS = 10000;
 export declare const CRON_REFRESH_CHAIN_STAKING_METADATA = 900000;
-export declare const CRON_REFRESH_CHAIN_NOMINATOR_METADATA = 900000;
+export declare const CRON_REFRESH_CHAIN_NOMINATOR_METADATA = 1800000;
 export declare const ALL_ACCOUNT_KEY = "ALL";
 export declare const ALL_NETWORK_KEY = "all";
 export declare const ALL_GENESIS_HASH: null;

package/constants/index.js

@@ -2,24 +2,18 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export const CRON_REFRESH_PRICE_INTERVAL = 30000;
-export const DOTSAMA_API_TIMEOUT = 30000;
-export const DOTSAMA_AUTO_CONNECT_MS = 3000;
-export const DOTSAMA_MAX_CONTINUE_RETRY = 2;
 export const CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = 60000;
 export const CRON_AUTO_RECOVER_WEB3_INTERVAL = 90000;
 export const ACALA_REFRESH_CROWDLOAN_INTERVAL = 300000;
-export const ACALA_REFRESH_BALANCE_INTERVAL = 30000;
-export const ASTAR_REFRESH_BALANCE_INTERVAL = 30000;
-export const SUB_TOKEN_REFRESH_BALANCE_INTERVAL = 30000;
-export const SUBSCRIBE_BALANCE_FAST_INTERVAL = 9000;
-export const CRON_REFRESH_NFT_INTERVAL = 900000;
+export const ASTAR_REFRESH_BALANCE_INTERVAL = 60000;
+export const SUB_TOKEN_REFRESH_BALANCE_INTERVAL = 60000;
+export const CRON_REFRESH_NFT_INTERVAL = 7200000;
 export const CRON_REFRESH_STAKING_REWARD_INTERVAL = 900000;
-export const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 10000;
-export const CRON_REFRESH_HISTORY_INTERVAL = 90000;
-export const CRON_GET_API_MAP_STATUS = 5000;
-export const CRON_REFRESH_STAKING_DATA = 30000;
+export const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 300000;
+export const CRON_REFRESH_HISTORY_INTERVAL = 900000;
+export const CRON_GET_API_MAP_STATUS = 10000;
 export const CRON_REFRESH_CHAIN_STAKING_METADATA = 900000;
-export const CRON_REFRESH_CHAIN_NOMINATOR_METADATA = 900000;
+export const CRON_REFRESH_CHAIN_NOMINATOR_METADATA = 1800000;
 export const ALL_ACCOUNT_KEY = 'ALL';
 export const ALL_NETWORK_KEY = 'all';
 export const ALL_GENESIS_HASH = null;

package/koni/api/dotsama/balance.d.ts

@@ -4,4 +4,3 @@ import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain
 export declare function subscribeBalance(addresses: string[], chainInfoMap: Record<string, _ChainInfo>, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, callback: (rs: BalanceItem) => void): () => void;
 export declare function subscribeSubstrateBalance(addresses: string[], chainInfo: _ChainInfo, chain: string, networkAPI: _SubstrateApi, evmApiMap: Record<string, _EvmApi>, callBack: (rs: BalanceItem) => void): Promise<() => void>;
 export declare function subscribeEVMBalance(chain: string, addresses: string[], evmApiMap: Record<string, _EvmApi>, callback: (rs: BalanceItem) => void, tokenInfo: _ChainAsset): () => void;
-export declare function getFreeBalance(chain: string, address: string, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, tokenSlug?: string): Promise<string>;