feat: Periodic validation of pending transactions

packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts

@@ -194,7 +194,7 @@ export default class IndexerCacheService {
     const txsWithStatus: TransactionWithStatus[] = []
     const fetchBlockDetailsQueue = queue(async (hash: string) => {
       const txWithStatus = await this.rpcService.getTransaction(hash)
-      if (!txWithStatus) {
+      if (!txWithStatus?.transaction) {
         return
       }
       const blockHeader = await this.rpcService.getHeader(txWithStatus!.txStatus.blockHash!)

packages/neuron-wallet/src/block-sync-renderer/tx-status-listener.ts

@@ -7,6 +7,7 @@ import TransactionWithStatus from '../models/chain/transaction-with-status'
 import logger from '../utils/logger'
 import { getConnection } from '../database/chain/connection'
 import { interval } from 'rxjs'
+import TxStatus from '../models/chain/tx-status'
 
 type TransactionDetail = {
   hash: string
@@ -18,7 +19,8 @@ type TransactionDetail = {
 const getTransactionStatus = async (hash: string) => {
   const network = NetworksService.getInstance().getCurrent()
   const rpcService = new RpcService(network.remote, network.type)
-  const txWithStatus: TransactionWithStatus | undefined = await rpcService.getTransaction(hash)
+  const txWithStatus: TransactionWithStatus | undefined | { transaction: null; txStatus: TxStatus } =
+    await rpcService.getTransaction(hash)
   if (!txWithStatus) {
     return {
       tx: txWithStatus,
@@ -33,6 +35,13 @@ const getTransactionStatus = async (hash: string) => {
       blockHash: txWithStatus.txStatus.blockHash,
     }
   }
+  if (txWithStatus.txStatus.isRejected()) {
+    return {
+      tx: null,
+      status: TransactionStatus.Rejected,
+      blockHash: null,
+    }
+  }
   return {
     tx: txWithStatus.transaction,
     status: TransactionStatus.Pending,
@@ -41,16 +50,16 @@ const getTransactionStatus = async (hash: string) => {
 }
 
 const trackingStatus = async () => {
-  const pendingTransactions = await FailedTransaction.pendings()
+  const pendingOrFailedTransactions = await FailedTransaction.pendingOrFaileds()
   await FailedTransaction.processAmendFailedTxs()
 
-  if (!pendingTransactions.length) {
+  if (!pendingOrFailedTransactions.length) {
     return
   }
 
-  const pendingHashes = pendingTransactions.map(tx => tx.hash)
+  const pendingOrFailedHashes = pendingOrFailedTransactions.map(tx => tx.hash)
   const txs = await Promise.all(
-    pendingHashes.map(async hash => {
+    pendingOrFailedHashes.map(async hash => {
       try {
         const txWithStatus = await getTransactionStatus(hash)
         return {
@@ -65,17 +74,18 @@ const trackingStatus = async () => {
     })
   )
 
-  const failedTxs = txs.filter(
-    (tx): tx is TransactionDetail & { status: TransactionStatus.Failed } => tx?.status === TransactionStatus.Failed
-  )
-  const successTxs = txs.filter(
-    (tx): tx is TransactionDetail & { status: TransactionStatus.Success } => tx?.status === TransactionStatus.Success
-  )
+  const failedTxs = txs.filter((tx): tx is TransactionDetail => tx?.status === TransactionStatus.Failed)
+  const successTxs = txs.filter((tx): tx is TransactionDetail => tx?.status === TransactionStatus.Success)
+  const rejectedTxs = txs.filter((tx): tx is TransactionDetail => tx?.status === TransactionStatus.Rejected)
 
   if (failedTxs.length) {
     await FailedTransaction.updateFailedTxs(failedTxs.map(tx => tx.hash))
   }
 
+  if (rejectedTxs.length) {
+    await FailedTransaction.deleteFailedTxs(rejectedTxs.map(tx => tx.hash))
+  }
+
   if (successTxs.length > 0) {
     const network = NetworksService.getInstance().getCurrent()
     const rpcService = new RpcService(network.remote, network.type)

packages/neuron-wallet/src/models/chain/transaction.ts

@@ -14,6 +14,7 @@ export enum TransactionStatus {
   Pending = 'pending',
   Success = 'success',
   Failed = 'failed',
+  Rejected = 'rejected',
 }
 
 export interface SudtTokenInfo {

packages/neuron-wallet/src/models/chain/tx-status.ts

@@ -4,6 +4,7 @@ export enum TxStatusType {
   Pending = 'pending',
   Proposed = 'proposed',
   Committed = 'committed',
+  Rejected = 'rejected',
 }
 
 export default class TxStatus {
@@ -28,6 +29,10 @@ export default class TxStatus {
     return this.status === TxStatusType.Committed
   }
 
+  public isRejected(): boolean {
+    return this.status === TxStatusType.Rejected
+  }
+
   public toSDK() {
     return {
       blockHash: this.blockHash,

packages/neuron-wallet/src/services/rpc-service.ts

@@ -6,6 +6,7 @@ import TransactionWithStatus from '../models/chain/transaction-with-status'
 import logger from '../utils/logger'
 import { generateRPC } from '../utils/ckb-rpc'
 import { NetworkType } from '../models/network'
+import TxStatus, { TxStatusType } from '../models/chain/tx-status'
 
 export default class RpcService {
   private retryTime: number
@@ -29,20 +30,19 @@ export default class RpcService {
     return BlockHeader.fromSDK(result)
   }
 
-  /**
-   * TODO: rejected tx should be handled
-   * {
-   *   transaction: null,
-   *   txStatus: { blockHash: null, status: 'rejected' }
-   * }
-   */
-  public async getTransaction(hash: string): Promise<TransactionWithStatus | undefined> {
+  public async getTransaction(
+    hash: string
+  ): Promise<TransactionWithStatus | undefined | { transaction: null; txStatus: TxStatus }> {
     const result = await this.rpc.getTransaction(hash)
     if (result?.transaction) {
       return TransactionWithStatus.fromSDK(result)
     }
-    if ((result.txStatus as any) === 'rejected') {
+    if (result.txStatus.status === TxStatusType.Rejected) {
       logger.warn(`Transaction[${hash}] was rejected`)
+      return {
+        transaction: null,
+        txStatus: TxStatus.fromSDK(result.txStatus),
+      }
     }
     return undefined
   }

packages/neuron-wallet/src/services/tx/failed-transaction.ts

@@ -9,16 +9,41 @@ import { TransactionStatus } from '../../models/chain/transaction'
 import AmendTransactionEntity from '../../database/chain/entities/amend-transaction'
 
 export class FailedTransaction {
-  public static pendings = async (): Promise<TransactionEntity[]> => {
-    const pendingTransactions = await getConnection()
+  public static pendingOrFaileds = async (): Promise<TransactionEntity[]> => {
+    const transactions = await getConnection()
       .getRepository(TransactionEntity)
       .createQueryBuilder('tx')
       .where({
-        status: TransactionStatus.Pending,
+        status: In([TransactionStatus.Pending, TransactionStatus.Failed]),
       })
       .getMany()
 
-    return pendingTransactions
+    return transactions
+  }
+
+  public static deleteFailedTxs = async (hashes: string[]) => {
+    await getConnection().manager.transaction(async transactionalEntityManager => {
+      await transactionalEntityManager
+        .createQueryBuilder()
+        .delete()
+        .from(TransactionEntity)
+        .where({ hash: In(hashes) })
+        .execute()
+
+      await transactionalEntityManager
+        .createQueryBuilder()
+        .delete()
+        .from(OutputEntity)
+        .where({ outPointTxHash: In(hashes) })
+        .execute()
+
+      await transactionalEntityManager
+        .createQueryBuilder()
+        .delete()
+        .from(InputEntity)
+        .where({ outPointTxHash: In(hashes) })
+        .execute()
+    })
   }
 
   public static processAmendFailedTxs = async () => {
@@ -56,28 +81,7 @@ export class FailedTransaction {
       }
     })
 
-    await getConnection().manager.transaction(async transactionalEntityManager => {
-      await transactionalEntityManager
-        .createQueryBuilder()
-        .delete()
-        .from(TransactionEntity)
-        .where({ hash: In(removeTxs) })
-        .execute()
-
-      await transactionalEntityManager
-        .createQueryBuilder()
-        .delete()
-        .from(OutputEntity)
-        .where({ outPointTxHash: In(removeTxs) })
-        .execute()
-
-      await transactionalEntityManager
-        .createQueryBuilder()
-        .delete()
-        .from(InputEntity)
-        .where({ outPointTxHash: In(removeTxs) })
-        .execute()
-    })
+    await FailedTransaction.deleteFailedTxs(removeTxs)
   }
 
   // update tx status to TransactionStatus.Failed

packages/neuron-wallet/src/services/tx/transaction-generator.ts

@@ -72,7 +72,7 @@ export class TransactionGenerator {
       if (!nftCell) return
 
       const nftTx = await this.getRpcService().getTransaction(outPoint.txHash)
-      const nftOriginalOutputData = nftTx?.transaction.outputsData[Number(outPoint.index)]
+      const nftOriginalOutputData = nftTx?.transaction?.outputsData[Number(outPoint.index)]
       if (!nftOriginalOutputData) return
 
       nftCell.data = nftOriginalOutputData