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

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

@@ -45,4 +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,7 +270,7 @@ 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) {
     const transaction = this.getTransaction(id);
@@ -455,7 +456,7 @@ export default class TransactionService {
   onSigned({
     id
   }) {
-    console.log(`Transaction "${id}" is signed`);
+    console.debug(`Transaction "${id}" is signed`);
   }
   onSend({
     id
@@ -467,22 +468,24 @@ export default class TransactionService {
 
     // Create Input History Transaction History
     this.historyService.insertHistories(this.transactionToHistories(id)).catch(console.error);
-    console.log(`Transaction "${id}" is sent`);
+    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
@@ -519,7 +522,6 @@ export default class TransactionService {
     this.updateTransaction(id, {
       status: ExtrinsicStatus.SUCCESS
     });
-    console.log('Transaction completed', id, transaction.extrinsicHash);
 
     // Write success transaction history
     this.historyService.updateHistories(transaction.chain, transaction.extrinsicHash, {
@@ -551,7 +553,6 @@ export default class TransactionService {
         status: nextStatus,
         errors
       });
-      console.log('Transaction failed', id, transaction.extrinsicHash);
 
       // Write failed transaction history
       this.historyService.updateHistories(transaction.chain, transaction.extrinsicHash, {
@@ -570,8 +571,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);
@@ -680,6 +679,7 @@ export default class TransactionService {
         emitter.emit('signed', eventData);
 
         // Send transaction
+        this.handleTransactionTimeout(emitter, eventData);
         emitter.emit('send', eventData); // This event is needed after sending transaction with queue
         signedTransaction && web3Api.eth.sendSignedTransaction(signedTransaction).once('transactionHash', hash => {
           eventData.extrinsicHash = hash;
@@ -734,7 +734,9 @@ export default class TransactionService {
       emitter.emit('signed', eventData);
 
       // Send transaction
+      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,6 +746,7 @@ 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);
           }
         }
@@ -779,4 +782,23 @@ 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/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;

package/services/transaction-service/utils.js

@@ -8,19 +8,30 @@ export function parseTransactionData(data) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   return data;
 }
-export function getTransactionLink(chainInfo, extrinsicHash) {
-  if (extrinsicHash.startsWith('0x')) {
-    const explorerLink = _getBlockExplorerFromChain(chainInfo);
-    if (_isPureEvmChain(chainInfo)) {
-      if (explorerLink) {
-        return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}tx/${extrinsicHash}`;
-      }
-    } else {
-      const explorerLink = _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 (_isPureEvmChain(chainInfo)) {
+    return 'tx';
+  }
+  return 'extrinsic';
+}
+export function getExplorerLink(chainInfo, value, type) {
+  const explorerLink = _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;
 }