Merge pull request #920 from nervosnetwork/rc/v0.20.0-beta.0

ashchan · web-flow · commit 919099b05c4d · 2019-09-09T17:34:28.000+09:00
[ᚬmaster] Rc/v0.20.0 beta.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# [0.20.0-beta.0](https://github.com/nervosnetwork/neuron/compare/v0.19.0-beta.1...v0.20.0-beta.0) (2019-09-09)
+
+
+### Bug Fixes
+
+* fix gatherInputs select error ([a104618](https://github.com/nervosnetwork/neuron/commit/a104618))
+
+
+### Features
+
+* **neuron-ui:** set the default font style to use system fonts ([70f4680](https://github.com/nervosnetwork/neuron/commit/70f4680))
+* bump sdk to v0.20.0 ([607558b](https://github.com/nervosnetwork/neuron/commit/607558b))
+
+
+
 # [0.19.0-beta.1](https://github.com/nervosnetwork/neuron/compare/v0.19.0-beta.0...v0.19.0-beta.1) (2019-09-04)
 
 
diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.19.0-beta.1",
+  "version": "0.20.0-beta.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.19.0-beta.1",
+  "version": "0.20.0-beta.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -43,23 +43,23 @@
     }
   },
   "devDependencies": {
-    "@types/jest": "24.0.13",
+    "@types/jest": "24.0.18",
     "@typescript-eslint/eslint-plugin": "2.1.0",
     "@typescript-eslint/parser": "2.1.0",
-    "concurrently": "4.1.1",
-    "cross-env": "5.2.0",
+    "concurrently": "4.1.2",
+    "cross-env": "5.2.1",
     "eslint": "6.3.0",
     "eslint-config-airbnb": "18.0.1",
-    "eslint-config-prettier": "6.1.0",
+    "eslint-config-prettier": "6.2.0",
     "eslint-plugin-import": "2.18.2",
     "eslint-plugin-jsx-a11y": "6.2.3",
     "eslint-plugin-prettier": "3.1.0",
     "eslint-plugin-react": "7.14.3",
-    "husky": "3.0.1",
-    "lerna": "3.16.2",
+    "husky": "3.0.5",
+    "lerna": "3.16.4",
     "ncp": "2.0.0",
-    "nodemon": "1.19.1",
-    "prettier": "1.17.1",
+    "nodemon": "1.19.2",
+    "prettier": "1.18.2",
     "ts-jest": "24.0.2",
     "typescript": "3.6.2",
     "wait-on": "3.3.0"
diff --git a/packages/neuron-ui/.eslintrc.js b/packages/neuron-ui/.eslintrc.js
@@ -11,6 +11,11 @@ module.exports = {
     "react/jsx-filename-extension": [1, {
       "extensions": [".ts", ".tsx"]
     }],
-    "react/jsx-props-no-spreading": [0]
+    "react/jsx-props-no-spreading": [0],
+    "typescript-eslint/no-angle-bracket-type-assertion": [0],
+    "no-alert": [0],
+    "no-console": [2, {
+      "allow": ["info", "warn", "error", "group", "groupEnd"]
+    }]
   }
 }
diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.19.0-beta.1",
+  "version": "0.20.0-beta.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -43,51 +43,51 @@
     "last 2 chrome versions"
   ],
   "dependencies": {
-    "@nervosnetwork/ckb-sdk-core": "0.19.1",
-    "@uifabric/experiments": "7.10.0",
-    "@uifabric/styling": "7.4.0",
+    "@nervosnetwork/ckb-sdk-core": "0.20.0",
+    "@uifabric/experiments": "7.16.1",
+    "@uifabric/styling": "7.6.2",
     "canvg": "2.0.0",
-    "grommet-icons": "4.2.0",
-    "i18next": "15.1.3",
-    "office-ui-fabric-react": "7.19.1",
+    "grommet-icons": "4.3.0",
+    "i18next": "17.0.13",
+    "office-ui-fabric-react": "7.31.1",
     "qr.js": "0.0.0",
-    "react": "16.8.6",
-    "react-dom": "16.8.6",
-    "react-i18next": "10.11.0",
-    "react-router-dom": "5.0.0",
+    "react": "16.9.0",
+    "react-dom": "16.9.0",
+    "react-i18next": "10.12.2",
+    "react-router-dom": "5.0.1",
     "react-scripts": "3.1.1",
     "styled-components": "5.0.0-beta.0"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "5.1.9",
-    "@storybook/addon-knobs": "5.1.9",
-    "@storybook/addon-links": "5.1.9",
-    "@storybook/addon-storyshots": "5.1.10",
-    "@storybook/addon-viewport": "5.1.9",
-    "@storybook/addons": "5.1.9",
-    "@storybook/cli": "5.1.9",
-    "@storybook/react": "5.1.9",
-    "@types/enzyme": "3.9.3",
+    "@storybook/addon-actions": "5.1.11",
+    "@storybook/addon-knobs": "5.1.11",
+    "@storybook/addon-links": "5.1.11",
+    "@storybook/addon-storyshots": "5.1.11",
+    "@storybook/addon-viewport": "5.1.11",
+    "@storybook/addons": "5.1.11",
+    "@storybook/cli": "5.1.11",
+    "@storybook/react": "5.1.11",
+    "@types/enzyme": "3.10.3",
     "@types/enzyme-adapter-react-16": "1.0.5",
-    "@types/node": "11.13.5",
-    "@types/react": "16.8.19",
-    "@types/react-dom": "16.8.4",
-    "@types/react-router-dom": "4.3.3",
+    "@types/node": "12.7.4",
+    "@types/react": "16.9.2",
+    "@types/react-dom": "16.9.0",
+    "@types/react-router-dom": "4.3.5",
     "@types/storybook-react-router": "1.0.0",
     "@types/storybook__addon-knobs": "5.0.3",
-    "@types/storybook__addon-storyshots": "5.1.0",
+    "@types/storybook__addon-storyshots": "5.1.1",
     "@types/storybook__react": "4.0.2",
-    "@types/styled-components": "4.1.16",
-    "babel-jest": "24.8.0",
-    "enzyme": "3.9.0",
-    "enzyme-adapter-react-16": "1.13.2",
+    "@types/styled-components": "4.1.18",
+    "babel-jest": "24.9.0",
+    "enzyme": "3.10.0",
+    "enzyme-adapter-react-16": "1.14.0",
     "jest-styled-components": "7.0.0-beta.1",
     "jsqr": "1.2.0",
-    "lint-staged": "9.2.0",
+    "lint-staged": "9.2.5",
     "node-sass": "4.12.0",
     "react-app-rewired": "2.1.3",
-    "react-test-renderer": "16.8.6",
-    "rimraf": "2.6.3",
-    "storybook-react-router": "1.0.5"
+    "react-test-renderer": "16.9.0",
+    "rimraf": "3.0.0",
+    "storybook-react-router": "1.0.7"
   }
 }
diff --git a/packages/neuron-ui/src/components/ErrorBoundary/index.tsx b/packages/neuron-ui/src/components/ErrorBoundary/index.tsx
@@ -9,9 +9,11 @@ const handleError = (error: Error) => {
 }
 
 class ErrorBoundary extends Component<{ children: React.ReactChild }, { hasError: boolean }> {
-  /* eslint-disable react/state-in-constructor */
-  state = {
-    hasError: false,
+  constructor(props: { children: React.ReactChild }) {
+    super(props)
+    this.state = {
+      hasError: false,
+    }
   }
 
   static getDerivedStateFromError(error: Error) {
diff --git a/packages/neuron-ui/src/components/WalletSetting/index.tsx b/packages/neuron-ui/src/components/WalletSetting/index.tsx
@@ -67,7 +67,7 @@ const WalletSetting = ({
       hideMinerInfo()
       addPopup('lock-arg-copied')(dispatch)
     }
-  }, [minerInfo, t, hideMinerInfo, dispatch])
+  }, [minerInfo, hideMinerInfo, dispatch])
 
   const onChange = useCallback(
     (_e, option) => {
diff --git a/packages/neuron-ui/src/services/remote/controllerMethodWrapper.ts b/packages/neuron-ui/src/services/remote/controllerMethodWrapper.ts
@@ -48,11 +48,9 @@ export const controllerMethodWrapper = (controllerName: string) => (
   }
   const res = await callControllerMethod(controller)(realParams)
   if (process.env.NODE_ENV === 'development' && window.localStorage.getItem('log-response')) {
-    /* eslint-disable no-console */
     console.group(`${controllerName} controller`)
     console.info(JSON.stringify(res, null, 2))
     console.groupEnd()
-    /* eslint-enable no-console */
   }
 
   if (!res) {
diff --git a/packages/neuron-ui/src/services/remote/index.ts b/packages/neuron-ui/src/services/remote/index.ts
@@ -3,8 +3,6 @@ export * from './wallets'
 export * from './networks'
 export * from './transactions'
 
-/* eslint-disable no-alert */
-
 export const getLocale = () => {
   if (!window.remote) {
     console.warn('remote is not supported')
diff --git a/packages/neuron-ui/src/states/stateProvider/reducer.ts b/packages/neuron-ui/src/states/stateProvider/reducer.ts
@@ -62,11 +62,9 @@ export const reducer = (
 ): State.AppWithNeuronWallet => {
   const { app, wallet, settings, chain } = state
   if (process.env.NODE_ENV === 'development' && window.localStorage.getItem('log-action')) {
-    /* eslint-disable no-console */
     console.group(`type: ${type}`)
     console.info(payload)
     console.groupEnd()
-    /* eslint-enable no-console */
   }
   switch (type) {
     // Actions of Neuron Wallet
diff --git a/packages/neuron-ui/src/theme.tsx b/packages/neuron-ui/src/theme.tsx
@@ -34,6 +34,7 @@ import {
 import { registerIcons } from 'utils/icons'
 
 loadTheme({
+  defaultFontStyle: { fontFamily: 'inherit' },
   fonts: {
     tiny: { fontSize: '11px' },
     xSmall: { fontSize: '12px', lineHeight: '12px' },
diff --git a/packages/neuron-ui/src/utils/formatters.ts b/packages/neuron-ui/src/utils/formatters.ts
@@ -1,6 +1,3 @@
-/* eslint-disable no-redeclare */
-/* global BigInt */
-
 import { CapacityUnit } from './const'
 
 const base = 10e9
diff --git a/packages/neuron-ui/src/utils/validators.ts b/packages/neuron-ui/src/utils/validators.ts
@@ -1,6 +1,4 @@
 import { MAX_NETWORK_NAME_LENGTH } from 'utils/const'
-/* eslint-disable no-redeclare */
-/* global BigInt */
 import { ckbCore } from 'services/chain'
 import { MIN_PASSWORD_LENGTH, MAX_PASSWORD_LENGTH, MIN_AMOUNT, MAX_DECIMAL_DIGITS, ErrorCode } from './const'
 
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.19.0-beta.1",
+  "version": "0.20.0-beta.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -34,38 +34,38 @@
     ]
   },
   "dependencies": {
-    "@nervosnetwork/ckb-sdk-core": "0.19.1",
-    "@nervosnetwork/ckb-sdk-utils": "0.19.1",
+    "@nervosnetwork/ckb-sdk-core": "0.20.0",
+    "@nervosnetwork/ckb-sdk-utils": "0.20.0",
     "bn.js": "4.11.8",
     "chalk": "2.4.2",
     "electron-log": "3.0.7",
     "electron-updater": "4.1.2",
     "electron-window-state": "5.0.3",
-    "elliptic": "6.4.1",
-    "i18next": "15.1.3",
+    "elliptic": "6.5.1",
+    "i18next": "17.0.13",
     "reflect-metadata": "0.1.13",
-    "rxjs": "6.5.2",
-    "sha3": "2.0.4",
+    "rxjs": "6.5.3",
+    "sha3": "2.0.7",
     "sqlite3": "4.1.0",
     "typeorm": "0.2.18",
-    "uuid": "3.3.2"
+    "uuid": "3.3.3"
   },
   "devDependencies": {
-    "@nervosnetwork/ckb-types": "0.19.1",
+    "@nervosnetwork/ckb-types": "0.20.0",
     "@types/electron-devtools-installer": "2.2.0",
-    "@types/elliptic": "6.4.8",
+    "@types/elliptic": "6.4.9",
     "@types/sqlite3": "3.1.5",
-    "@types/uuid": "3.4.4",
+    "@types/uuid": "3.4.5",
     "@types/webdriverio": "4.13.0",
     "axios": "0.19.0",
     "devtron": "1.4.0",
-    "electron": "6.0.0",
+    "electron": "6.0.7",
     "electron-builder": "21.2.0",
     "electron-devtools-installer": "2.2.4",
     "electron-notarize": "0.1.1",
-    "lint-staged": "9.2.0",
-    "neuron-ui": "0.19.0-beta.1",
-    "rimraf": "2.6.3",
+    "lint-staged": "9.2.5",
+    "neuron-ui": "0.20.0-beta.0",
+    "rimraf": "3.0.0",
     "spectron": "8.0.0",
     "ts-transformer-imports": "0.4.3",
     "ttypescript": "1.5.7"
diff --git a/packages/neuron-wallet/src/models/lock-utils.ts b/packages/neuron-wallet/src/models/lock-utils.ts
@@ -1,3 +1,4 @@
+import { scriptToHash } from '@nervosnetwork/ckb-sdk-utils'
 import NodeService from 'services/node'
 import { OutPoint, Script, ScriptHashType } from 'types/cell-types'
 import env from 'env'
@@ -65,17 +66,17 @@ export default class LockUtils {
     SystemScriptSubject.next({ codeHash: info.codeHash })
   }
 
-  static computeScriptHash = async (script: Script): Promise<string> => {
+  static computeScriptHash = (script: Script): string => {
     const ckbScript: CKBComponents.Script = ConvertTo.toSdkScript(script)
-    const hash: string = await (core.rpc as any).computeScriptHash(ckbScript)
+    const hash: string = scriptToHash(ckbScript)
     if (!hash.startsWith('0x')) {
       return `0x${hash}`
     }
     return hash
   }
 
   // use SDK lockScriptToHash
-  static lockScriptToHash = async (lock: Script) => {
+  static lockScriptToHash = (lock: Script) => {
     return LockUtils.computeScriptHash(lock)
   }
 
@@ -92,7 +93,7 @@ export default class LockUtils {
 
   static async addressToLockHash(address: string, hashType: ScriptHashType = ScriptHashType.Type): Promise<string> {
     const lock: Script = await this.addressToLockScript(address, hashType)
-    const lockHash: string = await this.lockScriptToHash(lock)
+    const lockHash: string = this.lockScriptToHash(lock)
 
     return lockHash
   }
diff --git a/packages/neuron-wallet/src/services/cells.ts b/packages/neuron-wallet/src/services/cells.ts
@@ -83,7 +83,7 @@ export default class CellsService {
     }
 
     const queryParams = {
-      lockHashes: In(lockHashes),
+      lockHash: In(lockHashes),
       status: OutputStatus.Live,
     }
     const skipDataAndType = SkipDataAndType.getInstance().get()
diff --git a/packages/neuron-wallet/src/services/sync/check-and-save/output.ts b/packages/neuron-wallet/src/services/sync/check-and-save/output.ts
@@ -6,20 +6,19 @@ export default class CheckOutput {
 
   constructor(output: Cell) {
     this.output = output
-    // this.calcLockHash()
+    this.calcLockHash()
   }
 
-  public calcLockHash = async (): Promise<Cell> => {
+  public calcLockHash = (): Cell => {
     if (this.output.lockHash) {
       return this.output
     }
 
-    this.output.lockHash = await LockUtils.lockScriptToHash(this.output.lock)
+    this.output.lockHash = LockUtils.lockScriptToHash(this.output.lock)
     return this.output
   }
 
   public checkLockHash = async (lockHashList: string[]): Promise<boolean | undefined> => {
-    await this.calcLockHash()
     return lockHashList.includes(this.output.lockHash!)
   }
 }
diff --git a/packages/neuron-wallet/src/services/tx/transaction-persistor.ts b/packages/neuron-wallet/src/services/tx/transaction-persistor.ts
diff --git a/packages/neuron-wallet/src/services/wallets.ts b/packages/neuron-wallet/src/services/wallets.ts
diff --git a/packages/neuron-wallet/src/types/convert-to.ts b/packages/neuron-wallet/src/types/convert-to.ts
diff --git a/packages/neuron-wallet/src/utils/application-menu.ts b/packages/neuron-wallet/src/utils/application-menu.ts
diff --git a/packages/neuron-wallet/tests/models/lock-utils.test.ts b/packages/neuron-wallet/tests/models/lock-utils.test.ts
diff --git a/packages/neuron-wallet/tests/services/cells.test.ts b/packages/neuron-wallet/tests/services/cells.test.ts
diff --git a/yarn.lock b/yarn.lock

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.19.0-beta.1",`
	`5`	`+ "version": "0.20.0-beta.0",`
`6`	`6`	`"npmClient": "yarn",`
`7`	`7`	`"useWorkspaces": true`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,11 @@ module.exports = {`
`11`	`11`	`"react/jsx-filename-extension": [1, {`
`12`	`12`	`"extensions": [".ts", ".tsx"]`
`13`	`13`	`}],`
`14`		`- "react/jsx-props-no-spreading": [0]`
	`14`	`+ "react/jsx-props-no-spreading": [0],`
	`15`	`+ "typescript-eslint/no-angle-bracket-type-assertion": [0],`
	`16`	`+ "no-alert": [0],`
	`17`	`+ "no-console": [2, {`
	`18`	`+ "allow": ["info", "warn", "error", "group", "groupEnd"]`
	`19`	`+ }]`
`15`	`20`	`}`
`16`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,11 @@ const handleError = (error: Error) => {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`class ErrorBoundary extends Component<{ children: React.ReactChild }, { hasError: boolean }> {`
`12`		`- /* eslint-disable react/state-in-constructor */`
`13`		`- state = {`
`14`		`- hasError: false,`
	`12`	`+ constructor(props: { children: React.ReactChild }) {`
	`13`	`+ super(props)`
	`14`	`+ this.state = {`
	`15`	`+ hasError: false,`
	`16`	`+ }`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`static getDerivedStateFromError(error: Error) {`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ const WalletSetting = ({`
`67`	`67`	`hideMinerInfo()`
`68`	`68`	`addPopup('lock-arg-copied')(dispatch)`
`69`	`69`	`}`
`70`		`- }, [minerInfo, t, hideMinerInfo, dispatch])`
	`70`	`+ }, [minerInfo, hideMinerInfo, dispatch])`
`71`	`71`
`72`	`72`	`const onChange = useCallback(`
`73`	`73`	`(_e, option) => {`
Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,9 @@ export const controllerMethodWrapper = (controllerName: string) => (`
`48`	`48`	`}`
`49`	`49`	`const res = await callControllerMethod(controller)(realParams)`
`50`	`50`	`if (process.env.NODE_ENV === 'development' && window.localStorage.getItem('log-response')) {`
`51`		`- /* eslint-disable no-console */`
`52`	`51`	console.group(`${controllerName} controller`)
`53`	`52`	`console.info(JSON.stringify(res, null, 2))`
`54`	`53`	`console.groupEnd()`
`55`		`- /* eslint-enable no-console */`
`56`	`54`	`}`
`57`	`55`
`58`	`56`	`if (!res) {`