Skip to content

Commit 6169a10

Browse files
authored
Merge pull request #3181 from nervosnetwork/rc/v0.116.2
2 parents cfef054 + 6cb192c commit 6169a10

File tree

12 files changed

+25
-41
lines changed

12 files changed

+25
-41
lines changed

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
# 0.116.2 (2024-05-29)
2+
3+
### CKB Node & Light Client
4+
5+
- [CKB@v0.116.1](https://github.com/nervosnetwork/ckb/releases/tag/v0.116.1) was released on May. 11st, 2024. This version of CKB node is now bundled and preconfigured in Neuron.
6+
- [CKB Light Client@v0.3.7](https://github.com/nervosnetwork/ckb-light-client/releases/tag/v0.3.7) was released on Apr. 13th, 2024. This version of CKB Light Client is now bundled and preconfigured in Neuron
7+
8+
### Assumed valid target
9+
10+
Block before `0x6dd077b407d019a0bce0cbad8c34e69a524ae4b2599b9feda2c7491f3559d32c`(at height `13,007,704`) will be skipped in validation.(https://github.com/nervosnetwork/neuron/pull/3157)
11+
12+
---
13+
14+
## Bug fixes
15+
16+
- 3179: Remove the display of the ledger firmware version because it causes the Nervos app to crash on the ledger device.(@yanguoyu)
17+
18+
**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.116.1...v0.116.2
19+
120
# 0.116.1 (2024-05-28)
221

322
### CKB Node & Light Client

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"packages": ["packages/*"],
3-
"version": "0.116.1",
3+
"version": "0.116.2",
44
"npmClient": "yarn",
55
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
66
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "neuron",
33
"productName": "Neuron",
44
"description": "CKB Neuron Wallet",
5-
"version": "0.116.1",
5+
"version": "0.116.2",
66
"private": true,
77
"author": {
88
"name": "Nervos Core Dev",

packages/neuron-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "neuron-ui",
3-
"version": "0.116.1",
3+
"version": "0.116.2",
44
"private": true,
55
"author": {
66
"name": "Nervos Core Dev",

packages/neuron-ui/src/components/ImportHardware/detect-device.tsx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useCallback, useState } from 'react'
22
import { useTranslation } from 'react-i18next'
33
import Button from 'widgets/Button'
4-
import { getDevices, getDeviceFirmwareVersion, getDeviceCkbAppVersion, connectDevice } from 'services/remote'
4+
import { getDevices, getDeviceCkbAppVersion, connectDevice } from 'services/remote'
55
import { isSuccessResponse, errorFormatter, useDidMount } from 'utils'
66
import { ReactComponent as SuccessInfo } from 'widgets/Icons/SuccessInfo.svg'
77
import { Error as ErrorIcon } from 'widgets/Icons/icon'
@@ -50,7 +50,6 @@ const DetectDevice = ({ dispatch, model }: { dispatch: React.Dispatch<ActionType
5050
const [scanning, setScanning] = useState(true)
5151
const [error, setError] = useState('')
5252
const [appVersion, setAppVersion] = useState('')
53-
const [firmwareVersion, setFirmwareVersion] = useState('')
5453

5554
const findDevice = useCallback(async () => {
5655
setError('')
@@ -76,10 +75,6 @@ const DetectDevice = ({ dispatch, model }: { dispatch: React.Dispatch<ActionType
7675
setScanning(false)
7776
throw new ConnectFailedException(errorFormatter(connectionRes.message, t))
7877
}
79-
const firmwareVersionRes = await getDeviceFirmwareVersion(device.descriptor)
80-
if (isSuccessResponse(firmwareVersionRes)) {
81-
setFirmwareVersion(firmwareVersionRes.result!)
82-
}
8378
const ckbVersionRes = await getDeviceCkbAppVersion(device.descriptor)
8479
if (isSuccessResponse(ckbVersionRes)) {
8580
setAppVersion(ckbVersionRes.result!)
@@ -117,9 +112,6 @@ const DetectDevice = ({ dispatch, model }: { dispatch: React.Dispatch<ActionType
117112
<h3 className={styles.model}>{productName}</h3>
118113
{errorMsg ? <Info isError msg={errorMsg} /> : null}
119114
{scanning ? <Info isWaiting={scanning} msg={t('import-hardware.waiting')} /> : null}
120-
{firmwareVersion && !errorMsg && !scanning ? (
121-
<Info msg={t('import-hardware.firmware-version', { version: firmwareVersion })} />
122-
) : null}
123115
{appVersion ? <Info msg={t('import-hardware.app-version', { version: appVersion })} /> : null}
124116
</section>
125117
<footer className={styles.dialogFooter}>

packages/neuron-ui/src/services/remote/hardware.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ export type Version = string
3232

3333
export const getDevices = remoteApi<Model | null, DeviceInfo[]>('detect-device')
3434
export const getDeviceCkbAppVersion = remoteApi<Descriptor, Version>('get-device-ckb-app-version')
35-
export const getDeviceFirmwareVersion = remoteApi<Descriptor, Version>('get-device-firmware-version')
3635
export const getDeviceExtendedPublickey = remoteApi<void, ExtendedPublicKey>('get-device-extended-public-key')
3736
export const getDevicePublicKey = remoteApi<void, PublicKey>('get-device-public-key')
3837
export const connectDevice = remoteApi<DeviceInfo, void>('connect-device')

packages/neuron-ui/src/services/remote/remoteApiWrapper.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ type Action =
132132
// Hardware Wallet
133133
| 'detect-device'
134134
| 'get-device-ckb-app-version'
135-
| 'get-device-firmware-version'
136135
| 'get-device-public-key'
137136
| 'get-device-extended-public-key'
138137
| 'connect-device'

packages/neuron-wallet/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"productName": "Neuron",
44
"description": "CKB Neuron Wallet",
55
"homepage": "https://www.nervos.org/",
6-
"version": "0.116.1",
6+
"version": "0.116.2",
77
"private": true,
88
"author": {
99
"name": "Nervos Core Dev",
@@ -97,7 +97,7 @@
9797
"electron-builder": "24.9.1",
9898
"electron-devtools-installer": "3.2.0",
9999
"jest-when": "3.6.0",
100-
"neuron-ui": "0.116.1",
100+
"neuron-ui": "0.116.2",
101101
"typescript": "5.3.3"
102102
}
103103
}

packages/neuron-wallet/src/controllers/api.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -836,10 +836,6 @@ export default class ApiController {
836836
return this.#hardwareController.getCkbAppVersion()
837837
})
838838

839-
handle('get-device-firmware-version', async () => {
840-
return this.#hardwareController.getFirmwareVersion()
841-
})
842-
843839
handle('get-device-extended-public-key', async () => {
844840
return this.#hardwareController.getExtendedPublicKey()
845841
})

packages/neuron-wallet/src/controllers/hardware.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,6 @@ export default class HardwareController {
3838
}
3939
}
4040

41-
public async getFirmwareVersion(): Promise<Controller.Response<string>> {
42-
const device = HardwareWalletService.getInstance().getCurrent()!
43-
const version = await device.getFirmwareVersion?.()
44-
45-
return {
46-
status: ResponseCode.Success,
47-
result: version,
48-
}
49-
}
50-
5141
public async getExtendedPublicKey(): Promise<Controller.Response<ExtendedPublicKey>> {
5242
const device = HardwareWalletService.getInstance().getCurrent()!
5343
const pubkey = await device.getExtendedPublicKey()

0 commit comments

Comments
 (0)