@onekeyfe/hd-core 1.2.0-alpha.18 → 1.2.0-alpha.19

package/src/device/deviceIdentity.ts

@@ -0,0 +1,18 @@
+import type { Device } from './Device';
+
+type DeviceIdentityReader = Pick<Device, 'isProtocolV2' | 'getDeviceState' | 'checkDeviceId'>;
+
+/**
+ * Protocol V2 的 deviceId 来自运行态状态，比较前必须读取一次实时 status。
+ * Protocol V1 继续复用 Initialize/GetFeatures 已经返回的设备身份。
+ */
+export async function checkLiveDeviceId(
+  device: DeviceIdentityReader,
+  expectedDeviceId: string
+): Promise<boolean> {
+  if (device.isProtocolV2()) {
+    await device.getDeviceState({ refreshSections: ['status'] });
+  }
+
+  return device.checkDeviceId(expectedDeviceId);
+}

package/src/deviceProfile/buildDeviceFeatures.ts

@@ -1,4 +1,5 @@
 import { EDeviceType, EFirmwareType } from '@onekeyfe/hd-shared';
+import { Enum_Capability } from '@onekeyfe/hd-transport';
 
 import {
   isProtocolV2BootloaderDeviceInfo,
@@ -52,8 +53,8 @@ const versionFromParts = (major?: number | null, minor?: number | null, patch?:
 const getProtocolV1Mode = (features: ProtocolV1FeaturesCompat): Features['mode'] => {
   if (features.bootloader_mode === true) return 'bootloader';
   if (features.initialized === false) return 'notInitialized';
-  if (features.initialized === true) return 'normal';
-  return 'unknown';
+  if (features.no_backup === true) return 'backupMode';
+  return 'normal';
 };
 
 const getProtocolV1DeviceType = (features: ProtocolV1FeaturesCompat): Features['deviceType'] => {
@@ -96,20 +97,19 @@ const getProtocolV1FirmwareType = (
   features: ProtocolV1FeaturesCompat
 ): Features['firmwareType'] => {
   if (features.fw_vendor === 'OneKey Bitcoin-only') return EFirmwareType.BitcoinOnly;
+  const capabilities = features.capabilities as unknown as Array<number | string> | undefined;
+  if (
+    capabilities?.length &&
+    !capabilities.includes(Enum_Capability.Capability_Bitcoin_like) &&
+    !capabilities.includes('Capability_Bitcoin_like')
+  ) {
+    return EFirmwareType.BitcoinOnly;
+  }
   return EFirmwareType.Universal;
 };
 
-const getProtocolV1Label = (
-  features: ProtocolV1FeaturesCompat,
-  deviceType: Features['deviceType'],
-  bleName: string | null
-) => {
-  if (features.label) return features.label;
-  if (bleName) return bleName;
-  if (deviceType === EDeviceType.Unknown) return null;
-  if (deviceType === EDeviceType.ClassicPure) return 'OneKey Classic 1S';
-  return `OneKey ${deviceType.charAt(0).toUpperCase()}${deviceType.slice(1)}`;
-};
+const getProtocolV1Label = (features: ProtocolV1FeaturesCompat) =>
+  typeof features.label === 'string' && features.label.length > 0 ? features.label : null;
 
 export const buildProtocolV1FeaturesPayload = (
   protocolV1Features: PROTO.Features,
@@ -119,20 +119,27 @@ export const buildProtocolV1FeaturesPayload = (
   const firmwareVersion = firstMeaningfulVersion(
     features.onekey_firmware_version,
     features.onekey_version,
-    versionFromParts(features.major_version, features.minor_version, features.patch_version)
+    versionFromParts(features.major_version, features.minor_version, features.patch_version),
+    previous?.firmwareVersion
   );
   const bootloaderVersion = firstMeaningfulVersion(
     features.onekey_boot_version,
     features.bootloader_version,
     features.bootloader_mode
       ? versionFromParts(features.major_version, features.minor_version, features.patch_version)
-      : null
+      : null,
+    previous?.bootloaderVersion
   );
   const boardVersion = firstMeaningfulVersion(
     features.onekey_board_version,
-    features.boardloader_version
+    features.boardloader_version,
+    previous?.boardVersion
+  );
+  const bleVersion = firstMeaningfulVersion(
+    features.onekey_ble_version,
+    features.ble_ver,
+    previous?.bleVersion
   );
-  const bleVersion = firstMeaningfulVersion(features.onekey_ble_version, features.ble_ver);
   const serialNo = features.onekey_serial_no || features.onekey_serial || features.serial_no || '';
   const bleName = features.onekey_ble_name || features.ble_name || null;
   const deviceType = getProtocolV1DeviceType(features);
@@ -148,7 +155,7 @@ export const buildProtocolV1FeaturesPayload = (
     vendor: features.vendor ?? null,
     deviceId: features.device_id ?? null,
     serialNo,
-    label: getProtocolV1Label(features, deviceType, bleName),
+    label: getProtocolV1Label(features),
     bleName,
     capabilities: features.capabilities ?? [],
     mode: getProtocolV1Mode(features),
@@ -168,48 +175,73 @@ export const buildProtocolV1FeaturesPayload = (
     sdProtection: features.sd_protection ?? null,
     wipeCodeProtection: features.wipe_code_protection ?? null,
     passphraseAlwaysOnDevice: features.passphrase_always_on_device ?? null,
+    attachToPinEnabled: features.attach_to_pin_user ?? previous?.attachToPinEnabled ?? null,
+    unlockedAttachPin: features.unlocked_attach_pin ?? previous?.unlockedAttachPin ?? undefined,
     safetyChecks: features.safety_checks ?? null,
     autoLockDelayMs: features.auto_lock_delay_ms ?? null,
+    autoShutdownDelayMs: features.auto_shutdown_delay_ms ?? null,
     displayRotation: features.display_rotation ?? null,
     experimentalFeatures: features.experimental_features ?? null,
+    wallpaperPath: previous?.wallpaperPath ?? null,
+    brightness: features.brightness_prcent ?? previous?.brightness ?? null,
+    animationEnabled: previous?.animationEnabled ?? null,
+    tapToWake: previous?.tapToWake ?? null,
+    hapticFeedback: features.haptic_feedback ?? previous?.hapticFeedback ?? null,
+    deviceNameDisplayEnabled: previous?.deviceNameDisplayEnabled ?? null,
+    airgapMode: previous?.airgapMode ?? null,
+    fidoEnabled: previous?.fidoEnabled ?? null,
+    usbLockEnabled: previous?.usbLockEnabled ?? null,
+    randomKeypad: previous?.randomKeypad ?? null,
     firmwareVersion,
     bootloaderVersion,
     boardVersion,
     bleVersion,
-    se01Version: firstMeaningfulVersion(features.onekey_se01_version),
-    se02Version: firstMeaningfulVersion(features.onekey_se02_version),
-    se03Version: firstMeaningfulVersion(features.onekey_se03_version),
-    se04Version: firstMeaningfulVersion(features.onekey_se04_version),
-    se01BootVersion: firstMeaningfulVersion(features.onekey_se01_boot_version),
-    se02BootVersion: firstMeaningfulVersion(features.onekey_se02_boot_version),
-    se03BootVersion: firstMeaningfulVersion(features.onekey_se03_boot_version),
-    se04BootVersion: firstMeaningfulVersion(features.onekey_se04_boot_version),
-    seVersion: features.se_ver ?? null,
+    se01Version: firstMeaningfulVersion(features.onekey_se01_version, previous?.se01Version),
+    se02Version: firstMeaningfulVersion(features.onekey_se02_version, previous?.se02Version),
+    se03Version: firstMeaningfulVersion(features.onekey_se03_version, previous?.se03Version),
+    se04Version: firstMeaningfulVersion(features.onekey_se04_version, previous?.se04Version),
+    se01BootVersion: firstMeaningfulVersion(
+      features.onekey_se01_boot_version,
+      previous?.se01BootVersion
+    ),
+    se02BootVersion: firstMeaningfulVersion(
+      features.onekey_se02_boot_version,
+      previous?.se02BootVersion
+    ),
+    se03BootVersion: firstMeaningfulVersion(
+      features.onekey_se03_boot_version,
+      previous?.se03BootVersion
+    ),
+    se04BootVersion: firstMeaningfulVersion(
+      features.onekey_se04_boot_version,
+      previous?.se04BootVersion
+    ),
+    seVersion: features.se_ver ?? previous?.seVersion ?? null,
     verify: {
-      firmwareBuildId: features.onekey_firmware_build_id,
-      firmwareHash: features.onekey_firmware_hash,
-      bootloaderBuildId: features.onekey_boot_build_id,
-      bootloaderHash: features.onekey_boot_hash,
-      boardBuildId: features.onekey_board_build_id,
-      boardHash: features.onekey_board_hash,
-      bleBuildId: features.onekey_ble_build_id,
-      bleHash: features.onekey_ble_hash,
-      se01BuildId: features.onekey_se01_build_id,
-      se01Hash: features.onekey_se01_hash,
-      se02BuildId: features.onekey_se02_build_id,
-      se02Hash: features.onekey_se02_hash,
-      se03BuildId: features.onekey_se03_build_id,
-      se03Hash: features.onekey_se03_hash,
-      se04BuildId: features.onekey_se04_build_id,
-      se04Hash: features.onekey_se04_hash,
-      se01BootBuildId: features.onekey_se01_boot_build_id,
-      se01BootHash: features.onekey_se01_boot_hash,
-      se02BootBuildId: features.onekey_se02_boot_build_id,
-      se02BootHash: features.onekey_se02_boot_hash,
-      se03BootBuildId: features.onekey_se03_boot_build_id,
-      se03BootHash: features.onekey_se03_boot_hash,
-      se04BootBuildId: features.onekey_se04_boot_build_id,
-      se04BootHash: features.onekey_se04_boot_hash,
+      firmwareBuildId: features.onekey_firmware_build_id ?? previous?.verify?.firmwareBuildId,
+      firmwareHash: features.onekey_firmware_hash ?? previous?.verify?.firmwareHash,
+      bootloaderBuildId: features.onekey_boot_build_id ?? previous?.verify?.bootloaderBuildId,
+      bootloaderHash: features.onekey_boot_hash ?? previous?.verify?.bootloaderHash,
+      boardBuildId: features.onekey_board_build_id ?? previous?.verify?.boardBuildId,
+      boardHash: features.onekey_board_hash ?? previous?.verify?.boardHash,
+      bleBuildId: features.onekey_ble_build_id ?? previous?.verify?.bleBuildId,
+      bleHash: features.onekey_ble_hash ?? previous?.verify?.bleHash,
+      se01BuildId: features.onekey_se01_build_id ?? previous?.verify?.se01BuildId,
+      se01Hash: features.onekey_se01_hash ?? previous?.verify?.se01Hash,
+      se02BuildId: features.onekey_se02_build_id ?? previous?.verify?.se02BuildId,
+      se02Hash: features.onekey_se02_hash ?? previous?.verify?.se02Hash,
+      se03BuildId: features.onekey_se03_build_id ?? previous?.verify?.se03BuildId,
+      se03Hash: features.onekey_se03_hash ?? previous?.verify?.se03Hash,
+      se04BuildId: features.onekey_se04_build_id ?? previous?.verify?.se04BuildId,
+      se04Hash: features.onekey_se04_hash ?? previous?.verify?.se04Hash,
+      se01BootBuildId: features.onekey_se01_boot_build_id ?? previous?.verify?.se01BootBuildId,
+      se01BootHash: features.onekey_se01_boot_hash ?? previous?.verify?.se01BootHash,
+      se02BootBuildId: features.onekey_se02_boot_build_id ?? previous?.verify?.se02BootBuildId,
+      se02BootHash: features.onekey_se02_boot_hash ?? previous?.verify?.se02BootHash,
+      se03BootBuildId: features.onekey_se03_boot_build_id ?? previous?.verify?.se03BootBuildId,
+      se03BootHash: features.onekey_se03_boot_hash ?? previous?.verify?.se03BootHash,
+      se04BootBuildId: features.onekey_se04_boot_build_id ?? previous?.verify?.se04BootBuildId,
+      se04BootHash: features.onekey_se04_boot_hash ?? previous?.verify?.se04BootHash,
     },
     sessionId,
     session_id: sessionId ?? undefined,
@@ -224,7 +256,7 @@ export const buildProtocolV1FeaturesPayload = (
  *
  * 这是 Device 内部唯一缓存状态。字段只来自 DeviceInfoGet 或前一次 features
  * 缓存的同名字段级合并；不存在协议等价语义的字段保持 null/空值，不再通过
- * DeviceProfile 或 transport path 做身份兜底。
+ * 统一 DeviceState 或 transport path 做身份兜底。
  */
 export const buildProtocolV2FeaturesPayload = ({
   deviceInfo,
@@ -241,31 +273,39 @@ export const buildProtocolV2FeaturesPayload = ({
   const fwBoard = info?.fw?.romloader;
   const bleApplication = info?.coprocessor?.application;
   const status = deviceStatus;
+  const incomingSerialNo = info?.hw?.serial_no;
+  const samePhysicalDevice =
+    !incomingSerialNo || !previous?.serialNo || incomingSerialNo === previous.serialNo;
+  const cached = samePhysicalDevice ? previous : undefined;
 
   const firmwareVersion = firstMeaningfulVersion(
     getImageVersion(fwApplication),
-    previous?.firmwareVersion
+    cached?.firmwareVersion
   );
   const bootloaderVersion = firstMeaningfulVersion(
     getImageVersion(fwBootloader),
-    previous?.bootloaderVersion
+    cached?.bootloaderVersion
   );
-  const boardVersion = firstMeaningfulVersion(getImageVersion(fwBoard), previous?.boardVersion);
-  const bleVersion = firstMeaningfulVersion(getImageVersion(bleApplication), previous?.bleVersion);
-  const deviceId = status?.device_id ?? null;
-  const serialNo = firstValue(info?.hw?.serial_no, previous?.serialNo) ?? '';
-  const label = previous?.label ?? null;
-  const bleName = firstValue(info?.coprocessor?.bt_adv_name, previous?.bleName);
-  const initialized = firstValue(status?.init_states, previous?.initialized) ?? null;
+  const boardVersion = firstMeaningfulVersion(getImageVersion(fwBoard), cached?.boardVersion);
+  const bleVersion = firstMeaningfulVersion(getImageVersion(bleApplication), cached?.bleVersion);
+  const deviceId = status?.device_id ?? cached?.deviceId ?? null;
+  const serialNo = firstValue(incomingSerialNo, cached?.serialNo) ?? '';
+  const label = cached?.label ?? null;
+  const bleName = firstValue(info?.coprocessor?.bt_adv_name, cached?.bleName);
+  const initialized = firstValue(status?.init_states, cached?.initialized) ?? null;
   // Pro2 在锁定状态下返回的 passphrase_enabled 不是最终钱包状态。
   // 只有完成 PIN 解锁后的 DeviceStatus 才能作为 passphrase 开关真值来源。
-  const passphraseProtection = status?.unlocked === true ? status.passphrase_enabled ?? null : null;
-  const language = previous?.language ?? null;
-  const backupRequired = firstValue(status?.backup_required, previous?.backupRequired) ?? null;
-  const bleEnabled = previous?.bleEnabled;
-  const unlocked = firstValue(status?.unlocked, previous?.unlocked) ?? null;
-  const attachToPinEnabled = status?.attach_to_pin_enabled ?? null;
-  const unlockedAttachPin = status?.unlocked_by_attach_to_pin ?? undefined;
+  let passphraseProtection = cached?.passphraseProtection ?? null;
+  if (status?.unlocked === true) {
+    passphraseProtection = status.passphrase_enabled ?? null;
+  }
+  const language = cached?.language ?? null;
+  const backupRequired = firstValue(status?.backup_required, cached?.backupRequired) ?? null;
+  const bleEnabled = cached?.bleEnabled;
+  const unlocked = firstValue(status?.unlocked, cached?.unlocked) ?? null;
+  const attachToPinEnabled = status?.attach_to_pin_enabled ?? cached?.attachToPinEnabled ?? null;
+  const unlockedAttachPin =
+    status?.unlocked_by_attach_to_pin ?? cached?.unlockedAttachPin ?? undefined;
   const romloaderMode = isProtocolV2RomloaderDeviceInfo(info, status);
   const bootloaderMode = isProtocolV2BootloaderDeviceInfo(info, status);
   let mode: DeviceFeaturesMode = 'unknown';
@@ -277,13 +317,19 @@ export const buildProtocolV2FeaturesPayload = ({
     mode = 'notInitialized';
   } else if (initialized === true) {
     mode = 'normal';
+  } else if (cached?.mode === 'notInitialized' || cached?.mode === 'backupMode') {
+    mode = cached.mode;
+  } else if (info) {
+    mode = 'normal';
+  } else if (cached?.mode) {
+    mode = cached.mode;
   }
 
   return {
     protocol: 'V2',
-    protocolVersion: deviceInfo?.protocol_version ?? previous?.protocolVersion ?? null,
+    protocolVersion: deviceInfo?.protocol_version ?? cached?.protocolVersion ?? null,
     deviceType: EDeviceType.Pro2,
-    firmwareType: previous?.firmwareType ?? EFirmwareType.Universal,
+    firmwareType: cached?.firmwareType ?? EFirmwareType.Universal,
     model: 'pro2',
     vendor: 'onekey.so',
     deviceId,
@@ -295,7 +341,7 @@ export const buildProtocolV2FeaturesPayload = ({
     initialized,
     bootloaderMode,
     unlocked,
-    firmwarePresent: previous?.firmwarePresent ?? null,
+    firmwarePresent: cached?.firmwarePresent ?? null,
     passphraseProtection,
     pinProtection: null,
     backupRequired,
@@ -310,80 +356,91 @@ export const buildProtocolV2FeaturesPayload = ({
     passphraseAlwaysOnDevice: null,
     attachToPinEnabled,
     safetyChecks: null,
-    autoLockDelayMs: null,
+    autoLockDelayMs: cached?.autoLockDelayMs ?? null,
+    autoShutdownDelayMs: cached?.autoShutdownDelayMs ?? null,
     displayRotation: null,
-    experimentalFeatures: null,
+    experimentalFeatures: cached?.experimentalFeatures ?? null,
+    wallpaperPath: cached?.wallpaperPath ?? null,
+    brightness: cached?.brightness ?? null,
+    animationEnabled: cached?.animationEnabled ?? null,
+    tapToWake: cached?.tapToWake ?? null,
+    hapticFeedback: cached?.hapticFeedback ?? null,
+    deviceNameDisplayEnabled: cached?.deviceNameDisplayEnabled ?? null,
+    airgapMode: cached?.airgapMode ?? null,
+    fidoEnabled: cached?.fidoEnabled ?? null,
+    usbLockEnabled: cached?.usbLockEnabled ?? null,
+    randomKeypad: cached?.randomKeypad ?? null,
     firmwareVersion,
     bootloaderVersion,
     boardVersion,
     bleVersion,
     se01Version: firstMeaningfulVersion(
       getImageVersion(info?.se1?.application),
-      previous?.se01Version
+      cached?.se01Version
     ),
     se02Version: firstMeaningfulVersion(
       getImageVersion(info?.se2?.application),
-      previous?.se02Version
+      cached?.se02Version
     ),
     se03Version: firstMeaningfulVersion(
       getImageVersion(info?.se3?.application),
-      previous?.se03Version
+      cached?.se03Version
     ),
     se04Version: firstMeaningfulVersion(
       getImageVersion(info?.se4?.application),
-      previous?.se04Version
+      cached?.se04Version
     ),
     se01BootVersion: firstMeaningfulVersion(
       getImageVersion(info?.se1?.bootloader),
-      previous?.se01BootVersion
+      cached?.se01BootVersion
     ),
     se02BootVersion: firstMeaningfulVersion(
       getImageVersion(info?.se2?.bootloader),
-      previous?.se02BootVersion
+      cached?.se02BootVersion
     ),
     se03BootVersion: firstMeaningfulVersion(
       getImageVersion(info?.se3?.bootloader),
-      previous?.se03BootVersion
+      cached?.se03BootVersion
     ),
     se04BootVersion: firstMeaningfulVersion(
       getImageVersion(info?.se4?.bootloader),
-      previous?.se04BootVersion
+      cached?.se04BootVersion
     ),
-    seVersion: previous?.seVersion ?? null,
+    seVersion: cached?.seVersion ?? null,
     verify: {
-      firmwareBuildId: getImageBuildId(fwApplication) ?? previous?.verify?.firmwareBuildId,
-      firmwareHash: getImageHash(fwApplication) ?? previous?.verify?.firmwareHash,
-      bootloaderBuildId: getImageBuildId(fwBootloader) ?? previous?.verify?.bootloaderBuildId,
-      bootloaderHash: getImageHash(fwBootloader) ?? previous?.verify?.bootloaderHash,
-      boardBuildId: getImageBuildId(fwBoard) ?? previous?.verify?.boardBuildId,
-      boardHash: getImageHash(fwBoard) ?? previous?.verify?.boardHash,
-      bleBuildId: getImageBuildId(bleApplication) ?? previous?.verify?.bleBuildId,
-      bleHash: getImageHash(bleApplication) ?? previous?.verify?.bleHash,
-      se01BuildId: getImageBuildId(info?.se1?.application) ?? previous?.verify?.se01BuildId,
-      se01Hash: getImageHash(info?.se1?.application) ?? previous?.verify?.se01Hash,
-      se02BuildId: getImageBuildId(info?.se2?.application) ?? previous?.verify?.se02BuildId,
-      se02Hash: getImageHash(info?.se2?.application) ?? previous?.verify?.se02Hash,
-      se03BuildId: getImageBuildId(info?.se3?.application) ?? previous?.verify?.se03BuildId,
-      se03Hash: getImageHash(info?.se3?.application) ?? previous?.verify?.se03Hash,
-      se04BuildId: getImageBuildId(info?.se4?.application) ?? previous?.verify?.se04BuildId,
-      se04Hash: getImageHash(info?.se4?.application) ?? previous?.verify?.se04Hash,
-      se01BootBuildId: getImageBuildId(info?.se1?.bootloader) ?? previous?.verify?.se01BootBuildId,
-      se01BootHash: getImageHash(info?.se1?.bootloader) ?? previous?.verify?.se01BootHash,
-      se02BootBuildId: getImageBuildId(info?.se2?.bootloader) ?? previous?.verify?.se02BootBuildId,
-      se02BootHash: getImageHash(info?.se2?.bootloader) ?? previous?.verify?.se02BootHash,
-      se03BootBuildId: getImageBuildId(info?.se3?.bootloader) ?? previous?.verify?.se03BootBuildId,
-      se03BootHash: getImageHash(info?.se3?.bootloader) ?? previous?.verify?.se03BootHash,
-      se04BootBuildId: getImageBuildId(info?.se4?.bootloader) ?? previous?.verify?.se04BootBuildId,
-      se04BootHash: getImageHash(info?.se4?.bootloader) ?? previous?.verify?.se04BootHash,
+      firmwareBuildId: getImageBuildId(fwApplication) ?? cached?.verify?.firmwareBuildId,
+      firmwareHash: getImageHash(fwApplication) ?? cached?.verify?.firmwareHash,
+      bootloaderBuildId: getImageBuildId(fwBootloader) ?? cached?.verify?.bootloaderBuildId,
+      bootloaderHash: getImageHash(fwBootloader) ?? cached?.verify?.bootloaderHash,
+      boardBuildId: getImageBuildId(fwBoard) ?? cached?.verify?.boardBuildId,
+      boardHash: getImageHash(fwBoard) ?? cached?.verify?.boardHash,
+      bleBuildId: getImageBuildId(bleApplication) ?? cached?.verify?.bleBuildId,
+      bleHash: getImageHash(bleApplication) ?? cached?.verify?.bleHash,
+      se01BuildId: getImageBuildId(info?.se1?.application) ?? cached?.verify?.se01BuildId,
+      se01Hash: getImageHash(info?.se1?.application) ?? cached?.verify?.se01Hash,
+      se02BuildId: getImageBuildId(info?.se2?.application) ?? cached?.verify?.se02BuildId,
+      se02Hash: getImageHash(info?.se2?.application) ?? cached?.verify?.se02Hash,
+      se03BuildId: getImageBuildId(info?.se3?.application) ?? cached?.verify?.se03BuildId,
+      se03Hash: getImageHash(info?.se3?.application) ?? cached?.verify?.se03Hash,
+      se04BuildId: getImageBuildId(info?.se4?.application) ?? cached?.verify?.se04BuildId,
+      se04Hash: getImageHash(info?.se4?.application) ?? cached?.verify?.se04Hash,
+      se01BootBuildId: getImageBuildId(info?.se1?.bootloader) ?? cached?.verify?.se01BootBuildId,
+      se01BootHash: getImageHash(info?.se1?.bootloader) ?? cached?.verify?.se01BootHash,
+      se02BootBuildId: getImageBuildId(info?.se2?.bootloader) ?? cached?.verify?.se02BootBuildId,
+      se02BootHash: getImageHash(info?.se2?.bootloader) ?? cached?.verify?.se02BootHash,
+      se03BootBuildId: getImageBuildId(info?.se3?.bootloader) ?? cached?.verify?.se03BootBuildId,
+      se03BootHash: getImageHash(info?.se3?.bootloader) ?? cached?.verify?.se03BootHash,
+      se04BootBuildId: getImageBuildId(info?.se4?.bootloader) ?? cached?.verify?.se04BootBuildId,
+      se04BootHash: getImageHash(info?.se4?.bootloader) ?? cached?.verify?.se04BootHash,
     },
-    sessionId: previous?.sessionId ?? null,
+    sessionId: cached?.sessionId ?? null,
     device_id: deviceId ?? undefined,
-    session_id: previous?.sessionId ?? undefined,
+    session_id: cached?.sessionId ?? undefined,
     ble_name: bleName ?? undefined,
     onekey_device_type: 'PRO2',
     passphrase_protection: passphraseProtection ?? undefined,
     bootloader_mode: bootloaderMode,
-    passphraseState: previous?.passphraseState,
+    passphraseState: cached?.passphraseState,
     unlockedAttachPin,
     raw: {
       protocolV2DeviceInfo: deviceInfo,

package/src/deviceProfile/index.ts

@@ -1,4 +1,3 @@
-export { buildProfileFromProtocolV1, buildProfileFromProtocolV2 } from './buildDeviceProfile';
 export {
   buildProtocolV1FeaturesPayload,
   buildProtocolV2FeaturesPayload,

package/src/events/device.ts

@@ -1,6 +1,11 @@
 import type { MessageFactoryFn } from './utils';
 import type { PROTO } from '../constants';
-import type { KnownDevice as Device, Features, SupportFeatures } from '../types/device';
+import type {
+  KnownDevice as Device,
+  DeviceStateEvent,
+  Features,
+  SupportFeatures,
+} from '../types/device';
 
 export const DEVICE_EVENT = 'DEVICE_EVENT';
 export const DEVICE = {
@@ -30,6 +35,7 @@ export const DEVICE = {
   SELECT_DEVICE_FOR_SWITCH_FIRMWARE_WEB_DEVICE: 'select_device_for_switch_firmware_web_device',
 
   FEATURES: 'features',
+  STATE: 'state',
 } as const;
 
 export interface DeviceConnnectRequest {
@@ -65,6 +71,11 @@ export interface DeviceSendFeatures {
   payload: DeviceFeaturesPayload;
 }
 
+export interface DeviceSendState {
+  type: typeof DEVICE.STATE;
+  payload: DeviceStateEvent;
+}
+
 export type DeviceSupportFeaturesPayload = SupportFeatures & { device: Device | null };
 export interface DeviceSendSupportFeatures {
   type: typeof DEVICE.SUPPORT_FEATURES;
@@ -73,6 +84,7 @@ export interface DeviceSendSupportFeatures {
 
 export type DeviceEvent =
   | DeviceButtonRequest
+  | DeviceSendState
   | DeviceSendFeatures
   | DeviceSendSupportFeatures
   | DeviceDisconnnectRequest

package/src/events/logBlockEvent.ts

@@ -5,7 +5,7 @@ export const LogBlockEvent: Set<string> = new Set([
   UI_RESPONSE.RECEIVE_PASSPHRASE,
 ]);
 
-const LogBlockMethod: Set<string> = new Set(['evmSignTypedData']);
+const LogBlockMethod: Set<string> = new Set(['evmSignTypedData', 'deviceSessionOpen']);
 
 export function getLogBlockLabel(message: unknown): string | undefined {
   if (!message || typeof message !== 'object') return undefined;

package/src/inject.ts

@@ -114,7 +114,10 @@ export const createCoreApi = (
    * 获取设备信息
    */
   getFeatures: (connectId, params) => call({ ...params, connectId, method: 'getFeatures' }),
-  getDeviceInfo: (connectId, params) => call({ ...params, connectId, method: 'getDeviceInfo' }),
+  getDeviceState: (connectId, params) => {
+    const { refresh: _refresh, includeRaw: _includeRaw, ...commonParams } = (params ?? {}) as any;
+    return call({ ...commonParams, connectId, method: 'getDeviceState' });
+  },
   getOnekeyFeatures: (connectId, params) =>
     call({ ...params, connectId, method: 'getOnekeyFeatures' }),
 
@@ -160,8 +163,6 @@ export const createCoreApi = (
     call({ ...params, connectId, method: 'protocolInfoRequest' }),
   ping: (connectId, params) => call({ ...params, connectId, method: 'ping' }),
   deviceReboot: (connectId, params) => call({ ...params, connectId, method: 'deviceReboot' }),
-  deviceInfoGet: (connectId, params) => call({ ...params, connectId, method: 'deviceInfoGet' }),
-  deviceStatusGet: (connectId, params) => call({ ...params, connectId, method: 'deviceStatusGet' }),
   deviceGetOnboardingStatus: (connectId, params) =>
     call({ ...params, connectId, method: 'deviceGetOnboardingStatus' }),
   deviceSessionOpen: (connectId, params) =>
@@ -174,8 +175,6 @@ export const createCoreApi = (
     call({ ...params, connectId, method: 'deviceFactoryInfoSet' }),
   deviceFactoryInfoGet: (connectId, params) =>
     call({ ...params, connectId, method: 'deviceFactoryInfoGet' }),
-  deviceSettingsGet: (connectId, params) =>
-    call({ ...params, connectId, method: 'deviceSettingsGet' }),
   deviceSettingsSet: (connectId, params) =>
     call({ ...params, connectId, method: 'deviceSettingsSet' }),
   deviceSettingsPageShow: (connectId, params) =>

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

@@ -32,7 +32,7 @@ const normalizeEnumValue = <T extends Record<string | number, string | number>>(
 
 /**
  * DeviceSEInfo.state → 可读标签。SDK 内唯一的 SE 状态映射实现，
- * DeviceProfile 与标准 Features 构建都从这里取。
+ * DeviceState Mapper 与老协议 Features 兼容投影都从这里取。
  */
 export const getProtocolV2SeState = (se?: DeviceSEInfo): ProtocolV2SeStateLabel | null => {
   const label = normalizeEnumValue(DeviceSEState, se?.state);
@@ -49,7 +49,7 @@ export const getProtocolV2SeState = (se?: DeviceSEInfo): ProtocolV2SeStateLabel
 };
 
 /**
- * DeviceSEInfo.type → 可读标签（如 'THD89'）。DeviceProfile / Features
+ * DeviceSEInfo.type → 可读标签（如 'THD89'）。DeviceState / Features
  * 的 SE 类型归一化从这里取。
  */
 export const getProtocolV2SeType = (se?: DeviceSEInfo): string | null =>
@@ -58,8 +58,10 @@ export const getProtocolV2SeType = (se?: DeviceSEInfo): string | null =>
 /**
  * 兼容尚未提供显式 runtime mode 的 Protocol V2 固件。
  *
- * 当前 romloader 只上报 hw、fw.romloader 和 fw.bootloader；bootloader
- * 还会上报 application/application_data、coprocessor 或 SE 信息。
+ * 当前 romloader 只上报 hw、fw.romloader 和 fw.bootloader。普通版本读取也会
+ * 返回 SE 信息，因此 SE 不能作为 bootloader 判据；在没有显式 runtime mode 的
+ * 兼容固件上，只能把缺少 application/application_data 的非-romloader 形态视为
+ * bootloader。
  */
 export const isProtocolV2RomloaderDeviceInfo = (
   deviceInfo?: ProtocolV2DeviceInfo | null,
@@ -82,7 +84,16 @@ export const isProtocolV2BootloaderDeviceInfo = (
 ) =>
   !!deviceInfo &&
   deviceStatus == null &&
-  !isProtocolV2RomloaderDeviceInfo(deviceInfo, deviceStatus);
+  !isProtocolV2RomloaderDeviceInfo(deviceInfo, deviceStatus) &&
+  deviceInfo.fw?.application == null &&
+  deviceInfo.fw?.application_data == null;
+
+export const isProtocolV2LoaderDeviceInfo = (
+  deviceInfo?: ProtocolV2DeviceInfo | null,
+  deviceStatus?: DeviceStatus | null
+) =>
+  isProtocolV2RomloaderDeviceInfo(deviceInfo, deviceStatus) ||
+  isProtocolV2BootloaderDeviceInfo(deviceInfo, deviceStatus);
 
 export const PROTOCOL_V2_FEATURES_DEVICE_INFO_REQUEST = {
   targets: {
@@ -97,10 +108,8 @@ export const PROTOCOL_V2_FEATURES_DEVICE_INFO_REQUEST = {
 };
 
 /**
- * 轻量状态刷新请求（每次 run 前使用）。
- *
- * status 提供 init_states / passphrase_enabled 等会在设备端变化的字段；
- * hw / coprocessor 提供 serialNo / bleName 等身份字段；不含 fw/SE targets，单帧请求开销很小。
+ * 固件升级完成后的版本探测请求。
+ * 仅读取硬件与各固件组件信息，不隐式请求 DeviceStatus。
  */
 export const PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST = {
   targets: {

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

@@ -4,6 +4,7 @@ export {
   PROTOCOL_V2_FEATURES_DEVICE_INFO_REQUEST,
   PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST,
   isProtocolV2BootloaderDeviceInfo,
+  isProtocolV2LoaderDeviceInfo,
   isProtocolV2RomloaderDeviceInfo,
   getProtocolV2SeState,
   getProtocolV2SeType,

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

@@ -123,12 +123,14 @@ export async function getProtocolV2WalletSession(
   const expectedPassphraseState = options?.expectedPassphraseState ?? device.passphraseState;
 
   try {
-    // 锁屏时的 passphrase_enabled 不可信。先完成 PIN 解锁，unlockDevice 会立即
-    // 获取并合并一份新的 DeviceStatus，之后再决定打开主钱包还是隐藏钱包。
+    // 锁屏时先完成 PIN 解锁；解锁成功只更新已确认的 unlocked 字段，
+    // 不为了补全状态隐式轮询 DeviceStatus。
     if (device.features?.unlocked === false) {
       await device.unlockDevice();
     }
 
+    // 标准钱包不需要 DeviceSession。锁屏时先解锁刷新状态，
+    // 确认未开启 passphrase 后不得再生成或传递隐藏钱包 passphraseState。
     if (options?.onlyMainPin || device.getCurrentPassphraseProtection() === false) {
       return {
         passphraseState: undefined,
@@ -172,16 +174,12 @@ export async function getProtocolV2WalletSession(
       throw ERRORS.TypedError(HardwareErrorCode.DeviceCheckPassphraseStateError);
     }
 
-    if (message.btc_test_address && device.getCurrentPassphraseProtection() !== true) {
-      await refreshProtocolV2DeviceStatus(device);
-    }
-
     device.updateInternalState(
       true,
       message.btc_test_address,
       device.getCurrentDeviceId(),
       message.session_id,
-      options?.initSession ? null : device.features?.sessionId
+      options?.initSession ? null : device.features?.sessionId ?? null
     );
 
     return {

package/src/types/api/deviceSettings.ts

@@ -14,7 +14,15 @@ export type DeviceSettingsParams = {
   experimentalFeatures?: boolean;
   autoShutdownDelayMs?: number;
   changeBrightness?: boolean;
+  brightness?: number;
   hapticFeedback?: boolean;
+  bluetoothEnabled?: boolean;
+  animationEnabled?: boolean;
+  tapToWake?: boolean;
+  deviceNameDisplayEnabled?: boolean;
+  fidoEnabled?: boolean;
+  usbLockEnabled?: boolean;
+  randomKeypad?: boolean;
 };
 
 export declare function deviceSettings(