fix: Fix add block hash into ckb-indexer path. Restart ckb-indexer af…

…ter restart ckb-node (#2444)
nervosnetwork · Jul 8, 2022 · 332de8b · 332de8b · github-actions · Jul 8, 2022
1 parent 4d079ff
commit 332de8b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
@@ -464,7 +464,8 @@ export default class ApiController {
 
     handle('set-ckb-node-data-path', (_, dataPath: string) => {
       SettingsService.getInstance().ckbDataPath = dataPath
-      startMonitor('ckb', true)
+      stopMonitor('ckb-indexer')
+      startMonitor(undefined, true)
       return {
         status: ResponseCode.Success,
         result: SettingsService.getInstance().ckbDataPath
@@ -483,7 +484,7 @@ export default class ApiController {
       startMonitor('ckb-indexer', true)
       return {
         status: ResponseCode.Success,
-        result: SettingsService.getInstance().ckbDataPath
+        result: SettingsService.getInstance().indexerDataPath
       }
     })
 

diff --git a/packages/neuron-wallet/src/services/indexer.ts b/packages/neuron-wallet/src/services/indexer.ts
@@ -191,9 +191,9 @@ export default class IndexerService {
   #getDataPath = (network: Network): string => {
     let indexerDataPath = SettingsService.getInstance().indexerDataPath
     if (!indexerDataPath) {
-      indexerDataPath = path.resolve(env.fileBasePath, IndexerService.indexerDataFolder, 'data', `${network.genesisHash}`)
+      indexerDataPath = path.resolve(env.fileBasePath, IndexerService.indexerDataFolder, 'data')
       SettingsService.getInstance().indexerDataPath = indexerDataPath
     }
-    return indexerDataPath
+    return path.resolve(indexerDataPath, `${network.genesisHash}`)
   }
 }