@onekeyfe/hd-core 1.2.0-alpha.2 → 1.2.0-alpha.4

package/src/data-manager/DataManager.ts

@@ -34,6 +34,7 @@ const Log = getLogger(LoggerNames.Core);
 
 export const FIRMWARE_FIELDS = [
   'firmware',
+  'firmware-v1',
   'firmware-v2',
   'firmware-v8',
   'firmware-btc-v8',
@@ -46,6 +47,7 @@ export type ProtobufMessageSchema = ProtocolV1MessageSchema | 'v2Schema';
 
 const FIRMWARE_FIELD_TYPE_MAP: Readonly<Record<IFirmwareField, EFirmwareType>> = {
   firmware: EFirmwareType.Universal,
+  'firmware-v1': EFirmwareType.Universal,
   'firmware-v2': EFirmwareType.Universal,
   'firmware-v8': EFirmwareType.Universal,
   'firmware-btc-v8': EFirmwareType.BitcoinOnly,
@@ -87,6 +89,10 @@ export default class DataManager {
       firmware: [],
       ble: [],
     },
+    [EDeviceType.Pro2]: {
+      firmware: [],
+      ble: [],
+    },
     [EDeviceType.ClassicPure]: {
       firmware: [],
       ble: [],
@@ -447,6 +453,7 @@ export default class DataManager {
         [EDeviceType.Mini]: this.enrichFirmwareReleaseInfo(data.mini),
         [EDeviceType.Touch]: this.enrichFirmwareReleaseInfo(data.touch),
         [EDeviceType.Pro]: this.enrichFirmwareReleaseInfo(data.pro),
+        [EDeviceType.Pro2]: this.enrichFirmwareReleaseInfo(data.pro2),
       };
       this.assets = {
         bridge: data.bridge,

package/src/device/Device.ts

@@ -76,6 +76,7 @@ export type InitOptions = {
   passphraseState?: string;
   deriveCardano?: boolean;
   connectProtocol?: HardwareConnectProtocol;
+  protocolV2DeviceInfoTimeoutMs?: number;
 };
 
 export type RunOptions = {
@@ -187,7 +188,7 @@ export class Device extends EventEmitter {
   /**
    * 唯一设备状态缓存。
    *
-   * V1 直接保存原生 Features；V2 保存由 DevGetDeviceInfo 映射出的
+   * V1 直接保存原生 Features；V2 保存由 DeviceInfoGet 映射出的
    * Features 视图。Device 不再保存 profile，结构化 DeviceProfile 只作为
    * getDeviceInfo() 的 API 返回值存在。
    */
@@ -197,7 +198,7 @@ export class Device extends EventEmitter {
    * 是否需要更新设备信息。
    *
    * 历史名称保留用于兼容现有调用语义；对 V2 表示 features 需要由
-   * DevGetDeviceInfo 刷新。
+   * DeviceInfoGet 刷新。
    */
   featuresNeedsReload = false;
 
@@ -261,13 +262,14 @@ export class Device extends EventEmitter {
     const bleName = this.getCurrentBleName();
     const label = this.getCurrentLabel();
     const serialNo = this.getCurrentSerialNo();
+    const connectId = this.getConnectId();
     const deviceId = this.getCurrentDeviceId() || null;
 
     const features = this.features;
 
     return {
       /** Android uses Mac address, iOS uses uuid, USB uses uuid  */
-      connectId: DataManager.isBleConnect(env) ? this.mainId || null : serialNo,
+      connectId: DataManager.isBleConnect(env) ? this.mainId || null : connectId,
       /** Hardware ID, will not change at any time */
       uuid: serialNo,
       commType: this.originalDescriptor.commType,
@@ -325,7 +327,10 @@ export class Device extends EventEmitter {
     });
   }
 
-  async acquire(connectProtocol?: HardwareConnectProtocol) {
+  async acquire(
+    connectProtocol?: HardwareConnectProtocol,
+    options?: { throwOnRunPromiseError?: boolean }
+  ) {
     const env = DataManager.getSettings('env');
     const mainIdKey = DataManager.isBleConnect(env) ? 'id' : 'session';
     const expectedProtocol = connectProtocol ?? this.originalDescriptor.protocolType;
@@ -374,6 +379,9 @@ export class Device extends EventEmitter {
 
       this.commands = new DeviceCommands(this, this.mainId ?? '');
     } catch (error) {
+      if (options?.throwOnRunPromiseError) {
+        throw error;
+      }
       if (this.runPromise) {
         this.runPromise.reject(error);
       } else {
@@ -476,7 +484,7 @@ export class Device extends EventEmitter {
   /**
    * 唯一协议判别器。
    *
-   * descriptor.protocolType 是协议探测后的结果；V2 features 由 DevGetDeviceInfo
+   * descriptor.protocolType 是协议探测后的结果；V2 features 由 DeviceInfoGet
    * 映射产生。
    * 全 SDK 的协议分支都必须走这里，不要直接读 originalDescriptor.protocolType
    * 或从 features 反推。
@@ -501,6 +509,15 @@ export class Device extends EventEmitter {
     return this.features ? getDeviceUUID(this.features) : '';
   }
 
+  getConnectId() {
+    const serialNo = this.getCurrentSerialNo();
+    if (serialNo) return serialNo;
+
+    // connectId 是 SDK 内部连接路由 key。这里兜底到 transport descriptor，
+    // 不改变 features.serialNo / deviceId 的业务语义。
+    return this.originalDescriptor.path || this.originalDescriptor.id || '';
+  }
+
   getCurrentBleName() {
     return getDeviceBleName(this.features);
   }
@@ -730,13 +747,16 @@ export class Device extends EventEmitter {
     if (this.isProtocolV2()) {
       this.passphraseState = options?.passphraseState;
       if (this.features && !this.featuresNeedsReload && !options?.initSession) {
+        if (this.features.bootloaderMode) {
+          return;
+        }
         // 不能直接信任缓存 features：设备端 wipe / 完成初始化 / 改 label 后
         // features 会永久陈旧。每次 run 做一次轻量 status 刷新（不含 fw/SE），
         // 用字段级合并保留已有版本和 SE 信息。
-        await this._refreshProtocolV2Status();
+        await this._refreshProtocolV2Status(options);
         return;
       }
-      await this._initializeProtocolV2();
+      await this._initializeProtocolV2(options);
       return;
     }
 
@@ -786,10 +806,10 @@ export class Device extends EventEmitter {
   /**
    * Device initialization over Protocol V2.
    *
-   * Protocol V2 不走传统 Initialize/GetFeatures；直接用 DevGetDeviceInfo
+   * Protocol V2 不走传统 Initialize/GetFeatures；直接用 DeviceInfoGet
    * 生成唯一的 features 状态。
    */
-  private async _initializeProtocolV2() {
+  private async _initializeProtocolV2(options?: InitOptions) {
     Log.debug('Initialize device via Protocol V2 features adapter');
 
     try {
@@ -798,6 +818,7 @@ export class Device extends EventEmitter {
       // 且 reject 后底层调用仍会残留。
       const deviceInfo = await requestProtocolV2DeviceInfo({
         commands: this.commands,
+        timeoutMs: options?.protocolV2DeviceInfoTimeoutMs,
       });
       // 默认请求不含 SE/hash 数据，scope 如实标注为 basic；
       // 完整数据由 getDeviceInfo(scope:'verify'|'full') 获取。
@@ -813,15 +834,16 @@ export class Device extends EventEmitter {
   /**
    * Protocol V2 的轻量状态刷新（每次 run 前调用）。
    *
-   * 请求 hw + bt + status（不含 fw/SE target）：status 提供 init_states / label /
-   * passphrase_protection 等会在设备端变化的字段；hw/bt 提供 serialNo / bleName。
+   * 请求 hw + coprocessor + status（不含 fw/SE target）：status 提供 init_states / label /
+   * passphrase_enabled 等会在设备端变化的字段；hw/coprocessor 提供 serialNo / bleName。
    * versions 为空时按字段级合并保留旧值，verify 数据不会被降级。
    */
-  private async _refreshProtocolV2Status() {
+  private async _refreshProtocolV2Status(options?: InitOptions) {
     try {
       const deviceInfo = await requestProtocolV2DeviceInfo({
         commands: this.commands,
         request: PROTOCOL_V2_STATUS_DEVICE_INFO_REQUEST,
+        timeoutMs: options?.protocolV2DeviceInfoTimeoutMs,
       });
       const features = this.updateProtocolV2Features(deviceInfo);
       Log.debug('Protocol V2 features (status refresh):', features);

package/src/device/DevicePool.ts

@@ -118,14 +118,14 @@ export class DevicePool extends EventEmitter {
     for await (const descriptor of descriptorList) {
       const device = await this._createDevice(descriptor, initOptions);
 
-      const uuid = device.getCurrentSerialNo();
-      if (uuid) {
-        if (this.devicesCache[uuid]) {
-          const cache = this.devicesCache[uuid];
+      const connectId = device.getConnectId();
+      if (connectId) {
+        if (this.devicesCache[connectId]) {
+          const cache = this.devicesCache[connectId];
           cache.updateDescriptor(descriptor, true);
         }
-        this.devicesCache[uuid] = device;
-        devices[uuid] = device;
+        this.devicesCache[connectId] = device;
+        devices[connectId] = device;
       }
 
       deviceList.push(device);

package/src/deviceProfile/buildDeviceFeatures.ts

@@ -2,22 +2,8 @@ import { EDeviceType, EFirmwareType } from '@onekeyfe/hd-shared';
 
 import type { Features } from '../types';
 import type { PROTO } from '../constants';
-import type { DevFirmwareImageInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
-
-type ProtocolV2DeviceInfoCompat = ProtocolV2DeviceInfo & {
-  fw?: ProtocolV2DeviceInfo['fw'] & {
-    application?: DevFirmwareImageInfo | null;
-    application_data?: DevFirmwareImageInfo | null;
-    bootloader?: DevFirmwareImageInfo | null;
-    romloader?: DevFirmwareImageInfo | null;
-  };
-  coprocessor?: {
-    application?: DevFirmwareImageInfo | null;
-    bootloader?: DevFirmwareImageInfo | null;
-    bt_adv_name?: string | null;
-    bt_mac?: unknown;
-  } | null;
-};
+import type { DeviceFirmwareImageInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
+import { isProtocolV2BootloaderDeviceInfo } from '../protocols/protocol-v2/features';
 
 type ProtocolV1FeaturesCompat = PROTO.Features &
   Partial<PROTO.OnekeyFeatures> & {
@@ -26,7 +12,7 @@ type ProtocolV1FeaturesCompat = PROTO.Features &
     onekey_serial?: string;
   };
 
-const getImageVersion = (image?: DevFirmwareImageInfo | null) => image?.version ?? null;
+const getImageVersion = (image?: DeviceFirmwareImageInfo | null) => image?.version ?? null;
 
 const bytesToHex = (value: unknown): string | undefined => {
   if (!value) return undefined;
@@ -42,9 +28,9 @@ const bytesToHex = (value: unknown): string | undefined => {
   return undefined;
 };
 
-const getImageBuildId = (image?: DevFirmwareImageInfo | null) => image?.build_id ?? undefined;
+const getImageBuildId = (image?: DeviceFirmwareImageInfo | null) => image?.build_id ?? undefined;
 
-const getImageHash = (image?: DevFirmwareImageInfo | null) => bytesToHex(image?.hash);
+const getImageHash = (image?: DeviceFirmwareImageInfo | null) => bytesToHex(image?.hash);
 
 const firstValue = <T>(...values: Array<T | null | undefined>) =>
   values.find(value => value !== undefined && value !== null);
@@ -226,7 +212,7 @@ export const buildProtocolV1FeaturesPayload = (
 /**
  * Protocol V2 的结构化 `Features` 构建器。
  *
- * 这是 Device 内部唯一缓存状态。字段只来自 DevGetDeviceInfo 或前一次 features
+ * 这是 Device 内部唯一缓存状态。字段只来自 DeviceInfoGet 或前一次 features
  * 缓存的同名字段级合并；不存在协议等价语义的字段保持 null/空值，不再通过
  * DeviceProfile 或 transport path 做身份兜底。
  */
@@ -234,11 +220,12 @@ export const buildProtocolV2FeaturesPayload = (
   deviceInfo?: ProtocolV2DeviceInfo,
   previous?: Features
 ): Features => {
-  const info = deviceInfo as ProtocolV2DeviceInfoCompat | undefined;
-  const fwApplication = firstValue(info?.fw?.application, info?.fw?.app);
-  const fwBootloader = firstValue(info?.fw?.bootloader, info?.fw?.boot);
-  const fwBoard = firstValue(info?.fw?.application_data, info?.fw?.board);
-  const bleApplication = firstValue(info?.coprocessor?.application, info?.bt?.app);
+  const info = deviceInfo;
+  const fwApplication = info?.fw?.application;
+  const fwBootloader = info?.fw?.bootloader;
+  const fwBoard = firstValue(info?.fw?.application_data, info?.fw?.romloader);
+  const bleApplication = info?.coprocessor?.application;
+  const status = info?.status;
 
   const firmwareVersion = firstMeaningfulVersion(
     getImageVersion(fwApplication),
@@ -250,16 +237,26 @@ export const buildProtocolV2FeaturesPayload = (
   );
   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 = firstValue(deviceInfo?.status?.label, previous?.label) ?? null;
-  const bleName = firstValue(info?.coprocessor?.bt_adv_name, info?.bt?.adv_name, previous?.bleName);
-  const initialized = firstValue(deviceInfo?.status?.init_states, previous?.initialized) ?? null;
-  const passphraseProtection =
-    firstValue(deviceInfo?.status?.passphrase_protection, previous?.passphraseProtection) ?? null;
-  const language = firstValue(deviceInfo?.status?.language, previous?.language) ?? null;
-  const backupRequired =
-    firstValue(deviceInfo?.status?.backup_required, previous?.backupRequired) ?? null;
-  const bleEnabled = firstValue(deviceInfo?.status?.bt_enable, previous?.bleEnabled);
+  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 passphraseProtection = status?.passphrase_enabled ?? 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 bootloaderMode = isProtocolV2BootloaderDeviceInfo(info);
+  const mode = bootloaderMode
+    ? 'bootloader'
+    : initialized === false
+    ? 'notInitialized'
+    : initialized === true
+    ? 'normal'
+    : 'unknown';
 
   return {
     protocol: 'V2',
@@ -268,15 +265,15 @@ export const buildProtocolV2FeaturesPayload = (
     firmwareType: previous?.firmwareType ?? EFirmwareType.Universal,
     model: 'pro2',
     vendor: 'onekey.so',
-    deviceId: null,
+    deviceId,
     serialNo,
     label,
     bleName: bleName ?? null,
     capabilities: [],
-    mode: initialized === false ? 'notInitialized' : initialized === true ? 'normal' : 'unknown',
+    mode,
     initialized,
-    bootloaderMode: false,
-    unlocked: previous?.unlocked ?? null,
+    bootloaderMode,
+    unlocked,
     firmwarePresent: previous?.firmwarePresent ?? null,
     passphraseProtection,
     pinProtection: null,
@@ -290,6 +287,7 @@ export const buildProtocolV2FeaturesPayload = (
     sdProtection: null,
     wipeCodeProtection: null,
     passphraseAlwaysOnDevice: null,
+    attachToPinEnabled,
     safetyChecks: null,
     autoLockDelayMs: null,
     displayRotation: null,
@@ -299,35 +297,35 @@ export const buildProtocolV2FeaturesPayload = (
     boardVersion,
     bleVersion,
     se01Version: firstMeaningfulVersion(
-      getImageVersion(deviceInfo?.se1?.app),
+      getImageVersion(info?.se1?.application),
       previous?.se01Version
     ),
     se02Version: firstMeaningfulVersion(
-      getImageVersion(deviceInfo?.se2?.app),
+      getImageVersion(info?.se2?.application),
       previous?.se02Version
     ),
     se03Version: firstMeaningfulVersion(
-      getImageVersion(deviceInfo?.se3?.app),
+      getImageVersion(info?.se3?.application),
       previous?.se03Version
     ),
     se04Version: firstMeaningfulVersion(
-      getImageVersion(deviceInfo?.se4?.app),
+      getImageVersion(info?.se4?.application),
       previous?.se04Version
     ),
     se01BootVersion: firstMeaningfulVersion(
-      getImageVersion(deviceInfo?.se1?.boot),
+      getImageVersion(info?.se1?.bootloader),
       previous?.se01BootVersion
     ),
     se02BootVersion: firstMeaningfulVersion(
-      getImageVersion(deviceInfo?.se2?.boot),
+      getImageVersion(info?.se2?.bootloader),
       previous?.se02BootVersion
     ),
     se03BootVersion: firstMeaningfulVersion(
-      getImageVersion(deviceInfo?.se3?.boot),
+      getImageVersion(info?.se3?.bootloader),
       previous?.se03BootVersion
     ),
     se04BootVersion: firstMeaningfulVersion(
-      getImageVersion(deviceInfo?.se4?.boot),
+      getImageVersion(info?.se4?.bootloader),
       previous?.se04BootVersion
     ),
     seVersion: previous?.seVersion ?? null,
@@ -340,26 +338,26 @@ export const buildProtocolV2FeaturesPayload = (
       boardHash: getImageHash(fwBoard) ?? previous?.verify?.boardHash,
       bleBuildId: getImageBuildId(bleApplication) ?? previous?.verify?.bleBuildId,
       bleHash: getImageHash(bleApplication) ?? previous?.verify?.bleHash,
-      se01BuildId: getImageBuildId(deviceInfo?.se1?.app) ?? previous?.verify?.se01BuildId,
-      se01Hash: getImageHash(deviceInfo?.se1?.app) ?? previous?.verify?.se01Hash,
-      se02BuildId: getImageBuildId(deviceInfo?.se2?.app) ?? previous?.verify?.se02BuildId,
-      se02Hash: getImageHash(deviceInfo?.se2?.app) ?? previous?.verify?.se02Hash,
-      se03BuildId: getImageBuildId(deviceInfo?.se3?.app) ?? previous?.verify?.se03BuildId,
-      se03Hash: getImageHash(deviceInfo?.se3?.app) ?? previous?.verify?.se03Hash,
-      se04BuildId: getImageBuildId(deviceInfo?.se4?.app) ?? previous?.verify?.se04BuildId,
-      se04Hash: getImageHash(deviceInfo?.se4?.app) ?? previous?.verify?.se04Hash,
-      se01BootBuildId: getImageBuildId(deviceInfo?.se1?.boot) ?? previous?.verify?.se01BootBuildId,
-      se01BootHash: getImageHash(deviceInfo?.se1?.boot) ?? previous?.verify?.se01BootHash,
-      se02BootBuildId: getImageBuildId(deviceInfo?.se2?.boot) ?? previous?.verify?.se02BootBuildId,
-      se02BootHash: getImageHash(deviceInfo?.se2?.boot) ?? previous?.verify?.se02BootHash,
-      se03BootBuildId: getImageBuildId(deviceInfo?.se3?.boot) ?? previous?.verify?.se03BootBuildId,
-      se03BootHash: getImageHash(deviceInfo?.se3?.boot) ?? previous?.verify?.se03BootHash,
-      se04BootBuildId: getImageBuildId(deviceInfo?.se4?.boot) ?? previous?.verify?.se04BootBuildId,
-      se04BootHash: getImageHash(deviceInfo?.se4?.boot) ?? previous?.verify?.se04BootHash,
+      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,
     },
     sessionId: previous?.sessionId ?? null,
     passphraseState: previous?.passphraseState,
-    unlockedAttachPin: previous?.unlockedAttachPin,
+    unlockedAttachPin,
     raw: {
       protocolV2DeviceInfo: deviceInfo,
     },

package/src/deviceProfile/buildDeviceProfile.ts

@@ -25,7 +25,8 @@ import type {
   GetDeviceInfoParams,
 } from '../types/api/getDeviceInfo';
 import type { Features, OnekeyFeatures } from '../types';
-import type { DevFirmwareImageInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
+import type { DeviceFirmwareImageInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
+import { isProtocolV2BootloaderDeviceInfo } from '../protocols/protocol-v2/features';
 
 type BuildProtocolV1ProfileParams = {
   protocol?: DeviceInfoProtocol;
@@ -68,11 +69,11 @@ const bytesToHex = (value: unknown): string | undefined => {
   return undefined;
 };
 
-const getImageVersion = (image?: DevFirmwareImageInfo | null) => image?.version ?? null;
+const getImageVersion = (image?: DeviceFirmwareImageInfo | null) => image?.version ?? null;
 
-const getImageBuildId = (image?: DevFirmwareImageInfo | null) => image?.build_id ?? undefined;
+const getImageBuildId = (image?: DeviceFirmwareImageInfo | null) => image?.build_id ?? undefined;
 
-const getImageHash = (image?: DevFirmwareImageInfo | null) => bytesToHex(image?.hash);
+const getImageHash = (image?: DeviceFirmwareImageInfo | null) => bytesToHex(image?.hash);
 
 const shouldIncludeVerify = (scope?: GetDeviceInfoParams['scope']) =>
   scope === 'verify' || scope === 'full';
@@ -86,6 +87,7 @@ const getDeviceMode = (features?: Features): DeviceInfoStatus['mode'] => {
 };
 
 const getProtocolV2Mode = (deviceInfo?: ProtocolV2DeviceInfo): DeviceInfoStatus['mode'] => {
+  if (isProtocolV2BootloaderDeviceInfo(deviceInfo)) return 'bootloader';
   const initialized = deviceInfo?.status?.init_states;
   if (initialized === false) return 'notInitialized';
   if (initialized === true) return 'normal';
@@ -147,20 +149,25 @@ const normalizeV1Versions = (
   ),
 });
 
-const normalizeV2Versions = (deviceInfo?: ProtocolV2DeviceInfo): DeviceProfileVersions => ({
-  firmware: firstMeaningfulVersion(getImageVersion(deviceInfo?.fw?.app)),
-  bootloader: firstMeaningfulVersion(getImageVersion(deviceInfo?.fw?.boot)),
-  board: firstMeaningfulVersion(getImageVersion(deviceInfo?.fw?.board)),
-  ble: firstMeaningfulVersion(getImageVersion(deviceInfo?.bt?.app)),
-  se01: firstMeaningfulVersion(getImageVersion(deviceInfo?.se1?.app)),
-  se02: firstMeaningfulVersion(getImageVersion(deviceInfo?.se2?.app)),
-  se03: firstMeaningfulVersion(getImageVersion(deviceInfo?.se3?.app)),
-  se04: firstMeaningfulVersion(getImageVersion(deviceInfo?.se4?.app)),
-  se01Boot: firstMeaningfulVersion(getImageVersion(deviceInfo?.se1?.boot)),
-  se02Boot: firstMeaningfulVersion(getImageVersion(deviceInfo?.se2?.boot)),
-  se03Boot: firstMeaningfulVersion(getImageVersion(deviceInfo?.se3?.boot)),
-  se04Boot: firstMeaningfulVersion(getImageVersion(deviceInfo?.se4?.boot)),
-});
+const normalizeV2Versions = (deviceInfo?: ProtocolV2DeviceInfo): DeviceProfileVersions => {
+  const info = deviceInfo;
+  return {
+    firmware: firstMeaningfulVersion(getImageVersion(info?.fw?.application)),
+    bootloader: firstMeaningfulVersion(getImageVersion(info?.fw?.bootloader)),
+    board: firstMeaningfulVersion(
+      getImageVersion(info?.fw?.application_data ?? info?.fw?.romloader)
+    ),
+    ble: firstMeaningfulVersion(getImageVersion(info?.coprocessor?.application)),
+    se01: firstMeaningfulVersion(getImageVersion(info?.se1?.application)),
+    se02: firstMeaningfulVersion(getImageVersion(info?.se2?.application)),
+    se03: firstMeaningfulVersion(getImageVersion(info?.se3?.application)),
+    se04: firstMeaningfulVersion(getImageVersion(info?.se4?.application)),
+    se01Boot: firstMeaningfulVersion(getImageVersion(info?.se1?.bootloader)),
+    se02Boot: firstMeaningfulVersion(getImageVersion(info?.se2?.bootloader)),
+    se03Boot: firstMeaningfulVersion(getImageVersion(info?.se3?.bootloader)),
+    se04Boot: firstMeaningfulVersion(getImageVersion(info?.se4?.bootloader)),
+  };
+};
 
 // V2 状态由 normalizeV2Status 处理，这里只服务 buildProfileFromProtocolV1 的 V1 路径。
 const normalizeV1Status = (features?: Features): DeviceInfoStatus => ({
@@ -169,23 +176,31 @@ const normalizeV1Status = (features?: Features): DeviceInfoStatus => ({
   bootloaderMode: features?.bootloaderMode ?? null,
   unlocked: features?.unlocked ?? null,
   passphraseProtection: features?.passphraseProtection ?? null,
+  attachToPinEnabled: features?.attachToPinEnabled ?? null,
+  unlockedAttachPin: features?.unlockedAttachPin ?? null,
   backupRequired: features?.backupRequired ?? null,
   noBackup: features?.noBackup ?? null,
   language: features?.language ?? null,
   bleEnabled: features?.bleEnabled ?? null,
 });
 
-const normalizeV2Status = (deviceInfo?: ProtocolV2DeviceInfo): DeviceInfoStatus => ({
-  mode: getProtocolV2Mode(deviceInfo),
-  initialized: deviceInfo?.status?.init_states ?? null,
-  bootloaderMode: false,
-  unlocked: null,
-  passphraseProtection: deviceInfo?.status?.passphrase_protection ?? null,
-  backupRequired: deviceInfo?.status?.backup_required ?? null,
-  noBackup: null,
-  language: deviceInfo?.status?.language ?? null,
-  bleEnabled: deviceInfo?.status?.bt_enable ?? null,
-});
+const normalizeV2Status = (deviceInfo?: ProtocolV2DeviceInfo): DeviceInfoStatus => {
+  const status = deviceInfo?.status;
+  const bootloaderMode = isProtocolV2BootloaderDeviceInfo(deviceInfo);
+  return {
+    mode: getProtocolV2Mode(deviceInfo),
+    initialized: status?.init_states ?? null,
+    bootloaderMode,
+    unlocked: status?.unlocked ?? null,
+    passphraseProtection: status?.passphrase_enabled ?? null,
+    attachToPinEnabled: status?.attach_to_pin_enabled ?? null,
+    unlockedAttachPin: status?.unlocked_by_attach_to_pin ?? null,
+    backupRequired: status?.backup_required ?? null,
+    noBackup: null,
+    language: null,
+    bleEnabled: null,
+  };
+};
 
 const normalizeV1Verify = (
   features?: Features,
@@ -223,32 +238,35 @@ const normalizeV1Verify = (
   se04BootHash: protocolV1OneKeyFeatures?.onekey_se04_boot_hash ?? features?.verify?.se04BootHash,
 });
 
-const normalizeV2Verify = (deviceInfo?: ProtocolV2DeviceInfo): DeviceProfileVerify => ({
-  firmwareBuildId: getImageBuildId(deviceInfo?.fw?.app),
-  firmwareHash: getImageHash(deviceInfo?.fw?.app),
-  bootloaderBuildId: getImageBuildId(deviceInfo?.fw?.boot),
-  bootloaderHash: getImageHash(deviceInfo?.fw?.boot),
-  boardBuildId: getImageBuildId(deviceInfo?.fw?.board),
-  boardHash: getImageHash(deviceInfo?.fw?.board),
-  bleBuildId: getImageBuildId(deviceInfo?.bt?.app),
-  bleHash: getImageHash(deviceInfo?.bt?.app),
-  se01BuildId: getImageBuildId(deviceInfo?.se1?.app),
-  se01Hash: getImageHash(deviceInfo?.se1?.app),
-  se02BuildId: getImageBuildId(deviceInfo?.se2?.app),
-  se02Hash: getImageHash(deviceInfo?.se2?.app),
-  se03BuildId: getImageBuildId(deviceInfo?.se3?.app),
-  se03Hash: getImageHash(deviceInfo?.se3?.app),
-  se04BuildId: getImageBuildId(deviceInfo?.se4?.app),
-  se04Hash: getImageHash(deviceInfo?.se4?.app),
-  se01BootBuildId: getImageBuildId(deviceInfo?.se1?.boot),
-  se01BootHash: getImageHash(deviceInfo?.se1?.boot),
-  se02BootBuildId: getImageBuildId(deviceInfo?.se2?.boot),
-  se02BootHash: getImageHash(deviceInfo?.se2?.boot),
-  se03BootBuildId: getImageBuildId(deviceInfo?.se3?.boot),
-  se03BootHash: getImageHash(deviceInfo?.se3?.boot),
-  se04BootBuildId: getImageBuildId(deviceInfo?.se4?.boot),
-  se04BootHash: getImageHash(deviceInfo?.se4?.boot),
-});
+const normalizeV2Verify = (deviceInfo?: ProtocolV2DeviceInfo): DeviceProfileVerify => {
+  const info = deviceInfo;
+  return {
+    firmwareBuildId: getImageBuildId(info?.fw?.application),
+    firmwareHash: getImageHash(info?.fw?.application),
+    bootloaderBuildId: getImageBuildId(info?.fw?.bootloader),
+    bootloaderHash: getImageHash(info?.fw?.bootloader),
+    boardBuildId: getImageBuildId(info?.fw?.application_data ?? info?.fw?.romloader),
+    boardHash: getImageHash(info?.fw?.application_data ?? info?.fw?.romloader),
+    bleBuildId: getImageBuildId(info?.coprocessor?.application),
+    bleHash: getImageHash(info?.coprocessor?.application),
+    se01BuildId: getImageBuildId(info?.se1?.application),
+    se01Hash: getImageHash(info?.se1?.application),
+    se02BuildId: getImageBuildId(info?.se2?.application),
+    se02Hash: getImageHash(info?.se2?.application),
+    se03BuildId: getImageBuildId(info?.se3?.application),
+    se03Hash: getImageHash(info?.se3?.application),
+    se04BuildId: getImageBuildId(info?.se4?.application),
+    se04Hash: getImageHash(info?.se4?.application),
+    se01BootBuildId: getImageBuildId(info?.se1?.bootloader),
+    se01BootHash: getImageHash(info?.se1?.bootloader),
+    se02BootBuildId: getImageBuildId(info?.se2?.bootloader),
+    se02BootHash: getImageHash(info?.se2?.bootloader),
+    se03BootBuildId: getImageBuildId(info?.se3?.bootloader),
+    se03BootHash: getImageHash(info?.se3?.bootloader),
+    se04BootBuildId: getImageBuildId(info?.se4?.bootloader),
+    se04BootHash: getImageHash(info?.se4?.bootloader),
+  };
+};
 
 const normalizeRaw = ({
   features,
@@ -304,9 +322,11 @@ export function buildProfileFromProtocolV2({
   scope = 'basic',
   includeRaw = false,
 }: BuildProtocolV2ProfileParams): DeviceProfile {
+  const info = deviceInfo;
+  const deviceId = info?.status?.device_id || '';
   const serialNo = deviceInfo?.hw?.serial_no || '';
-  const label = deviceInfo?.status?.label ?? null;
-  const bleName = deviceInfo?.bt?.adv_name ?? null;
+  const label = null;
+  const bleName = info?.coprocessor?.bt_adv_name ?? null;
   const verify = normalizeV2Verify(deviceInfo);
 
   return {
@@ -314,9 +334,7 @@ export function buildProfileFromProtocolV2({
     sources,
     deviceType: EDeviceType.Pro2,
     firmwareType: EFirmwareType.Universal,
-    // Protocol V2 的 DevGetDeviceInfo 没有 device_id 字段；serialNo 与 deviceId
-    // 不是等价语义，这里保持空值，避免把稳定硬件序列号误当会随 wipe 轮换的身份。
-    deviceId: '',
+    deviceId,
     serialNo,
     label,
     bleName,