@onekeyfe/hd-core 1.2.0-alpha.0 → 1.2.0-alpha.1

package/src/deviceProfile/buildDeviceProfile.ts

@@ -1,5 +1,4 @@
 import { EDeviceType, EFirmwareType } from '@onekeyfe/hd-shared';
-import { OneKeyDeviceType, OneKeySEState, OneKeySeType } from '@onekeyfe/hd-transport';
 
 import {
   getDeviceBLEFirmwareVersion,
@@ -31,7 +30,7 @@ import type { DevFirmwareImageInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-tr
 type BuildProtocolV1ProfileParams = {
   protocol?: DeviceInfoProtocol;
   features?: Features;
-  onekeyFeatures?: OnekeyFeatures;
+  protocolV1OneKeyFeatures?: OnekeyFeatures;
   sources?: DeviceInfoSource[];
   scope?: GetDeviceInfoParams['scope'];
   includeRaw?: boolean;
@@ -42,17 +41,11 @@ type BuildProtocolV2ProfileParams = {
   sources?: DeviceInfoSource[];
   scope?: GetDeviceInfoParams['scope'];
   includeRaw?: boolean;
-  /**
-   * hw.serial_no 为空时的回退身份（通常传 transport 层的 device path）。
-   * 早期 Pro2 工程板没有烧录 serial_no，空 serialNo 会导致设备无法进入
-   * DevicePool 的 devices 字典，后续 getDevice(connectId) 必然失败。
-   */
-  fallbackSerialNo?: string;
 };
 
 const isMeaningfulVersion = (version?: string | null) => Boolean(version && version !== '0.0.0');
 
-const firstVersion = (...versions: Array<string | null | undefined>) =>
+const firstMeaningfulVersion = (...versions: Array<string | null | undefined>) =>
   versions.find(isMeaningfulVersion) ?? null;
 
 const versionArrayToString = (version?: Array<number | string | null> | null) => {
@@ -86,7 +79,7 @@ const shouldIncludeVerify = (scope?: GetDeviceInfoParams['scope']) =>
 
 const getDeviceMode = (features?: Features): DeviceInfoStatus['mode'] => {
   if (!features) return 'unknown';
-  if (features.bootloader_mode === true) return 'bootloader';
+  if (features.bootloaderMode === true) return 'bootloader';
   if (features.initialized === false) return 'notInitialized';
   if (features.initialized === true) return 'normal';
   return 'unknown';
@@ -101,74 +94,85 @@ const getProtocolV2Mode = (deviceInfo?: ProtocolV2DeviceInfo): DeviceInfoStatus[
 
 const normalizeV1Versions = (
   features?: Features,
-  onekeyFeatures?: OnekeyFeatures
+  protocolV1OneKeyFeatures?: OnekeyFeatures
 ): DeviceProfileVersions => ({
-  firmware: firstVersion(
-    onekeyFeatures?.onekey_firmware_version,
+  firmware: firstMeaningfulVersion(
+    protocolV1OneKeyFeatures?.onekey_firmware_version,
     versionArrayToString(getDeviceFirmwareVersion(features))
   ),
-  bootloader: firstVersion(
-    onekeyFeatures?.onekey_boot_version,
+  bootloader: firstMeaningfulVersion(
+    protocolV1OneKeyFeatures?.onekey_boot_version,
     versionArrayToString(getDeviceBootloaderVersion(features))
   ),
-  board: firstVersion(
-    onekeyFeatures?.onekey_board_version,
+  board: firstMeaningfulVersion(
+    protocolV1OneKeyFeatures?.onekey_board_version,
     versionArrayToString(features ? getDeviceBoardloaderVersion(features) : undefined)
   ),
-  ble: firstVersion(
-    onekeyFeatures?.onekey_ble_version,
-    features?.onekey_ble_version,
-    features?.ble_ver,
+  ble: firstMeaningfulVersion(
+    protocolV1OneKeyFeatures?.onekey_ble_version,
+    features?.bleVersion,
     versionArrayToString(features ? getDeviceBLEFirmwareVersion(features) : undefined)
   ),
-  se01: firstVersion(onekeyFeatures?.onekey_se01_version, features?.onekey_se01_version),
-  se02: firstVersion(onekeyFeatures?.onekey_se02_version, features?.onekey_se02_version),
-  se03: firstVersion(onekeyFeatures?.onekey_se03_version, features?.onekey_se03_version),
-  se04: firstVersion(onekeyFeatures?.onekey_se04_version, features?.onekey_se04_version),
-  se01Boot: firstVersion(
-    onekeyFeatures?.onekey_se01_boot_version,
-    features?.onekey_se01_boot_version
+  se01: firstMeaningfulVersion(
+    protocolV1OneKeyFeatures?.onekey_se01_version,
+    features?.se01Version
   ),
-  se02Boot: firstVersion(
-    onekeyFeatures?.onekey_se02_boot_version,
-    features?.onekey_se02_boot_version
+  se02: firstMeaningfulVersion(
+    protocolV1OneKeyFeatures?.onekey_se02_version,
+    features?.se02Version
   ),
-  se03Boot: firstVersion(
-    onekeyFeatures?.onekey_se03_boot_version,
-    features?.onekey_se03_boot_version
+  se03: firstMeaningfulVersion(
+    protocolV1OneKeyFeatures?.onekey_se03_version,
+    features?.se03Version
   ),
-  se04Boot: firstVersion(
-    onekeyFeatures?.onekey_se04_boot_version,
-    features?.onekey_se04_boot_version
+  se04: firstMeaningfulVersion(
+    protocolV1OneKeyFeatures?.onekey_se04_version,
+    features?.se04Version
+  ),
+  se01Boot: firstMeaningfulVersion(
+    protocolV1OneKeyFeatures?.onekey_se01_boot_version,
+    features?.se01BootVersion
+  ),
+  se02Boot: firstMeaningfulVersion(
+    protocolV1OneKeyFeatures?.onekey_se02_boot_version,
+    features?.se02BootVersion
+  ),
+  se03Boot: firstMeaningfulVersion(
+    protocolV1OneKeyFeatures?.onekey_se03_boot_version,
+    features?.se03BootVersion
+  ),
+  se04Boot: firstMeaningfulVersion(
+    protocolV1OneKeyFeatures?.onekey_se04_boot_version,
+    features?.se04BootVersion
   ),
 });
 
 const normalizeV2Versions = (deviceInfo?: ProtocolV2DeviceInfo): DeviceProfileVersions => ({
-  firmware: firstVersion(getImageVersion(deviceInfo?.fw?.app)),
-  bootloader: firstVersion(getImageVersion(deviceInfo?.fw?.boot)),
-  board: firstVersion(getImageVersion(deviceInfo?.fw?.board)),
-  ble: firstVersion(getImageVersion(deviceInfo?.bt?.app)),
-  se01: firstVersion(getImageVersion(deviceInfo?.se1?.app)),
-  se02: firstVersion(getImageVersion(deviceInfo?.se2?.app)),
-  se03: firstVersion(getImageVersion(deviceInfo?.se3?.app)),
-  se04: firstVersion(getImageVersion(deviceInfo?.se4?.app)),
-  se01Boot: firstVersion(getImageVersion(deviceInfo?.se1?.boot)),
-  se02Boot: firstVersion(getImageVersion(deviceInfo?.se2?.boot)),
-  se03Boot: firstVersion(getImageVersion(deviceInfo?.se3?.boot)),
-  se04Boot: firstVersion(getImageVersion(deviceInfo?.se4?.boot)),
+  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)),
 });
 
 // V2 状态由 normalizeV2Status 处理，这里只服务 buildProfileFromProtocolV1 的 V1 路径。
 const normalizeV1Status = (features?: Features): DeviceInfoStatus => ({
   mode: getDeviceMode(features),
   initialized: features?.initialized ?? null,
-  bootloaderMode: features?.bootloader_mode ?? null,
+  bootloaderMode: features?.bootloaderMode ?? null,
   unlocked: features?.unlocked ?? null,
-  passphraseProtection: features?.passphrase_protection ?? null,
-  backupRequired: features?.needs_backup ?? null,
-  noBackup: features?.no_backup ?? null,
+  passphraseProtection: features?.passphraseProtection ?? null,
+  backupRequired: features?.backupRequired ?? null,
+  noBackup: features?.noBackup ?? null,
   language: features?.language ?? null,
-  bleEnabled: features?.ble_enable ?? null,
+  bleEnabled: features?.bleEnabled ?? null,
 });
 
 const normalizeV2Status = (deviceInfo?: ProtocolV2DeviceInfo): DeviceInfoStatus => ({
@@ -185,32 +189,38 @@ const normalizeV2Status = (deviceInfo?: ProtocolV2DeviceInfo): DeviceInfoStatus
 
 const normalizeV1Verify = (
   features?: Features,
-  onekeyFeatures?: OnekeyFeatures
+  protocolV1OneKeyFeatures?: OnekeyFeatures
 ): DeviceProfileVerify => ({
-  firmwareBuildId: onekeyFeatures?.onekey_firmware_build_id ?? features?.onekey_firmware_build_id,
-  firmwareHash: onekeyFeatures?.onekey_firmware_hash ?? features?.onekey_firmware_hash,
-  bootloaderBuildId: onekeyFeatures?.onekey_boot_build_id ?? features?.onekey_boot_build_id,
-  bootloaderHash: onekeyFeatures?.onekey_boot_hash ?? features?.onekey_boot_hash,
-  boardBuildId: onekeyFeatures?.onekey_board_build_id ?? features?.onekey_board_build_id,
-  boardHash: onekeyFeatures?.onekey_board_hash ?? features?.onekey_board_hash,
-  bleBuildId: onekeyFeatures?.onekey_ble_build_id ?? features?.onekey_ble_build_id,
-  bleHash: onekeyFeatures?.onekey_ble_hash ?? features?.onekey_ble_hash,
-  se01BuildId: onekeyFeatures?.onekey_se01_build_id ?? features?.onekey_se01_build_id,
-  se01Hash: onekeyFeatures?.onekey_se01_hash ?? features?.onekey_se01_hash,
-  se02BuildId: onekeyFeatures?.onekey_se02_build_id ?? features?.onekey_se02_build_id,
-  se02Hash: onekeyFeatures?.onekey_se02_hash ?? features?.onekey_se02_hash,
-  se03BuildId: onekeyFeatures?.onekey_se03_build_id ?? features?.onekey_se03_build_id,
-  se03Hash: onekeyFeatures?.onekey_se03_hash ?? features?.onekey_se03_hash,
-  se04BuildId: onekeyFeatures?.onekey_se04_build_id ?? features?.onekey_se04_build_id,
-  se04Hash: onekeyFeatures?.onekey_se04_hash ?? features?.onekey_se04_hash,
-  se01BootBuildId: onekeyFeatures?.onekey_se01_boot_build_id ?? features?.onekey_se01_boot_build_id,
-  se01BootHash: onekeyFeatures?.onekey_se01_boot_hash ?? features?.onekey_se01_boot_hash,
-  se02BootBuildId: onekeyFeatures?.onekey_se02_boot_build_id ?? features?.onekey_se02_boot_build_id,
-  se02BootHash: onekeyFeatures?.onekey_se02_boot_hash ?? features?.onekey_se02_boot_hash,
-  se03BootBuildId: onekeyFeatures?.onekey_se03_boot_build_id ?? features?.onekey_se03_boot_build_id,
-  se03BootHash: onekeyFeatures?.onekey_se03_boot_hash ?? features?.onekey_se03_boot_hash,
-  se04BootBuildId: onekeyFeatures?.onekey_se04_boot_build_id ?? features?.onekey_se04_boot_build_id,
-  se04BootHash: onekeyFeatures?.onekey_se04_boot_hash ?? features?.onekey_se04_boot_hash,
+  firmwareBuildId:
+    protocolV1OneKeyFeatures?.onekey_firmware_build_id ?? features?.verify?.firmwareBuildId,
+  firmwareHash: protocolV1OneKeyFeatures?.onekey_firmware_hash ?? features?.verify?.firmwareHash,
+  bootloaderBuildId:
+    protocolV1OneKeyFeatures?.onekey_boot_build_id ?? features?.verify?.bootloaderBuildId,
+  bootloaderHash: protocolV1OneKeyFeatures?.onekey_boot_hash ?? features?.verify?.bootloaderHash,
+  boardBuildId: protocolV1OneKeyFeatures?.onekey_board_build_id ?? features?.verify?.boardBuildId,
+  boardHash: protocolV1OneKeyFeatures?.onekey_board_hash ?? features?.verify?.boardHash,
+  bleBuildId: protocolV1OneKeyFeatures?.onekey_ble_build_id ?? features?.verify?.bleBuildId,
+  bleHash: protocolV1OneKeyFeatures?.onekey_ble_hash ?? features?.verify?.bleHash,
+  se01BuildId: protocolV1OneKeyFeatures?.onekey_se01_build_id ?? features?.verify?.se01BuildId,
+  se01Hash: protocolV1OneKeyFeatures?.onekey_se01_hash ?? features?.verify?.se01Hash,
+  se02BuildId: protocolV1OneKeyFeatures?.onekey_se02_build_id ?? features?.verify?.se02BuildId,
+  se02Hash: protocolV1OneKeyFeatures?.onekey_se02_hash ?? features?.verify?.se02Hash,
+  se03BuildId: protocolV1OneKeyFeatures?.onekey_se03_build_id ?? features?.verify?.se03BuildId,
+  se03Hash: protocolV1OneKeyFeatures?.onekey_se03_hash ?? features?.verify?.se03Hash,
+  se04BuildId: protocolV1OneKeyFeatures?.onekey_se04_build_id ?? features?.verify?.se04BuildId,
+  se04Hash: protocolV1OneKeyFeatures?.onekey_se04_hash ?? features?.verify?.se04Hash,
+  se01BootBuildId:
+    protocolV1OneKeyFeatures?.onekey_se01_boot_build_id ?? features?.verify?.se01BootBuildId,
+  se01BootHash: protocolV1OneKeyFeatures?.onekey_se01_boot_hash ?? features?.verify?.se01BootHash,
+  se02BootBuildId:
+    protocolV1OneKeyFeatures?.onekey_se02_boot_build_id ?? features?.verify?.se02BootBuildId,
+  se02BootHash: protocolV1OneKeyFeatures?.onekey_se02_boot_hash ?? features?.verify?.se02BootHash,
+  se03BootBuildId:
+    protocolV1OneKeyFeatures?.onekey_se03_boot_build_id ?? features?.verify?.se03BootBuildId,
+  se03BootHash: protocolV1OneKeyFeatures?.onekey_se03_boot_hash ?? features?.verify?.se03BootHash,
+  se04BootBuildId:
+    protocolV1OneKeyFeatures?.onekey_se04_boot_build_id ?? features?.verify?.se04BootBuildId,
+  se04BootHash: protocolV1OneKeyFeatures?.onekey_se04_boot_hash ?? features?.verify?.se04BootHash,
 });
 
 const normalizeV2Verify = (deviceInfo?: ProtocolV2DeviceInfo): DeviceProfileVerify => ({
@@ -242,105 +252,46 @@ const normalizeV2Verify = (deviceInfo?: ProtocolV2DeviceInfo): DeviceProfileVeri
 
 const normalizeRaw = ({
   features,
-  onekeyFeatures,
+  protocolV1OneKeyFeatures,
   protocolV2DeviceInfo,
 }: {
   features?: Features;
-  onekeyFeatures?: OnekeyFeatures;
+  protocolV1OneKeyFeatures?: OnekeyFeatures;
   protocolV2DeviceInfo?: ProtocolV2DeviceInfo;
 }): DeviceProfileRaw => ({
   ...(features ? { features } : {}),
-  ...(onekeyFeatures ? { onekeyFeatures } : {}),
+  ...(protocolV1OneKeyFeatures ? { protocolV1OneKeyFeatures } : {}),
   ...(protocolV2DeviceInfo ? { protocolV2DeviceInfo } : {}),
 });
 
-/**
- * V1 profile 构建用的 features 合并视图。
- *
- * OnekeyFeatures 与 Features 的同名字段（onekey_device_type / onekey_se_type /
- * onekey_se0X_state）wire 同源：传输层解码会把 proto 枚举输出为名称字符串，与
- * Features 侧的 string 声明一致，仅生成类型分别声明为枚举/字符串，这里按
- * Features 的声明显式归一，避免整体 as Features 断言。
- */
-const mergeV1Features = (
-  features?: Features,
-  onekeyFeatures?: OnekeyFeatures
-): Features | undefined => {
-  if (!features && !onekeyFeatures) return undefined;
-
-  const {
-    onekey_device_type: onekeyDeviceType,
-    onekey_se_type: onekeySeType,
-    onekey_se01_state: onekeySe01State,
-    onekey_se02_state: onekeySe02State,
-    onekey_se03_state: onekeySe03State,
-    onekey_se04_state: onekeySe04State,
-    ...restOnekeyFeatures
-  } = onekeyFeatures ?? {};
-
-  const toEnumName = (
-    enumObject: Record<string | number, string | number>,
-    value: number | string | null | undefined
-  ): string | null | undefined => {
-    if (value == null || typeof value === 'string') return value;
-    const label = enumObject[value];
-    return typeof label === 'string' ? label : String(value);
-  };
-
-  return {
-    // 仅 onekeyFeatures 的场景没有完整 Features 底座（与历史 as Features 行为一致，
-    // 该路径目前没有调用方触达：两处调用都至少携带 features）。
-    ...((features ?? {}) as Features),
-    ...restOnekeyFeatures,
-    ...(onekeyDeviceType !== undefined
-      ? { onekey_device_type: toEnumName(OneKeyDeviceType, onekeyDeviceType) }
-      : {}),
-    ...(onekeySeType !== undefined
-      ? { onekey_se_type: toEnumName(OneKeySeType, onekeySeType) }
-      : {}),
-    ...(onekeySe01State !== undefined
-      ? { onekey_se01_state: toEnumName(OneKeySEState, onekeySe01State) }
-      : {}),
-    ...(onekeySe02State !== undefined
-      ? { onekey_se02_state: toEnumName(OneKeySEState, onekeySe02State) }
-      : {}),
-    ...(onekeySe03State !== undefined
-      ? { onekey_se03_state: toEnumName(OneKeySEState, onekeySe03State) }
-      : {}),
-    ...(onekeySe04State !== undefined
-      ? { onekey_se04_state: toEnumName(OneKeySEState, onekeySe04State) }
-      : {}),
-  };
-};
-
 export function buildProfileFromProtocolV1({
   protocol = 'V1',
   features,
-  onekeyFeatures,
+  protocolV1OneKeyFeatures,
   sources = ['features'],
   scope = 'basic',
   includeRaw = false,
 }: BuildProtocolV1ProfileParams): DeviceProfile {
-  const sourceFeatures = mergeV1Features(features, onekeyFeatures);
-  const verify = normalizeV1Verify(sourceFeatures, onekeyFeatures);
+  const sourceFeatures = features;
+  const verify = normalizeV1Verify(sourceFeatures, protocolV1OneKeyFeatures);
 
   return {
     protocol,
     sources,
     deviceType: getDeviceType(sourceFeatures),
     firmwareType: getFirmwareType(sourceFeatures),
-    deviceId: sourceFeatures?.device_id || (sourceFeatures ? getDeviceUUID(sourceFeatures) : ''),
+    deviceId: sourceFeatures?.deviceId || (sourceFeatures ? getDeviceUUID(sourceFeatures) : ''),
     serialNo: sourceFeatures ? getDeviceUUID(sourceFeatures) : '',
     label: getDeviceLabel(sourceFeatures),
     bleName: getDeviceBleName(sourceFeatures),
     status: normalizeV1Status(sourceFeatures),
-    versions: normalizeV1Versions(sourceFeatures, onekeyFeatures),
+    versions: normalizeV1Versions(sourceFeatures, protocolV1OneKeyFeatures),
     ...(shouldIncludeVerify(scope) ? { verify } : {}),
     ...(includeRaw
       ? {
           raw: normalizeRaw({
             features,
-            onekeyFeatures,
+            protocolV1OneKeyFeatures,
           }),
         }
       : {}),
@@ -352,10 +303,9 @@ export function buildProfileFromProtocolV2({
   sources = ['deviceInfo'],
   scope = 'basic',
   includeRaw = false,
-  fallbackSerialNo,
 }: BuildProtocolV2ProfileParams): DeviceProfile {
-  // 早期工程板 hw.serial_no 为空串，回退到调用方提供的 transport path（mock 身份）。
-  const serialNo = deviceInfo?.hw?.serial_no || fallbackSerialNo || '';
+  const deviceId = deviceInfo?.hw?.device_id || '';
+  const serialNo = deviceInfo?.hw?.serial_no || '';
   const label = deviceInfo?.status?.label ?? null;
   const bleName = deviceInfo?.bt?.adv_name ?? null;
   const verify = normalizeV2Verify(deviceInfo);
@@ -365,11 +315,7 @@ export function buildProfileFromProtocolV2({
     sources,
     deviceType: EDeviceType.Pro2,
     firmwareType: EFirmwareType.Universal,
-    // Protocol V2 的 DevGetDeviceInfo 没有 device_id 字段（固件 proto 仅提供 hw.serial_no），
-    // 这里只能回退 serialNo。注意语义差异：V1 的 device_id 随擦除/换种子轮换，serialNo 永不变化。
-    // 固件在 DevStatus 暴露 device_id 后，此处必须改为读取它，否则 wipe 后基于 deviceId 的
-    // session 缓存（deviceSessionCache）不会自然失效。
-    deviceId: serialNo,
+    deviceId,
     serialNo,
     label,
     bleName,

package/src/deviceProfile/index.ts

@@ -1,2 +1,5 @@
 export { buildProfileFromProtocolV1, buildProfileFromProtocolV2 } from './buildDeviceProfile';
-export { buildProtocolV2GetFeaturesPayload } from './legacyFeaturesView';
+export {
+  buildProtocolV1FeaturesPayload,
+  buildProtocolV2FeaturesPayload,
+} from './buildDeviceFeatures';

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

@@ -1,6 +1,6 @@
 import { DevSEState, DevSeType } from '@onekeyfe/hd-transport';
 
-import type { DeviceGetDeviceInfo, DevSEInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
+import type { DevGetDeviceInfo, DevSEInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
 import type { DeviceCommands } from '../../device/DeviceCommands';
 
 // 单源类型：直接使用 hd-transport 生成的 ProtocolV2DeviceInfo / DevSEInfo /
@@ -27,7 +27,7 @@ const normalizeEnumValue = <T extends Record<string | number, string | number>>(
 
 /**
  * DevSEInfo.state → 可读标签。SDK 内唯一的 SE 状态映射实现，
- * deviceProfile 与 legacy Features 兼容视图都从这里取。
+ * DeviceProfile 与标准 Features 构建都从这里取。
  */
 export const getProtocolV2SeState = (se?: DevSEInfo): ProtocolV2SeStateLabel | null => {
   const label = normalizeEnumValue(DevSEState, se?.state);
@@ -44,8 +44,8 @@ export const getProtocolV2SeState = (se?: DevSEInfo): ProtocolV2SeStateLabel | n
 };
 
 /**
- * DevSEInfo.type → 可读标签（如 'THD89'）。legacy Features 兼容视图的
- * onekey_se_type 字段从这里取。
+ * DevSEInfo.type → 可读标签（如 'THD89'）。DeviceProfile / Features
+ * 的 SE 类型归一化从这里取。
  */
 export const getProtocolV2SeType = (se?: DevSEInfo): string | null =>
   normalizeEnumValue(DevSeType, se?.type);
@@ -67,9 +67,7 @@ export const PROTOCOL_V2_FEATURES_DEVICE_INFO_REQUEST = {
  * 轻量状态刷新请求（每次 run 前使用）。
  *
  * status 提供 init_states / label / passphrase_protection 等会在设备端变化的字段；
- * hw / bt 提供 serialNo / bleName 等身份字段——applyProfileUpdate 对顶层字段是整体
- * 覆盖语义，缺少 hw/bt 会把已有 profile 的身份字段清空。不含 fw/SE targets，
- * 单帧请求开销很小。
+ * hw / bt 提供 serialNo / bleName 等身份字段；不含 fw/SE targets，单帧请求开销很小。
  */
 export const PROTOCOL_V2_STATUS_DEVICE_INFO_REQUEST = {
   targets: {
@@ -123,16 +121,16 @@ export const PROTOCOL_V2_DEVICE_INFO_REQUEST = PROTOCOL_V2_FULL_DEVICE_INFO_REQU
 export const PROTOCOL_V2_DEVICE_INFO_TIMEOUT_MS = 10 * 1000;
 
 /**
- * 临时开关（默认开启）：当前 Pro2 测试固件 / 早期工程板尚未实现 DevGetDeviceInfo，
- * 真实调用只会超时失败。开启时跳过 wire 调用，直接返回 mock DeviceInfo；
- * profile 的身份字段（serialNo/deviceId）由 buildProfileFromProtocolV2 的
- * fallbackSerialNo（transport path）兜底。
+ * 临时开关（默认关闭）：当前正式链路直接调用 DevGetDeviceInfo。
+ * 仅当 Pro2 测试固件 / 早期工程板尚未实现 DevGetDeviceInfo 时，才显式开启 mock。
+ * 开启时跳过 wire 调用，直接返回 mock DeviceInfo；
+ * DevGetDeviceInfo 尚未返回的字段保持为空，不再用 transport path 兜底成设备身份。
  *
- * 固件实现 DevGetDeviceInfo 后：把默认值改回 false（或直接删除开关与 mock）。
+ * 固件实现 DevGetDeviceInfo 稳定后：删除开关与 mock。
  * 注意：开启期间 FirmwareUpdateV4 的“升级完成版本比对”拿到的也是 mock 版本，
  * 不能作为升级成功的依据。
  */
-let protocolV2DeviceInfoMockEnabled = true;
+let protocolV2DeviceInfoMockEnabled = false;
 
 export const setProtocolV2DeviceInfoMock = (enabled: boolean) => {
   protocolV2DeviceInfoMockEnabled = enabled;
@@ -144,7 +142,7 @@ export const isProtocolV2DeviceInfoMockEnabled = () => protocolV2DeviceInfoMockE
 export const buildMockProtocolV2DeviceInfo = (): ProtocolV2DeviceInfo => ({
   protocol_version: 2,
   hw: {
-    // 留空：profile 身份走 fallbackSerialNo（transport path）
+    // 留空：协议未上报时 SDK 不再用 transport path 伪造身份字段
     serial_no: '',
   },
   fw: {
@@ -166,9 +164,9 @@ export async function requestProtocolV2DeviceInfo({
 }: {
   commands: DeviceCommands;
   timeoutMs?: number;
-  request?: DeviceGetDeviceInfo;
+  request?: DevGetDeviceInfo;
 }): Promise<ProtocolV2DeviceInfo> {
-  if (protocolV2DeviceInfoMockEnabled) {
+  if (isProtocolV2DeviceInfoMockEnabled()) {
     return buildMockProtocolV2DeviceInfo();
   }
   const { message } = await commands.typedCall('DevGetDeviceInfo', 'DeviceInfo', request, {

package/src/types/api/getDeviceInfo.ts

@@ -6,7 +6,7 @@ import type { ProtocolType, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport'
 // 协议类型单源：从 hd-transport 的 ProtocolType 派生，只额外允许 'unknown'。
 export type DeviceInfoProtocol = ProtocolType | 'unknown';
 
-export type DeviceInfoSource = 'features' | 'onekeyFeatures' | 'deviceInfo';
+export type DeviceInfoSource = 'features' | 'protocolV1OneKeyFeatures' | 'deviceInfo';
 
 export type DeviceInfoScope = 'basic' | 'versions' | 'verify' | 'full';
 
@@ -74,7 +74,7 @@ export type DeviceProfileVerify = {
 
 export type DeviceProfileRaw = {
   features?: Features;
-  onekeyFeatures?: OnekeyFeatures;
+  protocolV1OneKeyFeatures?: OnekeyFeatures;
   protocolV2DeviceInfo?: ProtocolV2DeviceInfo;
 };
 

package/src/types/api/getPassphraseState.ts

@@ -1,10 +1,10 @@
 import type { CommonParams, Response } from '../params';
 
 export type GetPassphraseStatePayload = {
-  passphrase_state?: string;
-  session_id?: string;
-  unlocked_attach_pin?: boolean;
-  passphrase_protection?: boolean | null;
+  passphraseState?: string;
+  sessionId?: string;
+  unlockedAttachPin?: boolean;
+  passphraseProtection?: boolean | null;
 };
 
 export type GetPassphraseStateParams = CommonParams & {

package/src/types/api/protocolV2.ts

@@ -1,6 +1,5 @@
 import type { CommonParams, Response } from '../params';
 import type {
-  DeviceFirmwareUpdateStatus,
   DevFirmwareUpdateStatus,
   FactoryDeviceInfo,
   OnboardingStatus,
@@ -96,12 +95,12 @@ export declare function deviceGetOnboardingStatus(
 export declare function deviceFirmwareUpdate(
   connectId: string,
   params: CommonParams & DeviceFirmwareUpdateParams
-): Response<Success | DevFirmwareUpdateStatus | DeviceFirmwareUpdateStatus>;
+): Response<Success | DevFirmwareUpdateStatus>;
 
 export declare function deviceGetFirmwareUpdateStatus(
   connectId: string,
   params?: CommonParams
-): Response<DevFirmwareUpdateStatus | DeviceFirmwareUpdateStatus>;
+): Response<DevFirmwareUpdateStatus>;
 
 export declare function devReboot(
   connectId: string,