Merge pull request #19 from nervosnetwork/rc/v0.1.0-alpha.2

nervosnetwork · Sep 28, 2020 · b2e69c6 · b2e69c6
2 parents 053bc02 + f8b0296
commit b2e69c6
Show file tree

Hide file tree

Showing 14 changed files with 60 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.1.0-alpha.2](https://github.com/nervosnetwork/keypering/compare/v0.1.0-alpha.1...v0.1.0-alpha.2) (2020-09-28)
+
+
+### Bug Fixes
+
+* fix the type of keystore version which should be number ([4b7f203](https://github.com/nervosnetwork/keypering/commit/4b7f203628684c34fda066153e7d490616c36c48))
+
+
+
+
+
 # 0.1.0-alpha.1 (2020-08-19)
 
 ### Note

diff --git a/README.md b/README.md
@@ -62,6 +62,11 @@ Keypering consists of 3 components:
 2. [@keypering/ui](https://github.com/nervosnetwork/keypering/tree/develop/packages/ui) renders the main interface of Keypering;
 3. [@keypering/app](https://github.com/nervosnetwork/keypering/tree/develop/packages/app) maintains data and handle requests from renderer process and DApp.
 
+# Tutorials
+
+- [How to Develop a CKB DApp with Keypering (Video, Chinese + English Subtitles)](https://youtu.be/i-gQ0enK5cY)
+- [How to Develop a CKB DApp with Keypering (Slides)](https://docs.google.com/presentation/d/1bswEhjSYwZZnUCF4rRL5x5vfOVXO_kDlbjsojsG94w8/edit?usp=sharing)
+
 # Resources
 
 - [Keypering Manual](https://nervosnetwork.github.io/keypering/#/manual) - User Guide of Keypering

diff --git a/docs/README.md b/docs/README.md
@@ -62,6 +62,11 @@ Keypering consists of 3 components:
 2. [@keypering/ui](https://github.com/nervosnetwork/keypering/tree/develop/packages/ui) renders the main interface of Keypering;
 3. [@keypering/app](https://github.com/nervosnetwork/keypering/tree/develop/packages/app) maintains data and handle requests from renderer process and DApp.
 
+# Tutorials
+
+- [How to Develop a CKB DApp with Keypering (Video, Chinese + English Subtitles)](https://youtu.be/i-gQ0enK5cY)
+- [How to Develop a CKB DApp with Keypering (Slides)](https://docs.google.com/presentation/d/1bswEhjSYwZZnUCF4rRL5x5vfOVXO_kDlbjsojsG94w8/edit?usp=sharing)
+
 # Resources
 
 - [Keypering Manual](https://nervosnetwork.github.io/keypering/#/manual) - User Guide of Keypering

diff --git a/lerna.json b/lerna.json
@@ -4,5 +4,5 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.1.0-alpha.1"
+  "version": "0.1.0-alpha.2"
 }
diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.1.0-alpha.2](https://github.com/nervosnetwork/keypering/compare/v0.1.0-alpha.1...v0.1.0-alpha.2) (2020-09-28)
+
+
+### Bug Fixes
+
+* fix the type of keystore version which should be number ([4b7f203](https://github.com/nervosnetwork/keypering/commit/4b7f203628684c34fda066153e7d490616c36c48))
+
+
+
+
+
 # 0.1.0-alpha.1 (2020-08-19)
 
 

diff --git a/packages/app/__mock__/wallet.ts b/packages/app/__mock__/wallet.ts
@@ -19,7 +19,7 @@ export const mockWallet = {
   keystores: [
     {
       id: '7dea774e-d829-4256-9a3f-2c6c0a62968a',
-      version: '3',
+      version: 3,
       crypto: {
         ciphertext:
           '51550837505b7b19544e88ae83e11cddf7427d42215fbd5458de0fb8c3719ffd5dc3337cd0d44cd202b468df12ddc22d7088d219b5f59a3a6f5c4cc2f860c1fa',
@@ -37,7 +37,7 @@ export const mockWallet = {
       },
     },
     {
-      version: '3',
+      version: 3,
       crypto: {
         cipher: 'aes-128-ctr',
         cipherparams: { iv: 'd18787c19b1be9680aa317e879c1f04f' },

diff --git a/packages/app/__tests__/wallet/mnemonic/index.ts b/packages/app/__tests__/wallet/mnemonic/index.ts
@@ -16,7 +16,7 @@ describe('Test mnemonic module', () => {
       const keystore = getKeystoreFromMnemonic({ mnemonic, password })
       expect(keystore).toEqual(expect.objectContaining({
         id: expect.any(String),
-        version: '3',
+        version: 3,
         crypto: {
           ciphertext: expect.any(String),
           cipherparams: {

diff --git a/packages/app/__tests__/wallet/service/index.ts b/packages/app/__tests__/wallet/service/index.ts
@@ -143,7 +143,7 @@ describe('Test wallet service', () => {
     it('should return keystore', () => {
       const expected = expect.objectContaining({
         id: expect.any(String),
-        version: '3',
+        version: 3,
         crypto: {
           cipher: 'aes-128-ctr',
           cipherparams: {

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keypering/app",
-  "version": "0.1.0-alpha.1",
+  "version": "0.1.0-alpha.2",
   "description": "",
   "author": "Keith <[email protected]>",
   "homepage": "https://nervosnetwork.github.io/keypering",
@@ -32,7 +32,7 @@
     "url": "https://github.com/nervosnetwork/keypering/issues"
   },
   "devDependencies": {
-    "@keypering/specs": "0.1.0-alpha.1",
+    "@keypering/specs": "0.1.0-alpha.2",
     "@types/elliptic": "6.4.12",
     "@types/uuid": "8.0.1",
     "electron": "9.2.0",

diff --git a/packages/app/src/wallet/keystore.ts b/packages/app/src/wallet/keystore.ts
@@ -25,7 +25,7 @@ interface Crypto {
 
 export interface Keystore {
   id: string
-  version: string
+  version: number
   crypto: Crypto
 }
 
@@ -53,7 +53,7 @@ export const getKeystoreFromXPrv = (xPrv: Buffer, password: string) => {
   const ciphertext = Buffer.concat([cipher.update(xPrv), cipher.final()])
   return {
     id: uuid(),
-    version: '3',
+    version: 3,
     crypto: {
       ciphertext: ciphertext.toString('hex'),
       cipherparams: { iv: iv.toString('hex') },

diff --git a/packages/specs/CHANGELOG.md b/packages/specs/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.1.0-alpha.2](https://github.com/nervosnetwork/keypering/compare/v0.1.0-alpha.1...v0.1.0-alpha.2) (2020-09-28)
+
+**Note:** Version bump only for package @keypering/specs
+
+
+
+
+
 # 0.1.0-alpha.1 (2020-08-19)
 
 

diff --git a/packages/specs/package.json b/packages/specs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keypering/specs",
-  "version": "0.1.0-alpha.1",
+  "version": "0.1.0-alpha.2",
   "description": "",
   "author": "Keith <[email protected]>",
   "homepage": "https://nervosnetwork.github.io/keypering/#/protocol",

diff --git a/packages/ui/CHANGELOG.md b/packages/ui/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.1.0-alpha.2](https://github.com/nervosnetwork/keypering/compare/v0.1.0-alpha.1...v0.1.0-alpha.2) (2020-09-28)
+
+**Note:** Version bump only for package @keypering/ui
+
+
+
+
+
 # 0.1.0-alpha.1 (2020-08-19)
 
 

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keypering/ui",
-  "version": "0.1.0-alpha.1",
+  "version": "0.1.0-alpha.2",
   "private": true,
   "homepage": ".",
   "scripts": {
@@ -29,7 +29,7 @@
     "react-scripts": "3.4.1"
   },
   "devDependencies": {
-    "@keypering/specs": "0.1.0-alpha.1",
+    "@keypering/specs": "0.1.0-alpha.2",
     "@nervosnetwork/ckb-types": "0.34.0",
     "@types/react": "16.9.45",
     "@types/react-dom": "16.9.0",