fix: Fix clear cache with light client.

yanguoyu · Nov 30, 2023 · 5d6082b · 5d6082b · github-actions · Nov 30, 2023
1 parent 106f520
commit 5d6082b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/packages/neuron-wallet/src/database/chain/index.ts b/packages/neuron-wallet/src/database/chain/index.ts
@@ -20,7 +20,7 @@ export const clean = async (clearAllLightClientData?: boolean) => {
     }),
     clearAllLightClientData
       ? getConnection().getRepository(SyncProgress).clear()
-      : SyncProgressService.clearCurrentWalletProgress(),
+      : SyncProgressService.clearWalletProgress(),
   ])
   MultisigOutputChangedSubject.getSubject().next('reset')
 

diff --git a/packages/neuron-wallet/src/services/sync-progress.ts b/packages/neuron-wallet/src/services/sync-progress.ts
@@ -1,4 +1,4 @@
-import { Equal, getConnection, In, LessThan, Not } from 'typeorm'
+import { getConnection, In, LessThan, Not } from 'typeorm'
 import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
 import SyncProgress, { SyncAddressType } from '../database/chain/entities/sync-progress'
 import WalletService from './wallets'
@@ -119,14 +119,11 @@ export default class SyncProgressService {
       .getMany()
   }
 
-  static async clearCurrentWalletProgress() {
-    const currentWallet = WalletService.getInstance().getCurrent()
-    await getConnection().getRepository(SyncProgress).delete({ walletId: currentWallet?.id })
+  static async clearWalletProgress() {
     await getConnection()
       .createQueryBuilder()
       .update(SyncProgress)
-      .set({ blockEndNumber: 0, cursor: undefined })
-      .where({ walletId: Not(Equal(currentWallet?.id)) })
+      .set({ blockStartNumber: 0, blockEndNumber: 0 })
       .execute()
   }
 }