fix: sync when start node

nervosnetwork · Nov 16, 2019 · 219d99c · 219d99c
1 parent e8aa042
commit 219d99c
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 19 deletions.
diff --git a/packages/neuron-wallet/src/startup/sync-block-task/create.ts b/packages/neuron-wallet/src/startup/sync-block-task/create.ts
@@ -8,6 +8,10 @@ import AddressService from 'services/addresses'
 import genesisBlockHash from './genesis'
 import InitDatabase from './init-database'
 import DataUpdateSubject from 'models/subjects/data-update'
+import logger from 'utils/logger'
+import NodeService from 'services/node'
+import NetworksService from 'services/networks'
+import { distinctUntilChanged } from 'rxjs/operators'
 
 export { genesisBlockHash }
 
@@ -22,32 +26,49 @@ export interface DatabaseInitParams {
   chain: string
 }
 
+// network switch or network connect
+const networkChange = async (network: NetworkWithID) => {
+  await InitDatabase.getInstance().stopAndWait()
+  const info = await InitDatabase.getInstance().init(network)
+
+  DataUpdateSubject.next({
+    dataType: 'transaction',
+    actionType: 'update',
+  })
+
+  if (info !== 'killed') {
+    const databaseInitParams: DatabaseInitParams = {
+      network,
+      genesisBlockHash: info.hash,
+      chain: info.chain
+    }
+    databaseInitSubject.next(databaseInitParams)
+    // re init txCount in addresses if switch network
+    await updateAllAddressesTxCount(network.remote)
+  }
+}
+
 export const databaseInitSubject = new ReplaySubject<DatabaseInitParams>(1)
 
 networkSwitchSubject.subscribe(async (network: NetworkWithID | undefined) => {
   if (network) {
-    // TODO: only switch if genesisHash is different
-
-    await InitDatabase.getInstance().stopAndWait()
-    const info = await InitDatabase.getInstance().init(network)
-
-    DataUpdateSubject.next({
-      dataType: 'transaction',
-      actionType: 'update',
-    })
+    await networkChange(network)
+  }
+})
 
-    if (info !== 'killed') {
-      const databaseInitParams: DatabaseInitParams = {
-        network,
-        genesisBlockHash: info.hash,
-        chain: info.chain
+NodeService
+  .getInstance()
+  .connectionStatusSubject
+  .pipe(distinctUntilChanged())
+  .subscribe(async (status: boolean) => {
+    if (status && InitDatabase.getInstance().isUsingPrevious()) {
+      const network = NetworksService.getInstance().getCurrent()
+      logger.debug('networkConnect:', network)
+      if (network) {
+        await networkChange(network)
       }
-      databaseInitSubject.next(databaseInitParams)
-      // re init txCount in addresses if switch network
-      await updateAllAddressesTxCount(network.remote)
     }
-  }
-})
+  })
 
 const loadURL = `file://${path.join(__dirname, 'index.html')}`
 

diff --git a/packages/neuron-wallet/src/startup/sync-block-task/init-database.ts b/packages/neuron-wallet/src/startup/sync-block-task/init-database.ts
@@ -28,6 +28,12 @@ export class InitDatabase {
 
   private killed: boolean = false
 
+  private usingPrevious: boolean = false
+
+  public isUsingPrevious = (): boolean => {
+    return this.usingPrevious
+  }
+
   public init = async (network: NetworkWithID) => {
     if (InitDatabase.previous) {
       await InitDatabase.previous.stopAndWait()
@@ -39,6 +45,7 @@ export class InitDatabase {
     let chain: string = ''
     while (!this.stopped && !this.success) {
       try {
+        this.usingPrevious = false
         hash = await genesisBlockHash(network.remote)
         await initConnection(hash)
         chain = await getChain(network.remote)
@@ -68,6 +75,7 @@ export class InitDatabase {
           DaoUtils.setDaoScript(metaInfo.daoScriptInfo)
           hash = metaInfo.genesisBlockHash
           this.success = true
+          this.usingPrevious = true
         } catch (error) {
           logger.error('get cached meta info error:', err)
           Utils.sleep(5000)