@onekeyfe/hd-core 1.1.27-alpha.31 → 1.1.27-alpha.33

package/src/api/GetPassphraseState.ts

@@ -16,7 +16,11 @@ export default class GetPassphraseState extends BaseMethod {
       return Promise.reject(ERRORS.TypedError(HardwareErrorCode.DeviceInitializeFailed));
 
     const { passphraseState, newSession, unlockedAttachPin } =
-      await getPassphraseStateWithRefreshDeviceInfo(this.device);
+      await getPassphraseStateWithRefreshDeviceInfo(this.device, {
+        expectPassphraseState: this.payload.passphraseState,
+        onlyMainPin: this.payload.useEmptyPassphrase,
+        allowCreateAttachPin: this.payload.allowCreateAttachPin,
+      });
 
     const { features } = this.device;
     const isPro2 = getDeviceType(features) === EDeviceType.Pro2;

package/src/api/PathInfo.ts

@@ -1,4 +1,5 @@
 import { BaseMethod } from './BaseMethod';
+import { validateNonEmptyString } from './helpers/filesystemValidation';
 
 export type PathInfoParams = {
   path: string;
@@ -8,7 +9,7 @@ export default class PathInfo extends BaseMethod<PathInfoParams> {
   init() {
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
-    this.params = { path: this.payload.path };
+    this.params = { path: validateNonEmptyString(this.payload.path, 'path') };
   }
 
   async run() {

package/src/api/evm/EVMGetAddress.ts

@@ -44,7 +44,7 @@ export default class EvmGetAddress extends BaseMethod<EthereumGetAddressOneKey[]
   }
 
   async getEvmAddress(param: EthereumGetAddressOneKey) {
-    if (TransportManager.getProtocolV1MessageSchema() === 'protocolV1Legacy') {
+    if (TransportManager.getProtocolV1MessageSchema() === 'v1LegacySchema') {
       return getAddressLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         param,

package/src/api/evm/EVMGetPublicKey.ts

@@ -57,7 +57,7 @@ export default class EVMGetPublicKey extends BaseMethod<EthereumGetPublicKeyOneK
   }
 
   getEvmPublicKey(param: EthereumGetPublicKey) {
-    if (TransportManager.getProtocolV1MessageSchema() === 'protocolV1Legacy') {
+    if (TransportManager.getProtocolV1MessageSchema() === 'v1LegacySchema') {
       return getPublicKeyLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         param,

package/src/api/evm/EVMSignMessage.ts

@@ -34,7 +34,7 @@ export default class EVMSignMessage extends BaseMethod<EthereumSignMessageOneKey
   }
 
   async run() {
-    if (TransportManager.getProtocolV1MessageSchema() === 'protocolV1Legacy') {
+    if (TransportManager.getProtocolV1MessageSchema() === 'v1LegacySchema') {
       return signMessageLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         params: this.params,

package/src/api/evm/EVMSignTransaction.ts

@@ -120,7 +120,7 @@ export default class EVMSignTransaction extends BaseMethod {
 
     if (formattedTx == null) throw ERRORS.TypedError('Runtime', 'formattedTx is not set');
 
-    if (TransportManager.getProtocolV1MessageSchema() === 'protocolV1Legacy') {
+    if (TransportManager.getProtocolV1MessageSchema() === 'v1LegacySchema') {
       return signTransactionLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         addressN,

package/src/api/evm/EVMSignTypedData.ts

@@ -261,7 +261,7 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
     let supportTrezor = false;
     let response: MessageResponse<MessageKey>;
     switch (TransportManager.getProtocolV1MessageSchema()) {
-      case 'protocolV1Legacy':
+      case 'v1LegacySchema':
         supportTrezor = true;
         response = await signTypedDataLegacyV1({
           typedCall: this.device.commands.typedCall.bind(this.device.commands),
@@ -272,7 +272,7 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
         });
         break;
 
-      case 'protocolV1Current':
+      case 'v1CurrentSchema':
       default:
         supportTrezor = false;
         response = await signTypedData({
@@ -309,7 +309,7 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
     if (!domainHash) throw ERRORS.TypedError('Runtime', 'domainHash is required');
 
     switch (TransportManager.getProtocolV1MessageSchema()) {
-      case 'protocolV1Legacy':
+      case 'v1LegacySchema':
         return signTypedHashLegacyV1({
           typedCall,
           addressN,
@@ -319,7 +319,7 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
           device: this.device,
         });
 
-      case 'protocolV1Current':
+      case 'v1CurrentSchema':
       default:
         return signTypedHash({
           typedCall,

package/src/api/evm/EVMVerifyMessage.ts

@@ -31,7 +31,7 @@ export default class EVMSignMessage extends BaseMethod<EthereumVerifyMessageOneK
   }
 
   async run() {
-    if (TransportManager.getProtocolV1MessageSchema() === 'protocolV1Legacy') {
+    if (TransportManager.getProtocolV1MessageSchema() === 'v1LegacySchema') {
       return verifyMessageLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         params: this.params,

package/src/api/helpers/filesystemValidation.ts

@@ -0,0 +1,51 @@
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+
+export const invalidParameter = (message: string) =>
+  ERRORS.TypedError(HardwareErrorCode.CallMethodInvalidParameter, message);
+
+export function validateNonEmptyString(value: unknown, name: string): string {
+  if (typeof value !== 'string' || value.trim().length === 0) {
+    throw invalidParameter(`Parameter [${name}] is required and must be a non-empty string.`);
+  }
+  return value;
+}
+
+export function validateNonNegativeInteger(
+  value: unknown,
+  name: string,
+  defaultValue?: number
+): number {
+  if (value === undefined || value === null) {
+    if (defaultValue !== undefined) return defaultValue;
+    throw invalidParameter(`Missing required parameter: ${name}`);
+  }
+
+  const numeric = typeof value === 'string' && value.trim() !== '' ? Number(value) : value;
+  if (typeof numeric !== 'number' || !Number.isSafeInteger(numeric) || numeric < 0) {
+    throw invalidParameter(`Parameter [${name}] must be a non-negative integer.`);
+  }
+  return numeric;
+}
+
+export function validateOptionalNonNegativeInteger(
+  value: unknown,
+  name: string
+): number | undefined {
+  if (value === undefined || value === null) return undefined;
+  return validateNonNegativeInteger(value, name);
+}
+
+export function validateOptionalPercentage(value: unknown, name: string): number | undefined {
+  const numeric = validateOptionalNonNegativeInteger(value, name);
+  if (numeric === undefined) return undefined;
+  if (numeric > 100) {
+    throw invalidParameter(`Parameter [${name}] must be between 0 and 100.`);
+  }
+  return numeric;
+}
+
+export function validateRequiredData(value: unknown, name: string): void {
+  if (value === undefined || value === null) {
+    throw invalidParameter(`Missing required parameter: ${name}`);
+  }
+}

package/src/api/protocol-v2/DeviceFirmwareUpdate.ts

@@ -20,11 +20,12 @@ export default class DeviceFirmwareUpdate extends BaseMethod<DeviceFirmwareUpdat
   }
 
   async run() {
+    const targets = normalizeFirmwareTargets(this.params);
     const res = await this.device.commands.typedCall(
       'DeviceFirmwareUpdate',
       PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES,
       {
-        targets: normalizeFirmwareTargets(this.params),
+        targets,
       },
       PROTOCOL_V2_FIRMWARE_UPDATE_OPTIONS
     );

package/src/api/protocol-v2/helpers.ts

@@ -1,5 +1,7 @@
 import { DeviceRebootType } from '@onekeyfe/hd-transport';
 
+import { invalidParameter, validateNonEmptyString } from '../helpers/filesystemValidation';
+
 import type {
   DeviceFirmwareTarget,
   DeviceFirmwareTargetType,
@@ -69,8 +71,10 @@ export const PROTOCOL_V2_FIRMWARE_UPDATE_OPTIONS: TransportCallOptions = {
   intermediateTypes: ['DeviceFirmwareInstallProgress'],
 };
 
-export const PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES: ('Success' | 'DeviceFirmwareUpdateStatus')[] =
-  ['Success', 'DeviceFirmwareUpdateStatus'];
+export const PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES: (
+  | 'Success'
+  | 'DeviceFirmwareUpdateStatus'
+)[] = ['Success', 'DeviceFirmwareUpdateStatus'];
 
 export function normalizeRebootType(value: RebootTypeInput | undefined): DeviceRebootType {
   if (typeof value === 'number') return value;
@@ -83,15 +87,24 @@ export function normalizeRebootType(value: RebootTypeInput | undefined): DeviceR
 }
 
 function normalizeTargetId(
-  value: DeviceFirmwareTargetType | string | number | undefined
+  value: DeviceFirmwareTargetType | string | number | undefined,
+  name: string
 ): DeviceFirmwareTargetType {
-  if (typeof value === 'number') return value;
+  if (value === undefined || value === null) {
+    throw invalidParameter(`Missing required parameter: ${name}`);
+  }
+  if (typeof value === 'number') {
+    if (Number.isSafeInteger(value) && value > 0) return value;
+    throw invalidParameter(`Parameter [${name}] must be a valid firmware target id.`);
+  }
   const numeric = Number(value);
-  if (Number.isFinite(numeric)) return numeric;
-  return 0;
+  if (Number.isSafeInteger(numeric) && numeric > 0) return numeric;
+  throw invalidParameter(`Parameter [${name}] must be a valid firmware target id.`);
 }
 
-export function normalizeFirmwareTargets(params: DeviceFirmwareUpdateParams): DeviceFirmwareTarget[] {
+export function normalizeFirmwareTargets(
+  params: DeviceFirmwareUpdateParams
+): DeviceFirmwareTarget[] {
   const targets =
     params.targets ??
     (params.path
@@ -103,10 +116,20 @@ export function normalizeFirmwareTargets(params: DeviceFirmwareUpdateParams): De
         ]
       : []);
 
-  return targets.map(target => ({
-    target_id: normalizeTargetId('target_id' in target ? target.target_id : target.targetId),
-    path: target.path,
-  }));
+  if (!Array.isArray(targets) || targets.length === 0) {
+    throw invalidParameter('Parameter [targets] must contain at least one firmware target.');
+  }
+
+  return targets.map((target, index) => {
+    if (!target || typeof target !== 'object') {
+      throw invalidParameter(`Parameter [targets.${index}] must be an object.`);
+    }
+    const targetId = target.target_id ?? target.targetId;
+    return {
+      target_id: normalizeTargetId(targetId, `targets.${index}.target_id`),
+      path: validateNonEmptyString(target.path, `targets.${index}.path`),
+    };
+  });
 }
 
 export function buildTargets(params: DeviceGetDeviceInfoParams): DeviceInfoTargets | undefined {

package/src/core/index.ts

@@ -479,7 +479,7 @@ const onCallDevice = async (
       // Check to see if it is safe to use Passphrase
       checkPassphraseEnableState(method, device.features);
 
-      if (device.hasUsePassphrase() && method.useDevicePassphraseState) {
+      if (shouldCheckPassphraseState(method, device)) {
         // check version
         const support = supportNewPassphrase(device.features);
         if (!support.support) {
@@ -994,8 +994,6 @@ export const cancel = (context: CoreContext, connectId?: string) => {
 const checkPassphraseEnableState = (method: BaseMethod, features?: Features) => {
   if (!method.useDevicePassphraseState) return;
 
-  const isPro2 = getDeviceType(features) === EDeviceType.Pro2;
-
   if (features?.passphrase_protection === true) {
     const hasNoPassphraseState =
       method.payload.passphraseState == null || method.payload.passphraseState === '';
@@ -1008,12 +1006,22 @@ const checkPassphraseEnableState = (method: BaseMethod, features?: Features) =>
     }
   }
 
-  if (features?.passphrase_protection === false && method.payload.passphraseState && !isPro2) {
+  if (features?.passphrase_protection === false && method.payload.passphraseState) {
     DevicePool.clearDeviceCache(method.payload.connectId);
     throw ERRORS.TypedError(HardwareErrorCode.DeviceNotOpenedPassphrase);
   }
 };
 
+const shouldCheckPassphraseState = (method: BaseMethod, device: Device) => {
+  if (!method.useDevicePassphraseState) return false;
+
+  const isPro2 = getDeviceType(device.features) === EDeviceType.Pro2;
+  const pro2ExplicitWalletSelection =
+    isPro2 && (!!method.payload?.passphraseState || !!method.payload?.useEmptyPassphrase);
+
+  return device.hasUsePassphrase() || pro2ExplicitWalletSelection;
+};
+
 const cleanup = () => {
   _uiPromises = [];
   Log.debug('Cleanup...');

package/src/data-manager/DataManager.ts

@@ -4,7 +4,7 @@ import { EDeviceType, EFirmwareType } from '@onekeyfe/hd-shared';
 
 import MessagesJSON from '../data/messages/messages.json';
 import MessagesLegacyV1JSON from '../data/messages/messages_legacy_v1.json';
-import MessagesPro2JSON from '../data/messages/messages-pro2.json';
+import MessagesProtocolV2JSON from '../data/messages/messages-protocol-v2.json';
 import {
   LoggerNames,
   getDeviceBLEFirmwareVersion,
@@ -41,8 +41,8 @@ export const FIRMWARE_FIELDS = [
 
 export type IFirmwareField = (typeof FIRMWARE_FIELDS)[number];
 
-export type ProtocolV1MessageSchema = 'protocolV1Current' | 'protocolV1Legacy';
-export type ProtobufMessageSchema = ProtocolV1MessageSchema | 'protocolV2';
+export type ProtocolV1MessageSchema = 'v1CurrentSchema' | 'v1LegacySchema';
+export type ProtobufMessageSchema = ProtocolV1MessageSchema | 'v2Schema';
 
 const FIRMWARE_FIELD_TYPE_MAP: Readonly<Record<IFirmwareField, EFirmwareType>> = {
   firmware: EFirmwareType.Universal,
@@ -98,9 +98,9 @@ export default class DataManager {
   static settings: ConnectSettings;
 
   static messages: { [schema in ProtobufMessageSchema]: JSON } = {
-    protocolV1Current: MessagesJSON as unknown as JSON,
-    protocolV1Legacy: MessagesLegacyV1JSON as unknown as JSON,
-    protocolV2: MessagesPro2JSON as unknown as JSON,
+    v1CurrentSchema: MessagesJSON as unknown as JSON,
+    v1LegacySchema: MessagesLegacyV1JSON as unknown as JSON,
+    v2Schema: MessagesProtocolV2JSON as unknown as JSON,
   };
 
   static lastCheckTimestamp = 0;
@@ -477,7 +477,7 @@ export default class DataManager {
     }
   }
 
-  static getProtobufMessages(schema: ProtobufMessageSchema = 'protocolV1Current'): JSON {
+  static getProtobufMessages(schema: ProtobufMessageSchema = 'v1CurrentSchema'): JSON {
     return this.messages[schema];
   }
 

package/src/data-manager/MessagesConfig.ts

@@ -12,17 +12,17 @@ export const PROTOBUF_MESSAGE_CONFIG: DeviceVersionConfig = {
   model_mini: [
     // Classic1s starts from 3.5.0, so use the current Protocol V1 schema by default.
     // Only use the legacy Protocol V1 schema for specific old versions (< 3.3.0).
-    { minVersion: '3.3.0', protocolV1MessageSchema: 'protocolV1Current' },
-    { minVersion: '0.0.1', protocolV1MessageSchema: 'protocolV1Legacy' },
+    { minVersion: '3.3.0', protocolV1MessageSchema: 'v1CurrentSchema' },
+    { minVersion: '0.0.1', protocolV1MessageSchema: 'v1LegacySchema' },
     // Fallback to current Protocol V1 schema for unknown versions (0.0.0).
-    { minVersion: '0.0.0', protocolV1MessageSchema: 'protocolV1Current' },
+    { minVersion: '0.0.0', protocolV1MessageSchema: 'v1CurrentSchema' },
   ],
   model_touch: [
     // Use the current Protocol V1 schema by default for Touch/Pro.
     // Only use the legacy Protocol V1 schema for specific old versions (< 4.5.0).
-    { minVersion: '4.5.0', protocolV1MessageSchema: 'protocolV1Current' },
-    { minVersion: '0.0.1', protocolV1MessageSchema: 'protocolV1Legacy' },
+    { minVersion: '4.5.0', protocolV1MessageSchema: 'v1CurrentSchema' },
+    { minVersion: '0.0.1', protocolV1MessageSchema: 'v1LegacySchema' },
     // Fallback to current Protocol V1 schema for unknown versions (0.0.0).
-    { minVersion: '0.0.0', protocolV1MessageSchema: 'protocolV1Current' },
+    { minVersion: '0.0.0', protocolV1MessageSchema: 'v1CurrentSchema' },
   ],
 };

package/src/data-manager/TransportManager.ts

@@ -33,7 +33,7 @@ export default class TransportManager {
 
   static reactNativeInit = false;
 
-  static protocolV1MessageSchema: ProtocolV1MessageSchema = 'protocolV1Current';
+  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.protocolV1MessageSchema = 'protocolV1Current';
+    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.protocolV1MessageSchema = 'protocolV1Current';
+      this.protocolV1MessageSchema = 'v1CurrentSchema';
       await this.configureProtocolV2Messages();
       Log.debug('Configuring transports done');
     } catch (error) {
@@ -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));

package/src/device/Device.ts

@@ -543,8 +543,8 @@ export class Device extends EventEmitter {
   /**
    * Device initialization over Protocol V2.
    *
-   * Protocol V2 不走传统 Initialize/GetFeatures，当前仅通过 Ping 验证链路，
-   * 然后使用 descriptor 生成临时 Features 视图。
+   * Protocol V2 不走传统 Initialize/GetFeatures，当前通过 Ping 验证链路，
+   * 再用 DeviceGetDeviceInfo 归一成 legacy-style Features 视图。
    */
   private async _initializeProtocolV2() {
     Log.debug('Initialize device via Protocol V2 feature adapter');

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

@@ -53,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];
@@ -228,7 +228,7 @@ export function normalizeProtocolV2Features(
 export async function getProtocolV2Features({
   commands,
   descriptor,
-  // onDeviceInfoError,
+  onDeviceInfoError,
   timeoutMs,
 }: {
   commands: DeviceCommands;
@@ -243,25 +243,22 @@ export async function getProtocolV2Features({
     await commands.typedCall('Ping', 'Success', { message: 'init' });
   }
 
-  // DeviceGetDeviceInfo 暂时关闭，避免初始化阶段依赖固件侧 DeviceInfo 支持。
-  // 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);
-  // }
-
-  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,5 +1,5 @@
 /**
- * Protocol V2 DeviceFirmwareTargetType enum (from messages-pro2.json).
+ * Protocol V2 DeviceFirmwareTargetType enum (from messages-protocol-v2.json).
  */
 export const ProtocolV2FirmwareTargetType = {
   TARGET_INVALID: 0,

package/src/types/api/getPassphraseState.ts

@@ -9,7 +9,11 @@ export type GetPassphraseStatePayload =
       passphrase_protection?: boolean | null;
     };
 
+export type GetPassphraseStateParams = CommonParams & {
+  allowCreateAttachPin?: boolean;
+};
+
 export declare function getPassphraseState(
   connectId?: string,
-  params?: CommonParams
+  params?: GetPassphraseStateParams
 ): Response<GetPassphraseStatePayload>;

package/src/types/api/index.ts

@@ -162,7 +162,7 @@ import type { neoSignTransaction } from './neoSignTransaction';
 import type { ConnectSettings } from '../settings';
 
 export * from './export';
-export type { GetPassphraseStatePayload } from './getPassphraseState';
+export type { GetPassphraseStateParams, GetPassphraseStatePayload } from './getPassphraseState';
 
 export type CoreApi = {
   /**

package/src/utils/deviceFeaturesUtils.ts

@@ -1,7 +1,10 @@
 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';
@@ -23,8 +26,8 @@ export const getSupportProtocolV1MessageSchema = (
 ): { messages: JSON; protocolV1MessageSchema: ProtocolV1MessageSchema } => {
   if (!features)
     return {
-      messages: DataManager.messages.protocolV1Current,
-      protocolV1MessageSchema: 'protocolV1Current',
+      messages: DataManager.messages.v1CurrentSchema,
+      protocolV1MessageSchema: 'v1CurrentSchema',
     };
 
   const currentDeviceVersion = getDeviceFirmwareVersion(features).join('.');
@@ -50,8 +53,8 @@ export const getSupportProtocolV1MessageSchema = (
   }
 
   return {
-    messages: DataManager.messages.protocolV1Current,
-    protocolV1MessageSchema: 'protocolV1Current',
+    messages: DataManager.messages.v1CurrentSchema,
+    protocolV1MessageSchema: 'v1CurrentSchema',
   };
 };
 
@@ -89,6 +92,7 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
   options?: {
     expectPassphraseState?: string;
     onlyMainPin?: boolean;
+    allowCreateAttachPin?: boolean;
   }
 ) => {
   const { features, commands } = device;
@@ -119,8 +123,10 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
     await device.getFeatures();
   }
 
-  if (isPro2 && device.features && (passphraseState || newSession)) {
-    device.features.passphrase_protection = true;
+  if (isPro2 && device.features) {
+    if (passphraseState) {
+      device.features.passphrase_protection = true;
+    }
     if (newSession) {
       device.features.session_id = newSession;
     }
@@ -146,6 +152,7 @@ export const getPassphraseState = async (
   options?: {
     expectPassphraseState?: string;
     onlyMainPin?: boolean;
+    allowCreateAttachPin?: boolean;
   }
 ): Promise<{
   passphraseState: string | undefined;
@@ -169,9 +176,18 @@ export const getPassphraseState = async (
     (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') {