Merge pull request #1164 from nervosnetwork/fix-tx-not-all

fix: the missing txs
nervosnetwork · Nov 28, 2019 · 04c7d3c · 04c7d3c
2 parents 908c202 + 43edefe
commit 04c7d3c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/packages/neuron-wallet/src/models/subjects/address-created-subject.ts b/packages/neuron-wallet/src/models/subjects/address-created-subject.ts
@@ -7,4 +7,8 @@ export default class AddressCreatedSubject {
   static getSubject() {
     return this.subject
   }
+
+  static setSubject(subject: ReplaySubject<Address[]>) {
+    this.subject = subject
+  }
 }
diff --git a/packages/neuron-wallet/src/services/sync/block-listener.ts b/packages/neuron-wallet/src/services/sync/block-listener.ts
@@ -31,11 +31,12 @@ export default class BlockListener {
   }
 
   public setLockHashes = (lockHashes: string[]) => {
-    this.lockHashes = lockHashes
+    const hashes = [...new Set(lockHashes)]
+    this.lockHashes = hashes
     if (!this.queue) {
       return
     }
-    this.queue.setLockHashes(lockHashes)
+    this.queue.setLockHashes(hashes)
   }
 
   public appendLockHashes = (lockHashes: string[]) => {

diff --git a/packages/neuron-wallet/src/startup/sync-block-task/task.ts b/packages/neuron-wallet/src/startup/sync-block-task/task.ts
@@ -8,11 +8,14 @@ import Utils from 'services/sync/utils'
 import { switchNetwork as syncSwitchNetwork } from './sync'
 import { switchNetwork as indexerSwitchNetwork } from './indexer'
 import { DatabaseInitParams } from './create'
+import AddressCreatedSubject from 'models/subjects/address-created-subject'
 
 // register to listen address updates
 registerAddressListener()
 
-const { addressesUsedSubject, databaseInitSubject } = remote.require('./startup/sync-block-task/params')
+const { addressesUsedSubject, databaseInitSubject, addressCreatedSubject } = remote.require('./startup/sync-block-task/params')
+
+AddressCreatedSubject.setSubject(addressCreatedSubject)
 
 // pass to task a main process subject
 AddressesUsedSubject.setSubject(addressesUsedSubject)