fix: don't restart when generate new address in normal sync

nervosnetwork · Aug 20, 2019 · 66b6810 · 66b6810
1 parent 50a3c73
commit 66b6810
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/packages/neuron-wallet/src/listeners/address.ts b/packages/neuron-wallet/src/listeners/address.ts
@@ -28,7 +28,8 @@ export const register = () => {
       walletIds.map(async id => {
         const wallet = WalletService.getInstance().get(id)
         const accountExtendedPublicKey: AccountExtendedPublicKey = wallet.accountExtendedPublicKey()
-        await AddressService.checkAndGenerateSave(id, accountExtendedPublicKey, true, 20, 10)
+        // set isImport to undefined means unknown
+        await AddressService.checkAndGenerateSave(id, accountExtendedPublicKey, undefined, 20, 10)
       })
     )
   })

diff --git a/packages/neuron-wallet/src/startup/sync-block-task/indexer.ts b/packages/neuron-wallet/src/startup/sync-block-task/indexer.ts
@@ -43,10 +43,12 @@ export const switchNetwork = async (nodeURL: string) => {
       const infos: LockHashInfo[] = (await Promise.all(
         addressWithWay.map(async aw => {
           const hashes: string[] = await LockUtils.addressToAllLockHashes(aw.address.address)
+          // undefined means true
+          const isImport: boolean = aw.isImport !== false
           return hashes.map(h => {
             return {
               lockHash: h,
-              isImport: aw.isImport,
+              isImport,
             }
           })
         })

diff --git a/packages/neuron-wallet/src/startup/sync-block-task/sync.ts b/packages/neuron-wallet/src/startup/sync-block-task/sync.ts
@@ -44,10 +44,12 @@ export const switchNetwork = async () => {
       const infos: LockHashInfo[] = (await Promise.all(
         addressWithWay.map(async aw => {
           const hashes: string[] = await LockUtils.addressToAllLockHashes(aw.address.address)
+          // undefined means false
+          const isImport: boolean = aw.isImport === true
           return hashes.map(h => {
             return {
               lockHash: h,
-              isImport: aw.isImport,
+              isImport,
             }
           })
         })