fix: also clean lock/dao info in renderer process

nervosnetwork · Nov 22, 2019 · a0b2470 · a0b2470
1 parent 60ec486
commit a0b2470
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/packages/neuron-wallet/src/models/lock-utils.ts b/packages/neuron-wallet/src/models/lock-utils.ts
@@ -17,30 +17,16 @@ export interface SystemScript {
   hashType: ScriptHashType
 }
 
-const subscribed = (target: any, propertyName: string) => {
-  let value: any
-  Object.defineProperty(target, propertyName, {
-    get: () => value,
-    set: (info: SystemScript | undefined) => {
-      value = info
-      if (info) {
-        SystemScriptSubject.next({ codeHash: info.codeHash })
-      }
-    },
-  })
-}
-
 export default class LockUtils {
   systemScript: SystemScript
 
   constructor(systemScript: SystemScript) {
     this.systemScript = systemScript
   }
 
-  @subscribed
-  static systemScriptInfo: SystemScript | undefined
+  private static systemScriptInfo: SystemScript | undefined
 
-  static previousURL: string | undefined
+  private static previousURL: string | undefined
 
   static async loadSystemScript(nodeURL: string): Promise<SystemScript> {
     const core = new Core(nodeURL)

diff --git a/packages/neuron-wallet/src/startup/sync-block-task/indexer.ts b/packages/neuron-wallet/src/startup/sync-block-task/indexer.ts
@@ -5,6 +5,7 @@ import IndexerQueue, { LockHashInfo } from 'services/indexer/queue'
 import { Address } from 'database/address/address-dao'
 
 import initConnection from 'database/chain/ormconfig'
+import DaoUtils from 'models/dao-utils'
 
 const { nodeService, addressCreatedSubject, walletCreatedSubject } = remote.require('./startup/sync-block-task/params')
 
@@ -24,6 +25,10 @@ export const switchNetwork = async (nodeURL: string, genesisBlockHash: string, _
     await indexerQueue.stopAndWait()
   }
 
+  // clean LockUtils info and DaoUtils info
+  LockUtils.cleanInfoWhenSwitchNetwork()
+  DaoUtils.cleanInfoWhenSwitchNetwork()
+
   // disconnect old connection and connect to new database
   await initConnection(genesisBlockHash)
   // load lockHashes

diff --git a/packages/neuron-wallet/src/startup/sync-block-task/sync.ts b/packages/neuron-wallet/src/startup/sync-block-task/sync.ts
@@ -4,6 +4,7 @@ import LockUtils from 'models/lock-utils'
 import BlockListener from 'services/sync/block-listener'
 import { Address } from 'database/address/address-dao'
 import initConnection from 'database/chain/ormconfig'
+import DaoUtils from 'models/dao-utils'
 
 const { nodeService, addressCreatedSubject, walletCreatedSubject } = remote.require('./startup/sync-block-task/params')
 
@@ -31,6 +32,10 @@ export const switchNetwork = async (url: string, genesisBlockHash: string, _chai
     await blockListener.stopAndWait()
   }
 
+  // clean LockUtils info and DaoUtils info
+  LockUtils.cleanInfoWhenSwitchNetwork()
+  DaoUtils.cleanInfoWhenSwitchNetwork()
+
   // disconnect old connection and connect to new database
   await initConnection(genesisBlockHash)
   // load lockHashes
@@ -79,4 +84,4 @@ export const switchNetwork = async (url: string, genesisBlockHash: string, _chai
   })
 
   blockListener.start()
-}
+}