Merge released refs/tags/v0.103.2 into develop

CHANGELOG.md

@@ -1,3 +1,22 @@
+# 0.103.2 (2022-07-09)
+
+### New features
+* #2422: Add heart beat and retry closed ckb/ckb-indexer process(@yanguoyu)
+* #2433: Add ckb node/indexer data path config in setting(@yanguoyu)
+* #2434: Adapt to ledger nano s plus(@yanguoyu)
+* #2441: Verify short and long address for hard wallet(@yanguoyu)
+
+
+### Bug fixes
+* #2425: Fix dialog route error after importing seed(@yanguoyu)
+* #2436: Fix link to Nervos DAO rule(@Keith-CY)
+* #2438: Fix duplicated addressd(@yanguoyu)
+
+
+**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.103.1...v0.103.2
+
+
+
 # 0.103.1 (2022-06-11)
 
 ### New features

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.103.1",
+  "version": "0.103.2",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

packages/neuron-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.103.1",
+  "version": "0.103.2",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

packages/neuron-wallet/package.json

@@ -3,7 +3,7 @@
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
   "homepage": "https://www.nervos.org/",
-  "version": "0.103.1",
+  "version": "0.103.2",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -91,7 +91,7 @@
     "eslint-plugin-prettier": "3.1.1",
     "jest-when": "2.7.2",
     "lint-staged": "9.2.5",
-    "neuron-ui": "0.103.1",
+    "neuron-ui": "0.103.2",
     "prettier": "1.19.1",
     "rimraf": "3.0.0",
     "ttypescript": "1.5.10",

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
       }
     })
 

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}`)
   }
 }