Skip to content

Fix/ledger session usb #803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ByteZhang1024 merged 5 commits into from
May 27, 2026
Merged

Fix/ledger session usb #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
12a971c
fix(ledger): enforce USB single-session and reject multi-device
ByteZhang1024 May 24, 2026
3a2eb45
fix(ledger): enforce single-USB only on auto-connect, not at discovery
ByteZhang1024 May 25, 2026
345d9fc
fix(ledger): guard USB fallback with fingerprint
ByteZhang1024 May 27, 2026
b69637a
chore(release): 1.1.27-alpha.4
ByteZhang1024 May 27, 2026
394190d
Merge branch 'onekey' into fix/ledger-session-usb
ByteZhang1024 May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/connect-examples/electron-example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "hardware-example",
"productName": "HardwareExample",
"executableName": "onekey-hardware-example",
"version": "1.1.27-alpha.3",
"version": "1.1.27-alpha.4",
"author": "OneKey",
"description": "End-to-end encrypted workspaces for teams",
"main": "dist/index.js",
Expand All @@ -22,7 +22,7 @@
"ts:check": "yarn tsc --noEmit"
},
"dependencies": {
"@onekeyfe/hd-transport-electron": "1.1.27-alpha.3",
"@onekeyfe/hd-transport-electron": "1.1.27-alpha.4",
"@stoprocent/noble": "2.3.16",
"debug": "4.3.4",
"electron-is-dev": "^3.0.1",
Expand Down
10 changes: 5 additions & 5 deletions packages/connect-examples/expo-example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "expo-example",
"version": "1.1.27-alpha.3",
"version": "1.1.27-alpha.4",
"scripts": {
"start": "cross-env CONNECT_SRC=https://localhost:8087/ yarn expo start --dev-client",
"android": "yarn expo run:android",
Expand All @@ -19,10 +19,10 @@
"@noble/ed25519": "^2.1.0",
"@noble/hashes": "^1.3.3",
"@noble/secp256k1": "^1.7.1",
"@onekeyfe/hd-ble-sdk": "1.1.27-alpha.3",
"@onekeyfe/hd-common-connect-sdk": "1.1.27-alpha.3",
"@onekeyfe/hd-core": "1.1.27-alpha.3",
"@onekeyfe/hd-web-sdk": "1.1.27-alpha.3",
"@onekeyfe/hd-ble-sdk": "1.1.27-alpha.4",
"@onekeyfe/hd-common-connect-sdk": "1.1.27-alpha.4",
"@onekeyfe/hd-core": "1.1.27-alpha.4",
"@onekeyfe/hd-web-sdk": "1.1.27-alpha.4",
"@onekeyfe/react-native-ble-utils": "^0.1.3",
"@polkadot/util-crypto": "13.1.1",
"@react-native-async-storage/async-storage": "1.21.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/connect-examples/expo-playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "onekey-hardware-playground",
"version": "1.1.27-alpha.3",
"version": "1.1.27-alpha.4",
"private": true,
"sideEffects": [
"app/utils/shim.js",
Expand All @@ -17,9 +17,9 @@
},
"dependencies": {
"@noble/hashes": "^1.8.0",
"@onekeyfe/hd-common-connect-sdk": "1.1.27-alpha.3",
"@onekeyfe/hd-core": "1.1.27-alpha.3",
"@onekeyfe/hd-shared": "1.1.27-alpha.3",
"@onekeyfe/hd-common-connect-sdk": "1.1.27-alpha.4",
"@onekeyfe/hd-core": "1.1.27-alpha.4",
"@onekeyfe/hd-shared": "1.1.27-alpha.4",
"@radix-ui/react-checkbox": "^1.3.2",
"@radix-ui/react-dialog": "^1.1.14",
"@radix-ui/react-dropdown-menu": "^2.1.15",
Expand Down
6 changes: 3 additions & 3 deletions packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-core",
"version": "1.1.27-alpha.3",
"version": "1.1.27-alpha.4",
"description": "Core processes and APIs for communicating with OneKey hardware devices.",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
Expand All @@ -25,8 +25,8 @@
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
},
"dependencies": {
"@onekeyfe/hd-shared": "1.1.27-alpha.3",
"@onekeyfe/hd-transport": "1.1.27-alpha.3",
"@onekeyfe/hd-shared": "1.1.27-alpha.4",
"@onekeyfe/hd-transport": "1.1.27-alpha.4",
"axios": "1.15.2",
"bignumber.js": "^9.0.2",
"bytebuffer": "^5.0.1",
Expand Down
8 changes: 4 additions & 4 deletions packages/hd-ble-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-ble-sdk",
"version": "1.1.27-alpha.3",
"version": "1.1.27-alpha.4",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "ISC",
Expand All @@ -20,8 +20,8 @@
"lint:fix": "eslint . --fix"
},
"dependencies": {
"@onekeyfe/hd-core": "1.1.27-alpha.3",
"@onekeyfe/hd-shared": "1.1.27-alpha.3",
"@onekeyfe/hd-transport-react-native": "1.1.27-alpha.3"
"@onekeyfe/hd-core": "1.1.27-alpha.4",
"@onekeyfe/hd-shared": "1.1.27-alpha.4",
"@onekeyfe/hd-transport-react-native": "1.1.27-alpha.4"
}
}
10 changes: 5 additions & 5 deletions packages/hd-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hardware-cli",
"version": "1.1.27-alpha.3",
"version": "1.1.27-alpha.4",
"description": "OneKey hardware wallet CLI for testing device communication",
"author": "OneKey",
"license": "Apache-2.0",
Expand Down Expand Up @@ -30,10 +30,10 @@
"test": "jest"
},
"dependencies": {
"@onekeyfe/hd-common-connect-sdk": "1.1.27-alpha.3",
"@onekeyfe/hd-core": "1.1.27-alpha.3",
"@onekeyfe/hd-shared": "1.1.27-alpha.3",
"@onekeyfe/hd-transport-usb": "1.1.27-alpha.3",
"@onekeyfe/hd-common-connect-sdk": "1.1.27-alpha.4",
"@onekeyfe/hd-core": "1.1.27-alpha.4",
"@onekeyfe/hd-shared": "1.1.27-alpha.4",
"@onekeyfe/hd-transport-usb": "1.1.27-alpha.4",
"commander": "^12.0.0"
}
}
16 changes: 8 additions & 8 deletions packages/hd-common-connect-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-common-connect-sdk",
"version": "1.1.27-alpha.3",
"version": "1.1.27-alpha.4",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "ISC",
Expand All @@ -20,12 +20,12 @@
"lint:fix": "eslint . --fix"
},
"dependencies": {
"@onekeyfe/hd-core": "1.1.27-alpha.3",
"@onekeyfe/hd-shared": "1.1.27-alpha.3",
"@onekeyfe/hd-transport-emulator": "1.1.27-alpha.3",
"@onekeyfe/hd-transport-http": "1.1.27-alpha.3",
"@onekeyfe/hd-transport-lowlevel": "1.1.27-alpha.3",
"@onekeyfe/hd-transport-usb": "1.1.27-alpha.3",
"@onekeyfe/hd-transport-web-device": "1.1.27-alpha.3"
"@onekeyfe/hd-core": "1.1.27-alpha.4",
"@onekeyfe/hd-shared": "1.1.27-alpha.4",
"@onekeyfe/hd-transport-emulator": "1.1.27-alpha.4",
"@onekeyfe/hd-transport-http": "1.1.27-alpha.4",
"@onekeyfe/hd-transport-lowlevel": "1.1.27-alpha.4",
"@onekeyfe/hd-transport-usb": "1.1.27-alpha.4",
"@onekeyfe/hd-transport-web-device": "1.1.27-alpha.4"
}
}
8 changes: 4 additions & 4 deletions packages/hd-transport-electron/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-electron",
"version": "1.1.27-alpha.3",
"version": "1.1.27-alpha.4",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "MIT",
Expand All @@ -25,9 +25,9 @@
"electron-log": ">=4.0.0"
},
"dependencies": {
"@onekeyfe/hd-core": "1.1.27-alpha.3",
"@onekeyfe/hd-shared": "1.1.27-alpha.3",
"@onekeyfe/hd-transport": "1.1.27-alpha.3",
"@onekeyfe/hd-core": "1.1.27-alpha.4",
"@onekeyfe/hd-shared": "1.1.27-alpha.4",
"@onekeyfe/hd-transport": "1.1.27-alpha.4",
"@stoprocent/noble": "2.3.16",
"p-retry": "^4.6.2"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/hd-transport-emulator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-emulator",
"version": "1.1.27-alpha.3",
"version": "1.1.27-alpha.4",
"description": "hardware emulator transport",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
Expand All @@ -24,8 +24,8 @@
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
},
"dependencies": {
"@onekeyfe/hd-shared": "1.1.27-alpha.3",
"@onekeyfe/hd-transport": "1.1.27-alpha.3",
"@onekeyfe/hd-shared": "1.1.27-alpha.4",
"@onekeyfe/hd-transport": "1.1.27-alpha.4",
"axios": "1.15.2",
"secure-json-parse": "^4.0.0"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/hd-transport-http/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-http",
"version": "1.1.27-alpha.3",
"version": "1.1.27-alpha.4",
"description": "hardware http transport",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
Expand All @@ -24,8 +24,8 @@
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
},
"dependencies": {
"@onekeyfe/hd-shared": "1.1.27-alpha.3",
"@onekeyfe/hd-transport": "1.1.27-alpha.3",
"@onekeyfe/hd-shared": "1.1.27-alpha.4",
"@onekeyfe/hd-transport": "1.1.27-alpha.4",
"axios": "1.15.2",
"secure-json-parse": "^4.0.0"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/hd-transport-lowlevel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-lowlevel",
"version": "1.1.27-alpha.3",
"version": "1.1.27-alpha.4",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "MIT",
"main": "dist/index.js",
Expand All @@ -19,7 +19,7 @@
"lint:fix": "eslint . --fix"
},
"dependencies": {
"@onekeyfe/hd-shared": "1.1.27-alpha.3",
"@onekeyfe/hd-transport": "1.1.27-alpha.3"
"@onekeyfe/hd-shared": "1.1.27-alpha.4",
"@onekeyfe/hd-transport": "1.1.27-alpha.4"
}
}
8 changes: 4 additions & 4 deletions packages/hd-transport-react-native/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-react-native",
"version": "1.1.27-alpha.3",
"version": "1.1.27-alpha.4",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "MIT",
"main": "dist/index.js",
Expand All @@ -19,9 +19,9 @@
"lint:fix": "eslint . --fix"
},
"dependencies": {
"@onekeyfe/hd-core": "1.1.27-alpha.3",
"@onekeyfe/hd-shared": "1.1.27-alpha.3",
"@onekeyfe/hd-transport": "1.1.27-alpha.3",
"@onekeyfe/hd-core": "1.1.27-alpha.4",
"@onekeyfe/hd-shared": "1.1.27-alpha.4",
"@onekeyfe/hd-transport": "1.1.27-alpha.4",
"@onekeyfe/react-native-ble-utils": "^0.1.4",
"react-native-ble-plx": "3.5.1"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/hd-transport-usb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-usb",
"version": "1.1.27-alpha.3",
"version": "1.1.27-alpha.4",
"description": "OneKey hardware wallet direct USB transport plugin (libusb)",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "MIT",
Expand All @@ -20,8 +20,8 @@
"lint:fix": "eslint . --fix"
},
"dependencies": {
"@onekeyfe/hd-shared": "1.1.27-alpha.3",
"@onekeyfe/hd-transport": "1.1.27-alpha.3",
"@onekeyfe/hd-shared": "1.1.27-alpha.4",
"@onekeyfe/hd-transport": "1.1.27-alpha.4",
"bytebuffer": "^5.0.1",
"usb": "^2.14.0"
}
Expand Down
8 changes: 4 additions & 4 deletions packages/hd-transport-web-device/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-web-device",
"version": "1.1.27-alpha.3",
"version": "1.1.27-alpha.4",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "MIT",
Expand All @@ -20,11 +20,11 @@
"lint:fix": "eslint . --fix"
},
"dependencies": {
"@onekeyfe/hd-shared": "1.1.27-alpha.3",
"@onekeyfe/hd-transport": "1.1.27-alpha.3"
"@onekeyfe/hd-shared": "1.1.27-alpha.4",
"@onekeyfe/hd-transport": "1.1.27-alpha.4"
},
"devDependencies": {
"@onekeyfe/hd-transport-electron": "1.1.27-alpha.3",
"@onekeyfe/hd-transport-electron": "1.1.27-alpha.4",
"@types/w3c-web-usb": "^1.0.6",
"@types/web-bluetooth": "^0.0.17"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/hd-transport/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport",
"version": "1.1.27-alpha.3",
"version": "1.1.27-alpha.4",
"description": "Transport layer abstractions and utilities for OneKey hardware SDK.",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
Expand Down
10 changes: 5 additions & 5 deletions packages/hd-web-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-web-sdk",
"version": "1.1.27-alpha.3",
"version": "1.1.27-alpha.4",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "ISC",
Expand All @@ -21,10 +21,10 @@
},
"dependencies": {
"@onekeyfe/cross-inpage-provider-core": "2.2.67",
"@onekeyfe/hd-core": "1.1.27-alpha.3",
"@onekeyfe/hd-shared": "1.1.27-alpha.3",
"@onekeyfe/hd-transport-http": "1.1.27-alpha.3",
"@onekeyfe/hd-transport-web-device": "1.1.27-alpha.3"
"@onekeyfe/hd-core": "1.1.27-alpha.4",
"@onekeyfe/hd-shared": "1.1.27-alpha.4",
"@onekeyfe/hd-transport-http": "1.1.27-alpha.4",
"@onekeyfe/hd-transport-web-device": "1.1.27-alpha.4"
},
"devDependencies": {
"@babel/plugin-proposal-optional-chaining": "^7.17.12",
Expand Down
2 changes: 1 addition & 1 deletion packages/hwk-adapter-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hwk-adapter-core",
"version": "1.1.27-alpha.3",
"version": "1.1.27-alpha.4",
"description": "Shared types and utilities for OneKey hardware wallet kit",
"author": "OneKey",
"license": "MIT",
Expand Down
1 change: 1 addition & 0 deletions packages/hwk-adapter-core/src/__tests__/core-types.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ describe('HardwareErrorCode contract', () => {
expect(HardwareErrorCode.DeviceNotInitialized).toBe(10104);
expect(HardwareErrorCode.DeviceInBootloader).toBe(10105);
expect(HardwareErrorCode.DeviceMismatch).toBe(10106);
expect(HardwareErrorCode.DeviceOneDeviceOnly).toBe(10109);
});

it('firmware (10200-10299)', () => {
Expand Down
3 changes: 3 additions & 0 deletions packages/hwk-adapter-core/src/types/errors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ export enum HardwareErrorCode {
DeviceAppStuck = 10107,
/** Vendor (Ledger / Trezor) doesn't support the chain at all. */
ChainNotSupported = 10108,
/** Current operation supports only one connected device. */
DeviceOneDeviceOnly = 10109,

// --- 10200s Firmware ---
FirmwareTooOld = 10200,
Expand Down Expand Up @@ -129,6 +131,7 @@ export const ORPHAN_ELIGIBLE_ERROR_CODES: number[] = [
HardwareErrorCode.DeviceDisconnected,
HardwareErrorCode.DeviceMismatch,
HardwareErrorCode.DeviceAppStuck,
HardwareErrorCode.DeviceOneDeviceOnly,
HardwareErrorCode.TransportError,
HardwareErrorCode.DevicePermissionDenied,
HardwareErrorCode.BlePairingTimeout,
Expand Down
2 changes: 2 additions & 0 deletions packages/hwk-adapter-core/src/utils/errorMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ export function enrichErrorMessage(code: HardwareErrorCode, originalMessage: str
return `${originalMessage}. Please reconnect the device and try again.`;
case HardwareErrorCode.DeviceLocked:
return `${originalMessage}. Please unlock your device and try again.`;
case HardwareErrorCode.DeviceOneDeviceOnly:
return `${originalMessage}. Disconnect the extra device and try again.`;
case HardwareErrorCode.UserRejected:
return `${originalMessage}. The request was rejected on the device.`;
case HardwareErrorCode.WrongApp:
Expand Down
4 changes: 2 additions & 2 deletions packages/hwk-ledger-adapter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hwk-ledger-adapter",
"version": "1.1.27-alpha.3",
"version": "1.1.27-alpha.4",
"description": "Ledger hardware wallet adapter for OneKey",
"author": "OneKey",
"license": "MIT",
Expand Down Expand Up @@ -50,7 +50,7 @@
"@ledgerhq/device-signer-kit-solana": "^1.7.0",
"@ledgerhq/hw-app-trx": "^6.34.1",
"@ledgerhq/hw-transport": "^6.34.1",
"@onekeyfe/hwk-adapter-core": "1.1.27-alpha.3",
"@onekeyfe/hwk-adapter-core": "1.1.27-alpha.4",
"bitcoinjs-lib": "npm:@onekeyfe/bitcoinjs-lib@7.0.1"
},
"devDependencies": {
Expand Down
Loading
Loading