@onekeyfe/hd-core 1.1.27-alpha.30 → 1.1.27-alpha.32

package/src/data-manager/TransportManager.ts

@@ -4,9 +4,9 @@ import DataManager from './DataManager';
 import { LoggerNames, getLogger } from '../utils';
 // eslint-disable-next-line import/no-cycle
 import { DevicePool } from '../device/DevicePool';
-import { getSupportMessageVersion } from '../utils/deviceFeaturesUtils';
+import { getSupportProtocolV1MessageSchema } from '../utils/deviceFeaturesUtils';
 
-import type { MessageVersion } from './DataManager';
+import type { ProtocolV1MessageSchema } from './DataManager';
 import type { LowlevelTransportSharedPlugin, Transport } from '@onekeyfe/hd-transport';
 import type { Features } from '../types';
 
@@ -33,7 +33,7 @@ export default class TransportManager {
 
   static reactNativeInit = false;
 
-  static messageVersion: MessageVersion = 'latest';
+  static protocolV1MessageSchema: ProtocolV1MessageSchema = 'v1CurrentSchema';
 
   static plugin: LowlevelTransportSharedPlugin | null = null;
 
@@ -41,7 +41,7 @@ export default class TransportManager {
     Log.debug('transport manager load');
     this.defaultMessages = DataManager.getProtobufMessages();
     this.currentMessages = this.defaultMessages;
-    this.messageVersion = 'latest';
+    this.protocolV1MessageSchema = 'v1CurrentSchema';
   }
 
   static async configure() {
@@ -76,7 +76,7 @@ export default class TransportManager {
       Log.debug('Configuring transports');
       await this.transport.configure(JSON.stringify(this.defaultMessages));
       this.currentMessages = this.defaultMessages;
-      this.messageVersion = 'latest';
+      this.protocolV1MessageSchema = 'v1CurrentSchema';
       await this.configureProtocolV2Messages();
       Log.debug('Configuring transports done');
     } catch (error) {
@@ -90,8 +90,8 @@ export default class TransportManager {
   /**
    * Re-load the transport's main protobuf schema based on a device's reported features.
    *
-   * This handles message-version compatibility within Protocol V1 (e.g. Touch's classic
-   * vs latest schema). It is NOT used to switch between Protocol V1 and Protocol V2 —
+   * This handles protobuf schema compatibility within Protocol V1 (e.g. Touch's legacy
+   * vs current Protocol V1 schema). It is NOT used to switch between Protocol V1 and Protocol V2 —
    * the transport already holds both schemas after initial configure(), and routes per
    * device by `getProtocolType()`.
    */
@@ -100,18 +100,18 @@ export default class TransportManager {
       return;
     }
 
-    const { messageVersion, messages } = getSupportMessageVersion(features);
+    const { protocolV1MessageSchema, messages } = getSupportProtocolV1MessageSchema(features);
 
     if (this.currentMessages === messages || !messages) {
       return;
     }
 
-    Log.debug(`Reconfiguring transports version:${messageVersion}`);
+    Log.debug(`Reconfiguring transports Protocol V1 schema:${protocolV1MessageSchema}`);
 
     try {
       await this.transport.configure(JSON.stringify(messages));
       this.currentMessages = messages;
-      this.messageVersion = messageVersion;
+      this.protocolV1MessageSchema = protocolV1MessageSchema;
     } catch (error) {
       throw ERRORS.TypedError(
         HardwareErrorCode.TransportInvalidProtobuf,
@@ -148,7 +148,7 @@ export default class TransportManager {
   }
 
   private static async configureProtocolV2Messages() {
-    const protocolV2Messages = DataManager.getProtobufMessages('protocolV2');
+    const protocolV2Messages = DataManager.getProtobufMessages('v2Schema');
     const { configureProtocolV2 } = this.transport;
     if (protocolV2Messages && typeof configureProtocolV2 === 'function') {
       await configureProtocolV2.call(this.transport, JSON.stringify(protocolV2Messages));
@@ -164,7 +164,7 @@ export default class TransportManager {
     return this.currentMessages;
   }
 
-  static getMessageVersion() {
-    return this.messageVersion;
+  static getProtocolV1MessageSchema() {
+    return this.protocolV1MessageSchema;
   }
 }

package/src/device/Device.ts

@@ -543,8 +543,8 @@ export class Device extends EventEmitter {
   /**
    * Device initialization over Protocol V2.
    *
-   * Protocol V2 不走传统 Initialize/GetFeatures。当前固件暂不支持
-   * DevGetDeviceInfo，初始化阶段只通过 Ping 建立基础 Features 视图。
+   * Protocol V2 不走传统 Initialize/GetFeatures，当前通过 Ping 验证链路，
+   * 再用 DeviceGetDeviceInfo 归一成 legacy-style Features 视图。
    */
   private async _initializeProtocolV2() {
     Log.debug('Initialize device via Protocol V2 feature adapter');
@@ -882,9 +882,13 @@ export class Device extends EventEmitter {
       this.features,
       Enum_Capability.Capability_AttachToPin
     );
+    const isPro2 = getDeviceType(this.features) === EDeviceType.Pro2;
 
     const supportUnlock =
-      supportAttachPinCapability || (versionRange && semver.gte(firmwareVersion, versionRange.min));
+      supportAttachPinCapability ||
+      // Pro2 V2 暂未从 features 暴露 capabilities，先直连该方法用于固件联调。
+      isPro2 ||
+      (versionRange && semver.gte(firmwareVersion, versionRange.min));
 
     if (supportUnlock) {
       const res = await this.commands.typedCall('UnLockDevice', 'UnLockDeviceResponse');

package/src/inject.ts

@@ -152,15 +152,15 @@ export const createCoreApi = (
   // File system & device control API (Protocol V2 only)
   getProtoVersion: (connectId, params) => call({ ...params, connectId, method: 'getProtoVersion' }),
   ping: (connectId, params) => call({ ...params, connectId, method: 'ping' }),
-  devReboot: (connectId, params) => call({ ...params, connectId, method: 'devReboot' }),
-  devGetDeviceInfo: (connectId, params) =>
-    call({ ...params, connectId, method: 'devGetDeviceInfo' }),
-  devGetOnboardingStatus: (connectId, params) =>
-    call({ ...params, connectId, method: 'devGetOnboardingStatus' }),
-  devFirmwareUpdate: (connectId, params) =>
-    call({ ...params, connectId, method: 'devFirmwareUpdate' }),
-  devGetFirmwareUpdateStatus: (connectId, params) =>
-    call({ ...params, connectId, method: 'devGetFirmwareUpdateStatus' }),
+  deviceReboot: (connectId, params) => call({ ...params, connectId, method: 'deviceReboot' }),
+  deviceGetDeviceInfo: (connectId, params) =>
+    call({ ...params, connectId, method: 'deviceGetDeviceInfo' }),
+  deviceGetOnboardingStatus: (connectId, params) =>
+    call({ ...params, connectId, method: 'deviceGetOnboardingStatus' }),
+  deviceFirmwareUpdate: (connectId, params) =>
+    call({ ...params, connectId, method: 'deviceFirmwareUpdate' }),
+  deviceGetFirmwareUpdateStatus: (connectId, params) =>
+    call({ ...params, connectId, method: 'deviceGetFirmwareUpdateStatus' }),
   factoryDeviceInfoSettings: (connectId, params) =>
     call({ ...params, connectId, method: 'factoryDeviceInfoSettings' }),
   factoryGetDeviceInfo: connectId => call({ connectId, method: 'factoryGetDeviceInfo' }),

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

@@ -22,6 +22,7 @@ type ProtocolV2SEInfo = {
 type ProtocolV2DeviceInfo = {
   protocol_version?: number;
   hw?: {
+    Device_type?: number;
     device_type?: number;
     serial_no?: string;
     hardware_version?: string;
@@ -52,24 +53,24 @@ type ProtocolV2DeviceInfo = {
   };
 };
 
-// const PROTOCOL_V2_DEVICE_INFO_REQUEST = {
-//   targets: {
-//     hw: true,
-//     fw: true,
-//     bt: true,
-//     se1: true,
-//     se2: true,
-//     se3: true,
-//     se4: true,
-//     status: true,
-//   },
-//   types: {
-//     version: true,
-//     build_id: true,
-//     hash: true,
-//     specific: true,
-//   },
-// };
+const PROTOCOL_V2_DEVICE_INFO_REQUEST = {
+  targets: {
+    hw: true,
+    fw: true,
+    bt: true,
+    se1: true,
+    se2: true,
+    se3: true,
+    se4: true,
+    status: true,
+  },
+  types: {
+    version: true,
+    build_id: true,
+    hash: true,
+    specific: true,
+  },
+};
 
 function parseVersion(version?: string | null): [number, number, number] {
   if (!version) return [0, 0, 0];
@@ -130,7 +131,7 @@ function createBaseFeatures(descriptor: DeviceDescriptor): Features {
     bootloader_mode: false,
     device_id: descriptorId,
     pin_protection: null,
-    passphrase_protection: false,
+    passphrase_protection: null,
     language: null,
     label: null,
     initialized: false,
@@ -227,6 +228,7 @@ export function normalizeProtocolV2Features(
 export async function getProtocolV2Features({
   commands,
   descriptor,
+  onDeviceInfoError,
   timeoutMs,
 }: {
   commands: DeviceCommands;
@@ -241,26 +243,22 @@ export async function getProtocolV2Features({
     await commands.typedCall('Ping', 'Success', { message: 'init' });
   }
 
-  // 当前 Pro2 固件暂不支持 DevGetDeviceInfo，初始化阶段只保留 Ping。
-  // 固件支持后再恢复下面这段 DeviceInfo 读取，用于补全版本、序列号和状态字段。
-  // try {
-  //   const { message } = callOptions
-  //     ? await commands.typedCall(
-  //         'DevGetDeviceInfo',
-  //         'DeviceInfo',
-  //         PROTOCOL_V2_DEVICE_INFO_REQUEST,
-  //         callOptions
-  //       )
-  //     : await commands.typedCall(
-  //         'DevGetDeviceInfo',
-  //         'DeviceInfo',
-  //         PROTOCOL_V2_DEVICE_INFO_REQUEST
-  //       );
-  //   return normalizeProtocolV2Features(descriptor, message as unknown as ProtocolV2DeviceInfo);
-  // } catch (error) {
-  //   onDeviceInfoError?.(error);
-  //   throw error;
-  // }
-
-  return normalizeProtocolV2Features(descriptor);
+  try {
+    const { message } = callOptions
+      ? await commands.typedCall(
+          'DeviceGetDeviceInfo',
+          'DeviceInfo',
+          PROTOCOL_V2_DEVICE_INFO_REQUEST,
+          callOptions
+        )
+      : await commands.typedCall(
+          'DeviceGetDeviceInfo',
+          'DeviceInfo',
+          PROTOCOL_V2_DEVICE_INFO_REQUEST
+        );
+    return normalizeProtocolV2Features(descriptor, message as unknown as ProtocolV2DeviceInfo);
+  } catch (error) {
+    onDeviceInfoError?.(error);
+    return normalizeProtocolV2Features(descriptor);
+  }
 }

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

@@ -1,26 +1,26 @@
 /**
- * Protocol V2 DevFirmwareTargetType enum (from messages-pro2.json).
+ * Protocol V2 DeviceFirmwareTargetType enum (from messages-protocol-v2.json).
  */
 export const ProtocolV2FirmwareTargetType = {
-  TARGET_MAIN_APP: 0,
-  TARGET_MAIN_BOOT: 1,
-  TARGET_BT: 2,
-  TARGET_SE1: 3,
-  TARGET_SE2: 4,
-  TARGET_SE3: 5,
-  TARGET_SE4: 6,
+  TARGET_INVALID: 0,
+  TARGET_ROMLOADER: 1,
+  TARGET_BOOTLOADER: 2,
+  TARGET_FIRMWARE_P1: 3,
+  TARGET_FIRMWARE_P2: 4,
+  TARGET_COPROCESSOR: 5,
+  TARGET_SE: 6,
   TARGET_RESOURCE: 10,
 } as const;
 
 /**
- * Map Protocol V2 firmware file name to DevFirmwareUpdate target_id.
+ * Map Protocol V2 firmware file name to DeviceFirmwareUpdate target_id.
  */
 export function protocolV2FileNameToTargetId(fileName: string): number {
-  if (fileName.includes('ble')) return ProtocolV2FirmwareTargetType.TARGET_BT;
-  if (fileName.includes('bootloader')) return ProtocolV2FirmwareTargetType.TARGET_MAIN_BOOT;
-  if (fileName.includes('se1')) return ProtocolV2FirmwareTargetType.TARGET_SE1;
-  if (fileName.includes('se2')) return ProtocolV2FirmwareTargetType.TARGET_SE2;
-  if (fileName.includes('se3')) return ProtocolV2FirmwareTargetType.TARGET_SE3;
-  if (fileName.includes('se4')) return ProtocolV2FirmwareTargetType.TARGET_SE4;
-  return ProtocolV2FirmwareTargetType.TARGET_MAIN_APP;
+  const normalized = fileName.toLowerCase();
+  if (normalized.includes('romloader')) return ProtocolV2FirmwareTargetType.TARGET_ROMLOADER;
+  if (normalized.includes('bootloader')) return ProtocolV2FirmwareTargetType.TARGET_BOOTLOADER;
+  if (normalized.includes('ble')) return ProtocolV2FirmwareTargetType.TARGET_COPROCESSOR;
+  if (normalized.includes('se')) return ProtocolV2FirmwareTargetType.TARGET_SE;
+  if (normalized.includes('p2')) return ProtocolV2FirmwareTargetType.TARGET_FIRMWARE_P2;
+  return ProtocolV2FirmwareTargetType.TARGET_FIRMWARE_P1;
 }

package/src/types/api/getPassphraseState.ts

@@ -1,6 +1,19 @@
 import type { CommonParams, Response } from '../params';
 
+export type GetPassphraseStatePayload =
+  | string
+  | {
+      passphrase_state?: string;
+      session_id?: string;
+      unlocked_attach_pin?: boolean;
+      passphrase_protection?: boolean | null;
+    };
+
+export type GetPassphraseStateParams = CommonParams & {
+  allowCreateAttachPin?: boolean;
+};
+
 export declare function getPassphraseState(
   connectId?: string,
-  params?: CommonParams
-): Response<string>;
+  params?: GetPassphraseStateParams
+): Response<GetPassphraseStatePayload>;

package/src/types/api/index.ts

@@ -1,9 +1,9 @@
 import type {
-  devFirmwareUpdate,
-  devGetDeviceInfo,
-  devGetFirmwareUpdateStatus,
-  devGetOnboardingStatus,
-  devReboot,
+  deviceFirmwareUpdate,
+  deviceGetDeviceInfo,
+  deviceGetFirmwareUpdateStatus,
+  deviceGetOnboardingStatus,
+  deviceReboot,
   dirList,
   dirMake,
   dirRemove,
@@ -162,6 +162,7 @@ import type { neoSignTransaction } from './neoSignTransaction';
 import type { ConnectSettings } from '../settings';
 
 export * from './export';
+export type { GetPassphraseStateParams, GetPassphraseStatePayload } from './getPassphraseState';
 
 export type CoreApi = {
   /**
@@ -235,11 +236,11 @@ export type CoreApi = {
    */
   getProtoVersion: typeof getProtoVersion;
   ping: typeof ping;
-  devReboot: typeof devReboot;
-  devGetDeviceInfo: typeof devGetDeviceInfo;
-  devGetOnboardingStatus: typeof devGetOnboardingStatus;
-  devFirmwareUpdate: typeof devFirmwareUpdate;
-  devGetFirmwareUpdateStatus: typeof devGetFirmwareUpdateStatus;
+  deviceReboot: typeof deviceReboot;
+  deviceGetDeviceInfo: typeof deviceGetDeviceInfo;
+  deviceGetOnboardingStatus: typeof deviceGetOnboardingStatus;
+  deviceFirmwareUpdate: typeof deviceFirmwareUpdate;
+  deviceGetFirmwareUpdateStatus: typeof deviceGetFirmwareUpdateStatus;
   factoryDeviceInfoSettings: typeof factoryDeviceInfoSettings;
   factoryGetDeviceInfo: typeof factoryGetDeviceInfo;
   filesystemFixPermission: typeof filesystemFixPermission;

package/src/types/api/protocolV2.ts

@@ -1,11 +1,11 @@
 import type { CommonParams, Response } from '../params';
 import type {
-  DevFirmwareTarget,
-  DevFirmwareUpdateStatus,
-  DevOnboardingStatus,
-  DevInfoTargets,
-  DevInfoTypes,
-  DevRebootType,
+  DeviceFirmwareTarget,
+  DeviceFirmwareUpdateStatus,
+  DeviceOnboardingStatus,
+  DeviceInfoTargets,
+  DeviceInfoTypes,
+  DeviceRebootType,
   FactoryDeviceInfo,
   ProtoVersion,
   ProtocolV2DeviceInfo,
@@ -48,14 +48,14 @@ export type PathInfoResult = {
   directory?: boolean;
 };
 
-export type DevRebootParams = {
-  rebootType?: DevRebootType | string | number;
-  reboot_type?: DevRebootType | string | number;
+export type DeviceRebootParams = {
+  rebootType?: DeviceRebootType | string | number;
+  reboot_type?: DeviceRebootType | string | number;
 };
 
-export type DevGetDeviceInfoParams = {
-  targets?: DevInfoTargets;
-  types?: DevInfoTypes;
+export type DeviceGetDeviceInfoParams = {
+  targets?: DeviceInfoTargets;
+  types?: DeviceInfoTypes;
   targetHw?: boolean;
   targetFw?: boolean;
   targetBt?: boolean;
@@ -70,10 +70,10 @@ export type DevGetDeviceInfoParams = {
   includeSpecific?: boolean;
 };
 
-export type DevFirmwareUpdateParams = {
-  targets?: DevFirmwareTarget[];
-  targetId?: DevFirmwareTarget['target_id'] | string | number;
-  target_id?: DevFirmwareTarget['target_id'] | string | number;
+export type DeviceFirmwareUpdateParams = {
+  targets?: DeviceFirmwareTarget[];
+  targetId?: DeviceFirmwareTarget['target_id'] | string | number;
+  target_id?: DeviceFirmwareTarget['target_id'] | string | number;
   path?: string;
 };
 
@@ -149,30 +149,30 @@ export declare function ping(
   params?: CommonParams & { message?: string }
 ): Response<Success>;
 
-export declare function devReboot(
+export declare function deviceReboot(
   connectId: string,
-  params: CommonParams & DevRebootParams
+  params: CommonParams & DeviceRebootParams
 ): Response<Success>;
 
-export declare function devGetDeviceInfo(
+export declare function deviceGetDeviceInfo(
   connectId: string,
-  params?: CommonParams & DevGetDeviceInfoParams
+  params?: CommonParams & DeviceGetDeviceInfoParams
 ): Response<ProtocolV2DeviceInfo>;
 
-export declare function devGetOnboardingStatus(
+export declare function deviceGetOnboardingStatus(
   connectId: string,
   params?: CommonParams
-): Response<DevOnboardingStatus>;
+): Response<DeviceOnboardingStatus>;
 
-export declare function devFirmwareUpdate(
+export declare function deviceFirmwareUpdate(
   connectId: string,
-  params: CommonParams & DevFirmwareUpdateParams
-): Response<Success | DevFirmwareUpdateStatus>;
+  params: CommonParams & DeviceFirmwareUpdateParams
+): Response<Success | DeviceFirmwareUpdateStatus>;
 
-export declare function devGetFirmwareUpdateStatus(
+export declare function deviceGetFirmwareUpdateStatus(
   connectId: string,
   params?: CommonParams
-): Response<DevFirmwareUpdateStatus>;
+): Response<DeviceFirmwareUpdateStatus>;
 
 export declare function factoryDeviceInfoSettings(
   connectId: string,

package/src/utils/deviceFeaturesUtils.ts

@@ -1,11 +1,17 @@
 import semver from 'semver';
 import { isNaN } from 'lodash';
 import { EDeviceType, type EFirmwareType, ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
-import { Enum_Capability } from '@onekeyfe/hd-transport';
+import {
+  Enum_Capability,
+  type GetPassphraseState as GetPassphraseStateMessage,
+} from '@onekeyfe/hd-transport';
 
 import { toHardened } from '../api/helpers/pathUtils';
 import { DeviceModelToTypes, DeviceTypeToModels } from '../types';
-import DataManager, { type IFirmwareField, type MessageVersion } from '../data-manager/DataManager';
+import DataManager, {
+  type IFirmwareField,
+  type ProtocolV1MessageSchema,
+} from '../data-manager/DataManager';
 import { PROTOBUF_MESSAGE_CONFIG } from '../data-manager/MessagesConfig';
 import { getDeviceType } from './deviceInfoUtils';
 import { getDeviceFirmwareVersion } from './deviceVersionUtils';
@@ -15,13 +21,13 @@ import type { Device } from '../device/Device';
 import type { DeviceCommands } from '../device/DeviceCommands';
 import type { Features, SupportFeatureType } from '../types';
 
-export const getSupportMessageVersion = (
+export const getSupportProtocolV1MessageSchema = (
   features: Features | undefined
-): { messages: JSON; messageVersion: MessageVersion } => {
+): { messages: JSON; protocolV1MessageSchema: ProtocolV1MessageSchema } => {
   if (!features)
     return {
-      messages: DataManager.messages.latest,
-      messageVersion: 'latest',
+      messages: DataManager.messages.v1CurrentSchema,
+      protocolV1MessageSchema: 'v1CurrentSchema',
     };
 
   const currentDeviceVersion = getDeviceFirmwareVersion(features).join('.');
@@ -37,18 +43,18 @@ export const getSupportMessageVersion = (
   const sortedDeviceVersionConfigs =
     deviceVersionConfigs?.sort((a, b) => semver.compare(b.minVersion, a.minVersion)) ?? [];
 
-  for (const { minVersion, messageVersion } of sortedDeviceVersionConfigs) {
+  for (const { minVersion, protocolV1MessageSchema } of sortedDeviceVersionConfigs) {
     if (semver.gte(currentDeviceVersion, minVersion)) {
       return {
-        messages: DataManager.messages[messageVersion],
-        messageVersion,
+        messages: DataManager.messages[protocolV1MessageSchema],
+        protocolV1MessageSchema,
       };
     }
   }
 
   return {
-    messages: DataManager.messages.latest,
-    messageVersion: 'latest',
+    messages: DataManager.messages.v1CurrentSchema,
+    protocolV1MessageSchema: 'v1CurrentSchema',
   };
 };
 
@@ -68,7 +74,11 @@ export const supportNewPassphrase = (features?: Features): SupportFeatureType =>
   if (!features) return { support: false };
 
   const deviceType = getDeviceType(features);
-  if (deviceType === EDeviceType.Touch || deviceType === EDeviceType.Pro) {
+  if (
+    deviceType === EDeviceType.Touch ||
+    deviceType === EDeviceType.Pro ||
+    deviceType === EDeviceType.Pro2
+  ) {
     return { support: true };
   }
 
@@ -82,10 +92,13 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
   options?: {
     expectPassphraseState?: string;
     onlyMainPin?: boolean;
+    allowCreateAttachPin?: boolean;
   }
 ) => {
   const { features, commands } = device;
   const locked = features?.unlocked === false;
+  const deviceType = getDeviceType(features);
+  const isPro2 = deviceType === EDeviceType.Pro2;
 
   const { passphraseState, newSession, unlockedAttachPin } = await getPassphraseState(
     features,
@@ -95,12 +108,12 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
     }
   );
 
-  const isModeT =
-    getDeviceType(features) === EDeviceType.Touch || getDeviceType(features) === EDeviceType.Pro;
+  const isModeT = deviceType === EDeviceType.Touch || deviceType === EDeviceType.Pro;
 
   // 如果可以获取到 passphraseState，但是设备 features 显示设备未开启 passphrase，需要刷新设备状态
   // if passphraseState can be obtained, but the device features show that the device has not enabled passphrase, the device status needs to be refreshed
-  const needRefreshWithPassphrase = passphraseState && features?.passphrase_protection !== true;
+  const needRefreshWithPassphrase =
+    !isPro2 && passphraseState && features?.passphrase_protection !== true;
   // 如果 Touch/Pro 在之前是锁定状态，刷新设备状态
   // if Touch/Pro was locked before, refresh the device state
   const needRefreshWithLocked = isModeT && locked;
@@ -110,10 +123,19 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
     await device.getFeatures();
   }
 
+  if (isPro2 && device.features) {
+    if (passphraseState) {
+      device.features.passphrase_protection = true;
+    }
+    if (newSession) {
+      device.features.session_id = newSession;
+    }
+  }
+
   // Attach to pin try to fix internal state
   if (features?.device_id) {
     device.updateInternalState(
-      device.features?.passphrase_protection ?? false,
+      (device.features?.passphrase_protection ?? false) || isPro2,
       passphraseState,
       device.features?.device_id ?? '',
       newSession,
@@ -130,6 +152,7 @@ export const getPassphraseState = async (
   options?: {
     expectPassphraseState?: string;
     onlyMainPin?: boolean;
+    allowCreateAttachPin?: boolean;
   }
 ): Promise<{
   passphraseState: string | undefined;
@@ -148,12 +171,23 @@ export const getPassphraseState = async (
   );
   const supportGetPassphraseState =
     supportAttachPinCapability ||
+    // Pro2 V2 暂未从 features 暴露 capabilities，先直连该方法用于固件联调。
+    deviceType === EDeviceType.Pro2 ||
     (deviceType === EDeviceType.Pro && semver.gte(firmwareVersion.join('.'), '4.15.0'));
 
   if (supportGetPassphraseState) {
-    const { message, type } = await commands.typedCall('GetPassphraseState', 'PassphraseState', {
-      passphrase_state: options?.onlyMainPin ? undefined : options?.expectPassphraseState,
-    });
+    const payload: GetPassphraseStateMessage = options?.onlyMainPin
+      ? { _only_main_pin: true }
+      : { passphrase_state: options?.expectPassphraseState };
+    if (options?.allowCreateAttachPin) {
+      payload.allow_create_attach_pin = true;
+    }
+
+    const { message, type } = await commands.typedCall(
+      'GetPassphraseState',
+      'PassphraseState',
+      payload
+    );
 
     // @ts-expect-error
     if (type === 'CallMethodError') {

package/dist/api/protocol-v2/DevFirmwareUpdate.d.ts

@@ -1,7 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-import type { DevFirmwareUpdateParams } from './helpers';
-export default class DevFirmwareUpdate extends BaseMethod<DevFirmwareUpdateParams> {
-    init(): void;
-    run(): Promise<import("packages/hd-transport/dist").Success | import("packages/hd-transport/dist").DevFirmwareUpdateStatus>;
-}
-//# sourceMappingURL=DevFirmwareUpdate.d.ts.map

package/dist/api/protocol-v2/DevFirmwareUpdate.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DevFirmwareUpdate.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DevFirmwareUpdate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAO3C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,UAAU,CAAC,uBAAuB,CAAC;IAChF,IAAI;IAWE,GAAG;CAWV"}

package/dist/api/protocol-v2/DevGetDeviceInfo.d.ts

@@ -1,7 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-import type { DevGetDeviceInfoParams } from './helpers';
-export default class DevGetDeviceInfo extends BaseMethod<DevGetDeviceInfoParams> {
-    init(): void;
-    run(): Promise<import("packages/hd-transport/dist").ProtocolV2DeviceInfo | import("packages/hd-transport/dist").DeviceInfo>;
-}
-//# sourceMappingURL=DevGetDeviceInfo.d.ts.map

package/dist/api/protocol-v2/DevGetDeviceInfo.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DevGetDeviceInfo.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DevGetDeviceInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAU,CAAC,sBAAsB,CAAC;IAC9E,IAAI;IAqBE,GAAG;CAOV"}

package/dist/api/protocol-v2/DevGetFirmwareUpdateStatus.d.ts

@@ -1,6 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-export default class DevGetFirmwareUpdateStatus extends BaseMethod {
-    init(): void;
-    run(): Promise<import("packages/hd-transport/dist").DevFirmwareUpdateStatus>;
-}
-//# sourceMappingURL=DevGetFirmwareUpdateStatus.d.ts.map

package/dist/api/protocol-v2/DevGetFirmwareUpdateStatus.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DevGetFirmwareUpdateStatus.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DevGetFirmwareUpdateStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,UAAU;IAChE,IAAI;IAME,GAAG;CAQV"}

package/dist/api/protocol-v2/DevGetOnboardingStatus.d.ts

@@ -1,6 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-export default class DevGetOnboardingStatus extends BaseMethod {
-    init(): void;
-    run(): Promise<import("packages/hd-transport/dist").DevOnboardingStatus>;
-}
-//# sourceMappingURL=DevGetOnboardingStatus.d.ts.map