Merge pull request #1907 from nervosnetwork/hotfix/0.33.1

Hotfix/0.33.1

Author: kellyshang

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.33.1 (2020-11-16)
+
+[CKB v0.35.1](https://github.com/nervosnetwork/ckb/releases/tag/v0.35.1) was released on Sept. 14th, 2020. This version of CKB node is now bundled and preconfigured in Neuron. 
+
+### Hotfix
+
+* Includes the `hd_public_key_info` table info in debug log.
+* Requires the **x64** version of vcredist component on Windows.
+
+
 # 0.33.0 (2020-10-14)
 
 [CKB v0.35.1](https://github.com/nervosnetwork/ckb/releases/tag/v0.35.1) was released on Sept. 14th, 2020. This version of CKB node is now bundled and preconfigured in Neuron. 

lerna.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "neuron",
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
-  "version": "0.33.0",
+  "version": "0.33.1",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

packages/neuron-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.33.0",
+  "version": "0.33.1",
   "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.33.0",
+  "version": "0.33.1",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -79,7 +79,7 @@
     "electron-notarize": "0.2.1",
     "jest-when": "2.7.2",
     "lint-staged": "9.2.5",
-    "neuron-ui": "0.33.0",
+    "neuron-ui": "0.33.1",
     "rimraf": "3.0.0",
     "ttypescript": "1.5.10"
   }

packages/neuron-wallet/src/controllers/export-debug.ts

@@ -9,6 +9,7 @@ import { t } from 'i18next'
 import { ckbDataPath } from 'services/ckb-runner'
 import NetworksService from 'services/networks'
 import SyncedBlockNumber from 'models/synced-block-number'
+import AddressService from 'services/addresses'
 
 export default class ExportDebugController {
   #I18N_PATH = 'export-debug-info'
@@ -34,7 +35,7 @@ export default class ExportDebugController {
         return
       }
       this.archive.pipe(fs.createWriteStream(filePath))
-      await Promise.all([this.addStatusFile(), this.addBundledCKBLog(), this.addLogFiles()])
+      await Promise.all([this.addStatusFile(), this.addBundledCKBLog(), this.addLogFiles(), this.addHdPublicKeyInfoCsv()])
       await this.archive.finalize()
       dialog.showMessageBox({
         type: 'info',
@@ -122,6 +123,17 @@ export default class ExportDebugController {
     })
   }
 
+  private async addHdPublicKeyInfoCsv() {
+    const addressMetas = await AddressService.getAddressesByAllWallets()
+    let csv = 'walletId,addressType,addressIndex,publicKeyInBlake160\n'
+    for (const addressMeta of addressMetas) {
+      const row = `${addressMeta.walletId},${addressMeta.addressType},${addressMeta.addressIndex},${addressMeta.blake160}\n`
+      csv += row
+    }
+    const csvFileName = 'hd_public_key_info.csv'
+    this.archive.append(csv, { name: csvFileName })
+  }
+
   private addLogFiles = (files = ['main.log', 'renderer.log']) => {
     const logFile = logger.transports.file.getFile()
     if (!logFile?.path) {

packages/neuron-wallet/src/database/chain/cleaner.ts

@@ -4,13 +4,12 @@ import OutputEntity from './entities/output'
 import TransactionEntity from './entities/transaction'
 import SyncInfoEntity from './entities/sync-info'
 import IndexerTxHashCache from './entities/indexer-tx-hash-cache'
-import HdPublicKeyInfo from './entities/hd-public-key-info'
 
 // Clean local sqlite storage
 export default class ChainCleaner {
   public static async clean() {
     Promise.all(
-      [InputEntity, OutputEntity, TransactionEntity, IndexerTxHashCache, HdPublicKeyInfo].map(entity => {
+      [InputEntity, OutputEntity, TransactionEntity, IndexerTxHashCache].map(entity => {
         return getConnection().getRepository(entity).clear()
       })
     )

packages/neuron-wallet/src/locales/en.ts

@@ -134,7 +134,7 @@ export default {
       'ckb-dependency': {
         title: 'Bundled CKB Node',
         message: 'Dependency Required',
-        detail: `The embedded CKB node in Neuron requires Microsoft Visual C++ Redistributable component to be installed to work properly. You have to install it to enable the internal node. If you'd like to use a remote CKB node, you can skip this step.`,
+        detail: `The embedded CKB node in Neuron requires x64 version of Microsoft Visual C++ Redistributable component to be installed to work properly. You have to install it to enable the internal node. If you'd like to use a remote CKB node, you can skip this step.`,
         buttons: {
           'skip': 'Skip',
           'install-and-exit': 'Install and Exit'

packages/neuron-wallet/src/locales/zh-tw.ts

@@ -132,7 +132,7 @@ export default {
       'ckb-dependency': {
         title: '內置 CKB 節點',
         message: '缺少必要的依賴',
-        detail: 'Neuron 內置的 CKB 節點需要安裝 Microsoft Visual C++ Redistributable 才能正常運行。您需要安裝該組件來啟動內置節點。如果您使用外部節點，也可以跳過該步驟。',
+        detail: 'Neuron 內置的 CKB 節點需要安裝 x64 版本的 Microsoft Visual C++ Redistributable 才能正常運行。您需要安裝該組件來啟動內置節點。如果您使用外部節點，也可以跳過該步驟。',
         buttons: {
           'skip': '跳過',
           'install-and-exit': '安裝並退出'

packages/neuron-wallet/src/locales/zh.ts

@@ -133,7 +133,7 @@ export default {
       'ckb-dependency': {
         title: '内置 CKB 节点',
         message: '缺少必要的依赖',
-        detail: 'Neuron 内置的 CKB 节点需要安装 Microsoft Visual C++ Redistributable 才能正常运行。您需要安装该组件来启用内置节点。如果您使用外部节点，也可以跳过该步骤。',
+        detail: 'Neuron 内置的 CKB 节点需要安装 x64 版本的 Microsoft Visual C++ Redistributable 才能正常运行。您需要安装该组件来启用内置节点。如果您使用外部节点，也可以跳过该步骤。',
         buttons: {
           'skip': '跳过',
           'install-and-exit': '安装并退出'