Merge pull request #1884 from nervosnetwork/rc/v0.33.0

kellyshang · web-flow · commit 42e0fb2f8aa6 · 2020-10-12T14:37:21.000+08:00
Rc/v0.33.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,31 @@
+# 0.33.0 (2020-10-12)
+
+[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. 
+
+**Note:** There will be a data migration for the new bundled node [CKB v0.35.1](https://github.com/nervosnetwork/ckb/releases/tag/v0.35.1), which may take several minutes to boot up for the first time after upgraded from the earlier versions. 
+**Attention:** The migration is not reversible. Please backup the data directory if you want to use old versions later.
+
+### Refactor
+
+* Upgrade from Electron 7 to Electron 9.
+* Refactor the wallet address storage to be based on an SQLite table rather than a JSON file.
+* Deprecate LevelDB and instead SQLite for persisting transaction descriptions.
+* Refactor send component.
+* Reduce the confirmation block height from 300 to 24.
+
+### New features
+
+* Enable `Asset Accounts` for mainnet.
+* Support transfer to multisig address.
+
+### Bug fixes
+
+* Fixed `InsufficientCellCapacity` error for CKB ACP transfer when there are cells with data.
+* Fixed `too many SQL variables` error when there are too many addresses in wallets.
+* Fixed the autofill description on unlocking assets.
+* Refine error message when the fee for dao withdrawal transaction is insufficient.
+
+
 # 0.33.0-rc1 (2020-09-27)
 
 This is a release candidate to preview the changes in the next official release and may not be stable. Welcome any questions or suggestions.
diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.33.0-rc1",
+  "version": "0.33.0",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "neuron",
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
-  "version": "0.33.0-rc1",
+  "version": "0.33.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.33.0-rc1",
+  "version": "0.33.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
@@ -3,7 +3,7 @@
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
   "homepage": "https://www.nervos.org/",
-  "version": "0.33.0-rc1",
+  "version": "0.33.0",
   "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-rc1",
+    "neuron-ui": "0.33.0",
     "rimraf": "3.0.0",
     "ttypescript": "1.5.10"
   }
diff --git a/packages/neuron-wallet/src/block-sync-renderer/index.ts b/packages/neuron-wallet/src/block-sync-renderer/index.ts
@@ -25,6 +25,7 @@ let syncTask: SyncTask | null
 let network: Network | null
 
 const resetSyncTaskQueue = queue(async ({startTask, clearIndexerFolder}) => {
+  await WalletService.getInstance().generateAddressesIfNecessary()
   await killBlockSyncTask()
   if (startTask) {
     await createBlockSyncTask(clearIndexerFolder)
@@ -121,9 +122,6 @@ export const createBlockSyncTask = async (clearIndexerFolder: boolean) => {
   })
 
   if (network.genesisHash !== EMPTY_GENESIS_HASH) {
-    await WalletService.getInstance().generateAddressesIfNecessary()
-
-    // re init txCount in addresses if switch network
     syncTask!.start(
       network.remote,
       network.genesisHash,
diff --git a/packages/neuron-wallet/src/database/chain/entities/hd-public-key-info.ts b/packages/neuron-wallet/src/database/chain/entities/hd-public-key-info.ts
@@ -14,12 +14,6 @@ export default class HdPublicKeyInfo {
   @Index()
   walletId!: string
 
-  @Column({
-    type: 'varchar',
-  })
-  @Index()
-  address!: string
-
   @Column()
   addressType!: AddressType
 
@@ -48,7 +42,6 @@ export default class HdPublicKeyInfo {
     const publicKeyInfo = new HdPublicKeyInfo()
 
     publicKeyInfo.walletId = model.walletId
-    publicKeyInfo.address = model.address
     publicKeyInfo.addressType = model.addressType
     publicKeyInfo.addressIndex = model.addressIndex
     publicKeyInfo.publicKeyInBlake160 = model.publicKeyInBlake160
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1601447406035-RemoveKeyInfoAddress.ts b/packages/neuron-wallet/src/database/chain/migrations/1601447406035-RemoveKeyInfoAddress.ts
@@ -0,0 +1,12 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class RemoveKeyInfoAddress1601447406035 implements MigrationInterface {
+  name = 'RemoveKeyInfoAddress1601447406035'
+
+  public async up(queryRunner: QueryRunner): Promise<any> {
+      await queryRunner.dropColumn(`hd_public_key_info`, 'address');
+  }
+
+  public async down(): Promise<any> {}
+
+}
diff --git a/packages/neuron-wallet/src/database/chain/ormconfig.ts b/packages/neuron-wallet/src/database/chain/ormconfig.ts
@@ -37,6 +37,7 @@ import { RemoveLiveCell1592781363749 } from './migrations/1592781363749-RemoveLi
 import { AddIndexerTxHashCache1592727615004 } from './migrations/1592727615004-AddIndexerTxHashCache'
 import { HDPublicKeyInfo1598087517643 } from './migrations/1598087517643-HDPublicKeyInfo'
 import { TxDescription1599441769473 } from './migrations/1599441769473-TxDescription'
+import { RemoveKeyInfoAddress1601447406035 } from './migrations/1601447406035-RemoveKeyInfoAddress'
 
 export const CONNECTION_NOT_FOUND_NAME = 'ConnectionNotFoundError'
 
@@ -90,6 +91,7 @@ const connectOptions = async (genesisBlockHash: string): Promise<SqliteConnectio
       AddIndexerTxHashCache1592727615004,
       HDPublicKeyInfo1598087517643,
       TxDescription1599441769473,
+      RemoveKeyInfoAddress1601447406035,
     ],
     logger: 'simple-console',
     logging,
diff --git a/packages/neuron-wallet/src/models/keys/hd-public-key-info.ts b/packages/neuron-wallet/src/models/keys/hd-public-key-info.ts
@@ -1,27 +1,35 @@
-import Address, { AddressType } from "./address"
+import AddressGenerator from "models/address-generator"
+import SystemScriptInfo from "models/system-script-info"
+import NetworksService from "services/networks"
+import Address, { AddressPrefix, AddressType } from "./address"
 
 export default class HdPublicKeyInfoModel {
   public walletId: string
-  public address: string
   public addressType: AddressType
   public addressIndex: number
   public publicKeyInBlake160: string
   public description?: string
 
+  public get address() {
+    const prefix = NetworksService.getInstance().isMainnet() ? AddressPrefix.Mainnet : AddressPrefix.Testnet
+    return AddressGenerator.toShort(
+      SystemScriptInfo.generateSecpScript(this.publicKeyInBlake160),
+      prefix
+    )
+  }
+
   public get path(): string {
     return Address.pathFor(this.addressType, this.addressIndex)
   }
 
   constructor(
     walletId: string,
-    address: string,
     addressType: AddressType,
     addressIndex: number,
     publicKeyInBlake160: string,
     description?: string,
   ) {
     this.walletId = walletId
-    this.address = address
     this.addressType = addressType
     this.addressIndex = addressIndex
     this.publicKeyInBlake160 = publicKeyInBlake160
@@ -30,15 +38,13 @@ export default class HdPublicKeyInfoModel {
 
   public static fromObject(params: {
     walletId: string,
-    address: string,
     addressType: AddressType,
     addressIndex: number,
     publicKeyInBlake160: string,
     description?: string,
   }): HdPublicKeyInfoModel {
     return new HdPublicKeyInfoModel (
       params.walletId,
-      params.address,
       params.addressType,
       params.addressIndex,
       params.publicKeyInBlake160,
diff --git a/packages/neuron-wallet/src/services/wallets.ts b/packages/neuron-wallet/src/services/wallets.ts
@@ -149,8 +149,9 @@ export default class WalletService {
 
   public generateAddressesIfNecessary = async () => {
     for (const wallet of this.getAll()) {
-      if ((await AddressService.getAddressesByWalletId(wallet.id)).length === 0) {
-        await this.generateAddressesById(wallet.id, false)
+      const addresses = await AddressService.getAddressesByWalletId(wallet.id)
+      if (addresses.length === 0) {
+        await this.generateAddressesById(wallet.id, false, undefined, undefined, false)
       }
     }
   }
@@ -159,15 +160,17 @@ export default class WalletService {
     id: string,
     isImporting: boolean,
     receivingAddressCount: number = DefaultAddressNumber.Receiving,
-    changeAddressCount: number = DefaultAddressNumber.Change
+    changeAddressCount: number = DefaultAddressNumber.Change,
+    notifyAddressCreated: boolean = true
   ) => {
     const accountExtendedPublicKey: AccountExtendedPublicKey = this.get(id).accountExtendedPublicKey()
     await AddressService.checkAndGenerateSave(
       id,
       accountExtendedPublicKey,
       isImporting,
       receivingAddressCount,
-      changeAddressCount
+      changeAddressCount,
+      notifyAddressCreated
     )
   }
 
diff --git a/packages/neuron-wallet/tests/block-sync-render/index.test.ts b/packages/neuron-wallet/tests/block-sync-render/index.test.ts
@@ -54,6 +54,7 @@ const resetMocks = () => {
   stubbedQueryIndexer.mockReset()
   stubbedResetIndexerData.mockReset()
   stubbedGetCurrentNetwork.mockReset()
+  stubbedGenerateAddressesIfNecessary.mockReset()
 
   stubbedUnmountSyncTask.mockReset()
   stubbedSyncTaskStart.mockReset()
@@ -315,6 +316,7 @@ describe('block sync render', () => {
             await switchToNetwork(network)
             stubbedSyncTaskStart.mockReset()
             stubbedUnmountSyncTask.mockReset()
+            stubbedGenerateAddressesIfNecessary.mockReset()
           })
 
           describe('switches to different network', () => {
@@ -325,6 +327,9 @@ describe('block sync render', () => {
               expect(stubbedUnmountSyncTask).toHaveBeenCalled()
               expect(stubbedSyncTaskStart).toHaveBeenCalled()
             })
+            it('checks and generates addresses if necessary', () => {
+              expect(stubbedGenerateAddressesIfNecessary).toHaveBeenCalled()
+            })
           });
 
           describe('switches to same network', () => {
@@ -335,6 +340,9 @@ describe('block sync render', () => {
               expect(stubbedUnmountSyncTask).not.toHaveBeenCalled()
               expect(stubbedSyncTaskStart).not.toHaveBeenCalled()
             })
+            it('should not generate addresses', () => {
+              expect(stubbedGenerateAddressesIfNecessary).not.toHaveBeenCalled()
+            })
           });
 
           describe('forces reconnecting to same network', () => {
@@ -345,6 +353,9 @@ describe('block sync render', () => {
               expect(stubbedUnmountSyncTask).toHaveBeenCalled()
               expect(stubbedSyncTaskStart).toHaveBeenCalled()
             })
+            it('checks and generates addresses if necessary', () => {
+              expect(stubbedGenerateAddressesIfNecessary).toHaveBeenCalled()
+            })
           });
 
           it(`should not create sync task if genesis hash don't match`, async () => {
diff --git a/packages/neuron-wallet/tests/models/keys/hd-public-key-info.test.ts b/packages/neuron-wallet/tests/models/keys/hd-public-key-info.test.ts
@@ -0,0 +1,81 @@
+import { AddressPrefix } from '@nervosnetwork/ckb-sdk-utils'
+import AddressGenerator from '../../../src/models/address-generator'
+import { AddressType } from '../../../src/models/keys/address'
+import KeyInfos from '../../setupAndTeardown/public-key-info.fixture'
+
+const stubbedIsMainnet = jest.fn()
+
+jest.doMock('services/networks', () => {
+  return {
+    getInstance: () => ({
+      isMainnet: stubbedIsMainnet
+    }),
+  }
+})
+
+const HdPublicKeyInfoModel = require('../../../src/models/keys/hd-public-key-info').default
+
+const resetMocks = () => {
+  stubbedIsMainnet.mockReset()
+}
+
+describe('HdPublicKeyInfoModel', () => {
+  const [keyInfo] = KeyInfos
+  let keyInfoModel: any
+
+  beforeEach(() => {
+    resetMocks()
+  });
+
+  describe('#address', () => {
+    describe('with mainnet', () => {
+      beforeEach(() => {
+        stubbedIsMainnet.mockReturnValue(true)
+        keyInfoModel = HdPublicKeyInfoModel.fromObject({
+          publicKeyInBlake160: keyInfo.publicKeyInBlake160,
+        })
+      });
+      it('generates mainnet address by property', () => {
+        const address = AddressGenerator.toShortByBlake160(keyInfo.publicKeyInBlake160, AddressPrefix.Mainnet)
+        expect(keyInfoModel.address).toEqual(address)
+      })
+    });
+    describe('with testnet', () => {
+      beforeEach(() => {
+        stubbedIsMainnet.mockReturnValue(false)
+        keyInfoModel = HdPublicKeyInfoModel.fromObject({
+          publicKeyInBlake160: keyInfo.publicKeyInBlake160,
+        })
+      });
+      it('generates testnet address by property', () => {
+        const address = AddressGenerator.toShortByBlake160(keyInfo.publicKeyInBlake160, AddressPrefix.Testnet)
+        expect(keyInfoModel.address).toEqual(address)
+      })
+    });
+  });
+
+  describe('#path', () => {
+    describe('with change address type', () => {
+      beforeEach(() => {
+        keyInfoModel = HdPublicKeyInfoModel.fromObject({
+          addressType: AddressType.Change,
+          addressIndex: 1
+        })
+      });
+      it('generates path by property', () => {
+        expect(keyInfoModel.path).toEqual("m/44'/309'/0'/1/1")
+      })
+    });
+    describe('with receive address type', () => {
+      beforeEach(() => {
+        keyInfoModel = HdPublicKeyInfoModel.fromObject({
+          addressType: AddressType.Receiving,
+          addressIndex: 1
+        })
+      });
+      it('generates path by property', () => {
+        expect(keyInfoModel.path).toEqual("m/44'/309'/0'/0/1")
+      })
+    });
+  });
+});
diff --git a/packages/neuron-wallet/tests/services/asset-account-service.test.ts b/packages/neuron-wallet/tests/services/asset-account-service.test.ts
@@ -88,7 +88,6 @@ describe('AssetAccountService', () => {
 
     const keyInfo = HdPublicKeyInfo.fromObject({
       walletId,
-      address: '',
       addressType: AddressType.Receiving,
       addressIndex: 0,
       publicKeyInBlake160: blake160,
diff --git a/packages/neuron-wallet/tests/services/cells.test.ts b/packages/neuron-wallet/tests/services/cells.test.ts
@@ -78,7 +78,6 @@ describe('CellsService', () => {
       HdPublicKeyInfo.fromObject({
         walletId: d.walletId,
         publicKeyInBlake160: d.lockScript.args,
-        address: d.address,
         addressType: 0,
         addressIndex: 0,
       })
diff --git a/packages/neuron-wallet/tests/services/wallets.test.ts b/packages/neuron-wallet/tests/services/wallets.test.ts

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"packages": [`
`3`	`3`	`"packages/*"`
`4`	`4`	`],`
`5`		`- "version": "0.33.0-rc1",`
	`5`	`+ "version": "0.33.0",`
`6`	`6`	`"npmClient": "yarn",`
`7`	`7`	`"useWorkspaces": true`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "neuron-ui",`
`3`		`- "version": "0.33.0-rc1",`
	`3`	`+ "version": "0.33.0",`
`4`	`4`	`"private": true,`
`5`	`5`	`"author": {`
`6`	`6`	`"name": "Nervos Core Dev",`