@subwallet/extension-base 1.0.5-1 → 1.0.5-3

package/background/KoniTypes.d.ts

@@ -419,6 +419,8 @@ export interface TransactionHistoryItem<ET extends ExtrinsicType = ExtrinsicType
     fee?: AmountData;
     explorerUrl?: string;
     additionalInfo?: TransactionAdditionalInfo<ET>;
+    startBlock?: number;
+    nonce?: number;
 }
 export interface SWError extends Error {
     code?: number;
@@ -1073,7 +1075,6 @@ export interface ChainStakingMetadata {
     minJoinNominationPool?: string;
     minStake: string;
     nominatorCount?: number;
-    minPoolBonding?: string;
     maxValidatorPerNominator: number;
     maxWithdrawalRequestPerValidator: number;
     allowCancelUnstaking: boolean;

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

@@ -34,7 +34,7 @@ function validateRelayUnbondingCondition(amount, chainStakingMetadata, nominator
   const errors = [];
   const bnActiveStake = new _util.BN(nominatorMetadata.activeStake);
   const bnRemainingStake = bnActiveStake.sub(new _util.BN(amount));
-  const minStake = new _util.BN(chainStakingMetadata.minPoolBonding || '0');
+  const minStake = new _util.BN(chainStakingMetadata.minJoinNominationPool || '0');
   if (!(bnRemainingStake.isZero() || bnRemainingStake.gte(minStake))) {
     errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.INVALID_ACTIVE_STAKE));
   }
@@ -48,7 +48,7 @@ function validatePoolBondingCondition(chainInfo, amount, selectedPool, address,
   // amount >= min stake
   const errors = [];
   let bnTotalStake = new _util.BN(amount);
-  const bnMinStake = new _util.BN(chainStakingMetadata.minPoolBonding || '0');
+  const bnMinStake = new _util.BN(chainStakingMetadata.minJoinNominationPool || '0');
   if (selectedPool.state !== 'Open') {
     errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.INACTIVE_NOMINATION_POOL));
   }
