Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
303 changes: 303 additions & 0 deletions HANDOFF-device-attestation.md

Large diffs are not rendered by default.

501 changes: 501 additions & 0 deletions docs/device-attestation-voucher-backend.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/connect-examples/electron-example/package.json
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.34-alpha.1",
"version": "1.1.34-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.34-alpha.1",
"@onekeyfe/hd-transport-electron": "1.1.34-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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "expo-example",
"version": "1.1.34-alpha.1",
"version": "1.1.34-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.34-alpha.1",
"@onekeyfe/hd-common-connect-sdk": "1.1.34-alpha.1",
"@onekeyfe/hd-core": "1.1.34-alpha.1",
"@onekeyfe/hd-web-sdk": "1.1.34-alpha.1",
"@onekeyfe/hd-ble-sdk": "1.1.34-alpha.4",
"@onekeyfe/hd-common-connect-sdk": "1.1.34-alpha.4",
"@onekeyfe/hd-core": "1.1.34-alpha.4",
"@onekeyfe/hd-web-sdk": "1.1.34-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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "onekey-hardware-playground",
"version": "1.1.34-alpha.1",
"version": "1.1.34-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.34-alpha.1",
"@onekeyfe/hd-core": "1.1.34-alpha.1",
"@onekeyfe/hd-shared": "1.1.34-alpha.1",
"@onekeyfe/hd-common-connect-sdk": "1.1.34-alpha.4",
"@onekeyfe/hd-core": "1.1.34-alpha.4",
"@onekeyfe/hd-shared": "1.1.34-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
65 changes: 64 additions & 1 deletion packages/connect-examples/hwk-demo/hwk/src/HwkScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,14 @@
event: string;
data?: Record<string, unknown>;
};
type BusyState = null | 'scan' | 'connect' | 'features' | 'address' | 'disconnect';
type BusyState =

Check failure on line 41 in packages/connect-examples/hwk-demo/hwk/src/HwkScreen.tsx

View workflow job for this annotation

GitHub Actions / lint (22)

Replace `⏎··|·null⏎··|·'scan'⏎··|·'connect'⏎··|·'features'⏎··|·'address'⏎··|·'disconnect'⏎·` with `·null·|·'scan'·|·'connect'·|·'features'·|·'address'·|·'disconnect'`
| null
| 'scan'
| 'connect'
| 'features'
| 'address'
| 'disconnect'
| 'attestation';
type ThpPairingPrompt = {
connectId: string;
availableMethods: number[];
Expand Down Expand Up @@ -129,6 +136,7 @@
features: 'Getting features...',
address: 'Getting address...',
disconnect: 'Disconnecting...',
attestation: 'Verifying device...',
};

const upsertDevice = (devices: DeviceInfo[], device: DeviceInfo) => {
Expand Down Expand Up @@ -369,7 +377,7 @@
adapterRef.current = adapter;
setReady(true);
appendLog('info', 'HWK Trezor BLE adapter initialized.');
}, [appendLog, debugLogger]);

Check warning on line 380 in packages/connect-examples/hwk-demo/hwk/src/HwkScreen.tsx

View workflow job for this annotation

GitHub Actions / lint (22)

React Hook useCallback has a missing dependency: 'brand'. Either include it or remove the dependency array

const selectDevice = useCallback((device: DeviceInfo, source: SelectableDeviceSource) => {
const normalizedDevice = normalizeDevice(device);
Expand Down Expand Up @@ -676,8 +684,56 @@
} finally {
setBusy(null);
}
}, [appendLog, connectedId, selected?.connectId]);

Check warning on line 687 in packages/connect-examples/hwk-demo/hwk/src/HwkScreen.tsx

View workflow job for this annotation

GitHub Actions / lint (22)

React Hook useCallback has a missing dependency: 'brand'. Either include it or remove the dependency array

