Skip to content

Commit 2a87b87

Browse files
wabicaiwabicai
authored
feat: firmware v6 (#447)
* fix: fix pro boot upgrade with firmware-v6 * fix: delete firmware-v5 * fix: update version * fix: delete unuse code * fix: lint error * fix: delete unuse submodule
1 parent e5163db commit 2a87b87

File tree

15 files changed

+51
-49
lines changed

15 files changed

+51
-49
lines changed

‎packages/connect-examples/electron-example/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "hardware-example",
33
"productName": "HardwareExample",
44
"executableName": "onekey-hardware-example",
5-
"version": "1.0.25-alpha.9",
5+
"version": "1.0.25-alpha.10",
66
"author": "OneKey",
77
"description": "End-to-end encrypted workspaces for teams",
88
"main": "dist/index.js",

‎packages/connect-examples/expo-example/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "expo-example",
3-
"version": "1.0.25-alpha.9",
3+
"version": "1.0.25-alpha.10",
44
"scripts": {
55
"start": "CONNECT_SRC=https://localhost:8087/ yarn expo start --dev-client",
66
"android": "yarn expo run:android",
@@ -19,10 +19,10 @@
1919
"@noble/ed25519": "^2.1.0",
2020
"@noble/hashes": "^1.3.3",
2121
"@noble/secp256k1": "^1.7.1",
22-
"@onekeyfe/hd-ble-sdk": "^1.0.25-alpha.9",
23-
"@onekeyfe/hd-common-connect-sdk": "^1.0.25-alpha.9",
24-
"@onekeyfe/hd-core": "^1.0.25-alpha.9",
25-
"@onekeyfe/hd-web-sdk": "^1.0.25-alpha.9",
22+
"@onekeyfe/hd-ble-sdk": "^1.0.25-alpha.10",
23+
"@onekeyfe/hd-common-connect-sdk": "^1.0.25-alpha.10",
24+
"@onekeyfe/hd-core": "^1.0.25-alpha.10",
25+
"@onekeyfe/hd-web-sdk": "^1.0.25-alpha.10",
2626
"@onekeyfe/react-native-ble-plx": "3.0.0",
2727
"@polkadot/util-crypto": "13.1.1",
2828
"@react-native-async-storage/async-storage": "1.21.0",

‎packages/core/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-core",
3-
"version": "1.0.25-alpha.9",
3+
"version": "1.0.25-alpha.10",
44
"description": "> TODO: description",
55
"author": "OneKey",
66
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
2525
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
2626
},
2727
"dependencies": {
28-
"@onekeyfe/hd-shared": "^1.0.25-alpha.9",
29-
"@onekeyfe/hd-transport": "^1.0.25-alpha.9",
28+
"@onekeyfe/hd-shared": "^1.0.25-alpha.10",
29+
"@onekeyfe/hd-transport": "^1.0.25-alpha.10",
3030
"axios": "^0.27.2",
3131
"bignumber.js": "^9.0.2",
3232
"bytebuffer": "^5.0.1",

‎packages/core/src/data-manager/DataManager.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import type {
2525
import { DeviceModelToTypes } from '../types';
2626
import { findLatestRelease, getReleaseChangelog, getReleaseStatus } from '../utils/release';
2727

28-
export type FirmwareField = 'firmware' | 'firmware-v2' | 'firmware-v5';
28+
export type FirmwareField = 'firmware' | 'firmware-v2' | 'firmware-v6';
2929

3030
export type MessageVersion = 'latest' | 'v1';
3131

‎packages/core/src/types/settings.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export type DeviceTypeMap = {
6969
[k in IKnownDevice]: {
7070
firmware: IFirmwareReleaseInfo[];
7171
'firmware-v2'?: IFirmwareReleaseInfo[];
72-
'firmware-v5'?: IFirmwareReleaseInfo[];
72+
'firmware-v6'?: IFirmwareReleaseInfo[];
7373
ble: IBLEFirmwareReleaseInfo[];
7474
};
7575
};

‎packages/core/src/utils/deviceFeaturesUtils.ts‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -159,31 +159,33 @@ export const getFirmwareUpdateField = ({
159159
}
160160

161161
if (DeviceModelToTypes.model_mini.includes(deviceType)) {
162-
return 'firmware-v5';
162+
return 'firmware-v6';
163163
}
164164

165165
if (deviceType === EDeviceType.Touch) {
166166
if (targetVersion) {
167167
if (semver.eq(targetVersion, '4.0.0')) return 'firmware-v2';
168-
if (semver.gt(targetVersion, '4.0.0')) return 'firmware-v5';
168+
if (semver.gt(targetVersion, '4.0.0')) return 'firmware-v6';
169169
}
170170

171171
if (semver.lt(deviceFirmwareVersion.join('.'), '3.4.0')) return 'firmware';
172172

173-
return 'firmware-v5';
173+
return 'firmware-v6';
174174
}
175175
if (deviceType === EDeviceType.Pro) {
176-
return 'firmware-v5';
176+
return 'firmware-v6';
177177
}
178178
return 'firmware';
179179
};
180180
/**
181181
* Returns the optional firmware version
182+
* Used in firmware web update
183+
* https://firmware.onekey.so/
182184
*/
183185
export const getFirmwareUpdateFieldArray = (
184186
features: Features,
185187
updateType: 'firmware' | 'ble' | 'bootloader'
186-
): ('firmware' | 'ble' | 'firmware-v2' | 'firmware-v5')[] => {
188+
): ('firmware' | 'ble' | 'firmware-v2' | 'firmware-v6')[] => {
187189
const deviceType = getDeviceType(features);
188190
if (updateType === 'ble') {
189191
return ['ble'];
@@ -195,25 +197,25 @@ export const getFirmwareUpdateFieldArray = (
195197
deviceType === 'mini' ||
196198
deviceType === 'classicpure'
197199
) {
198-
return ['firmware-v5'];
200+
return ['firmware-v6'];
199201
}
200202

201203
if (deviceType === 'touch') {
202204
const currentVersion = getDeviceFirmwareVersion(features).join('.');
203205
if (semver.gt(currentVersion, '4.0.0')) {
204-
return ['firmware-v5', 'firmware'];
206+
return ['firmware-v6', 'firmware'];
205207
}
206208
if (semver.gte(currentVersion, '4.0.0')) {
207209
return ['firmware-v2', 'firmware'];
208210
}
209211
if (!currentVersion || semver.lt(currentVersion, '3.0.0')) {
210-
return ['firmware-v5', 'firmware-v2', 'firmware'];
212+
return ['firmware-v6', 'firmware-v2', 'firmware'];
211213
}
212214
return ['firmware'];
213215
}
214216

215217
if (deviceType === 'pro') {
216-
return ['firmware-v5'];
218+
return ['firmware-v6'];
217219
}
218220

219221
return ['firmware'];

‎packages/hd-ble-sdk/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-ble-sdk",
3-
"version": "1.0.25-alpha.9",
3+
"version": "1.0.25-alpha.10",
44
"author": "OneKey",
55
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
66
"license": "ISC",
@@ -20,8 +20,8 @@
2020
"lint:fix": "eslint . --fix"
2121
},
2222
"dependencies": {
23-
"@onekeyfe/hd-core": "^1.0.25-alpha.9",
24-
"@onekeyfe/hd-shared": "^1.0.25-alpha.9",
25-
"@onekeyfe/hd-transport-react-native": "^1.0.25-alpha.9"
23+
"@onekeyfe/hd-core": "^1.0.25-alpha.10",
24+
"@onekeyfe/hd-shared": "^1.0.25-alpha.10",
25+
"@onekeyfe/hd-transport-react-native": "^1.0.25-alpha.10"
2626
}
2727
}

‎packages/hd-common-connect-sdk/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-common-connect-sdk",
3-
"version": "1.0.25-alpha.9",
3+
"version": "1.0.25-alpha.10",
44
"author": "OneKey",
55
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
66
"license": "ISC",
@@ -20,10 +20,10 @@
2020
"lint:fix": "eslint . --fix"
2121
},
2222
"dependencies": {
23-
"@onekeyfe/hd-core": "^1.0.25-alpha.9",
24-
"@onekeyfe/hd-shared": "^1.0.25-alpha.9",
25-
"@onekeyfe/hd-transport-http": "^1.0.25-alpha.9",
26-
"@onekeyfe/hd-transport-lowlevel": "^1.0.25-alpha.9",
27-
"@onekeyfe/hd-transport-webusb": "^1.0.25-alpha.9"
23+
"@onekeyfe/hd-core": "^1.0.25-alpha.10",
24+
"@onekeyfe/hd-shared": "^1.0.25-alpha.10",
25+
"@onekeyfe/hd-transport-http": "^1.0.25-alpha.10",
26+
"@onekeyfe/hd-transport-lowlevel": "^1.0.25-alpha.10",
27+
"@onekeyfe/hd-transport-webusb": "^1.0.25-alpha.10"
2828
}
2929
}

‎packages/hd-transport-http/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-transport-http",
3-
"version": "1.0.25-alpha.9",
3+
"version": "1.0.25-alpha.10",
44
"description": "hardware http transport",
55
"author": "OneKey",
66
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,8 +24,8 @@
2424
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
2525
},
2626
"dependencies": {
27-
"@onekeyfe/hd-shared": "^1.0.25-alpha.9",
28-
"@onekeyfe/hd-transport": "^1.0.25-alpha.9",
27+
"@onekeyfe/hd-shared": "^1.0.25-alpha.10",
28+
"@onekeyfe/hd-transport": "^1.0.25-alpha.10",
2929
"axios": "^0.27.2"
3030
}
3131
}

‎packages/hd-transport-lowlevel/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-transport-lowlevel",
3-
"version": "1.0.25-alpha.9",
3+
"version": "1.0.25-alpha.10",
44
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
55
"license": "MIT",
66
"main": "dist/index.js",
@@ -19,7 +19,7 @@
1919
"lint:fix": "eslint . --fix"
2020
},
2121
"dependencies": {
22-
"@onekeyfe/hd-shared": "^1.0.25-alpha.9",
23-
"@onekeyfe/hd-transport": "^1.0.25-alpha.9"
22+
"@onekeyfe/hd-shared": "^1.0.25-alpha.10",
23+
"@onekeyfe/hd-transport": "^1.0.25-alpha.10"
2424
}
2525
}

0 commit comments

Comments
 (0)