diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8aef31da7e..84574240e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# 0.35.0-rc1 (2020-12-19)
+
+This is a release candidate to preview the changes in the next official release and may not be stable. Welcome any questions or suggestions.
+
+[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.
+
+### New features
+
+* Enable hardware wallet of Ledger.
+* Support address verification on hardware wallet device.
+
+
# 0.34.0 (2020-12-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.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 190e0cbdd7..05c27db908 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -26,8 +26,8 @@ stages:
vmImage: 'macos-10.14'
strategy:
matrix:
- node_12_x:
- node_version: 12.x
+ node_14_x:
+ node_version: 14.x
steps:
- task: NodeTool@0
inputs:
@@ -47,13 +47,16 @@ stages:
vmImage: 'ubuntu-18.04'
strategy:
matrix:
- node_12_x:
- node_version: 12.x
+ node_14_x:
+ node_version: 14.x
steps:
- task: NodeTool@0
inputs:
versionSpec: $(node_version)
displayName: 'Install Node.js'
+ - script: |
+ sudo apt-get install -y libudev-dev
+ displayName: Install libudev
- script: |
yarn global add lerna
yarn bootstrap
@@ -71,8 +74,8 @@ stages:
vmImage: 'vs2017-win2016'
strategy:
matrix:
- node_12_x:
- node_version: 12.x
+ node_14_x:
+ node_version: 14.x
steps:
- task: NodeTool@0
inputs:
@@ -101,7 +104,7 @@ stages:
steps:
- task: NodeTool@0
inputs:
- versionSpec: 12.x
+ versionSpec: 14.x
displayName: 'Install Node.js'
- script: |
yarn global add lerna
@@ -131,8 +134,11 @@ stages:
steps:
- task: NodeTool@0
inputs:
- versionSpec: 12.x
+ versionSpec: 14.x
displayName: 'Install Node.js'
+ - script: |
+ sudo apt-get install -y libudev-dev
+ displayName: Install libudev
- script: |
yarn global add lerna
yarn bootstrap
@@ -152,7 +158,7 @@ stages:
steps:
- task: NodeTool@0
inputs:
- versionSpec: 12.x
+ versionSpec: 14.x
displayName: 'Install Node.js'
- script: yarn global add lerna
displayName: 'Install lerna'
diff --git a/lerna.json b/lerna.json
index 06451e9d1a..995ae7790e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,7 +2,7 @@
"packages": [
"packages/*"
],
- "version": "0.34.0",
+ "version": "0.35.0-rc1",
"npmClient": "yarn",
"useWorkspaces": true
}
diff --git a/package.json b/package.json
index c3885c466f..7fc703dfa3 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "neuron",
"productName": "Neuron",
"description": "CKB Neuron Wallet",
- "version": "0.34.0",
+ "version": "0.35.0-rc1",
"private": true,
"author": {
"name": "Nervos Core Dev",
@@ -22,7 +22,7 @@
"packages/*"
],
"scripts": {
- "bootstrap": "yarn policies set-version 1.19.2 && npx cross-env LUMOS_NODE_RUNTIME=electron LUMOS_NODE_RUNTIME_VERSION=9.0.2 lerna bootstrap && lerna link",
+ "bootstrap": "npx cross-env LUMOS_NODE_RUNTIME=electron LUMOS_NODE_RUNTIME_VERSION=9.0.2 lerna bootstrap && lerna link",
"start:ui": "cd packages/neuron-ui && yarn run start",
"start:wallet": "cd packages/neuron-wallet && yarn run start:dev",
"start": "concurrently \"cross-env BROWSER=none yarn run start:ui\" \"wait-on http://localhost:3000 && yarn run start:wallet\"",
diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
index d05aa7bbc6..9e0e148e86 100644
--- a/packages/neuron-ui/package.json
+++ b/packages/neuron-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "neuron-ui",
- "version": "0.34.0",
+ "version": "0.35.0-rc1",
"private": true,
"author": {
"name": "Nervos Core Dev",
diff --git a/packages/neuron-ui/src/components/ImportHardware/confirming.tsx b/packages/neuron-ui/src/components/ImportHardware/confirming.tsx
index 3c78ddca56..b7d42b655c 100644
--- a/packages/neuron-ui/src/components/ImportHardware/confirming.tsx
+++ b/packages/neuron-ui/src/components/ImportHardware/confirming.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'
import { RouteComponentProps } from 'react-router-dom'
import Button from 'widgets/Button'
import { ReactComponent as PendingIcon } from 'widgets/Icons/Pending.svg'
-import { getDevicePublickey } from 'services/remote'
+import { getDeviceExtendedPublickey } from 'services/remote'
import { isSuccessResponse, useDidMount } from 'utils'
import { RoutePath, LocationState } from './common'
@@ -17,7 +17,7 @@ const Confirming = ({ history, location }: RouteComponentProps<{}, {}, LocationS
}, [history, entryPath])
useDidMount(() => {
- getDevicePublickey().then(res => {
+ getDeviceExtendedPublickey().then(res => {
if (isSuccessResponse(res)) {
history.push({
pathname: entryPath + RoutePath.NameWallet,
diff --git a/packages/neuron-ui/src/components/Receive/index.tsx b/packages/neuron-ui/src/components/Receive/index.tsx
index 2af32d5596..75194c5e6e 100644
--- a/packages/neuron-ui/src/components/Receive/index.tsx
+++ b/packages/neuron-ui/src/components/Receive/index.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react'
+import React, { useCallback, useMemo, useState } from 'react'
import { useRouteMatch, useHistory } from 'react-router-dom'
import { useTranslation } from 'react-i18next'
import Button from 'widgets/Button'
@@ -6,18 +6,19 @@ import QRCode from 'widgets/QRCode'
import CopyZone from 'widgets/CopyZone'
import { RoutePath } from 'utils'
import { useState as useGlobalState, useDispatch } from 'states'
+import VerifyHardwareAddress from 'components/VerifyHardwareAddress'
import styles from './receive.module.scss'
const Receive = () => {
- const {
- wallet: { addresses = [] },
- } = useGlobalState()
+ const { wallet } = useGlobalState()
const dispatch = useDispatch()
const [t] = useTranslation()
const {
params: { address },
} = useRouteMatch()
const history = useHistory()
+ const [displayVerifyDialog, setDisplayVerifyDialog] = useState(false)
+ const { addresses } = wallet
const isSingleAddress = addresses.length === 1
const accountAddress = useMemo(() => {
@@ -31,6 +32,10 @@ const Receive = () => {
history.push(RoutePath.Addresses)
}, [history])
+ const onVerifyAddressClick = useCallback(() => {
+ setDisplayVerifyDialog(true)
+ }, [])
+
if (!accountAddress) {
return {t('receive.address-not-found')}
}
@@ -58,6 +63,23 @@ const Receive = () => {
onClick={onAddressBookClick}
/>
)}
+ {isSingleAddress && (
+
+ )}
+ {displayVerifyDialog && (
+ {
+ setDisplayVerifyDialog(false)
+ }}
+ />
+ )}
)
}
diff --git a/packages/neuron-ui/src/components/VerifyHardwareAddress/index.tsx b/packages/neuron-ui/src/components/VerifyHardwareAddress/index.tsx
new file mode 100644
index 0000000000..ed1a5ea83d
--- /dev/null
+++ b/packages/neuron-ui/src/components/VerifyHardwareAddress/index.tsx
@@ -0,0 +1,233 @@
+import React, { useCallback, useRef, useState, useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+import Button from 'widgets/Button'
+import { ControllerResponse } from 'services/remote/remoteApiWrapper'
+import Spinner from 'widgets/Spinner'
+import { ReactComponent as HardWalletIcon } from 'widgets/Icons/HardWallet.svg'
+import { ReactComponent as VerifiedIcon } from 'widgets/Icons/Success.svg'
+import {
+ connectDevice,
+ getDevices,
+ getDeviceCkbAppVersion,
+ getDevicePublicKey,
+ DeviceInfo,
+ updateWallet,
+ getPlatform,
+} from 'services/remote'
+import { ErrorCode, errorFormatter, isSuccessResponse, useDidMount } from 'utils'
+import { CkbAppNotFoundException, DeviceNotFoundException } from 'exceptions'
+import CopyZone from 'widgets/CopyZone'
+import styles from './verifyHardwareAddress.module.scss'
+import VerifyError from './verify-error'
+
+export interface VerifyHardwareAddressProps {
+ address: string
+ wallet: State.WalletIdentity
+ onDismiss: () => void
+}
+
+const VerifyHardwareAddress = ({ address, wallet, onDismiss }: VerifyHardwareAddressProps) => {
+ const [t] = useTranslation()
+ const dialogRef = useRef(null)
+ // const dispatch = useDispatch()
+ const onCancel = useCallback(() => {
+ onDismiss()
+ }, [onDismiss])
+ const isWin32 = useMemo(() => {
+ return getPlatform() === 'win32'
+ }, [])
+ const [status, setStatus] = useState('')
+ const [error, setError] = useState('')
+ const connectStatus = t('hardware-verify-address.status.connect')
+ const userInputStatus = t('hardware-verify-address.status.user-input')
+ const disconnectStatus = t('hardware-verify-address.status.disconnect')
+ const verifiedStatus = t('hardware-verify-address.verified')
+ const invalidStatus = t('hardware-verify-address.invalid')
+ const ckbAppNotFoundStatus = t(CkbAppNotFoundException.message)
+ const isNotAvailableToVerify = useMemo(() => {
+ return status === disconnectStatus || status === ckbAppNotFoundStatus
+ }, [status, disconnectStatus, ckbAppNotFoundStatus])
+
+ const [deviceInfo, setDeviceInfo] = useState(wallet.device!)
+ const [isReconnecting, setIsReconnecting] = useState(false)
+ const isLoading = useMemo(() => {
+ return status === userInputStatus || isReconnecting
+ }, [status, userInputStatus, isReconnecting])
+
+ const productName = `${wallet.device!.manufacturer} ${wallet.device!.product}`
+
+ const ensureDeviceAvailable = useCallback(
+ async (device: DeviceInfo) => {
+ try {
+ const conectionRes = await connectDevice(device)
+ let { descriptor } = device
+ if (!isSuccessResponse(conectionRes)) {
+ // for win32, opening or closing the ckb app changes the HID descriptor(deviceInfo),
+ // so if we can't connect to the device, we need to re-search device automatically.
+ // for unix, the descriptor never changes unless user plugs the device into another USB port,
+ // in that case, mannauly re-search device one time will do.
+ if (isWin32) {
+ setIsReconnecting(true)
+ const devicesRes = await getDevices(device)
+ setIsReconnecting(false)
+ if (isSuccessResponse(devicesRes) && Array.isArray(devicesRes.result) && devicesRes.result.length > 0) {
+ const [updatedDeviceInfo] = devicesRes.result
+ descriptor = updatedDeviceInfo.descriptor
+ setDeviceInfo(updatedDeviceInfo)
+ } else {
+ throw new DeviceNotFoundException()
+ }
+ } else {
+ throw new DeviceNotFoundException()
+ }
+ }
+
+ // getDeviceCkbAppVersion will halt forever while in win32 sleep mode.
+ const ckbVersionRes = await Promise.race([
+ getDeviceCkbAppVersion(descriptor),
+ new Promise((_, reject) => setTimeout(() => reject(), 1000)),
+ ]).catch(() => {
+ return { status: ErrorCode.DeviceInSleep }
+ })
+
+ if (!isSuccessResponse(ckbVersionRes)) {
+ if (ckbVersionRes.status !== ErrorCode.DeviceInSleep) {
+ throw new CkbAppNotFoundException()
+ } else {
+ throw new DeviceNotFoundException()
+ }
+ }
+ setStatus(connectStatus)
+ } catch (err) {
+ if (err.code === ErrorCode.CkbAppNotFound) {
+ setStatus(ckbAppNotFoundStatus)
+ } else {
+ setStatus(disconnectStatus)
+ }
+ }
+ },
+ [connectStatus, disconnectStatus, ckbAppNotFoundStatus, isWin32]
+ )
+
+ const reconnect = useCallback(async () => {
+ setIsReconnecting(true)
+ try {
+ const res = await getDevices(deviceInfo)
+ if (isSuccessResponse(res) && Array.isArray(res.result) && res.result.length > 0) {
+ const [device] = res.result
+ setDeviceInfo(device)
+ if (device.descriptor !== deviceInfo.descriptor) {
+ await updateWallet({
+ id: wallet.id,
+ device,
+ })
+ }
+ await ensureDeviceAvailable(device)
+ }
+ } catch (err) {
+ setStatus(disconnectStatus)
+ } finally {
+ setIsReconnecting(false)
+ }
+ }, [deviceInfo, disconnectStatus, ensureDeviceAvailable, wallet.id])
+
+ const verify = useCallback(async () => {
+ await ensureDeviceAvailable(deviceInfo)
+ setStatus(userInputStatus)
+ const res = await getDevicePublicKey()
+ if (isSuccessResponse(res)) {
+ const { result } = res
+ if (result?.address === address) {
+ setStatus(verifiedStatus)
+ } else {
+ setStatus(invalidStatus)
+ }
+ } else {
+ setError(errorFormatter(res.message, t))
+ }
+ }, [deviceInfo, address, userInputStatus, verifiedStatus, invalidStatus, ensureDeviceAvailable, t])
+
+ useDidMount(() => {
+ // eslint-disable-next-line no-unused-expressions
+ dialogRef.current?.showModal()
+ ensureDeviceAvailable(deviceInfo)
+ })
+
+ const dialogClass = `${styles.dialog}`
+
+ let container = (
+
+
{t('hardware-verify-address.title')}
+
+
+
+
+ | {t('hardware-verify-address.device')} |
+
+
+ {productName}
+ |
+
+
+ | {t('hardware-verify-address.address')} |
+
+
+ {address}
+
+ |
+
+
+ | {t('hardware-verify-address.status.label')} |
+
+ {status === verifiedStatus && }
+ {status}
+ |
+
+
+
+
+
+