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

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

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

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

@@ -17,7 +17,6 @@ class MigrationService {
     this.logger = (0, _util.logger)('Migration');
   }
   async run() {
-    this.logger.log('Migrating...');
     const keys = Object.keys(_scripts.default).sort((a, b) => a.localeCompare(b));
 
     // Await timeout 2s
@@ -32,7 +31,6 @@ class MigrationService {
           key
         }).first();
         if (!check || key.startsWith(_scripts.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({
@@ -45,7 +43,6 @@ class MigrationService {
         this.logger.error('Migration error: ', _scripts.default[keys[i]].name, error);
       }
     }
-    this.logger.log('Migration done.');
   }
 }
 exports.default = MigrationService;

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

@@ -0,0 +1,30 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+var _constants = require("@subwallet/extension-base/services/setting-service/constants");
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateAutoLock extends _Base.default {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        this.state.settingService.getSettings(currentSettings => {
+          this.state.settingService.setSettings({
+            ...currentSettings,
+            timeAutoLock: _constants.DEFAULT_AUTO_LOCK_TIME
+          });
+          resolve();
+        });
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = MigrateAutoLock;

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

@@ -0,0 +1,30 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+var _constants = require("@subwallet/extension-base/services/setting-service/constants");
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateChainPatrol extends _Base.default {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        this.state.settingService.getSettings(currentSettings => {
+          this.state.settingService.setSettings({
+            ...currentSettings,
+            enableChainPatrol: _constants.DEFAULT_CHAIN_PATROL_ENABLE
+          });
+          resolve();
+        });
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = MigrateChainPatrol;

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

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.EVERYTIME = void 0;
 var _AutoEnableChainsTokens = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/AutoEnableChainsTokens"));
 var _MigrateAuthUrls = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateAuthUrls"));
+var _MigrateAutoLock = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateAutoLock"));
+var _MigrateChainPatrol = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateChainPatrol"));
 var _MigrateImportedToken = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateImportedToken"));
 var _MigrateNetworkSettings = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateNetworkSettings"));
 var _MigrateSettings = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateSettings"));
@@ -22,7 +24,9 @@ var _default = {
   '1.0.1-30': _MigrateTransactionHistory.default,
   '1.0.1-40': _AutoEnableChainsTokens.default,
   '1.0.1-50': _MigrateSettings.default,
-  '1.0.1-60': _MigrateAuthUrls.default
+  '1.0.1-60': _MigrateAuthUrls.default,
+  '1.0.3-01': _MigrateAutoLock.default,
+  '1.0.3-02': _MigrateChainPatrol.default
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };
 exports.default = _default;

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/price-service/coingecko.js

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

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

@@ -40,7 +40,6 @@ class PriceService {
   }
   refreshPriceData(priceIds) {
     clearTimeout(this.refreshTimeout);
-    console.log('Refresh Price Data');
     this.priceIds = priceIds || this.getPriceIds();
 
     // Update for tokens price
@@ -79,7 +78,6 @@ class PriceService {
   }
   startPromiseHandler = (0, _promise.createPromiseHandler)();
   async start() {
-    console.debug('Start price service');
     try {
       this.startPromiseHandler = (0, _promise.createPromiseHandler)();
       this.status = _types.ServiceStatus.STARTING;
@@ -96,7 +94,6 @@ class PriceService {
   }
   stopPromiseHandler = (0, _promise.createPromiseHandler)();
   async stop() {
-    console.debug('Stop price service');
     try {
       this.status = _types.ServiceStatus.STOPPING;
       this.stopPromiseHandler = (0, _promise.createPromiseHandler)();

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

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

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DEFAULT_THEME = exports.DEFAULT_SETTING = exports.DEFAULT_NOTIFICATION_TYPE = void 0;
+exports.DEFAULT_THEME = exports.DEFAULT_SETTING = exports.DEFAULT_NOTIFICATION_TYPE = exports.DEFAULT_CHAIN_PATROL_ENABLE = exports.DEFAULT_AUTO_LOCK_TIME = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -12,6 +12,10 @@ const DEFAULT_THEME = _KoniTypes.ThemeNames.DARK;
 exports.DEFAULT_THEME = DEFAULT_THEME;
 const DEFAULT_NOTIFICATION_TYPE = 'popup';
 exports.DEFAULT_NOTIFICATION_TYPE = DEFAULT_NOTIFICATION_TYPE;
+const DEFAULT_AUTO_LOCK_TIME = 15;
+exports.DEFAULT_AUTO_LOCK_TIME = DEFAULT_AUTO_LOCK_TIME;
+const DEFAULT_CHAIN_PATROL_ENABLE = false;
+exports.DEFAULT_CHAIN_PATROL_ENABLE = DEFAULT_CHAIN_PATROL_ENABLE;
 const DEFAULT_SETTING = {
   // language: 'en',
   browserConfirmationType: DEFAULT_NOTIFICATION_TYPE,
@@ -19,6 +23,8 @@ const DEFAULT_SETTING = {
   isShowBalance: false,
   accountAllLogo: '',
   theme: DEFAULT_THEME,
-  camera: false
+  camera: false,
+  timeAutoLock: DEFAULT_AUTO_LOCK_TIME,
+  enableChainPatrol: DEFAULT_CHAIN_PATROL_ENABLE
 };
 exports.DEFAULT_SETTING = DEFAULT_SETTING;

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

@@ -45,6 +45,7 @@ class DatabaseService {
       const rs = await this.stores.price.table.get('usd');
       return rs;
     } catch (e) {
+      this.logger.error(e);
       return undefined;
     }
   }
@@ -55,8 +56,6 @@ class DatabaseService {
   }
   async updateBalanceStore(address, item) {
     if (item.state === _KoniTypes.APIItemState.READY) {
-      // this.logger.log(`Updating balance for [${item.tokenSlug}]`);
-
       return this.stores.balance.upsert({
         address,
         ...item
@@ -64,23 +63,18 @@ 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 === _KoniTypes.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);
     }
   }
@@ -88,22 +82,16 @@ class DatabaseService {
   // Staking
   async updateStaking(chain, address, item) {
     if (item.state === _KoniTypes.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) {
@@ -129,12 +117,10 @@ 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;
@@ -146,8 +132,6 @@ 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) {
@@ -170,18 +154,12 @@ class DatabaseService {
     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;
+    return this.stores.nft.cleanUpNfts(chain, (0, _utils.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
@@ -191,54 +169,36 @@ 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() {
@@ -249,8 +209,6 @@ 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/cjs/services/transaction-service/constants.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.TRANSACTION_TIMEOUT = void 0;
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const TRANSACTION_TIMEOUT = 2 * 60 * 1000;
+exports.TRANSACTION_TIMEOUT = TRANSACTION_TIMEOUT;

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

@@ -12,6 +12,7 @@ var _TransactionWarning = require("@subwallet/extension-base/background/warnings
 var _constants = require("@subwallet/extension-base/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _constants2 = require("@subwallet/extension-base/services/request-service/constants");
+var _constants3 = require("@subwallet/extension-base/services/transaction-service/constants");
 var _eventParser = require("@subwallet/extension-base/services/transaction-service/event-parser");
 var _helpers = require("@subwallet/extension-base/services/transaction-service/helpers");
 var _utils2 = require("@subwallet/extension-base/services/transaction-service/utils");
@@ -276,9 +277,9 @@ class TransactionService {
   getTransactionLink(id) {
     const transaction = this.getTransaction(id);
     const chainInfo = this.chainService.getChainInfoByKey(transaction.chain);
-    return (0, _utils2.getTransactionLink)(chainInfo, transaction.extrinsicHash);
+    return (0, _utils2.getExplorerLink)(chainInfo, transaction.extrinsicHash, 'tx');
   }
-  transactionToHistories(id, eventLogs) {
+  transactionToHistories(id, startBlock, nonce, eventLogs) {
     const transaction = this.getTransaction(id);
     const historyItem = {
       origin: 'app',
@@ -296,9 +297,12 @@ 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 = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
     const baseNativeAmount = {
@@ -463,11 +467,13 @@ class TransactionService {
     let {
       id
     } = _ref;
-    console.log(`Transaction "${id}" is signed`);
+    console.debug(`Transaction "${id}" is signed`);
   }
   onSend(_ref2) {
     let {
-      id
+      id,
+      nonce,
+      startBlock
     } = _ref2;
     // Update transaction status
     this.updateTransaction(id, {
@@ -475,24 +481,26 @@ 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(_ref3) {
     let {
+      blockHash,
       extrinsicHash,
       id
     } = _ref3;
     // Write processing transaction history
     const updateData = {
       extrinsicHash,
-      status: _KoniTypes.ExtrinsicStatus.PROCESSING
+      status: _KoniTypes.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
@@ -524,16 +532,18 @@ class TransactionService {
     let {
       blockHash,
       blockNumber,
+      extrinsicHash,
       id
     } = _ref4;
     const transaction = this.getTransaction(id);
     this.updateTransaction(id, {
-      status: _KoniTypes.ExtrinsicStatus.SUCCESS
+      status: _KoniTypes.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: _KoniTypes.ExtrinsicStatus.SUCCESS,
       blockNumber: blockNumber || 0,
       blockHash: blockHash || ''
@@ -554,6 +564,7 @@ class TransactionService {
       blockHash,
       blockNumber,
       errors,
+      extrinsicHash,
       id
     } = _ref5;
     const transaction = this.getTransaction(id);
@@ -561,12 +572,13 @@ 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 || ''
@@ -582,8 +594,6 @@ class TransactionService {
       });
     }
     this.eventService.emit('transaction.failed', transaction);
-    // Log transaction errors
-    console.error(errors);
   }
   generateHashPayload(chain, transaction) {
     const chainInfo = this.chainService.getChainInfoByKey(chain);
@@ -668,7 +678,7 @@ class TransactionService {
       errors: [],
       warnings: []
     };
-    this.requestService.addConfirmation(id, url || _constants2.EXTENSION_REQUEST_URL, 'evmSendTransactionRequest', payload, {}).then(_ref7 => {
+    this.requestService.addConfirmation(id, url || _constants2.EXTENSION_REQUEST_URL, 'evmSendTransactionRequest', payload, {}).then(async _ref7 => {
       let {
         isApproved,
         payload
@@ -694,11 +704,17 @@ 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);
@@ -724,6 +740,7 @@ class TransactionService {
   signAndSendSubstrateTransaction(_ref8) {
     let {
       address,
+      chain,
       id,
       transaction,
       url
@@ -744,12 +761,17 @@ 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) {
@@ -759,10 +781,12 @@ 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(_ref9 => {
@@ -798,6 +822,22 @@ class TransactionService {
     });
     return emitter;
   }
+  handleTransactionTimeout(emitter, eventData) {
+    const timeout = setTimeout(() => {
+      const transaction = this.getTransaction(eventData.id);
+      if (transaction.status !== _KoniTypes.ExtrinsicStatus.SUCCESS && transaction.status !== _KoniTypes.ExtrinsicStatus.FAIL) {
+        eventData.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.TIMEOUT, 'Transaction timeout'));
+        emitter.emit('error', eventData);
+        clearTimeout(timeout);
+      }
+    }, _constants3.TRANSACTION_TIMEOUT);
+    emitter.once('success', () => {
+      clearTimeout(timeout);
+    });
+    emitter.once('error', () => {
+      clearTimeout(timeout);
+    });
+  }
   resetWallet() {
     this.transactionSubject.next({});
   }

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTransactionLink = getTransactionLink;
+exports.getExplorerLink = getExplorerLink;
 exports.parseTransactionData = parseTransactionData;
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
@@ -14,19 +14,30 @@ function parseTransactionData(data) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   return data;
 }
-function getTransactionLink(chainInfo, extrinsicHash) {
-  if (extrinsicHash.startsWith('0x')) {
-    const explorerLink = (0, _utils._getBlockExplorerFromChain)(chainInfo);
-    if ((0, _utils._isPureEvmChain)(chainInfo)) {
-      if (explorerLink) {
-        return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}tx/${extrinsicHash}`;
-      }
-    } else {
-      const explorerLink = (0, _utils._getBlockExplorerFromChain)(chainInfo);
-      if (explorerLink) {
-        return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}extrinsic/${extrinsicHash}`;
-      }
-    }
+function getBlockExplorerAccountRoute(explorerLink) {
+  if (explorerLink.includes('explorer.subspace.network')) {
+    return 'accounts';
+  }
+  if (explorerLink.includes('subscan.io')) {
+    return 'account';
+  }
+  return 'address';
+}
+function getBlockExplorerTxRoute(chainInfo) {
+  if ((0, _utils._isPureEvmChain)(chainInfo)) {
+    return 'tx';
+  }
+  return 'extrinsic';
+}
+function getExplorerLink(chainInfo, value, type) {
+  const explorerLink = (0, _utils._getBlockExplorerFromChain)(chainInfo);
+  if (explorerLink && type === 'account') {
+    const route = getBlockExplorerAccountRoute(explorerLink);
+    return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}${route}/${value}`;
+  }
+  if (explorerLink && value.startsWith('0x')) {
+    const route = getBlockExplorerTxRoute(chainInfo);
+    return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}${route}/${value}`;
   }
   return undefined;
 }

package/cjs/utils/index.js

@@ -56,6 +56,9 @@ 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 (!address || address === '') {
+      return '';
+    }
     if ((0, _utilCrypto.isEthereumAddress)(address)) {
       return address;
     }