const onVerifyDevice = useCallback(async () => {
const adapter = adapterRef.current;
const connectId = selected?.connectId ?? connectedId;
if (!adapter || !connectId) {
Alert.alert('Tip', 'Please connect a device first.');
return;
}
// Both TrezorAdapter and LedgerAdapter expose verifyDeviceAuthenticity(connectId).
const verifier = adapter as unknown as {
verifyDeviceAuthenticity: (id: string) => Promise<{
success: boolean;
payload: {
verified?: boolean;
deviceId?: string; // Trezor (verified)
unverifiedDeviceId?: string; // Ledger (local read, unverified)
usedDebugKey?: boolean;
attestationPubKey?: string;
deviceCertPubKey?: string;
serialNumber?: string;
note?: string;
error?: string;
};
}>;
};
try {
setBusy('attestation');
appendLog('info', `verifyDeviceAuthenticity ${connectId}... (confirm on device)`);
const result = await verifier.verifyDeviceAuthenticity(connectId);
appendLog('info', { verifyDeviceAuthenticity: result });
if (!result.success) {
Alert.alert('verifyDeviceAuthenticity failed', JSON.stringify(result.payload));
return;
}
const { verified, deviceId, unverifiedDeviceId, usedDebugKey, note } = result.payload;
const id = deviceId ?? unverifiedDeviceId ?? '(none)';
const title = verified
? usedDebugKey
? 'Verified ⚠️ DEBUG key'
: 'Verified ✅'
: 'Read only (not verified)';
Alert.alert(title, `id:\n${id}${note ? `\n\n${note}` : ''}`);
} catch (error) {
appendLog('error', { step: 'verifyDeviceAuthenticity.error', error: formatError(error) });
} finally {
setBusy(null);
}
}, [appendLog, connectedId, selected?.connectId]);

