@onekeyfe/hd-core 1.2.0-alpha.17 → 1.2.0-alpha.170

package/src/deviceProfile/buildDeviceFeatures.ts

@@ -1,9 +1,21 @@
-import { EDeviceType, EFirmwareType } from '@onekeyfe/hd-shared';
+import {
+  EDeviceType,
+  EFirmwareType,
+  canonicalizePro2BleAdvertisementName,
+} from '@onekeyfe/hd-shared';
 
 import {
-  isProtocolV2BootloaderDeviceInfo,
-  isProtocolV2RomloaderDeviceInfo,
-} from '../protocols/protocol-v2/features';
+  resolveDeviceBleFirmwareVersion,
+  resolveDeviceBleName,
+  resolveDeviceBoardVersion,
+  resolveDeviceBootloaderVersion,
+  resolveDeviceFirmwareType,
+  resolveDeviceFirmwareVersion,
+  resolveDeviceSerialNo,
+  resolveDeviceType,
+} from '../utils/deviceFeaturesCompat';
+import { normalizeSafetyCheckLevel } from '../utils/deviceSettings';
+import { resolveProtocolV2DeviceIdentity } from './protocolV2DeviceIdentity';
 
 import type {
   DeviceFirmwareImageInfo,
@@ -11,6 +23,7 @@ import type {
   ProtocolV2DeviceInfo,
 } from '@onekeyfe/hd-transport';
 import type { PROTO } from '../constants';
+import type { ProtocolV2RuntimeMode } from '../protocols/protocol-v2/features';
 import type { DeviceFeaturesMode, Features } from '../types';
 
 type ProtocolV1FeaturesCompat = PROTO.Features &
@@ -46,70 +59,15 @@ const firstValue = <T>(...values: Array<T | null | undefined>) =>
 const firstMeaningfulVersion = (...versions: Array<string | null | undefined>) =>
   versions.find(version => Boolean(version && version !== '0.0.0')) ?? null;
 
-const versionFromParts = (major?: number | null, minor?: number | null, patch?: number | null) =>
-  [major, minor, patch].map(part => Number(part) || 0).join('.');
-
 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'] => {
-  const onekeyDeviceType = features.onekey_device_type as string | null | undefined;
-  switch (onekeyDeviceType) {
-    case 'CLASSIC':
-      return EDeviceType.Classic;
-    case 'CLASSIC1S':
-      return EDeviceType.Classic1s;
-    case 'MINI':
-      return EDeviceType.Mini;
-    case 'TOUCH':
-      return EDeviceType.Touch;
-    case 'PRO':
-      return EDeviceType.Pro;
-    case 'PRO2':
-    case 'pro2':
-      return EDeviceType.Pro2;
-    case 'PURE':
-      return EDeviceType.ClassicPure;
-    default:
-      break;
-  }
-
-  const serialNo = features.onekey_serial_no || features.onekey_serial || features.serial_no || '';
-  const prefix = serialNo.slice(0, 2).toLowerCase();
-  if (prefix === 'bi' || prefix === 'cl') return EDeviceType.Classic;
-  if (prefix === 'cp') return EDeviceType.ClassicPure;
-  if (prefix === 'mi') return EDeviceType.Mini;
-  if (prefix === 'tc') return EDeviceType.Touch;
-  if (prefix === 'pr') return EDeviceType.Pro;
-  if (prefix === 'p2') return EDeviceType.Pro2;
-  if (!serialNo && features.bootloader_mode === true && features.model === '1') {
-    return EDeviceType.Classic;
-  }
-  return EDeviceType.Unknown;
-};
-
-const getProtocolV1FirmwareType = (
-  features: ProtocolV1FeaturesCompat
-): Features['firmwareType'] => {
-  if (features.fw_vendor === 'OneKey Bitcoin-only') 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,
@@ -117,25 +75,24 @@ export const buildProtocolV1FeaturesPayload = (
 ): Features => {
   const features = protocolV1Features as ProtocolV1FeaturesCompat;
   const firmwareVersion = firstMeaningfulVersion(
-    features.onekey_firmware_version,
-    features.onekey_version,
-    versionFromParts(features.major_version, features.minor_version, features.patch_version)
+    resolveDeviceFirmwareVersion(features),
+    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
+    resolveDeviceBootloaderVersion(features),
+    previous?.bootloaderVersion
   );
   const boardVersion = firstMeaningfulVersion(
-    features.onekey_board_version,
-    features.boardloader_version
+    resolveDeviceBoardVersion(features),
+    previous?.boardVersion
+  );
+  const bleVersion = firstMeaningfulVersion(
+    resolveDeviceBleFirmwareVersion(features),
+    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);
+  const serialNo = resolveDeviceSerialNo(features);
+  const bleName = resolveDeviceBleName(features);
+  const deviceType = resolveDeviceType(features);
   const sessionId = features.session_id ?? previous?.sessionId ?? null;
 
   return {
@@ -143,12 +100,12 @@ export const buildProtocolV1FeaturesPayload = (
     protocol: 'V1',
     protocolVersion: features.protocol_version ?? previous?.protocolVersion ?? 1,
     deviceType,
-    firmwareType: getProtocolV1FirmwareType(features),
+    firmwareType: resolveDeviceFirmwareType(features),
     model: features.model ?? null,
     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 +125,73 @@ export const buildProtocolV1FeaturesPayload = (
     sdProtection: features.sd_protection ?? null,
     wipeCodeProtection: features.wipe_code_protection ?? null,
     passphraseAlwaysOnDevice: features.passphrase_always_on_device ?? null,
-    safetyChecks: features.safety_checks ?? null,
+    attachToPinEnabled: features.attach_to_pin_user ?? previous?.attachToPinEnabled ?? null,
+    unlockedAttachPin: features.unlocked_attach_pin ?? previous?.unlockedAttachPin ?? undefined,
+    safetyChecks: normalizeSafetyCheckLevel(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,
@@ -220,71 +202,89 @@ export const buildProtocolV1FeaturesPayload = (
 };
 
 /**
- * Protocol V2 的结构化 `Features` 构建器。
+ * Structured Protocol V2 `Features` builder.
  *
- * 这是 Device 内部唯一缓存状态。字段只来自 DeviceInfoGet 或前一次 features
- * 缓存的同名字段级合并；不存在协议等价语义的字段保持 null/空值，不再通过
- * DeviceProfile 或 transport path 做身份兜底。
+ * This is the only cached Device state. Fields come from DeviceInfoGet or same-name
+ * values in the previous cache. Fields without protocol-equivalent meaning remain
+ * null or empty and never fall back to DeviceState or a transport path.
  */
 export const buildProtocolV2FeaturesPayload = ({
   deviceInfo,
   deviceStatus,
   previous,
+  runtimeMode,
 }: {
   deviceInfo?: ProtocolV2DeviceInfo;
   deviceStatus?: DeviceStatus;
   previous?: Features;
+  runtimeMode?: ProtocolV2RuntimeMode;
 }): Features => {
   const info = deviceInfo;
-  const fwApplication = info?.fw?.application;
-  const fwBootloader = info?.fw?.bootloader;
-  const fwBoard = info?.fw?.romloader;
+  const fwApplication = info?.main_mcu?.application;
+  const fwBootloader = info?.main_mcu?.bootloader;
+  const fwBoard = info?.main_mcu?.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 incomingDeviceType = info?.hw?.Device_type;
+  const resolvedIdentity = resolveProtocolV2DeviceIdentity(incomingDeviceType);
+  const cachedIdentity =
+    incomingDeviceType === undefined || incomingDeviceType === null ? cached : undefined;
+  const deviceType = cachedIdentity ? cachedIdentity.deviceType : resolvedIdentity.deviceType;
+  const model = cachedIdentity ? cachedIdentity.model : resolvedIdentity.model;
 
   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;
-  // 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;
-  const romloaderMode = isProtocolV2RomloaderDeviceInfo(info, status);
-  const bootloaderMode = isProtocolV2BootloaderDeviceInfo(info, status);
+  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 rawBleName = firstValue(info?.coprocessor?.bt_adv_name, cached?.bleName);
+  const bleName = rawBleName ? canonicalizePro2BleAdvertisementName(rawBleName) : rawBleName;
+  const initialized = firstValue(status?.init_states, cached?.initialized) ?? null;
+  // passphrase_enabled from a locked Pro2 is not authoritative. Only DeviceStatus
+  // after PIN unlock can determine the final passphrase setting.
+  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 bootloaderMode = runtimeMode === 'bootloader' || runtimeMode === 'romloader';
   let mode: DeviceFeaturesMode = 'unknown';
-  if (romloaderMode) {
-    mode = 'romloader';
-  } else if (bootloaderMode) {
-    mode = 'bootloader';
+  if (runtimeMode) {
+    mode = runtimeMode;
   } else if (initialized === false) {
     mode = 'notInitialized';
   } else if (initialized === true) {
     mode = 'normal';
+  } else if (cached?.mode === 'notInitialized' || cached?.mode === 'backupMode') {
+    mode = cached.mode;
+  } else if (cached?.mode) {
+    mode = cached.mode;
   }
 
   return {
     protocol: 'V2',
-    protocolVersion: deviceInfo?.protocol_version ?? previous?.protocolVersion ?? null,
-    deviceType: EDeviceType.Pro2,
-    firmwareType: previous?.firmwareType ?? EFirmwareType.Universal,
-    model: 'pro2',
+    protocolVersion: deviceInfo?.protocol_version ?? cached?.protocolVersion ?? null,
+    deviceType,
+    firmwareType: cached?.firmwareType ?? EFirmwareType.Universal,
+    model,
     vendor: 'onekey.so',
     deviceId,
     serialNo,
@@ -295,7 +295,7 @@ export const buildProtocolV2FeaturesPayload = ({
     initialized,
     bootloaderMode,
     unlocked,
-    firmwarePresent: previous?.firmwarePresent ?? null,
+    firmwarePresent: cached?.firmwarePresent ?? null,
     passphraseProtection,
     pinProtection: null,
     backupRequired,
@@ -310,80 +310,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',
+    onekey_device_type: deviceType === EDeviceType.Unknown ? undefined : deviceType.toUpperCase(),
     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/deviceProfile/protocolV2DeviceIdentity.ts

@@ -0,0 +1,35 @@
+import { EDeviceType } from '@onekeyfe/hd-shared';
+import { DeviceType } from '@onekeyfe/hd-transport';
+
+export const resolveProtocolV2DeviceIdentity = (
+  deviceType?: DeviceType | keyof typeof DeviceType | null
+): { deviceType: EDeviceType; model: string | null } => {
+  switch (deviceType) {
+    case DeviceType.CLASSIC1:
+    case 'CLASSIC1':
+      return { deviceType: EDeviceType.Classic, model: 'classic' };
+    case DeviceType.CLASSIC1S:
+    case 'CLASSIC1S':
+      return { deviceType: EDeviceType.Classic1s, model: 'classic1s' };
+    case DeviceType.CLASSIC1S_PURE:
+    case 'CLASSIC1S_PURE':
+      return { deviceType: EDeviceType.ClassicPure, model: 'classicpure' };
+    case DeviceType.MINI:
+    case 'MINI':
+      return { deviceType: EDeviceType.Mini, model: 'mini' };
+    case DeviceType.TOUCH:
+    case 'TOUCH':
+      return { deviceType: EDeviceType.Touch, model: 'touch' };
+    case DeviceType.PRO:
+    case 'PRO':
+      return { deviceType: EDeviceType.Pro, model: 'pro' };
+    case DeviceType.PRO2:
+    case 'PRO2':
+      return { deviceType: EDeviceType.Pro2, model: 'pro2' };
+    case DeviceType.NEO:
+    case 'NEO':
+      return { deviceType: EDeviceType.Neo, model: 'neo' };
+    default:
+      return { deviceType: EDeviceType.Unknown, model: null };
+  }
+};

package/src/events/call.ts

@@ -53,12 +53,6 @@ export interface IFrameCancelMessage {
   payload: { connectId?: string };
 }
 
-export interface IFrameCancelOperationMessage {
-  event: typeof IFRAME.CANCEL_OPERATION;
-  type: typeof IFRAME.CANCEL_OPERATION;
-  payload: { operationId: string };
-}
-
 export interface IFrameSwitchTransportMessage {
   event: typeof IFRAME.SWITCH_TRANSPORT;
   type: typeof IFRAME.SWITCH_TRANSPORT;

package/src/events/core.ts

@@ -5,7 +5,6 @@ import type {
   IFrameCallMessage,
   IFrameCallbackMessage,
   IFrameCancelMessage,
-  IFrameCancelOperationMessage,
   IFrameSwitchTransportMessage,
 } from './call';
 import type { DeviceEventMessage } from './device';
@@ -24,7 +23,6 @@ export type CoreMessage = {
   | IFrameEventMessage
   | IFrameCallMessage
   | IFrameCancelMessage
-  | IFrameCancelOperationMessage
   | IFrameSwitchTransportMessage
   | IFrameCallbackMessage
   | UiResponseMessage