@subwallet/extension-base 1.0.4-1 → 1.0.5-2

package/services/keyring-service/index.js

@@ -41,7 +41,6 @@ export class KeyringService {
 
         // Remove account
         removedAddresses.forEach(address => {
-          console.log('account.remove', address);
           this.eventService.emit('account.remove', address);
         });
       } else if (beforeAddresses.length < afterAddresses.length) {
@@ -49,7 +48,6 @@ export class KeyringService {
 
         // Add account
         addedAddresses.forEach(address => {
-          console.log('account.add', address);
           this.eventService.emit('account.add', address);
         });
       } else {

package/services/migration-service/index.js

@@ -9,7 +9,6 @@ export default class MigrationService {
     this.logger = createLogger('Migration');
   }
   async run() {
-    this.logger.log('Migrating...');
     const keys = Object.keys(MigrationScripts).sort((a, b) => a.localeCompare(b));
 
     // Await timeout 2s
@@ -24,7 +23,6 @@ export default class MigrationService {
           key
         }).first();
         if (!check || key.startsWith(EVERYTIME)) {
-          this.logger.log('Running script: ', JobClass.name);
           const job = new JobClass(this.state);
           await job.run();
           await this.state.dbService.stores.migration.table.put({
@@ -37,6 +35,5 @@ export default class MigrationService {
         this.logger.error('Migration error: ', MigrationScripts[keys[i]].name, error);
       }
     }
-    this.logger.log('Migration done.');
   }
 }

package/services/migration-service/scripts/MigrateAutoLock.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateAutoLock extends BaseMigrationJob {
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/MigrateAutoLock.js

@@ -0,0 +1,22 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+import { DEFAULT_AUTO_LOCK_TIME } from '@subwallet/extension-base/services/setting-service/constants';
+export default class MigrateAutoLock extends BaseMigrationJob {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        this.state.settingService.getSettings(currentSettings => {
+          this.state.settingService.setSettings({
+            ...currentSettings,
+            timeAutoLock: DEFAULT_AUTO_LOCK_TIME
+          });
+          resolve();
+        });
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}

package/services/migration-service/scripts/MigrateChainPatrol.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateChainPatrol extends BaseMigrationJob {
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/MigrateChainPatrol.js

@@ -0,0 +1,22 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+import { DEFAULT_CHAIN_PATROL_ENABLE } from '@subwallet/extension-base/services/setting-service/constants';
+export default class MigrateChainPatrol extends BaseMigrationJob {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        this.state.settingService.getSettings(currentSettings => {
+          this.state.settingService.setSettings({
+            ...currentSettings,
+            enableChainPatrol: DEFAULT_CHAIN_PATROL_ENABLE
+          });
+          resolve();
+        });
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}

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

@@ -3,6 +3,8 @@
 
 import AutoEnableChainsTokens from '@subwallet/extension-base/services/migration-service/scripts/AutoEnableChainsTokens';
 import MigrateAuthUrls from '@subwallet/extension-base/services/migration-service/scripts/MigrateAuthUrls';
+import MigrateAutoLock from '@subwallet/extension-base/services/migration-service/scripts/MigrateAutoLock';
+import MigrateChainPatrol from '@subwallet/extension-base/services/migration-service/scripts/MigrateChainPatrol';
 import MigrateImportedToken from '@subwallet/extension-base/services/migration-service/scripts/MigrateImportedToken';
 import MigrateNetworkSettings from '@subwallet/extension-base/services/migration-service/scripts/MigrateNetworkSettings';
 import MigrateSettings from '@subwallet/extension-base/services/migration-service/scripts/MigrateSettings';
@@ -14,6 +16,8 @@ export default {
   '1.0.1-30': MigrateTransactionHistory,
   '1.0.1-40': AutoEnableChainsTokens,
   '1.0.1-50': MigrateSettings,
-  '1.0.1-60': MigrateAuthUrls
+  '1.0.1-60': MigrateAuthUrls,
+  '1.0.3-01': MigrateAutoLock,
+  '1.0.3-02': MigrateChainPatrol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/services/notification-service/NotificationService.js

@@ -30,7 +30,7 @@ export default 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/services/price-service/coingecko.js

@@ -37,7 +37,7 @@ export const getTokenPrice = async (priceIds, currency = 'usd') => {
       price24hMap
     };
   } catch (err) {
-    console.error('Failed to get token price', err);
+    console.error(err);
     throw err;
   }
 };

package/services/price-service/index.js

@@ -34,7 +34,6 @@ export class PriceService {
   }
   refreshPriceData(priceIds) {
     clearTimeout(this.refreshTimeout);
-    console.log('Refresh Price Data');
     this.priceIds = priceIds || this.getPriceIds();
 
     // Update for tokens price
@@ -73,7 +72,6 @@ export class PriceService {
   }
   startPromiseHandler = createPromiseHandler();
   async start() {
-    console.debug('Start price service');
     try {
       this.startPromiseHandler = createPromiseHandler();
       this.status = ServiceStatus.STARTING;
@@ -90,7 +88,6 @@ export class PriceService {
   }
   stopPromiseHandler = createPromiseHandler();
   async stop() {
-    console.debug('Stop price service');
     try {
       this.status = ServiceStatus.STOPPING;
       this.stopPromiseHandler = createPromiseHandler();

package/services/request-service/handler/AuthRequestHandler.js

@@ -68,7 +68,7 @@ export default class AuthRequestHandler {
       update(this.authorizeCached);
     } else {
       this.authorizeStore.get('authUrls', data => {
-        this.authorizeCached = data;
+        this.authorizeCached = data || {};
         update(this.authorizeCached);
       });
     }

package/services/setting-service/constants.d.ts

@@ -1,4 +1,6 @@
-import { BrowserConfirmationType, RequestSettingsType, ThemeNames } from '@subwallet/extension-base/background/KoniTypes';
+import { BrowserConfirmationType, ThemeNames, UiSettings } from '@subwallet/extension-base/background/KoniTypes';
 export declare const DEFAULT_THEME: ThemeNames;
 export declare const DEFAULT_NOTIFICATION_TYPE: BrowserConfirmationType;
-export declare const DEFAULT_SETTING: RequestSettingsType;
+export declare const DEFAULT_AUTO_LOCK_TIME = 15;
+export declare const DEFAULT_CHAIN_PATROL_ENABLE = false;
+export declare const DEFAULT_SETTING: UiSettings;

package/services/setting-service/constants.js

@@ -4,6 +4,8 @@
 import { ThemeNames } from '@subwallet/extension-base/background/KoniTypes';
 export const DEFAULT_THEME = ThemeNames.DARK;
 export const DEFAULT_NOTIFICATION_TYPE = 'popup';
+export const DEFAULT_AUTO_LOCK_TIME = 15;
+export const DEFAULT_CHAIN_PATROL_ENABLE = false;
 export const DEFAULT_SETTING = {
   // language: 'en',
   browserConfirmationType: DEFAULT_NOTIFICATION_TYPE,
@@ -11,5 +13,7 @@ export const DEFAULT_SETTING = {
   isShowBalance: false,
   accountAllLogo: '',
   theme: DEFAULT_THEME,
-  camera: false
+  camera: false,
+  timeAutoLock: DEFAULT_AUTO_LOCK_TIME,
+  enableChainPatrol: DEFAULT_CHAIN_PATROL_ENABLE
 };

package/services/storage-service/DatabaseService.d.ts

@@ -41,7 +41,7 @@ export default class DatabaseService {
     subscribeNominatorMetadata(callback: (data: NominatorMetadata[]) => void): void;
     getHistories(query?: HistoryQuery): Promise<import("@subwallet/extension-base/services/storage-service/databases").ITransactionHistoryItem[]>;
     upsertHistory(histories: TransactionHistoryItem[]): Promise<unknown>;
-    updateHistoryByNewExtrinsicHash(extrinsicHash: string, updateData: Partial<TransactionHistoryItem>): Promise<unknown>;
+    updateHistoryByExtrinsicHash(extrinsicHash: string, updateData: Partial<TransactionHistoryItem>): Promise<unknown>;
     addNftCollection(collection: NftCollection): Promise<unknown>;
     deleteNftCollection(chain: string, collectionId: string): Promise<void>;
     getAllNftCollection(chainHashes?: string[]): import("dexie").PromiseExtended<NftCollection[]>;

package/services/storage-service/DatabaseService.js

@@ -38,6 +38,7 @@ export default class DatabaseService {
       const rs = await this.stores.price.table.get('usd');
       return rs;
     } catch (e) {
+      this.logger.error(e);
       return undefined;
     }
   }
@@ -48,8 +49,6 @@ export default class DatabaseService {
   }
   async updateBalanceStore(address, item) {
     if (item.state === APIItemState.READY) {
-      // this.logger.log(`Updating balance for [${item.tokenSlug}]`);
-
       return this.stores.balance.upsert({
         address,
         ...item
@@ -57,23 +56,18 @@ export default class DatabaseService {
     }
   }
   async removeFromBalanceStore(assets) {
-    this.logger.log('Bulk removing AssetStore');
     return this.stores.balance.removeBySlugs(assets);
   }
 
   // Crowdloan
   async updateCrowdloanStore(chain, address, item) {
     if (item.state === APIItemState.READY && item.contribute !== '0') {
-      // this.logger.log(`Updating crowdloan for [${chain}]`);
-
       return this.stores.crowdloan.upsert({
         chain,
         address,
         ...item
       });
     } else {
-      // this.logger.debug(`Removing crowdloan for [${chain}]`);
-
       return this.stores.crowdloan.deleteByChainAndAddress(chain, address);
     }
   }
@@ -81,22 +75,16 @@ export default class DatabaseService {
   // Staking
   async updateStaking(chain, address, item) {
     if (item.state === APIItemState.READY) {
-      // this.logger.log(`Updating staking for [${chain}]`);
-
       return this.stores.staking.upsert(item);
     }
   }
   async getStakings(addresses, chains) {
-    // 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) {
-    // this.logger.log('Get Pooled Stakings: ', stakings);
-
     return this.stores.staking.getPooledStakings(addresses, chainHashes);
   }
   subscribeStaking(addresses, chainList, callback) {
@@ -122,12 +110,10 @@ export default class DatabaseService {
     return this.stores.transaction.queryHistory(query);
   }
   async upsertHistory(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);
   }
-  async updateHistoryByNewExtrinsicHash(extrinsicHash, updateData) {
-    // this.logger.log('Updating transaction histories');
+  async updateHistoryByExtrinsicHash(extrinsicHash, updateData) {
     const canUpdate = updateData && extrinsicHash;
     if (!canUpdate) {
       return;
@@ -139,8 +125,6 @@ export default class DatabaseService {
 
   // NFT Collection
   async addNftCollection(collection) {
-    // this.logger.log(`Updating NFT collection for [${collection.chain}]`);
-
     return this.stores.nftCollection.upsert(collection);
   }
   async deleteNftCollection(chain, collectionId) {
@@ -163,18 +147,12 @@ export default class DatabaseService {
     if (ownNothing) {
       return this.stores.nft.deleteNftsByChainAndOwner(chain, reformatAddress(owner, 42));
     }
-    const result = await this.stores.nft.cleanUpNfts(chain, reformatAddress(owner, 42), collectionIds, nftIds);
-    result > 0 && console.debug(`Cleaned up ${result} NFTs on chain ${chain} for owner ${reformatAddress(owner, 42)}`, collectionIds, nftIds);
-    return result;
+    return this.stores.nft.cleanUpNfts(chain, reformatAddress(owner, 42), collectionIds, nftIds);
   }
   async getNft(addresses, chainHashes) {
-    // 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}]`);
-
     return this.stores.nft.upsert({
       ...nft,
       address
@@ -184,54 +162,36 @@ export default class DatabaseService {
     return this.stores.nft.deleteNftItem(chain, addresses, nftItem);
   }
   removeNfts(chain, address, collectionId, nftIds) {
-    // 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}]`);
-
     return this.stores.chain.upsert(item);
   }
   async bulkUpdateChainStore(data) {
-    // this.logger.log('Bulk updating ChainStore');
-
     return this.stores.chain.bulkUpsert(data);
   }
   async removeFromChainStore(chains) {
-    // this.logger.log('Bulk removing ChainStore');
-
     return this.stores.chain.removeChains(chains);
   }
   async getAllChainStore() {
-    // 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}]`);
-
     return this.stores.asset.upsert(item);
   }
   async getAllAssetStore() {
-    // this.logger.log('Get all stored assets: ', allAssets);
-
     return this.stores.asset.getAll();
   }
   async removeFromAssetStore(items) {
-    // this.logger.log('Bulk removing AssetStore');
-
     return this.stores.asset.removeAssets(items);
   }
 
   // Staking
   async updateChainStakingMetadata(item) {
-    // this.logger.log('Update ChainStakingMetadata: ', item.chain);
-
     return this.stores.chainStakingMetadata.upsert(item);
   }
   async getChainStakingMetadata() {
@@ -241,8 +201,6 @@ export default class DatabaseService {
     return this.stores.chainStakingMetadata.getByChainAndType(chain, type);
   }
   async updateNominatorMetadata(item) {
-    // this.logger.log('Update NominatorMetadata: ', item.address, item.chain);
-
     return this.stores.nominatorMetadata.upsert(item);
   }
   async getNominatorMetadata() {

package/services/transaction-service/constants.d.ts

@@ -0,0 +1 @@
+export declare const TRANSACTION_TIMEOUT: number;

package/services/transaction-service/constants.js

@@ -0,0 +1,4 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export const TRANSACTION_TIMEOUT = 2 * 60 * 1000;

package/services/transaction-service/index.d.ts

@@ -45,5 +45,6 @@ export default class TransactionService {
     generateHashPayload(chain: string, transaction: TransactionConfig): HexString;
     private signAndSendEvmTransaction;
     private signAndSendSubstrateTransaction;
+    private handleTransactionTimeout;
     resetWallet(): void;
 }

package/services/transaction-service/index.js

@@ -8,9 +8,10 @@ import { TransactionWarning } from '@subwallet/extension-base/background/warning
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
 import { _getChainNativeTokenBasicInfo, _getEvmChainId } from '@subwallet/extension-base/services/chain-service/utils';
 import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/request-service/constants';
+import { TRANSACTION_TIMEOUT } from '@subwallet/extension-base/services/transaction-service/constants';
 import { parseTransferEventLogs, parseXcmEventLogs } from '@subwallet/extension-base/services/transaction-service/event-parser';
 import { getTransactionId, isSubstrateTransaction } from '@subwallet/extension-base/services/transaction-service/helpers';
-import { getTransactionLink, parseTransactionData } from '@subwallet/extension-base/services/transaction-service/utils';
+import { getExplorerLink, parseTransactionData } from '@subwallet/extension-base/services/transaction-service/utils';
 import { anyNumberToBN } from '@subwallet/extension-base/utils/eth';
 import { parseTxAndSignature } from '@subwallet/extension-base/utils/eth/mergeTransactionAndSignature';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
@@ -269,9 +270,9 @@ export default class TransactionService {
   getTransactionLink(id) {
     const transaction = this.getTransaction(id);
     const chainInfo = this.chainService.getChainInfoByKey(transaction.chain);
-    return getTransactionLink(chainInfo, transaction.extrinsicHash);
+    return getExplorerLink(chainInfo, transaction.extrinsicHash, 'tx');
   }
-  transactionToHistories(id, eventLogs) {
+  transactionToHistories(id, startBlock, nonce, eventLogs) {
     const transaction = this.getTransaction(id);
     const historyItem = {
       origin: 'app',
@@ -289,9 +290,12 @@ export default class TransactionService {
       fee: transaction.estimateFee,
       blockNumber: 0,
       // Will be added in next step
-      blockHash: '' // Will be added in next step
+      blockHash: '',
+      // Will be added in next step
+      nonce: nonce || 0,
+      startBlock: startBlock || 0
     };
-
+    console.log('historyItem', historyItem);
     const chainInfo = this.chainService.getChainInfoByKey(transaction.chain);
     const nativeAsset = _getChainNativeTokenBasicInfo(chainInfo);
     const baseNativeAmount = {
@@ -455,10 +459,12 @@ export default class TransactionService {
   onSigned({
     id
   }) {
-    console.log(`Transaction "${id}" is signed`);
+    console.debug(`Transaction "${id}" is signed`);
   }
   onSend({
-    id
+    id,
+    nonce,
+    startBlock
   }) {
     // Update transaction status
     this.updateTransaction(id, {
@@ -466,23 +472,25 @@ export default class TransactionService {
     });
 
     // Create Input History Transaction History
-    this.historyService.insertHistories(this.transactionToHistories(id)).catch(console.error);
-    console.log(`Transaction "${id}" is sent`);
+    this.historyService.insertHistories(this.transactionToHistories(id, startBlock, nonce)).catch(console.error);
+    console.debug(`Transaction "${id}" is sent`);
   }
   onHasTransactionHash({
+    blockHash,
     extrinsicHash,
     id
   }) {
     // Write processing transaction history
     const updateData = {
       extrinsicHash,
-      status: ExtrinsicStatus.PROCESSING
+      status: ExtrinsicStatus.PROCESSING,
+      blockHash: blockHash || ''
     };
     this.updateTransaction(id, updateData);
 
     // In this case transaction id is the same as extrinsic hash and will change after below update
     this.historyService.updateHistoryByExtrinsicHash(id, updateData).catch(console.error);
-    console.log(`Transaction "${id}" is submitted with hash ${extrinsicHash || ''}`);
+    console.debug(`Transaction "${id}" is submitted with hash ${extrinsicHash || ''}`);
   }
   handlePostProcessing(id) {
     // must be done after success/failure to make sure the transaction is finalized
@@ -513,16 +521,18 @@ export default class TransactionService {
   onSuccess({
     blockHash,
     blockNumber,
+    extrinsicHash,
     id
   }) {
     const transaction = this.getTransaction(id);
     this.updateTransaction(id, {
-      status: ExtrinsicStatus.SUCCESS
+      status: ExtrinsicStatus.SUCCESS,
+      extrinsicHash
     });
-    console.log('Transaction completed', id, transaction.extrinsicHash);
 
     // Write success transaction history
-    this.historyService.updateHistories(transaction.chain, transaction.extrinsicHash, {
+    this.historyService.updateHistoryByExtrinsicHash(transaction.extrinsicHash, {
+      extrinsicHash,
       status: ExtrinsicStatus.SUCCESS,
       blockNumber: blockNumber || 0,
       blockHash: blockHash || ''
@@ -542,6 +552,7 @@ export default class TransactionService {
     blockHash,
     blockNumber,
     errors,
+    extrinsicHash,
     id
   }) {
     const transaction = this.getTransaction(id);
@@ -549,12 +560,13 @@ export default class TransactionService {
     if (transaction) {
       this.updateTransaction(id, {
         status: nextStatus,
-        errors
+        errors,
+        extrinsicHash
       });
-      console.log('Transaction failed', id, transaction.extrinsicHash);
 
       // Write failed transaction history
-      this.historyService.updateHistories(transaction.chain, transaction.extrinsicHash, {
+      this.historyService.updateHistoryByExtrinsicHash(transaction.extrinsicHash, {
+        extrinsicHash: extrinsicHash || transaction.extrinsicHash,
         status: nextStatus,
         blockNumber: blockNumber || 0,
         blockHash: blockHash || ''
@@ -570,8 +582,6 @@ export default class TransactionService {
       });
     }
     this.eventService.emit('transaction.failed', transaction);
-    // Log transaction errors
-    console.error(errors);
   }
   generateHashPayload(chain, transaction) {
     const chainInfo = this.chainService.getChainInfoByKey(chain);
@@ -655,7 +665,7 @@ export default class TransactionService {
       errors: [],
       warnings: []
     };
-    this.requestService.addConfirmation(id, url || EXTENSION_REQUEST_URL, 'evmSendTransactionRequest', payload, {}).then(({
+    this.requestService.addConfirmation(id, url || EXTENSION_REQUEST_URL, 'evmSendTransactionRequest', payload, {}).then(async ({
       isApproved,
       payload
     }) => {
@@ -680,11 +690,17 @@ export default class TransactionService {
         emitter.emit('signed', eventData);
 
         // Send transaction
+        this.handleTransactionTimeout(emitter, eventData);
+
+        // Add start info
+        eventData.nonce = txObject.nonce;
+        eventData.startBlock = await web3Api.eth.getBlockNumber();
         emitter.emit('send', eventData); // This event is needed after sending transaction with queue
         signedTransaction && web3Api.eth.sendSignedTransaction(signedTransaction).once('transactionHash', hash => {
           eventData.extrinsicHash = hash;
           emitter.emit('extrinsicHash', eventData);
         }).once('receipt', rs => {
+          eventData.extrinsicHash = rs.transactionHash;
           eventData.blockHash = rs.blockHash;
           eventData.blockNumber = rs.blockNumber;
           emitter.emit('success', eventData);
@@ -709,6 +725,7 @@ export default class TransactionService {
   }
   signAndSendSubstrateTransaction({
     address,
+    chain,
     id,
     transaction,
     url
@@ -729,12 +746,17 @@ export default class TransactionService {
           };
         }
       }
-    }).then(rs => {
+    }).then(async rs => {
       // Emit signed event
       emitter.emit('signed', eventData);
 
       // Send transaction
+      const api = this.chainService.getSubstrateApi(chain);
+      eventData.nonce = rs.nonce.toNumber();
+      eventData.startBlock = (await api.api.query.system.number()).toPrimitive();
+      this.handleTransactionTimeout(emitter, eventData);
       emitter.emit('send', eventData); // This event is needed after sending transaction with queue
+
       rs.send(txState => {
         // handle events, logs, history
         if (!txState || !txState.status) {
@@ -744,10 +766,12 @@ export default class TransactionService {
           eventData.eventLogs = txState.events;
           if (!eventData.extrinsicHash || eventData.extrinsicHash === '') {
             eventData.extrinsicHash = txState.txHash.toHex();
+            eventData.blockHash = txState.status.asInBlock.toHex();
             emitter.emit('extrinsicHash', eventData);
           }
         }
         if (txState.status.isFinalized) {
+          eventData.extrinsicHash = txState.txHash.toHex();
           eventData.eventLogs = txState.events;
           // TODO: push block hash and block number into eventData
           txState.events.filter(({
@@ -779,6 +803,22 @@ export default class TransactionService {
     });
     return emitter;
   }
+  handleTransactionTimeout(emitter, eventData) {
+    const timeout = setTimeout(() => {
+      const transaction = this.getTransaction(eventData.id);
+      if (transaction.status !== ExtrinsicStatus.SUCCESS && transaction.status !== ExtrinsicStatus.FAIL) {
+        eventData.errors.push(new TransactionError(BasicTxErrorType.TIMEOUT, 'Transaction timeout'));
+        emitter.emit('error', eventData);
+        clearTimeout(timeout);
+      }
+    }, TRANSACTION_TIMEOUT);
+    emitter.once('success', () => {
+      clearTimeout(timeout);
+    });
+    emitter.once('error', () => {
+      clearTimeout(timeout);
+    });
+  }
   resetWallet() {
     this.transactionSubject.next({});
   }

package/services/transaction-service/types.d.ts

@@ -39,6 +39,8 @@ export interface TransactionEventResponse extends ValidateTransactionResponse {
     blockHash?: string;
     blockNumber?: number;
     eventLogs?: EventRecord[];
+    nonce?: number;
+    startBlock?: number;
 }
 export interface TransactionEventMap {
     send: (response: TransactionEventResponse) => void;

package/services/transaction-service/utils.d.ts

@@ -1,4 +1,4 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { ExtrinsicDataTypeMap, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 export declare function parseTransactionData<T extends ExtrinsicType>(data: unknown): ExtrinsicDataTypeMap[T];
-export declare function getTransactionLink(chainInfo: _ChainInfo, extrinsicHash: string): string | undefined;
+export declare function getExplorerLink(chainInfo: _ChainInfo, value: string, type: 'account' | 'tx'): string | undefined;