fix: Fix light client sync slow when fetch much transactions. (#2944)

* fix: Fix light client sync slow when fetch much transactions. * fix: Add message send to avoid the tx db has not submit finish yet. * Add annotation Co-authored-by: homura <[email protected]> --------- Co-authored-by: homura <[email protected]>
nervosnetwork · Nov 22, 2023 · 1f53a28 · 1f53a28 · github-actions · Nov 22, 2023
1 parent dffd921
commit 1f53a28
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/light-connector.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/light-connector.ts
@@ -1,7 +1,7 @@
 import { BI } from '@ckb-lumos/bi'
 import { Subject } from 'rxjs'
 import { queue, QueueObject } from 'async'
-import { HexString, QueryOptions } from '@ckb-lumos/base'
+import type { HexString, QueryOptions, TransactionWithStatus } from '@ckb-lumos/base'
 import { Indexer as CkbIndexer, CellCollector } from '@ckb-lumos/ckb-indexer'
 import logger from '../../utils/logger'
 import { Address } from '../../models/address'
@@ -18,6 +18,7 @@ import AssetAccountInfo from '../../models/asset-account-info'
 import { DepType } from '../../models/chain/cell-dep'
 import { molecule } from '@ckb-lumos/codec'
 import { blockchain } from '@ckb-lumos/base'
+import type { Base } from '@ckb-lumos/rpc/lib/Base'
 
 interface SyncQueueParam {
   script: CKBComponents.Script
@@ -232,14 +233,33 @@ export default class LightConnector extends Connector<CKBComponents.Hash> {
       })
       return
     }
-    this.transactionsSubject.next({ txHashes: result.txs.map(v => v.txHash), params: syncProgress.hash })
+    const txHashes = result.txs.map(v => v.txHash)
+    await this.fetchPreviousOutputs(txHashes)
+    this.transactionsSubject.next({ txHashes, params: syncProgress.hash })
     this.syncInQueue.set(syncProgress.hash, {
       blockStartNumber: result.lastCursor === '0x' ? parseInt(blockRange[1]) : parseInt(blockRange[0]),
       blockEndNumber: parseInt(blockRange[1]),
       cursor: result.lastCursor === '0x' ? undefined : result.lastCursor,
     })
   }
 
+  private async fetchPreviousOutputs(txHashes: string[]) {
+    const transactions = await this.lightRpc
+      .createBatchRequest<'getTransaction', string[], TransactionWithStatus[]>(txHashes.map(v => ['getTransaction', v]))
+      .exec()
+    const previousTxHashes = new Set<string>()
+    transactions
+      .flatMap(tx => tx.transaction.inputs)
+      .forEach(input => {
+        const previousTxHash = input.previousOutput!.txHash
+        // exclude the cell base transaction in a block
+        if (previousTxHash !== `0x${'0'.repeat(64)}`) {
+          previousTxHashes.add(previousTxHash)
+        }
+      })
+    await this.lightRpc.createBatchRequest([...previousTxHashes].map(v => ['fetchTransaction' as keyof Base, v])).exec()
+  }
+
   private async collectLiveCellsByScript(query: LumosCellQuery) {
     const { lock, type, data } = query
     if (!lock && !type) {

diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts
@@ -90,6 +90,7 @@ export default class Queue {
       while (true) {
         try {
           await this.#checkAndSave(txHashes)
+          process.send?.({ channel: 'tx-db-changed' })
           break
         } catch (error) {
           logger.error('retry saving transactions in 2 seconds due to error:', error)
@@ -171,7 +172,10 @@ export default class Queue {
     }, 1)
 
     const drainFetchTxQueue = new Promise((resolve, reject) => {
-      fetchTxQueue.error(reject)
+      fetchTxQueue.error(err => {
+        fetchTxQueue.kill()
+        reject(err)
+      })
       fetchTxQueue.drain(() => resolve(0))
     })