const onGetAddress = useCallback(async () => {
const adapter = adapterRef.current;
const connectId = selected?.connectId ?? connectedId;
Expand Down Expand Up @@ -1008,6 +1064,13 @@
>
<Text style={styles.btnText}>getFeatures</Text>
</TouchableOpacity>
<TouchableOpacity
style={styles.btn}
onPress={onVerifyDevice}
disabled={!selected || !!busy}
>
<Text style={styles.btnText}>verifyDevice (deviceId)</Text>
</TouchableOpacity>
<TouchableOpacity
style={styles.btn}
onPress={onGetBtcAddress}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ import type { HwkAdapter, HwkAdapterBundle, HwkAdapterDeps, HwkBrand } from './t
/**
* Web factory.
* Trezor → WebUSB (navigator.usb, requires user-gesture picker)
* Ledger → disabled on this MVP build.
* Ledger → disabled on web. The Ledger WebHID connector pulls in
* `@ledgerhq/device-transport-kit-web-hid`, which Metro cannot resolve
* from a workspace package (the "DMK ↔ metro" friction). Test the
* Ledger attestation path on real hardware via app-monorepo instead.
*
* Mirror of `connectorFactory.native.ts` — registers the same
* `REQUEST_DEVICE_PERMISSION` event handler, but on the web side
Expand Down
18 changes: 9 additions & 9 deletions packages/connect-examples/hwk-demo/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hwk-demo",
"version": "1.1.34-alpha.1",
"version": "1.1.34-alpha.4",
"private": true,
"main": "index.js",
"scripts": {
Expand All @@ -13,14 +13,14 @@
},
"dependencies": {
"@expo/metro-runtime": "~3.1.3",
"@onekeyfe/hwk-adapter-core": "1.1.34-alpha.1",
"@onekeyfe/hwk-ledger-adapter": "1.1.34-alpha.1",
"@onekeyfe/hwk-ledger-connector-ble": "1.1.34-alpha.1",
"@onekeyfe/hwk-ledger-connector-webhid": "1.1.34-alpha.1",
"@onekeyfe/hwk-trezor-adapter": "1.1.34-alpha.1",
"@onekeyfe/hwk-trezor-connector": "1.1.34-alpha.1",
"@onekeyfe/hwk-trezor-connector-rn-ble": "1.1.34-alpha.1",
"@onekeyfe/hwk-trezor-connector-webusb": "1.1.34-alpha.1",
"@onekeyfe/hwk-adapter-core": "1.1.34-alpha.4",
"@onekeyfe/hwk-ledger-adapter": "1.1.34-alpha.4",
"@onekeyfe/hwk-ledger-connector-ble": "1.1.34-alpha.4",
"@onekeyfe/hwk-ledger-connector-webhid": "1.1.34-alpha.4",
"@onekeyfe/hwk-trezor-adapter": "1.1.34-alpha.4",
"@onekeyfe/hwk-trezor-connector": "1.1.34-alpha.4",
"@onekeyfe/hwk-trezor-connector-rn-ble": "1.1.34-alpha.4",
"@onekeyfe/hwk-trezor-connector-webusb": "1.1.34-alpha.4",
"@react-native-async-storage/async-storage": "1.21.0",
"browserify-zlib": "^0.2.0",
"buffer": "^6.0.3",
Expand Down
6 changes: 3 additions & 3 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-core",
"version": "1.1.34-alpha.1",
"version": "1.1.34-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.34-alpha.1",
"@onekeyfe/hd-transport": "1.1.34-alpha.1",
"@onekeyfe/hd-shared": "1.1.34-alpha.4",
"@onekeyfe/hd-transport": "1.1.34-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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-ble-sdk",
"version": "1.1.34-alpha.1",
"version": "1.1.34-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.34-alpha.1",
"@onekeyfe/hd-shared": "1.1.34-alpha.1",
"@onekeyfe/hd-transport-react-native": "1.1.34-alpha.1"
"@onekeyfe/hd-core": "1.1.34-alpha.4",
"@onekeyfe/hd-shared": "1.1.34-alpha.4",
"@onekeyfe/hd-transport-react-native": "1.1.34-alpha.4"
}
}
10 changes: 5 additions & 5 deletions packages/hd-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hardware-cli",
"version": "1.1.34-alpha.1",
"version": "1.1.34-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.34-alpha.1",
"@onekeyfe/hd-core": "1.1.34-alpha.1",
"@onekeyfe/hd-shared": "1.1.34-alpha.1",
"@onekeyfe/hd-transport-usb": "1.1.34-alpha.1",
"@onekeyfe/hd-common-connect-sdk": "1.1.34-alpha.4",
"@onekeyfe/hd-core": "1.1.34-alpha.4",
"@onekeyfe/hd-shared": "1.1.34-alpha.4",
"@onekeyfe/hd-transport-usb": "1.1.34-alpha.4",
"commander": "^12.0.0"
}
}
16 changes: 8 additions & 8 deletions packages/hd-common-connect-sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-common-connect-sdk",
"version": "1.1.34-alpha.1",
"version": "1.1.34-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.34-alpha.1",
"@onekeyfe/hd-shared": "1.1.34-alpha.1",
"@onekeyfe/hd-transport-emulator": "1.1.34-alpha.1",
"@onekeyfe/hd-transport-http": "1.1.34-alpha.1",
"@onekeyfe/hd-transport-lowlevel": "1.1.34-alpha.1",
"@onekeyfe/hd-transport-usb": "1.1.34-alpha.1",
"@onekeyfe/hd-transport-web-device": "1.1.34-alpha.1"
"@onekeyfe/hd-core": "1.1.34-alpha.4",
"@onekeyfe/hd-shared": "1.1.34-alpha.4",
"@onekeyfe/hd-transport-emulator": "1.1.34-alpha.4",
"@onekeyfe/hd-transport-http": "1.1.34-alpha.4",
"@onekeyfe/hd-transport-lowlevel": "1.1.34-alpha.4",
"@onekeyfe/hd-transport-usb": "1.1.34-alpha.4",
"@onekeyfe/hd-transport-web-device": "1.1.34-alpha.4"
}
}
8 changes: 4 additions & 4 deletions packages/hd-transport-electron/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-electron",
"version": "1.1.34-alpha.1",
"version": "1.1.34-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.34-alpha.1",
"@onekeyfe/hd-shared": "1.1.34-alpha.1",
"@onekeyfe/hd-transport": "1.1.34-alpha.1",
"@onekeyfe/hd-core": "1.1.34-alpha.4",
"@onekeyfe/hd-shared": "1.1.34-alpha.4",
"@onekeyfe/hd-transport": "1.1.34-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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-emulator",
"version": "1.1.34-alpha.1",
"version": "1.1.34-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.34-alpha.1",
"@onekeyfe/hd-transport": "1.1.34-alpha.1",
"@onekeyfe/hd-shared": "1.1.34-alpha.4",
"@onekeyfe/hd-transport": "1.1.34-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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-http",
"version": "1.1.34-alpha.1",
"version": "1.1.34-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.34-alpha.1",
"@onekeyfe/hd-transport": "1.1.34-alpha.1",
"@onekeyfe/hd-shared": "1.1.34-alpha.4",
"@onekeyfe/hd-transport": "1.1.34-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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-lowlevel",
"version": "1.1.34-alpha.1",
"version": "1.1.34-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.34-alpha.1",
"@onekeyfe/hd-transport": "1.1.34-alpha.1"
"@onekeyfe/hd-shared": "1.1.34-alpha.4",
"@onekeyfe/hd-transport": "1.1.34-alpha.4"
}
}
8 changes: 4 additions & 4 deletions packages/hd-transport-react-native/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-react-native",
"version": "1.1.34-alpha.1",
"version": "1.1.34-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.34-alpha.1",
"@onekeyfe/hd-shared": "1.1.34-alpha.1",
"@onekeyfe/hd-transport": "1.1.34-alpha.1",
"@onekeyfe/hd-core": "1.1.34-alpha.4",
"@onekeyfe/hd-shared": "1.1.34-alpha.4",
"@onekeyfe/hd-transport": "1.1.34-alpha.4",
"@onekeyfe/react-native-ble-utils": "^0.1.6",
"react-native-ble-plx": "3.5.1"
}
Expand Down
Loading
Loading