@onekeyfe/hd-core 1.2.2-alpha.109 → 1.2.2-alpha.110

package/__tests__/device-lifecycle-events.test.ts

@@ -15,12 +15,17 @@ import {
 } from '../src/core';
 import { DataManager } from '../src/data-manager';
 import GetDeviceState from '../src/api/GetDeviceState';
+import DeviceVerify from '../src/api/device/DeviceVerify';
 import TransportManager from '../src/data-manager/TransportManager';
 import { Device } from '../src/device/Device';
 import { cancelDeviceInPrompt, cancelDeviceWithInitialize } from '../src/device/DeviceCommands';
 import { DevicePool } from '../src/device/DevicePool';
 import { CORE_EVENT, DEVICE, IFRAME } from '../src/events';
 import { PROTOCOL_V2_DEVICE_STATUS_GET_MESSAGE_TYPE } from '../src/protocols/protocol-v2';
+import {
+  ProtocolV2UiInteractionCoordinator,
+  resolveProtocolV2UiInteraction,
+} from '../src/protocols/protocol-v2/uiInteraction';
 
 import type Core from '../src/core';
 import type { CoreMessage } from '../src/events';
@@ -776,6 +781,38 @@ describe('public device lifecycle events', () => {
     }
   );
 
+  test.each(['react-native', 'desktop-web-ble', 'webusb', 'desktop-webusb'] as const)(
+    'sends Cancel once for device verification on an already unlocked Protocol V2 %s device',
+    async env => {
+      jest.spyOn(DataManager, 'getSettings').mockReturnValue(env as never);
+      const device = createInitializedDevice('V2');
+      device.originalDescriptor.session = device.mainId;
+      jest.spyOn(device, 'hasDeviceAcquire').mockReturnValue(true);
+      const post = jest.fn().mockResolvedValue(undefined);
+      const cancel = jest.fn().mockResolvedValue(undefined);
+      device.commands = {
+        transport: { post },
+        cancelDevice: () => cancelDeviceInPrompt(device, false),
+        cancel,
+      } as never;
+      const method = new DeviceVerify({
+        payload: { method: 'deviceVerify', dataHex: '00' },
+      });
+      method.init();
+      const postMessage = jest.fn();
+      const coordinator = new ProtocolV2UiInteractionCoordinator(device, postMessage);
+      device.beginProtocolV2UiInteraction();
+      coordinator.enterMethodInteraction(resolveProtocolV2UiInteraction(method));
+
+      await device.interruptionFromUser();
+      await device.interruptionFromUser();
+
+      expect(post).toHaveBeenCalledTimes(1);
+      expect(post).toHaveBeenCalledWith(device.mainId, 'Cancel', {});
+      expect(cancel).toHaveBeenCalledTimes(1);
+    }
+  );
+
   test.each(['react-native', 'webusb', 'desktop-webusb'] as const)(
     'sends a fallback Cancel for an acquired Protocol V2 %s call with an open UI',
     async env => {

package/__tests__/protocol-v2.test.ts

@@ -1,4 +1,5 @@
 import { Buffer } from 'buffer';
+import { randomBytes } from 'crypto';
 import { EDeviceType, EFirmwareType, ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import { sha256 } from '@noble/hashes/sha256';
 import { bytesToHex } from '@noble/hashes/utils';
@@ -1824,6 +1825,56 @@ describe('Protocol V2 feature adapter', () => {
     ]);
   });
 
+  test.each([false, true])(
+    'rejects the first incorrect passphrase after a missing or expired session (cached: %s)',
+    async cached => {
+      const deviceId = `first-passphrase-error-${String(cached)}`;
+      const device = Device.fromDescriptor({
+        id: deviceId,
+        path: deviceId,
+        protocolType: 'V2',
+      } as never);
+      device.features = normalizeProtocolV2Features(
+        { ...descriptor, protocolType: 'V2' } as never,
+        {
+          status: { device_id: deviceId, unlocked: true, passphrase_enabled: true },
+        }
+      );
+      device.passphraseState = 'expected-public-address';
+      if (cached) {
+        preloadSessionCache(deviceId, device.passphraseState, randomBytes(32).toString('hex'));
+      }
+      let reads = 0;
+      const typedCall = createWalletSessionTypedCall(
+        jest.fn((request: string) => {
+          if (request === 'DeviceSessionAskPassphrase') return { message: {} };
+          if (request === 'DeviceSessionGet') {
+            reads += 1;
+            if (reads === 1) {
+              throw ERRORS.TypedError(HardwareErrorCode.WalletSessionInvalid);
+            }
+            return {
+              message: {
+                session_id: randomBytes(32).toString('hex'),
+                btc_test_address: 'different-public-address',
+              },
+            };
+          }
+          throw new Error(`Unexpected request: ${request}`);
+        })
+      );
+      const promptPassphrase = jest.fn().mockResolvedValue({ passphraseOnDevice: true });
+      device.commands = { typedCall, promptPassphrase } as never;
+
+      await expect(getProtocolV2WalletSession(device)).rejects.toMatchObject({
+        errorCode: HardwareErrorCode.DeviceCheckPassphraseStateError,
+      });
+      expect(promptPassphrase).toHaveBeenCalledTimes(1);
+      expect(reads).toBe(2);
+      expect(device.getInternalState()).toBeUndefined();
+    }
+  );
+
   test('reselects a hidden wallet when the cached Pro2 session resolves to another wallet', async () => {
     const device = Device.fromDescriptor({
       id: 'cache-device-mismatch',

package/dist/api/device/DeviceVerify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceVerify.d.ts","sourceRoot":"","sources":["../../../src/api/device/DeviceVerify.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,UAAU,CAAC,wBAAwB,CAAC;IAC5E,qBAAqB;IAIrB,IAAI;IAgBE,GAAG;CAsDV"}
+{"version":3,"file":"DeviceVerify.d.ts","sourceRoot":"","sources":["../../../src/api/device/DeviceVerify.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,UAAU,CAAC,wBAAwB,CAAC;IAC5E,qBAAqB;IAIrB,IAAI;IAwBE,GAAG;CAsDV"}

package/dist/index.js

@@ -41878,6 +41878,7 @@ function getProtocolV2WalletSession(device, options) {
             ? device.getInternalState()
             : undefined;
         let response;
+        let walletSelectionRequested = false;
         let resumed = false;
         let walletStatusRefreshed = false;
         const markWalletStatusRefreshed = () => {
@@ -42049,6 +42050,7 @@ function getProtocolV2WalletSession(device, options) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WalletSessionInvalid);
             }
             yield lockAttachPinBeforePassphraseSelection();
+            walletSelectionRequested = true;
             response = yield selectDeviceSession(device, expectedPassphraseState, options === null || options === void 0 ? void 0 : options.deriveCardano, markWalletStatusRefreshed);
         }
         let { message } = response;
@@ -42071,6 +42073,10 @@ function getProtocolV2WalletSession(device, options) {
                 device.clearInternalState();
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WalletSessionInvalid);
             }
+            if (walletSelectionRequested) {
+                clearCurrentWalletSession();
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError);
+            }
             if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
                 (_j = device.clearStandardInternalState) === null || _j === void 0 ? void 0 : _j.call(device);
                 yield selectStandardWallet(true);
@@ -49178,6 +49184,14 @@ class DeviceVerify extends BaseMethod {
         this.unlockPolicy = 'unlock-before-run';
         this.protocolV2PreUnlockPinType = hdTransport.DeviceSessionPinType.Any;
         this.useDevicePassphraseState = false;
+        this.protocolV2UiInteraction = {
+            request: 'button',
+            source: 'method-lifecycle',
+            reason: 'device-management',
+            completion: 'operation-completed',
+            deviceOnly: true,
+            operation: 'deviceVerify',
+        };
         validateParams(this.payload, [{ name: 'dataHex', type: 'hexString' }]);
         this.params = {
             data: formatAnyHex(this.payload.dataHex),

package/dist/protocols/protocol-v2/walletSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"walletSession.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/walletSession.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAuBlD,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,0DAGjE;AAED,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,qCAGjE;AAED,wBAAsB,qCAAqC,CAAC,MAAM,EAAE,MAAM,oBAgBzE;AA8JD,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IACR,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,2BAA2B,CAAC,EAAE,OAAO,CAAC;IAEtC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;;;;;;GAkYF;AAED,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,MAAM,EACd,uBAAuB,EAAE,MAAM,EAC/B,aAAa,CAAC,EAAE,OAAO;;;;;;GAOxB"}
+{"version":3,"file":"walletSession.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/walletSession.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAuBlD,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,0DAGjE;AAED,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,qCAGjE;AAED,wBAAsB,qCAAqC,CAAC,MAAM,EAAE,MAAM,oBAgBzE;AA8JD,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IACR,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,2BAA2B,CAAC,EAAE,OAAO,CAAC;IAEtC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;;;;;;GAyYF;AAED,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,MAAM,EACd,uBAAuB,EAAE,MAAM,EAC/B,aAAa,CAAC,EAAE,OAAO;;;;;;GAOxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.2-alpha.109",
+  "version": "1.2.2-alpha.110",
   "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.2-alpha.109",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.109",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.110",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.110",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "buffer": "^6.0.3",
@@ -46,5 +46,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "4ee0588f08abdde1c72b8044091a76106e4770c4"
+  "gitHead": "80a959fb1e9383ce948b911fddece1265b40051f"
 }

package/src/api/device/DeviceVerify.ts

@@ -22,6 +22,14 @@ export default class DeviceVerify extends BaseMethod<BixinVerifyDeviceRequest> {
     // the main PIN or an Attach PIN may authorize them.
     this.protocolV2PreUnlockPinType = DeviceSessionPinType.Any;
     this.useDevicePassphraseState = false;
+    this.protocolV2UiInteraction = {
+      request: 'button',
+      source: 'method-lifecycle',
+      reason: 'device-management',
+      completion: 'operation-completed',
+      deviceOnly: true,
+      operation: 'deviceVerify',
+    };
 
     // check payload
     validateParams(this.payload, [{ name: 'dataHex', type: 'hexString' }]);

package/src/protocols/protocol-v2/walletSession.ts

@@ -268,6 +268,7 @@ export async function getProtocolV2WalletSession(
       ? device.getInternalState()
       : undefined;
   let response;
+  let walletSelectionRequested = false;
   let resumed = false;
   let walletStatusRefreshed = false;
   const markWalletStatusRefreshed = () => {
@@ -482,6 +483,7 @@ export async function getProtocolV2WalletSession(
       throw ERRORS.TypedError(HardwareErrorCode.WalletSessionInvalid);
     }
     await lockAttachPinBeforePassphraseSelection();
+    walletSelectionRequested = true;
     response = await selectDeviceSession(
       device,
       expectedPassphraseState,
@@ -508,6 +510,11 @@ export async function getProtocolV2WalletSession(
       device.clearInternalState();
       throw ERRORS.TypedError(HardwareErrorCode.WalletSessionInvalid);
     }
+    // Report a fresh selection mismatch before asking for input again.
+    if (walletSelectionRequested) {
+      clearCurrentWalletSession();
+      throw ERRORS.TypedError(HardwareErrorCode.DeviceCheckPassphraseStateError);
+    }
     if (options?.onlyMainPin) {
       device.clearStandardInternalState?.();
       await selectStandardWallet(true);