@onekeyfe/hd-core 1.1.27-alpha.40 → 1.1.27-alpha.42

package/src/device/Device.ts

@@ -51,7 +51,7 @@ import type {
 } from '../events';
 import type { PassphrasePromptResponse } from './DeviceCommands';
 import type { Deferred, HardwareConnectProtocol } from '@onekeyfe/hd-shared';
-import type { OneKeyDeviceInfo as DeviceDescriptor } from '@onekeyfe/hd-transport';
+import type { OneKeyDeviceInfo as DeviceDescriptor, Success } from '@onekeyfe/hd-transport';
 import type DeviceConnector from './DeviceConnector';
 
 export type InitOptions = {
@@ -862,7 +862,11 @@ export class Device extends EventEmitter {
     return false;
   }
 
-  async lockDevice() {
+  async lockDevice(): Promise<Success> {
+    if (getDeviceType(this.features) === EDeviceType.Pro2) {
+      return { message: 'LockDevice skipped for Pro2' };
+    }
+
     const res = await this.commands.typedCall('LockDevice', 'Success', {});
     return res.message;
   }
@@ -940,14 +944,11 @@ export class Device extends EventEmitter {
         onlyMainPin: useEmptyPassphrase,
       });
 
-    if (skipPassphraseCheck) {
-      return true;
-    }
-
     // Main wallet and unlock Attach Pin, throw safe error
     const mainWalletUseAttachPin = unlockedAttachPin && useEmptyPassphrase;
     const useErrorAttachPin =
       unlockedAttachPin && passphraseState && passphraseState !== newPassphraseState;
+    const passphraseStateMismatch = !!passphraseState && passphraseState !== newPassphraseState;
 
     Log.debug('Check passphrase state safety: ', {
       passphraseState,
@@ -956,6 +957,14 @@ export class Device extends EventEmitter {
       useEmptyPassphrase,
     });
 
+    if (skipPassphraseCheck) {
+      if (passphraseStateMismatch) {
+        this.clearInternalState();
+        return false;
+      }
+      return true;
+    }
+
     if (mainWalletUseAttachPin || useErrorAttachPin) {
       try {
         await this.lockDevice();
@@ -967,7 +976,7 @@ export class Device extends EventEmitter {
     }
 
     // When exists passphraseState, check passphraseState
-    if (passphraseState && passphraseState !== newPassphraseState) {
+    if (passphraseStateMismatch) {
       this.clearInternalState();
       return false;
     }

package/src/events/logBlockEvent.ts

@@ -4,3 +4,26 @@ export const LogBlockEvent: Set<string> = new Set([
   UI_RESPONSE.RECEIVE_PIN,
   UI_RESPONSE.RECEIVE_PASSPHRASE,
 ]);
+
+const LogBlockMethod: Set<string> = new Set(['evmSignTypedData']);
+
+export function getLogBlockLabel(message: unknown): string | undefined {
+  if (!message || typeof message !== 'object') return undefined;
+
+  const { type, payload, method } = message as {
+    type?: string;
+    payload?: { method?: string };
+    method?: string;
+  };
+
+  if (type && LogBlockEvent.has(type)) {
+    return type;
+  }
+
+  const methodName = method ?? payload?.method;
+  if (methodName && LogBlockMethod.has(methodName)) {
+    return methodName;
+  }
+
+  return undefined;
+}

package/src/types/api/protocolV2.ts

@@ -2,11 +2,11 @@ import type { CommonParams, Response } from '../params';
 import type {
   DeviceFirmwareTarget,
   DeviceFirmwareUpdateStatus,
-  DeviceOnboardingStatus,
   DeviceInfoTargets,
   DeviceInfoTypes,
   DeviceRebootType,
   FactoryDeviceInfo,
+  OnboardingStatus,
   ProtoVersion,
   ProtocolV2DeviceInfo,
   Success,
@@ -162,7 +162,7 @@ export declare function deviceGetDeviceInfo(
 export declare function deviceGetOnboardingStatus(
   connectId: string,
   params?: CommonParams
-): Response<DeviceOnboardingStatus>;
+): Response<OnboardingStatus>;
 
 export declare function deviceFirmwareUpdate(
   connectId: string,