From 593a776c8b809c6d98a88691360994b3aa4a1a45 Mon Sep 17 00:00:00 2001 From: yanguoyu <841185308@qq.com> Date: Wed, 27 Sep 2023 15:10:33 +0800 Subject: [PATCH] fix: When get transaction error ignore update transaction --- .../block-sync-renderer/tx-status-listener.ts | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/packages/neuron-wallet/src/block-sync-renderer/tx-status-listener.ts b/packages/neuron-wallet/src/block-sync-renderer/tx-status-listener.ts index ae10bb37f5..1af3660c26 100644 --- a/packages/neuron-wallet/src/block-sync-renderer/tx-status-listener.ts +++ b/packages/neuron-wallet/src/block-sync-renderer/tx-status-listener.ts @@ -3,11 +3,18 @@ import { CONNECTION_NOT_FOUND_NAME } from '../database/chain/ormconfig' import { FailedTransaction, TransactionPersistor } from '../services/tx' import RpcService from '../services/rpc-service' import NetworksService from '../services/networks' -import { TransactionStatus } from '../models/chain/transaction' +import Transaction, { TransactionStatus } from '../models/chain/transaction' import TransactionWithStatus from '../models/chain/transaction-with-status' import logger from '../utils/logger' import { interval } from 'rxjs' +type TransactionDetail = { + hash: string + tx: Transaction | undefined + status: TransactionStatus + blockHash: string | null +} + const getTransactionStatus = async (hash: string) => { const url: string = NetworksService.getInstance().getCurrent().remote const rpcService = new RpcService(url) @@ -42,18 +49,26 @@ const trackingStatus = async () => { const pendingHashes = pendingTransactions.map(tx => tx.hash) const txs = await Promise.all( pendingHashes.map(async hash => { - const txWithStatus = await getTransactionStatus(hash) - return { - hash, - tx: txWithStatus.tx, - status: txWithStatus.status, - blockHash: txWithStatus.blockHash, + try { + const txWithStatus = await getTransactionStatus(hash) + return { + hash, + tx: txWithStatus.tx, + status: txWithStatus.status, + blockHash: txWithStatus.blockHash, + } + } catch (error) { + // ignore error, get failed skip current update } }) ) - const failedTxs = txs.filter(tx => tx.status === TransactionStatus.Failed) - const successTxs = txs.filter(tx => tx.status === TransactionStatus.Success) + 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 + ) if (failedTxs.length) { await FailedTransaction.updateFailedTxs(failedTxs.map(tx => tx.hash))