diff --git a/packages/connect-examples/electron-example/package.json b/packages/connect-examples/electron-example/package.json index 088251209..aec43382b 100644 --- a/packages/connect-examples/electron-example/package.json +++ b/packages/connect-examples/electron-example/package.json @@ -2,7 +2,7 @@ "name": "hardware-example", "productName": "HardwareExample", "executableName": "onekey-hardware-example", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "author": "OneKey", "description": "OneKey Hardware SDK Electron BLE example", "main": "dist/index.js", @@ -21,7 +21,7 @@ "ts:check": "yarn tsc --noEmit" }, "dependencies": { - "@onekeyfe/hd-transport-electron": "1.2.0-alpha.142", + "@onekeyfe/hd-transport-electron": "1.2.0-alpha.148", "@stoprocent/noble": "2.3.16", "debug": "4.3.4", "electron-is-dev": "^3.0.1", diff --git a/packages/connect-examples/expo-example/package.json b/packages/connect-examples/expo-example/package.json index 18851eb86..44260fb58 100644 --- a/packages/connect-examples/expo-example/package.json +++ b/packages/connect-examples/expo-example/package.json @@ -1,6 +1,6 @@ { "name": "expo-example", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "scripts": { "start": "yarn expo start --dev-client", "android": "yarn expo run:android", @@ -19,11 +19,11 @@ "@noble/ed25519": "^2.1.0", "@noble/hashes": "^1.3.3", "@noble/secp256k1": "^1.7.1", - "@onekeyfe/hd-ble-sdk": "1.2.0-alpha.142", - "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.142", - "@onekeyfe/hd-core": "1.2.0-alpha.142", - "@onekeyfe/hd-shared": "1.2.0-alpha.142", - "@onekeyfe/hd-transport": "1.2.0-alpha.142", + "@onekeyfe/hd-ble-sdk": "1.2.0-alpha.148", + "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.148", + "@onekeyfe/hd-core": "1.2.0-alpha.148", + "@onekeyfe/hd-shared": "1.2.0-alpha.148", + "@onekeyfe/hd-transport": "1.2.0-alpha.148", "@onekeyfe/react-native-ble-utils": "^0.1.3", "@polkadot/util-crypto": "13.1.1", "@react-native-async-storage/async-storage": "1.21.0", diff --git a/packages/connect-examples/expo-playground/package.json b/packages/connect-examples/expo-playground/package.json index 0a8557c0e..f20862c44 100644 --- a/packages/connect-examples/expo-playground/package.json +++ b/packages/connect-examples/expo-playground/package.json @@ -1,6 +1,6 @@ { "name": "onekey-hardware-playground", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "private": true, "sideEffects": [ "app/utils/shim.js", @@ -19,10 +19,10 @@ }, "dependencies": { "@noble/hashes": "^1.8.0", - "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.142", - "@onekeyfe/hd-core": "1.2.0-alpha.142", - "@onekeyfe/hd-shared": "1.2.0-alpha.142", - "@onekeyfe/hd-transport": "1.2.0-alpha.142", + "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.148", + "@onekeyfe/hd-core": "1.2.0-alpha.148", + "@onekeyfe/hd-shared": "1.2.0-alpha.148", + "@onekeyfe/hd-transport": "1.2.0-alpha.148", "@radix-ui/react-checkbox": "^1.3.2", "@radix-ui/react-dialog": "^1.1.14", "@radix-ui/react-dropdown-menu": "^2.1.15", diff --git a/packages/connect-examples/hwk-demo/package.json b/packages/connect-examples/hwk-demo/package.json index 016874d67..193340e60 100644 --- a/packages/connect-examples/hwk-demo/package.json +++ b/packages/connect-examples/hwk-demo/package.json @@ -1,6 +1,6 @@ { "name": "hwk-demo", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "private": true, "main": "index.js", "scripts": { diff --git a/packages/core/package.json b/packages/core/package.json index 5e1aadda5..329278f7a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-core", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "description": "Core processes and APIs for communicating with OneKey hardware devices.", "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", @@ -25,8 +25,8 @@ "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues" }, "dependencies": { - "@onekeyfe/hd-shared": "1.2.0-alpha.142", - "@onekeyfe/hd-transport": "1.2.0-alpha.142", + "@onekeyfe/hd-shared": "1.2.0-alpha.148", + "@onekeyfe/hd-transport": "1.2.0-alpha.148", "axios": "1.15.2", "bignumber.js": "^9.0.2", "buffer": "^6.0.3", diff --git a/packages/core/src/core/index.ts b/packages/core/src/core/index.ts index 7516ea870..1b6ec6aff 100644 --- a/packages/core/src/core/index.ts +++ b/packages/core/src/core/index.ts @@ -415,6 +415,10 @@ const onCallDevice = async ( if (method.payload?.onlyConnectBleDevice) { preWarmCallbackTask?.resolve(); Log.debug('Call API - only connect ble device: ', device?.mainId); + // This early return bypasses the normal-path releaseTask at the end of the + // call; without it the task leaks and haunts every later queue snapshot + // and cancel sweep (field log: a completed task lingered for 6 minutes). + requestQueue.releaseTask(method.responseID); return createResponseMessage(method.responseID, true, null); } @@ -938,7 +942,60 @@ export function isMissingDetectedProtocolV2Error(method: BaseMethod, error: unkn * If the Bluetooth connection times out, retry up to 6 times * @param retryCount - Current retry count (default 0) */ -async function connectDeviceForBle(method: BaseMethod, device: Device, retryCount = 0) { +// device.acquire awaits a transport reply with no deadline of its own; a +// transport that never settles (field case: Electron main lost an IPC reply, +// "reply was never sent" after 5 minutes) hangs the call forever and cancel() +// only takes effect at poll checkpoints. Race acquire against a deadline and +// the caller's abort signal so the hang is bounded and cancel is immediate. +const BLE_ACQUIRE_DEADLINE_MS = 60 * 1000; + +function raceBleAcquire(acquirePromise: Promise, abortSignal?: AbortSignal): Promise { + return new Promise((resolve, reject) => { + let settled = false; + const settle = (fn: () => void) => { + if (settled) return; + settled = true; + clearTimeout(deadline); + abortSignal?.removeEventListener('abort', onAbort); + fn(); + }; + const onAbort = () => + settle(() => reject(ERRORS.TypedError(HardwareErrorCode.CallQueueActionCancelled))); + const deadline = setTimeout( + () => + settle(() => + reject( + ERRORS.TypedError( + HardwareErrorCode.BleTimeoutError, + `BLE acquire exceeded ${BLE_ACQUIRE_DEADLINE_MS}ms deadline` + ) + ) + ), + BLE_ACQUIRE_DEADLINE_MS + ); + // Attach before any early return so a late settlement of acquirePromise + // is always consumed — an abort or deadline must never leave the acquire + // rejection unhandled. + acquirePromise.then( + value => settle(() => resolve(value)), + error => settle(() => reject(error)) + ); + if (abortSignal) { + if (abortSignal.aborted) { + onAbort(); + return; + } + abortSignal.addEventListener('abort', onAbort); + } + }); +} + +async function connectDeviceForBle( + method: BaseMethod, + device: Device, + abortSignal?: AbortSignal, + retryCount = 0 +) { try { if (method.payload.forceProtocolDetection && device.hasDeviceAcquire()) { await device.release(); @@ -949,9 +1006,31 @@ async function connectDeviceForBle(method: BaseMethod, device: Device, retryCoun !device.commands || device.commands.disposed; if (shouldAcquire) { - await device.acquire(method.payload.connectProtocol, { - forceProtocolDetection: method.payload.forceProtocolDetection, - }); + // A cancel landing during the retry backoff must not start a new acquire. + if (abortSignal?.aborted) { + throw ERRORS.TypedError(HardwareErrorCode.CallQueueActionCancelled); + } + try { + await raceBleAcquire( + device.acquire(method.payload.connectProtocol, { + forceProtocolDetection: method.payload.forceProtocolDetection, + }), + abortSignal + ); + } catch (err) { + // A deadline hit means the transport is wedged mid-acquire; drop the + // link before the retry so it cold-connects instead of stacking a + // second connect onto the half-open one. + if ( + err.errorCode === HardwareErrorCode.BleTimeoutError && + device.mainId && + device.deviceConnector + ) { + await device.deviceConnector.disconnect(device.mainId).catch(() => undefined); + device.markTransportDisconnected(); + } + throw err; + } } if (method.payload?.onlyConnectBleDevice) { if (shouldAcquire) { @@ -997,7 +1076,7 @@ async function connectDeviceForBle(method: BaseMethod, device: Device, retryCoun const nextRetry = retryCount + 1; Log.debug(`Bluetooth connection will retry, retry count: ${nextRetry}`); await wait(3000); - await connectDeviceForBle(method, device, nextRetry); + await connectDeviceForBle(method, device, abortSignal, nextRetry); } else { throw err; } @@ -1102,7 +1181,7 @@ const ensureConnected = async ( if (abort()) { return; } - await connectDeviceForBle(method, device); + await connectDeviceForBle(method, device, abortSignal); } resolve(device); return; @@ -1144,6 +1223,8 @@ const ensureConnected = async ( HardwareErrorCode.DeviceDetectInBootloaderMode, HardwareErrorCode.BleCharacteristicNotifyChangeFailure, HardwareErrorCode.BridgeNeedsPermission, + // Cancel must fail the call now, not after another poll round. + HardwareErrorCode.CallQueueActionCancelled, ].includes(error.errorCode) ) { reject(error); diff --git a/packages/hd-ble-sdk/package.json b/packages/hd-ble-sdk/package.json index f7fe3e879..567cf2a92 100644 --- a/packages/hd-ble-sdk/package.json +++ b/packages/hd-ble-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-ble-sdk", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", "license": "ISC", @@ -20,8 +20,8 @@ "lint:fix": "eslint . --fix" }, "dependencies": { - "@onekeyfe/hd-core": "1.2.0-alpha.142", - "@onekeyfe/hd-shared": "1.2.0-alpha.142", - "@onekeyfe/hd-transport-react-native": "1.2.0-alpha.142" + "@onekeyfe/hd-core": "1.2.0-alpha.148", + "@onekeyfe/hd-shared": "1.2.0-alpha.148", + "@onekeyfe/hd-transport-react-native": "1.2.0-alpha.148" } } diff --git a/packages/hd-cli/package.json b/packages/hd-cli/package.json index 85871be84..32587a614 100644 --- a/packages/hd-cli/package.json +++ b/packages/hd-cli/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hardware-cli", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "description": "OneKey hardware wallet CLI for testing device communication", "author": "OneKey", "license": "Apache-2.0", @@ -31,10 +31,10 @@ "test": "jest" }, "dependencies": { - "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.142", - "@onekeyfe/hd-core": "1.2.0-alpha.142", - "@onekeyfe/hd-shared": "1.2.0-alpha.142", - "@onekeyfe/hd-transport-usb": "1.2.0-alpha.142", + "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.148", + "@onekeyfe/hd-core": "1.2.0-alpha.148", + "@onekeyfe/hd-shared": "1.2.0-alpha.148", + "@onekeyfe/hd-transport-usb": "1.2.0-alpha.148", "@stoprocent/noble": "2.3.16", "commander": "^12.0.0" } diff --git a/packages/hd-common-connect-sdk/package.json b/packages/hd-common-connect-sdk/package.json index 32c81dd76..66cc083df 100644 --- a/packages/hd-common-connect-sdk/package.json +++ b/packages/hd-common-connect-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-common-connect-sdk", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", "license": "ISC", @@ -20,12 +20,12 @@ "lint:fix": "eslint . --fix" }, "dependencies": { - "@onekeyfe/hd-core": "1.2.0-alpha.142", - "@onekeyfe/hd-shared": "1.2.0-alpha.142", - "@onekeyfe/hd-transport-emulator": "1.2.0-alpha.142", - "@onekeyfe/hd-transport-http": "1.2.0-alpha.142", - "@onekeyfe/hd-transport-lowlevel": "1.2.0-alpha.142", - "@onekeyfe/hd-transport-usb": "1.2.0-alpha.142", - "@onekeyfe/hd-transport-web-device": "1.2.0-alpha.142" + "@onekeyfe/hd-core": "1.2.0-alpha.148", + "@onekeyfe/hd-shared": "1.2.0-alpha.148", + "@onekeyfe/hd-transport-emulator": "1.2.0-alpha.148", + "@onekeyfe/hd-transport-http": "1.2.0-alpha.148", + "@onekeyfe/hd-transport-lowlevel": "1.2.0-alpha.148", + "@onekeyfe/hd-transport-usb": "1.2.0-alpha.148", + "@onekeyfe/hd-transport-web-device": "1.2.0-alpha.148" } } diff --git a/packages/hd-transport-electron/package.json b/packages/hd-transport-electron/package.json index 49cbdccb7..6f2cb1cf2 100644 --- a/packages/hd-transport-electron/package.json +++ b/packages/hd-transport-electron/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-transport-electron", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", "license": "MIT", @@ -25,9 +25,9 @@ "electron-log": ">=4.0.0" }, "dependencies": { - "@onekeyfe/hd-core": "1.2.0-alpha.142", - "@onekeyfe/hd-shared": "1.2.0-alpha.142", - "@onekeyfe/hd-transport": "1.2.0-alpha.142", + "@onekeyfe/hd-core": "1.2.0-alpha.148", + "@onekeyfe/hd-shared": "1.2.0-alpha.148", + "@onekeyfe/hd-transport": "1.2.0-alpha.148", "@stoprocent/noble": "2.3.16", "p-retry": "^4.6.2" }, diff --git a/packages/hd-transport-emulator/package.json b/packages/hd-transport-emulator/package.json index d1390c3ea..5aa2d0d01 100644 --- a/packages/hd-transport-emulator/package.json +++ b/packages/hd-transport-emulator/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-transport-emulator", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "description": "hardware emulator transport", "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", @@ -24,8 +24,8 @@ "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues" }, "dependencies": { - "@onekeyfe/hd-shared": "1.2.0-alpha.142", - "@onekeyfe/hd-transport": "1.2.0-alpha.142", + "@onekeyfe/hd-shared": "1.2.0-alpha.148", + "@onekeyfe/hd-transport": "1.2.0-alpha.148", "axios": "1.15.2", "secure-json-parse": "^4.0.0" } diff --git a/packages/hd-transport-http/package.json b/packages/hd-transport-http/package.json index 3bf8ab2c6..16fd8d22e 100644 --- a/packages/hd-transport-http/package.json +++ b/packages/hd-transport-http/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-transport-http", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "description": "hardware http transport", "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", @@ -24,8 +24,8 @@ "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues" }, "dependencies": { - "@onekeyfe/hd-shared": "1.2.0-alpha.142", - "@onekeyfe/hd-transport": "1.2.0-alpha.142", + "@onekeyfe/hd-shared": "1.2.0-alpha.148", + "@onekeyfe/hd-transport": "1.2.0-alpha.148", "axios": "1.15.2", "secure-json-parse": "^4.0.0" } diff --git a/packages/hd-transport-lowlevel/package.json b/packages/hd-transport-lowlevel/package.json index bf79e3de3..7d8d854c2 100644 --- a/packages/hd-transport-lowlevel/package.json +++ b/packages/hd-transport-lowlevel/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-transport-lowlevel", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", "license": "MIT", "main": "dist/index.js", @@ -20,7 +20,7 @@ "lint:fix": "eslint . --fix" }, "dependencies": { - "@onekeyfe/hd-shared": "1.2.0-alpha.142", - "@onekeyfe/hd-transport": "1.2.0-alpha.142" + "@onekeyfe/hd-shared": "1.2.0-alpha.148", + "@onekeyfe/hd-transport": "1.2.0-alpha.148" } } diff --git a/packages/hd-transport-react-native/package.json b/packages/hd-transport-react-native/package.json index ebf9fdb05..8e64a7609 100644 --- a/packages/hd-transport-react-native/package.json +++ b/packages/hd-transport-react-native/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-transport-react-native", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", "license": "MIT", "main": "dist/index.js", @@ -20,9 +20,9 @@ "lint:fix": "eslint . --fix" }, "dependencies": { - "@onekeyfe/hd-core": "1.2.0-alpha.142", - "@onekeyfe/hd-shared": "1.2.0-alpha.142", - "@onekeyfe/hd-transport": "1.2.0-alpha.142", + "@onekeyfe/hd-core": "1.2.0-alpha.148", + "@onekeyfe/hd-shared": "1.2.0-alpha.148", + "@onekeyfe/hd-transport": "1.2.0-alpha.148", "@onekeyfe/react-native-ble-utils": "^0.1.6", "react-native-ble-plx": "3.5.1" } diff --git a/packages/hd-transport-usb/package.json b/packages/hd-transport-usb/package.json index 9345fc0bc..d24689466 100644 --- a/packages/hd-transport-usb/package.json +++ b/packages/hd-transport-usb/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-transport-usb", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "description": "OneKey hardware wallet direct USB transport plugin (libusb)", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", "license": "MIT", @@ -21,8 +21,8 @@ "lint:fix": "eslint . --fix" }, "dependencies": { - "@onekeyfe/hd-shared": "1.2.0-alpha.142", - "@onekeyfe/hd-transport": "1.2.0-alpha.142", + "@onekeyfe/hd-shared": "1.2.0-alpha.148", + "@onekeyfe/hd-transport": "1.2.0-alpha.148", "bytebuffer": "^5.0.1", "usb": "^2.14.0" } diff --git a/packages/hd-transport-web-device/package.json b/packages/hd-transport-web-device/package.json index 67ac8a164..bb202797e 100644 --- a/packages/hd-transport-web-device/package.json +++ b/packages/hd-transport-web-device/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-transport-web-device", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", "license": "MIT", @@ -21,11 +21,11 @@ "lint:fix": "eslint . --fix" }, "dependencies": { - "@onekeyfe/hd-shared": "1.2.0-alpha.142", - "@onekeyfe/hd-transport": "1.2.0-alpha.142" + "@onekeyfe/hd-shared": "1.2.0-alpha.148", + "@onekeyfe/hd-transport": "1.2.0-alpha.148" }, "devDependencies": { - "@onekeyfe/hd-transport-electron": "1.2.0-alpha.142", + "@onekeyfe/hd-transport-electron": "1.2.0-alpha.148", "@types/w3c-web-usb": "^1.0.6", "@types/web-bluetooth": "^0.0.17" } diff --git a/packages/hd-transport/package.json b/packages/hd-transport/package.json index a4d17eb21..2e3f3c7e3 100644 --- a/packages/hd-transport/package.json +++ b/packages/hd-transport/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-transport", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "description": "Transport layer abstractions and utilities for OneKey hardware SDK.", "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", diff --git a/packages/hd-web-sdk/package.json b/packages/hd-web-sdk/package.json index 0dce4c81b..39c0aa204 100644 --- a/packages/hd-web-sdk/package.json +++ b/packages/hd-web-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-web-sdk", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", "license": "ISC", @@ -23,10 +23,10 @@ }, "dependencies": { "@onekeyfe/cross-inpage-provider-core": "2.2.67", - "@onekeyfe/hd-core": "1.2.0-alpha.142", - "@onekeyfe/hd-shared": "1.2.0-alpha.142", - "@onekeyfe/hd-transport-http": "1.2.0-alpha.142", - "@onekeyfe/hd-transport-web-device": "1.2.0-alpha.142" + "@onekeyfe/hd-core": "1.2.0-alpha.148", + "@onekeyfe/hd-shared": "1.2.0-alpha.148", + "@onekeyfe/hd-transport-http": "1.2.0-alpha.148", + "@onekeyfe/hd-transport-web-device": "1.2.0-alpha.148" }, "devDependencies": { "@babel/plugin-proposal-optional-chaining": "^7.17.12", diff --git a/packages/hwk-adapter-core/package.json b/packages/hwk-adapter-core/package.json index 19e61f78f..801001b2e 100644 --- a/packages/hwk-adapter-core/package.json +++ b/packages/hwk-adapter-core/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hwk-adapter-core", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "description": "Shared types and utilities for OneKey hardware wallet kit", "author": "OneKey", "license": "MIT", diff --git a/packages/hwk-ledger-adapter/package.json b/packages/hwk-ledger-adapter/package.json index e2ee5113b..a0f88774b 100644 --- a/packages/hwk-ledger-adapter/package.json +++ b/packages/hwk-ledger-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hwk-ledger-adapter", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "description": "Ledger hardware wallet adapter for OneKey", "author": "OneKey", "license": "MIT", @@ -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.2.0-alpha.142", + "@onekeyfe/hwk-adapter-core": "1.2.0-alpha.148", "bitcoinjs-lib": "npm:@onekeyfe/bitcoinjs-lib@7.0.1" }, "devDependencies": { diff --git a/packages/hwk-ledger-connector-ble/package.json b/packages/hwk-ledger-connector-ble/package.json index f14a1dc1e..2b884e252 100644 --- a/packages/hwk-ledger-connector-ble/package.json +++ b/packages/hwk-ledger-connector-ble/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hwk-ledger-connector-ble", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "description": "IConnector implementation for Ledger hardware wallets via React Native BLE", "author": "OneKey", "license": "MIT", @@ -51,8 +51,8 @@ "@ledgerhq/device-signer-kit-ethereum": "^1.9.0", "@ledgerhq/device-signer-kit-solana": "^1.7.0", "@ledgerhq/device-transport-kit-react-native-ble": "^1.0.0", - "@onekeyfe/hwk-adapter-core": "1.2.0-alpha.142", - "@onekeyfe/hwk-ledger-adapter": "1.2.0-alpha.142" + "@onekeyfe/hwk-adapter-core": "1.2.0-alpha.148", + "@onekeyfe/hwk-ledger-adapter": "1.2.0-alpha.148" }, "peerDependencies": { "react-native": "*" diff --git a/packages/hwk-ledger-connector-webhid/package.json b/packages/hwk-ledger-connector-webhid/package.json index 85bd9a6f9..9acacce7d 100644 --- a/packages/hwk-ledger-connector-webhid/package.json +++ b/packages/hwk-ledger-connector-webhid/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hwk-ledger-connector-webhid", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "description": "IConnector implementation for Ledger hardware wallets via WebHID (DMK)", "author": "OneKey", "license": "MIT", @@ -49,8 +49,8 @@ "@ledgerhq/device-signer-kit-ethereum": "^1.9.0", "@ledgerhq/device-signer-kit-solana": "^1.7.0", "@ledgerhq/device-transport-kit-web-hid": "^1.0.0", - "@onekeyfe/hwk-adapter-core": "1.2.0-alpha.142", - "@onekeyfe/hwk-ledger-adapter": "1.2.0-alpha.142" + "@onekeyfe/hwk-adapter-core": "1.2.0-alpha.148", + "@onekeyfe/hwk-ledger-adapter": "1.2.0-alpha.148" }, "devDependencies": { "rimraf": "^5.0.0", diff --git a/packages/hwk-trezor-adapter/package.json b/packages/hwk-trezor-adapter/package.json index 375ec901c..922641dc7 100644 --- a/packages/hwk-trezor-adapter/package.json +++ b/packages/hwk-trezor-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hwk-trezor-adapter", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "description": "Trezor hardware wallet adapter primitives for OneKey", "author": "OneKey", "license": "MIT", @@ -43,8 +43,8 @@ "crypto" ], "dependencies": { - "@onekeyfe/hwk-adapter-core": "1.2.0-alpha.142", - "@onekeyfe/hwk-trezor-core": "1.2.0-alpha.142", + "@onekeyfe/hwk-adapter-core": "1.2.0-alpha.148", + "@onekeyfe/hwk-trezor-core": "1.2.0-alpha.148", "tslib": "^2.6.2" }, "devDependencies": { diff --git a/packages/hwk-trezor-connector-electron-ble/package.json b/packages/hwk-trezor-connector-electron-ble/package.json index c60e259e1..67e92d836 100644 --- a/packages/hwk-trezor-connector-electron-ble/package.json +++ b/packages/hwk-trezor-connector-electron-ble/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hwk-trezor-connector-electron-ble", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "description": "IConnector implementation for Trezor hardware wallets via Electron BLE (noble in main process)", "author": "OneKey", "license": "MIT", @@ -58,9 +58,9 @@ "connector" ], "dependencies": { - "@onekeyfe/hwk-adapter-core": "1.2.0-alpha.142", - "@onekeyfe/hwk-trezor-adapter": "1.2.0-alpha.142", - "@onekeyfe/hwk-trezor-connector": "1.2.0-alpha.142", + "@onekeyfe/hwk-adapter-core": "1.2.0-alpha.148", + "@onekeyfe/hwk-trezor-adapter": "1.2.0-alpha.148", + "@onekeyfe/hwk-trezor-connector": "1.2.0-alpha.148", "buffer": "^6.0.3" }, "peerDependencies": { diff --git a/packages/hwk-trezor-connector-rn-ble/package.json b/packages/hwk-trezor-connector-rn-ble/package.json index 5633a3681..d8ea54bf7 100644 --- a/packages/hwk-trezor-connector-rn-ble/package.json +++ b/packages/hwk-trezor-connector-rn-ble/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hwk-trezor-connector-rn-ble", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "description": "IConnector implementation for Trezor hardware wallets via React Native BLE", "author": "OneKey", "license": "MIT", @@ -46,9 +46,9 @@ "connector" ], "dependencies": { - "@onekeyfe/hwk-adapter-core": "1.2.0-alpha.142", - "@onekeyfe/hwk-trezor-adapter": "1.2.0-alpha.142", - "@onekeyfe/hwk-trezor-connector": "1.2.0-alpha.142", + "@onekeyfe/hwk-adapter-core": "1.2.0-alpha.148", + "@onekeyfe/hwk-trezor-adapter": "1.2.0-alpha.148", + "@onekeyfe/hwk-trezor-connector": "1.2.0-alpha.148", "buffer": "^6.0.3", "react-native-ble-plx": "^3.5.1" }, diff --git a/packages/hwk-trezor-connector-webusb/package.json b/packages/hwk-trezor-connector-webusb/package.json index a121c241f..5e7cb03ce 100644 --- a/packages/hwk-trezor-connector-webusb/package.json +++ b/packages/hwk-trezor-connector-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hwk-trezor-connector-webusb", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "description": "IConnector implementation for Trezor hardware wallets via WebUSB", "author": "OneKey", "license": "MIT", @@ -55,8 +55,8 @@ "connector" ], "dependencies": { - "@onekeyfe/hwk-adapter-core": "1.2.0-alpha.142", - "@onekeyfe/hwk-trezor-connector": "1.2.0-alpha.142", + "@onekeyfe/hwk-adapter-core": "1.2.0-alpha.148", + "@onekeyfe/hwk-trezor-connector": "1.2.0-alpha.148", "buffer": "^6.0.3" }, "devDependencies": { diff --git a/packages/hwk-trezor-connector/package.json b/packages/hwk-trezor-connector/package.json index 203472ed3..579c87dfb 100644 --- a/packages/hwk-trezor-connector/package.json +++ b/packages/hwk-trezor-connector/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hwk-trezor-connector", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "description": "Shared Trezor connector base for Hardware Wallet Kit", "author": "OneKey", "license": "MIT", @@ -38,13 +38,13 @@ }, "sideEffects": false, "dependencies": { - "@onekeyfe/hwk-adapter-core": "1.2.0-alpha.142", - "@onekeyfe/hwk-trezor-core": "1.2.0-alpha.142" + "@onekeyfe/hwk-adapter-core": "1.2.0-alpha.148", + "@onekeyfe/hwk-trezor-core": "1.2.0-alpha.148" }, "devDependencies": { - "@onekeyfe/hwk-trezor-protobuf": "1.2.0-alpha.142", - "@onekeyfe/hwk-trezor-protocol": "1.2.0-alpha.142", - "@onekeyfe/hwk-trezor-transport": "1.2.0-alpha.142", + "@onekeyfe/hwk-trezor-protobuf": "1.2.0-alpha.148", + "@onekeyfe/hwk-trezor-protocol": "1.2.0-alpha.148", + "@onekeyfe/hwk-trezor-transport": "1.2.0-alpha.148", "rimraf": "^5.0.0", "tsup": "^8.0.0", "typescript": "5.1.6" diff --git a/packages/hwk-trezor-core/package.json b/packages/hwk-trezor-core/package.json index 2d771b517..b1dd8dc63 100644 --- a/packages/hwk-trezor-core/package.json +++ b/packages/hwk-trezor-core/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hwk-trezor-core", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "description": "Minimal Trezor core call layer for Hardware Wallet Kit", "author": "OneKey", "license": "MIT", @@ -41,9 +41,9 @@ "devDependencies": { "@noble/ciphers": "^1.3.0", "@noble/hashes": "^1.8.0", - "@onekeyfe/hwk-trezor-protobuf": "1.2.0-alpha.142", - "@onekeyfe/hwk-trezor-protocol": "1.2.0-alpha.142", - "@onekeyfe/hwk-trezor-transport": "1.2.0-alpha.142", + "@onekeyfe/hwk-trezor-protobuf": "1.2.0-alpha.148", + "@onekeyfe/hwk-trezor-protocol": "1.2.0-alpha.148", + "@onekeyfe/hwk-trezor-transport": "1.2.0-alpha.148", "buffer": "^6.0.3", "rimraf": "^5.0.0", "tsup": "^8.0.0", diff --git a/packages/hwk-trezor-protobuf/package.json b/packages/hwk-trezor-protobuf/package.json index d9d9a05d5..2b43c4ff8 100644 --- a/packages/hwk-trezor-protobuf/package.json +++ b/packages/hwk-trezor-protobuf/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hwk-trezor-protobuf", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "private": true, "description": "Trezor protobuf helpers vendored from Trezor Suite MIT sources", "author": "OneKey", @@ -50,7 +50,7 @@ "sideEffects": false, "dependencies": { "@bufbuild/protobuf": "^2.11.0", - "@onekeyfe/hwk-trezor-schema-utils": "1.2.0-alpha.142" + "@onekeyfe/hwk-trezor-schema-utils": "1.2.0-alpha.148" }, "devDependencies": { "rimraf": "^5.0.0", diff --git a/packages/hwk-trezor-protocol/package.json b/packages/hwk-trezor-protocol/package.json index f5ac723b1..160b955db 100644 --- a/packages/hwk-trezor-protocol/package.json +++ b/packages/hwk-trezor-protocol/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hwk-trezor-protocol", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "private": true, "description": "Trezor transport protocol helpers vendored from Trezor Suite MIT sources", "author": "OneKey", diff --git a/packages/hwk-trezor-schema-utils/package.json b/packages/hwk-trezor-schema-utils/package.json index bf1698fd8..b6f6c694e 100644 --- a/packages/hwk-trezor-schema-utils/package.json +++ b/packages/hwk-trezor-schema-utils/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hwk-trezor-schema-utils", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "private": true, "description": "Schema helpers vendored from Trezor Suite MIT sources for HWK Trezor support", "author": "OneKey", @@ -44,7 +44,7 @@ }, "sideEffects": false, "dependencies": { - "@onekeyfe/hwk-trezor-type-utils": "1.2.0-alpha.142", + "@onekeyfe/hwk-trezor-type-utils": "1.2.0-alpha.148", "@sinclair/typebox": "^0.34.49", "ts-mixer": "^6.0.4" }, diff --git a/packages/hwk-trezor-transport/package.json b/packages/hwk-trezor-transport/package.json index 5cdccab57..c6258de11 100644 --- a/packages/hwk-trezor-transport/package.json +++ b/packages/hwk-trezor-transport/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hwk-trezor-transport", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "private": true, "description": "Low-level Trezor transport helpers vendored from Trezor Suite MIT sources", "author": "OneKey", @@ -49,10 +49,10 @@ }, "sideEffects": false, "dependencies": { - "@onekeyfe/hwk-trezor-protobuf": "1.2.0-alpha.142", - "@onekeyfe/hwk-trezor-protocol": "1.2.0-alpha.142", - "@onekeyfe/hwk-trezor-type-utils": "1.2.0-alpha.142", - "@onekeyfe/hwk-trezor-utils": "1.2.0-alpha.142", + "@onekeyfe/hwk-trezor-protobuf": "1.2.0-alpha.148", + "@onekeyfe/hwk-trezor-protocol": "1.2.0-alpha.148", + "@onekeyfe/hwk-trezor-type-utils": "1.2.0-alpha.148", + "@onekeyfe/hwk-trezor-utils": "1.2.0-alpha.148", "cross-fetch": "^4.1.0", "usb": "^2.17.0" }, diff --git a/packages/hwk-trezor-type-utils/package.json b/packages/hwk-trezor-type-utils/package.json index 09f727dd2..d31a6019a 100644 --- a/packages/hwk-trezor-type-utils/package.json +++ b/packages/hwk-trezor-type-utils/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hwk-trezor-type-utils", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "private": true, "description": "Type helpers vendored from Trezor Suite MIT sources for HWK Trezor support", "author": "OneKey", diff --git a/packages/hwk-trezor-utils/package.json b/packages/hwk-trezor-utils/package.json index 9757cbf48..6cfb8bcfd 100644 --- a/packages/hwk-trezor-utils/package.json +++ b/packages/hwk-trezor-utils/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hwk-trezor-utils", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "private": true, "description": "Utility helpers vendored from Trezor Suite MIT sources for HWK Trezor support", "author": "OneKey", @@ -39,7 +39,7 @@ }, "sideEffects": false, "dependencies": { - "@onekeyfe/hwk-trezor-type-utils": "1.2.0-alpha.142", + "@onekeyfe/hwk-trezor-type-utils": "1.2.0-alpha.148", "bignumber.js": "^9.3.1", "events": "^3.3.0" }, diff --git a/packages/shared/package.json b/packages/shared/package.json index eada24024..7de8ae1f0 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-shared", - "version": "1.2.0-alpha.142", + "version": "1.2.0-alpha.148", "description": "Hardware SDK's shared tool library", "keywords": [ "Hardware-SDK",