@@ -90,9 +90,6 @@ function validateRelayBondingCondition(chainInfo, amount, selectedValidators, ad
 async function getRelayChainStakingMetadata(chainInfo, substrateApi) {
   var _chainApi$api$query$a, _chainApi$api$query, _chainApi$api$query$s, _chainApi$api$query2, _chainApi$api$query2$, _chainApi$api$query3, _chainApi$api$query3$;
   const chain = chainInfo.slug;
-  const {
-    decimals
-  } = (0, _utils2._getChainNativeTokenBasicInfo)(chainInfo);
   const chainApi = await substrateApi.isReady;
   const _era = await chainApi.api.query.staking.currentEra();
   const currentEra = _era.toString();
@@ -136,8 +133,6 @@ async function getRelayChainStakingMetadata(chainInfo, substrateApi) {
     // in %, annually
     inflation,
     minStake: minStake.toString(),
-    minPoolBonding: (10 ** decimals).toString(),
-    // default is 1
     maxValidatorPerNominator: parseInt(maxNominations),
     maxWithdrawalRequestPerValidator: parseInt(maxUnlockingChunks),
     allowCancelUnstaking: true,

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

@@ -17,6 +17,7 @@ exports.getParaCurrentInflation = getParaCurrentInflation;
 exports.getStakingAvailableActionsByChain = getStakingAvailableActionsByChain;
 exports.getStakingAvailableActionsByNominator = getStakingAvailableActionsByNominator;
 exports.getStakingStatusByNominations = getStakingStatusByNominations;
+exports.getValidatorLabel = getValidatorLabel;
 exports.getWithdrawalInfo = getWithdrawalInfo;
 exports.isActionFromValidator = isActionFromValidator;
 exports.isShowNominationByValidator = isShowNominationByValidator;
@@ -268,4 +269,12 @@ function getStakingStatusByNominations(bnTotalActiveStake, nominationList) {
     }
   }
   return stakingStatus;
+}
+function getValidatorLabel(chain) {
+  if (_constants._STAKING_CHAIN_GROUP.astar.includes(chain)) {
+    return 'dApp';
+  } else if (_constants._STAKING_CHAIN_GROUP.relay.includes(chain)) {
+    return 'Validator';
+  }
+  return 'Collator';
 }

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

@@ -1299,7 +1299,7 @@ class KoniExtension {
     const isPasswordValidated = this.validatedAccountsPassword(file, password);
     if (isPasswordValidated) {
       try {
-        this._saveCurrentAccountAddress(addressList[0], () => {
+        this._saveCurrentAccountAddress(_constants.ALL_ACCOUNT_KEY, () => {
           _uiKeyring.keyring.restoreAccounts(file, password);
           this._addAddressesToAuthList(addressList, isAllowed);
         });
@@ -1446,7 +1446,8 @@ class KoniExtension {
 
     // Get native token amount
     const freeBalance = await this.#koniState.balanceService.getTokenFreeBalance(from, networkKey, tokenSlug);
-    if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to)) {
+    if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to) && (0, _utils._isTokenTransferredByEvm)(tokenInfo)) {
+      // TODO: review this
       chainType = _KoniTypes.ChainType.EVM;
       const txVal = transferAll ? freeBalance.value : value || '0';
 
@@ -2917,6 +2918,7 @@ class KoniExtension {
       return Object.fromEntries(Object.entries(rs).map(_ref70 => {
         let [key, value] = _ref70;
         const {
+          additionalValidator,
           transaction,
           ...transactionResult
         } = value;

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

@@ -445,35 +445,36 @@ class KoniTabs {
         const chainIdNum = parseInt(chainId, 16);
         const [existedNetworkSlug, existedChainInfo] = this.#koniState.findNetworkKeyByChainId(chainIdNum);
         if (existedNetworkSlug && existedChainInfo && existedChainInfo !== null && existedChainInfo !== void 0 && existedChainInfo.evmInfo) {
-          const evmInfo = existedChainInfo.evmInfo;
-          const substrateInfo = existedChainInfo.substrateInfo;
-          const chainState = this.#koniState.getChainStateByKey(existedNetworkSlug);
-          await this.#koniState.addNetworkConfirm(id, url, {
-            mode: 'update',
-            chainSpec: {
-              evmChainId: evmInfo.evmChainId,
-              decimals: evmInfo.decimals,
-              existentialDeposit: evmInfo.existentialDeposit,
-              genesisHash: (substrateInfo === null || substrateInfo === void 0 ? void 0 : substrateInfo.genesisHash) || '',
-              paraId: (substrateInfo === null || substrateInfo === void 0 ? void 0 : substrateInfo.paraId) || null,
-              addressPrefix: (substrateInfo === null || substrateInfo === void 0 ? void 0 : substrateInfo.addressPrefix) || 0
-            },
-            chainEditInfo: {
-              blockExplorer: blockExplorerUrls === null || blockExplorerUrls === void 0 ? void 0 : blockExplorerUrls[0],
-              slug: existedNetworkSlug,
-              currentProvider: chainState.currentProvider,
-              providers: existedChainInfo.providers,
-              symbol: evmInfo.symbol,
-              chainType: 'EVM',
-              name: existedChainInfo.name
-            }
-          });
           return await this.switchEvmChain(id, url, {
             method: 'wallet_switchEthereumChain',
             params: [{
               chainId
             }]
           });
+          // const evmInfo = existedChainInfo.evmInfo;
+          // const substrateInfo = existedChainInfo.substrateInfo;
+          // const chainState = this.#koniState.getChainStateByKey(existedNetworkSlug);
+          //
+          // return await this.#koniState.addNetworkConfirm(id, url, {
+          //   mode: 'update',
+          //   chainSpec: {
+          //     evmChainId: evmInfo.evmChainId,
+          //     decimals: evmInfo.decimals,
+          //     existentialDeposit: evmInfo.existentialDeposit,
+          //     genesisHash: substrateInfo?.genesisHash || '',
+          //     paraId: substrateInfo?.paraId || null,
+          //     addressPrefix: substrateInfo?.addressPrefix || 0
+          //   },
+          //   chainEditInfo: {
+          //     blockExplorer: blockExplorerUrls?.[0],
+          //     slug: existedNetworkSlug,
+          //     currentProvider: chainState.currentProvider,
+          //     providers: existedChainInfo.providers,
+          //     symbol: evmInfo.symbol,
+          //     chainType: 'EVM',
+          //     name: existedChainInfo.name
+          //   }
+          // });
         } else if (rpcUrls && chainName) {
           const filteredUrls = rpcUrls.filter(targetString => {
             let url;

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

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

@@ -36,7 +36,7 @@ const _BALANCE_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
   bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'] // perhaps there are some runtime updates
 };
 exports._BALANCE_CHAIN_GROUP = _BALANCE_CHAIN_GROUP;
@@ -194,7 +194,7 @@ const _TRANSFER_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   crab: ['crab', 'pangolin'],
   bitcountry: ['pioneer', 'bitcountry'],
-  statemine: ['statemint', 'statemine']
+  statemine: ['statemint', 'statemine', 'darwinia2']
 };
 exports._TRANSFER_CHAIN_GROUP = _TRANSFER_CHAIN_GROUP;
 const _BALANCE_PARSING_CHAIN_GROUP = {

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

@@ -720,6 +720,11 @@ class ChainService {
         targetChainInfo.substrateInfo.crowdloanUrl = params.chainEditInfo.crowdloanUrl;
       }
     }
+    if (targetChainInfo.evmInfo) {
+      if (params.chainEditInfo.blockExplorer !== undefined) {
+        targetChainInfo.evmInfo.blockExplorer = params.chainEditInfo.blockExplorer;
+      }
+    }
     this.updateChainInfoMapSubscription();
     this.dbService.updateChainStore({
       ...targetChainInfo,

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

@@ -61,6 +61,7 @@ exports._isSubstrateParaChain = _isSubstrateParaChain;
 exports._isSubstrateParachain = _isSubstrateParachain;
 exports._isSubstrateRelayChain = _isSubstrateRelayChain;
 exports._isTokenEvmSmartContract = _isTokenEvmSmartContract;
+exports._isTokenTransferredByEvm = _isTokenTransferredByEvm;
 exports._isTokenWasmSmartContract = _isTokenWasmSmartContract;
 exports._isXcmPathSupported = _isXcmPathSupported;
 exports._parseAssetRefKey = _parseAssetRefKey;
@@ -128,6 +129,10 @@ function _getContractAddressOfToken(tokenInfo) {
   var _tokenInfo$metadata;
   return ((_tokenInfo$metadata = tokenInfo.metadata) === null || _tokenInfo$metadata === void 0 ? void 0 : _tokenInfo$metadata.contractAddress) || '';
 }
+function _isTokenTransferredByEvm(tokenInfo) {
+  var _tokenInfo$metadata2;
+  return !!((_tokenInfo$metadata2 = tokenInfo.metadata) !== null && _tokenInfo$metadata2 !== void 0 && _tokenInfo$metadata2.contractAddress) || _isNativeToken(tokenInfo);
+}
 function _checkSmartContractSupportByChain(chainInfo, contractType) {
   // EVM chains support smart contract by default so just checking Substrate chains
   if (chainInfo.substrateInfo === null || chainInfo.substrateInfo && chainInfo.substrateInfo.supportSmartContract === null) {
@@ -138,12 +143,12 @@ function _checkSmartContractSupportByChain(chainInfo, contractType) {
 
 // Utils for balance functions
 function _getTokenOnChainAssetId(tokenInfo) {
-  var _tokenInfo$metadata2;
-  return ((_tokenInfo$metadata2 = tokenInfo.metadata) === null || _tokenInfo$metadata2 === void 0 ? void 0 : _tokenInfo$metadata2.assetId) || '-1';
+  var _tokenInfo$metadata3;
+  return ((_tokenInfo$metadata3 = tokenInfo.metadata) === null || _tokenInfo$metadata3 === void 0 ? void 0 : _tokenInfo$metadata3.assetId) || '-1';
 }
 function _getTokenOnChainInfo(tokenInfo) {
-  var _tokenInfo$metadata3;
-  return (_tokenInfo$metadata3 = tokenInfo.metadata) === null || _tokenInfo$metadata3 === void 0 ? void 0 : _tokenInfo$metadata3.onChainInfo;
+  var _tokenInfo$metadata4;
+  return (_tokenInfo$metadata4 = tokenInfo.metadata) === null || _tokenInfo$metadata4 === void 0 ? void 0 : _tokenInfo$metadata4.onChainInfo;
 }
 function _getTokenMinAmount(tokenInfo) {
   return tokenInfo.minAmount || '0';
@@ -296,16 +301,16 @@ function _isXcmPathSupported(originTokenSlug, destinationTokenSlug, assetRefMap)
   return assetRef.path === _types._AssetRefPath.XCM;
 }
 function _getXcmAssetType(tokenInfo) {
-  var _tokenInfo$metadata4;
-  return ((_tokenInfo$metadata4 = tokenInfo.metadata) === null || _tokenInfo$metadata4 === void 0 ? void 0 : _tokenInfo$metadata4.assetType) || '';
+  var _tokenInfo$metadata5;
+  return ((_tokenInfo$metadata5 = tokenInfo.metadata) === null || _tokenInfo$metadata5 === void 0 ? void 0 : _tokenInfo$metadata5.assetType) || '';
 }
 function _getXcmAssetId(tokenInfo) {
-  var _tokenInfo$metadata5;
-  return ((_tokenInfo$metadata5 = tokenInfo.metadata) === null || _tokenInfo$metadata5 === void 0 ? void 0 : _tokenInfo$metadata5.assetId) || '-1';
+  var _tokenInfo$metadata6;
+  return ((_tokenInfo$metadata6 = tokenInfo.metadata) === null || _tokenInfo$metadata6 === void 0 ? void 0 : _tokenInfo$metadata6.assetId) || '-1';
 }
 function _getXcmAssetMultilocation(tokenInfo) {
-  var _tokenInfo$metadata6;
-  return (_tokenInfo$metadata6 = tokenInfo.metadata) === null || _tokenInfo$metadata6 === void 0 ? void 0 : _tokenInfo$metadata6.multilocation;
+  var _tokenInfo$metadata7;
+  return (_tokenInfo$metadata7 = tokenInfo.metadata) === null || _tokenInfo$metadata7 === void 0 ? void 0 : _tokenInfo$metadata7.multilocation;
 }
 function _getXcmTransferType(originChainInfo, destinationChainInfo) {
   var _originChainInfo$subs, _destinationChainInfo;

package/cjs/services/history-service/helpers/recoverHistoryStatus.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.historyRecover = exports.HistoryRecoverStatus = void 0;
+var _utils = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 let HistoryRecoverStatus;
@@ -16,78 +17,194 @@ exports.HistoryRecoverStatus = HistoryRecoverStatus;
   HistoryRecoverStatus["FAIL_DETECT"] = "FAIL_DETECT";
   HistoryRecoverStatus["UNKNOWN"] = "UNKNOWN";
 })(HistoryRecoverStatus || (exports.HistoryRecoverStatus = HistoryRecoverStatus = {}));
+const BLOCK_LIMIT = 6;
 const substrateRecover = async (history, chainService) => {
   const {
+    address,
     blockHash,
     chain,
-    extrinsicHash
+    extrinsicHash,
+    from,
+    nonce,
+    startBlock
   } = history;
+  const result = {
+    status: HistoryRecoverStatus.UNKNOWN
+  };
   try {
     const substrateApi = chainService.getSubstrateApi(chain);
     if (substrateApi) {
       const _api = await substrateApi.isReady;
       const api = _api.api;
       if (!blockHash) {
-        console.log(`Fail to find extrinsic ${extrinsicHash} on ${chain}: No block hash`);
-        return HistoryRecoverStatus.LACK_INFO;
-      }
-      const block = await api.rpc.chain.getBlock(blockHash);
-      const allEvents = await api.query.system.events.at(blockHash);
-      const extrinsics = block.block.extrinsics;
-      let index;
-      extrinsics.forEach((extrinsic, _idx) => {
-        if (extrinsicHash === extrinsic.hash.toHex()) {
-          index = _idx;
+        if (!nonce || !startBlock) {
+          console.log(`Fail to find extrinsic for ${address} on ${chain}: With nonce ${nonce || 'undefined'} from block ${startBlock || 'undefined'}`);
+          return {
+            status: HistoryRecoverStatus.LACK_INFO
+          };
         }
-      });
-      if (index === undefined) {
-        console.log(`Fail to find extrinsic ${extrinsicHash} on ${chain}`);
-        return HistoryRecoverStatus.FAIL_DETECT;
-      }
-      const events = allEvents.filter(_ref => {
-        let {
-          phase
-        } = _ref;
-        return phase.isApplyExtrinsic && phase.asApplyExtrinsic.eq(index);
-      });
-      for (const {
-        event
-      } of events) {
-        if (api.events.system.ExtrinsicSuccess.is(event)) {
-          return HistoryRecoverStatus.SUCCESS;
-        } else if (api.events.system.ExtrinsicFailed.is(event)) {
-          return HistoryRecoverStatus.FAILED;
+        const currentBlock = (await api.query.system.number()).toPrimitive();
+        for (let i = 1, found = false; i < BLOCK_LIMIT && !found && startBlock + i <= currentBlock; i++) {
+          const blockHash = (await api.rpc.chain.getBlockHash(startBlock + i)).toHex();
+          const block = await api.rpc.chain.getBlock(blockHash);
+          const extrinsics = block.block.extrinsics;
+          let index;
+          for (const [idx, extrinsic] of Object.entries(extrinsics)) {
+            if (extrinsic.signer && (0, _utils.isSameAddress)(from, extrinsic.signer.toString()) && nonce === extrinsic.nonce.toNumber()) {
+              index = parseInt(idx);
+              found = true;
+              result.extrinsicHash = extrinsic.hash.toHex();
+              result.blockHash = block.block.hash.toHex();
+              result.blockNumber = block.block.header.number.toNumber();
+              break;
+            }
+          }
+          if (index !== undefined) {
+            const allEvents = await api.query.system.events.at(blockHash);
+            const events = allEvents.filter(_ref => {
+              let {
+                phase
+              } = _ref;
+              return phase.isApplyExtrinsic && phase.asApplyExtrinsic.eq(index);
+            });
+            for (const {
+              event
+            } of events) {
+              if (api.events.system.ExtrinsicSuccess.is(event)) {
+                return {
+                  ...result,
+                  status: HistoryRecoverStatus.SUCCESS
+                };
+              } else if (api.events.system.ExtrinsicFailed.is(event)) {
+                return {
+                  ...result,
+                  status: HistoryRecoverStatus.FAILED
+                };
+              }
+            }
+          }
+        }
+      } else {
+        const block = await api.rpc.chain.getBlock(blockHash);
+        const allEvents = await api.query.system.events.at(blockHash);
+        const extrinsics = block.block.extrinsics;
+        let index;
+        for (const [idx, extrinsic] of Object.entries(extrinsics)) {
+          if (extrinsicHash === extrinsic.hash.toHex()) {
+            index = parseInt(idx);
+            break;
+          }
+        }
+        if (index === undefined) {
+          console.log(`Fail to find extrinsic ${extrinsicHash} on ${chain}`);
+          return {
+            status: HistoryRecoverStatus.FAIL_DETECT
+          };
+        }
+        const events = allEvents.filter(_ref2 => {
+          let {
+            phase
+          } = _ref2;
+          return phase.isApplyExtrinsic && phase.asApplyExtrinsic.eq(index);
+        });
+        for (const {
+          event
+        } of events) {
+          if (api.events.system.ExtrinsicSuccess.is(event)) {
+            return {
+              ...result,
+              status: HistoryRecoverStatus.SUCCESS
+            };
+          } else if (api.events.system.ExtrinsicFailed.is(event)) {
+            return {
+              ...result,
+              status: HistoryRecoverStatus.FAILED
+            };
+          }
         }
       }
-      return HistoryRecoverStatus.FAIL_DETECT;
+      return {
+        status: HistoryRecoverStatus.FAIL_DETECT
+      };
     } else {
       console.error(`Fail to update history ${chain}-${extrinsicHash}: Api not active`);
-      return HistoryRecoverStatus.API_INACTIVE;
+      return {
+        status: HistoryRecoverStatus.API_INACTIVE
+      };
     }
   } catch (e) {
     console.error(`Fail to update history ${chain}-${extrinsicHash}:`, e.message);
-    return HistoryRecoverStatus.UNKNOWN;
+    return {
+      status: HistoryRecoverStatus.UNKNOWN
+    };
   }
 };
 const evmRecover = async (history, chainService) => {
   const {
+    address,
     chain,
-    extrinsicHash
+    extrinsicHash,
+    from,
+    nonce,
+    startBlock
   } = history;
+  const result = {
+    status: HistoryRecoverStatus.UNKNOWN
+  };
   try {
     const evmApi = chainService.getEvmApi(chain);
     if (evmApi) {
       const _api = await evmApi.isReady;
       const api = _api.api;
-      const block = await api.eth.getTransactionReceipt(extrinsicHash);
-      return block.status ? HistoryRecoverStatus.SUCCESS : HistoryRecoverStatus.FAILED;
+      if (extrinsicHash) {
+        const transactionReceipt = await api.eth.getTransactionReceipt(extrinsicHash);
+        return {
+          ...result,
+          status: transactionReceipt.status ? HistoryRecoverStatus.SUCCESS : HistoryRecoverStatus.FAILED
+        };
+      } else {
+        if (!nonce || !startBlock) {
+          console.log(`Fail to find extrinsic for ${address} on ${chain}: With nonce ${nonce || 'undefined'} from block ${startBlock || 'undefined'}`);
+          return {
+            ...result,
+            status: HistoryRecoverStatus.LACK_INFO
+          };
+        }
+        const currentBlock = await api.eth.getBlockNumber();
+        for (let i = 1, found = false; i < BLOCK_LIMIT && !found && startBlock + i <= currentBlock; i++) {
+          const block = await api.eth.getBlock(startBlock + i, true);
+          for (const transaction of block.transactions) {
+            if ((0, _utils.isSameAddress)(transaction.from, from) && nonce === transaction.nonce) {
+              result.extrinsicHash = transaction.hash;
+              result.blockHash = block.hash;
+              result.blockNumber = block.number;
+              found = true;
+              break;
+            }
+          }
+          if (result.extrinsicHash) {
+            const transactionReceipt = await api.eth.getTransactionReceipt(result.extrinsicHash);
+            return {
+              ...result,
+              status: transactionReceipt.status ? HistoryRecoverStatus.SUCCESS : HistoryRecoverStatus.FAILED
+            };
+          }
+        }
+      }
+      return {
+        status: HistoryRecoverStatus.FAIL_DETECT
+      };
     } else {
       console.error(`Fail to update history ${chain}-${extrinsicHash}: Api not active`);
-      return HistoryRecoverStatus.API_INACTIVE;
+      return {
+        status: HistoryRecoverStatus.API_INACTIVE
+      };
     }
   } catch (e) {
     console.error(`Fail to update history ${chain}-${extrinsicHash}:`, e.message);
-    return HistoryRecoverStatus.UNKNOWN;
+    return {
+      status: HistoryRecoverStatus.UNKNOWN
+    };
   }
 };
 
@@ -102,7 +219,9 @@ const historyRecover = async (history, chainService) => {
     const checkFunction = chainType === 'substrate' ? substrateRecover : evmRecover;
     return await checkFunction(history, chainService);
   } else {
-    return HistoryRecoverStatus.LACK_INFO;
+    return {
+      status: HistoryRecoverStatus.LACK_INFO
+    };
   }
 };
 exports.historyRecover = historyRecover;

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

@@ -17,7 +17,7 @@ var _subsquidMultiChainHistory = require("./subsquid-multi-chain-history");
 
 class HistoryService {
   historySubject = new _rxjs.BehaviorSubject([]);
-  #processingHistories = {};
+  #needRecoveryHistories = {};
   constructor(dbService, chainService, eventService, keyringService) {
     this.dbService = dbService;
     this.chainService = chainService;
@@ -80,7 +80,7 @@ class HistoryService {
     await this.addHistoryItems(updatedRecords);
   }
   async updateHistoryByExtrinsicHash(extrinsicHash, updateData) {
-    await this.dbService.updateHistoryByNewExtrinsicHash(extrinsicHash, updateData);
+    await this.dbService.updateHistoryByExtrinsicHash(extrinsicHash, updateData);
     this.historySubject.next(await this.dbService.getHistories());
   }
 
@@ -139,7 +139,7 @@ class HistoryService {
   }
   async recoverHistories() {
     const list = [];
-    for (const processingHistory of Object.values(this.#processingHistories)) {
+    for (const processingHistory of Object.values(this.#needRecoveryHistories)) {
       const chainState = this.chainService.getChainStateByKey(processingHistory.chain);
       if (chainState.active) {
         list.push(processingHistory);
@@ -149,24 +149,28 @@ class HistoryService {
       }
     }
     const promises = list.map(history => (0, _recoverHistoryStatus.historyRecover)(history, this.chainService));
-    const result = await Promise.all(promises);
-    result.forEach((status, index) => {
-      const extrinsicHash = list[index].extrinsicHash;
-      switch (status) {
+    const results = await Promise.all(promises);
+    results.forEach((recoverResult, index) => {
+      const currentExtrinsicHash = list[index].extrinsicHash;
+      const updateData = {
+        ...recoverResult,
+        status: _KoniTypes.ExtrinsicStatus.UNKNOWN
+      };
+      switch (recoverResult.status) {
         case _recoverHistoryStatus.HistoryRecoverStatus.API_INACTIVE:
           break;
         case _recoverHistoryStatus.HistoryRecoverStatus.FAILED:
         case _recoverHistoryStatus.HistoryRecoverStatus.SUCCESS:
-          this.updateHistoryByExtrinsicHash(extrinsicHash, {
-            status: status === _recoverHistoryStatus.HistoryRecoverStatus.SUCCESS ? _KoniTypes.ExtrinsicStatus.SUCCESS : _KoniTypes.ExtrinsicStatus.FAIL
-          }).catch(console.error);
-          delete this.#processingHistories[extrinsicHash];
+          updateData.status = recoverResult.status === _recoverHistoryStatus.HistoryRecoverStatus.SUCCESS ? _KoniTypes.ExtrinsicStatus.SUCCESS : _KoniTypes.ExtrinsicStatus.FAIL;
+          this.updateHistoryByExtrinsicHash(currentExtrinsicHash, updateData).catch(console.error);
+          delete this.#needRecoveryHistories[currentExtrinsicHash];
           break;
         default:
-          delete this.#processingHistories[extrinsicHash];
+          this.updateHistoryByExtrinsicHash(currentExtrinsicHash, updateData).catch(console.error);
+          delete this.#needRecoveryHistories[currentExtrinsicHash];
       }
     });
-    if (!Object.keys(this.#processingHistories).length) {
+    if (!Object.keys(this.#needRecoveryHistories).length) {
       await this.stopRecoverHistories();
     }
   }
@@ -176,7 +180,7 @@ class HistoryService {
     await this.loadData();
     Promise.all([this.eventService.waitKeyringReady, this.eventService.waitChainReady]).then(() => {
       this.getHistories().catch(console.log);
-      this.getProcessingHistory().catch(console.log);
+      this.recoverProcessingHistory().catch(console.error);
       this.eventService.on('account.add', () => {
         (async () => {
           await this.stopCron();
@@ -189,14 +193,18 @@ class HistoryService {
     }).catch(console.error);
     this.status = _types.ServiceStatus.INITIALIZED;
   }
-  async getProcessingHistory() {
+  async recoverProcessingHistory() {
     const histories = await this.dbService.getHistories();
-    this.#processingHistories = {};
+    this.#needRecoveryHistories = {};
     histories.filter(history => {
-      return history.status === 'processing';
+      return [_KoniTypes.ExtrinsicStatus.PROCESSING, _KoniTypes.ExtrinsicStatus.SUBMITTING].includes(history.status);
     }).forEach(history => {
-      this.#processingHistories[history.extrinsicHash] = history;
+      this.#needRecoveryHistories[history.extrinsicHash] = history;
     });
+    const recoverNumber = Object.keys(this.#needRecoveryHistories).length;
+    if (recoverNumber > 0) {
+      console.log(`Recover ${recoverNumber} processing history`);
+    }
     this.startRecoverHistories().catch(console.error);
   }
   async start() {
@@ -204,7 +212,6 @@ class HistoryService {
       this.startPromiseHandler = (0, _promise.createPromiseHandler)();
       this.status = _types.ServiceStatus.STARTING;
       await this.startCron();
-      await this.startRecoverHistories();
       this.status = _types.ServiceStatus.STARTED;
       this.startPromiseHandler.resolve();
     } catch (e) {

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

@@ -255,7 +255,7 @@ async function fetchMultiChainHistories(addresses, chainMap) {
     const usedAddresses = relatedAddresses.filter(a => lowerAddresses.includes(a.toLowerCase()));
     const chainInfo = chainMap[chainId];
     if (chainInfo === undefined) {
-      console.warn(`Not found chain info for chain id: ${chainId}`); // TODO: resolve conflicting chainId
+      console.debug(`Not found chain info for chain id: ${chainId}`); // TODO: resolve conflicting chainId
 
       return;
     }
@@ -264,7 +264,7 @@ async function fetchMultiChainHistories(addresses, chainMap) {
         const transactionData = parseSubsquidTransactionData(address, name, historyItem, chainInfo, parseData(args), parseData(_data));
         histories.push(transactionData);
       } catch (e) {
-        console.warn('Parse transaction data failed', address, e);
+        console.debug('Parse transaction data failed', address, e);
       }
     });
   });

package/cjs/services/notification-service/NotificationService.js

@@ -36,7 +36,7 @@ class NotificationService {
       type: 'basic',
       title,
       message,
-      iconUrl: 'https://subwallet.app/assets/images/favicon/favicon-192x192.png',
+      iconUrl: './images/icon-128.png',
       priority: 2,
       isClickable: !!link
     }, notificationId => {

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

@@ -120,7 +120,7 @@ class DatabaseService {
     const cleanedHistory = histories.filter(x => x && x.address && x.chain && x.extrinsicHash);
     return this.stores.transaction.bulkUpsert(cleanedHistory);
   }
-  async updateHistoryByNewExtrinsicHash(extrinsicHash, updateData) {
+  async updateHistoryByExtrinsicHash(extrinsicHash, updateData) {
     const canUpdate = updateData && extrinsicHash;
     if (!canUpdate) {
       return;