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

package/src/utils/deviceFeaturesUtils.ts

@@ -1,27 +1,33 @@
 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 } 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';
 import { existCapability } from './capabilitieUtils';
 
 import type { Device } from '../device/Device';
-import type { DeviceCommands } from '../device/DeviceCommands';
-import type { Features, SupportFeatureType } from '../types';
+import type { Features, IDeviceType, SupportFeatureType } from '../types';
 
-export const getSupportMessageVersion = (
+// 生成的 GetPassphraseState 已包含 _only_main_pin / allow_create_attach_pin，
+// 不再需要手动扩展字段。
+type GetPassphraseStateMessage = GetPassphraseState;
+
+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,25 +92,26 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
   options?: {
     expectPassphraseState?: string;
     onlyMainPin?: boolean;
+    allowCreateAttachPin?: boolean;
   }
 ) => {
-  const { features, commands } = device;
+  const { features } = device;
   const locked = features?.unlocked === false;
+  const deviceType = device.getCurrentDeviceType();
 
-  const { passphraseState, newSession, unlockedAttachPin } = await getPassphraseState(
-    features,
-    commands,
-    {
-      ...options,
-    }
-  );
+  const { passphraseState, newSession, unlockedAttachPin } = await getPassphraseState(device, {
+    ...options,
+  });
 
   const isModeT =
-    getDeviceType(features) === EDeviceType.Touch || getDeviceType(features) === EDeviceType.Pro;
+    deviceType === EDeviceType.Touch ||
+    deviceType === EDeviceType.Pro ||
+    deviceType === EDeviceType.Pro2;
 
   // 如果可以获取到 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 =
+    passphraseState && device.getCurrentPassphraseProtection() !== true;
   // 如果 Touch/Pro 在之前是锁定状态，刷新设备状态
   // if Touch/Pro was locked before, refresh the device state
   const needRefreshWithLocked = isModeT && locked;
@@ -111,49 +122,68 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
   }
 
   // Attach to pin try to fix internal state
-  if (features?.device_id) {
-    device.updateInternalState(
-      device.features?.passphrase_protection ?? false,
-      passphraseState,
-      device.features?.device_id ?? '',
-      newSession,
-      device.features?.session_id
-    );
-  }
+  const deviceId = device.getCurrentDeviceId();
+  device.updateInternalState(
+    device.getCurrentPassphraseProtection() ?? false,
+    passphraseState,
+    deviceId,
+    newSession,
+    device.features?.sessionId
+  );
 
   return { passphraseState, newSession, unlockedAttachPin };
 };
 
+// 仅适用于 Protocol V1 的 Pro：Pro2 走独立版本线，不能套用 4.15.0 门槛
+// （Pro2 在 getPassphraseState 中通过 isProtocolV2 直接判定支持）。
+const supportProSeriesAttachPinPassphrase = (deviceType: IDeviceType, firmwareVersion: string) =>
+  deviceType === EDeviceType.Pro && semver.gte(firmwareVersion, '4.15.0');
+
 export const getPassphraseState = async (
-  features: Features | undefined,
-  commands: DeviceCommands,
+  device: Device,
   options?: {
     expectPassphraseState?: string;
     onlyMainPin?: boolean;
+    allowCreateAttachPin?: boolean;
   }
 ): Promise<{
   passphraseState: string | undefined;
   newSession: string | undefined;
   unlockedAttachPin: boolean | undefined;
 }> => {
+  const { features, commands } = device;
+
+  // 设备尚未建立任何状态时无法判定，保持旧的空返回语义
   if (!features)
     return { passphraseState: undefined, newSession: undefined, unlockedAttachPin: undefined };
 
-  const firmwareVersion = getDeviceFirmwareVersion(features);
-  const deviceType = getDeviceType(features);
+  const firmwareVersion = device.getCurrentFirmwareVersionString() ?? '0.0.0';
+  const deviceType = device.getCurrentDeviceType();
 
   const supportAttachPinCapability = existCapability(
     features,
     Enum_Capability.Capability_AttachToPin
   );
+  // Pro2 (Protocol V2) 协议自带 GetPassphraseState(10028)，固件从首个版本即支持，
+  // 不依赖 Pro 系列的 4.15.0 版本线；V2 也没有 GetAddress Testnet 探测这条 legacy 回退路径。
   const supportGetPassphraseState =
+    device.isProtocolV2() ||
     supportAttachPinCapability ||
-    (deviceType === EDeviceType.Pro && semver.gte(firmwareVersion.join('.'), '4.15.0'));
+    supportProSeriesAttachPinPassphrase(deviceType, firmwareVersion);
 
   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') {
@@ -186,40 +216,8 @@ export const getPassphraseState = async (
   };
 };
 
-export const supportBatchPublicKey = (
-  features?: Features,
-  options?: {
-    includeNode?: boolean;
-  }
-): boolean => {
-  if (!features) return false;
-  const currentVersion = getDeviceFirmwareVersion(features).join('.');
-
-  const deviceType = getDeviceType(features);
-  // btc batch get public key
-  if (!!options?.includeNode && deviceType === EDeviceType.Pro) {
-    return semver.gte(currentVersion, '4.14.0');
-  }
-  if (!!options?.includeNode && deviceType === EDeviceType.Touch) {
-    return semver.gte(currentVersion, '4.11.0');
-  }
-  if (!!options?.includeNode && DeviceModelToTypes.model_classic1s.includes(deviceType)) {
-    return semver.gte(currentVersion, '3.12.0');
-  }
-  if (!!options?.includeNode && DeviceModelToTypes.model_mini.includes(deviceType)) {
-    return semver.gte(currentVersion, '3.10.0');
-  }
-  if (options?.includeNode) {
-    return false;
-  }
-
-  // support batch get public key
-  if (deviceType === EDeviceType.Touch || deviceType === EDeviceType.Pro) {
-    return semver.gte(currentVersion, '3.1.0');
-  }
-
-  return semver.gte(currentVersion, '2.6.0');
-};
+// supportBatchPublicKey 已迁移为 device-aware 版本：
+// 见 api/helpers/batchGetPublickeys.ts 的 supportBatchPublicKeyByDevice
 
 export const supportModifyHomescreen = (features?: Features): SupportFeatureType => {
   if (!features) return { support: false };
@@ -340,12 +338,8 @@ export const fixFeaturesFirmwareVersion = (features: Features): Features => {
   // fix Touch、Pro device when bootloader version is lower than 2.5.2, the features returned do not have firmware_version error
   const tempFeatures = { ...features };
 
-  if (tempFeatures.onekey_firmware_version && !semver.valid(tempFeatures.onekey_firmware_version)) {
-    tempFeatures.onekey_firmware_version = fixVersion(tempFeatures.onekey_firmware_version);
-  }
-
-  if (tempFeatures.onekey_version && !semver.valid(tempFeatures.onekey_version)) {
-    tempFeatures.onekey_version = fixVersion(tempFeatures.onekey_version);
+  if (tempFeatures.firmwareVersion && !semver.valid(tempFeatures.firmwareVersion)) {
+    tempFeatures.firmwareVersion = fixVersion(tempFeatures.firmwareVersion);
   }
 
   return tempFeatures;

package/src/utils/deviceInfoUtils.ts

@@ -14,27 +14,12 @@ export const getDeviceType = (features?: Features): IDeviceType => {
   if (!features || typeof features !== 'object') {
     return EDeviceType.Unknown;
   }
+  if (features.deviceType) {
+    return features.deviceType;
+  }
 
-  // classic1s 3.5.0 pro 4.6.0
-  switch (features.onekey_device_type) {
-    case 'CLASSIC':
-      return EDeviceType.Classic;
-    case 'CLASSIC1S':
-      return EDeviceType.Classic1s;
-    case 'MINI':
-      return EDeviceType.Mini;
-    case 'TOUCH':
-      return EDeviceType.Touch;
-    case 'PRO':
-      return EDeviceType.Pro;
-    case 'PURE':
-      return EDeviceType.ClassicPure;
-    default:
-      // future And old device onekey_device_type is empty
-      if (!isEmpty(features.onekey_serial_no)) {
-        return EDeviceType.Unknown;
-      }
-    // old device type
+  if (features.model === EDeviceType.Pro2 || features.model === 'pro2') {
+    return EDeviceType.Pro2;
   }
 
   // low version hardware
@@ -42,7 +27,7 @@ export const getDeviceType = (features?: Features): IDeviceType => {
   const serialNo = getDeviceUUID(features);
 
   // not exist serialNo, bootloader mode, model 1 is classic
-  if (isEmpty(serialNo) && features.bootloader_mode === true && features.model === '1') {
+  if (isEmpty(serialNo) && features.bootloaderMode === true && features.model === '1') {
     return EDeviceType.Classic;
   }
 
@@ -56,6 +41,7 @@ export const getDeviceType = (features?: Features): IDeviceType => {
   if (miniFlag.toLowerCase() === 'mi') return EDeviceType.Mini;
   if (miniFlag.toLowerCase() === 'tc') return EDeviceType.Touch;
   if (miniFlag.toLowerCase() === 'pr') return EDeviceType.Pro;
+  if (miniFlag.toLowerCase() === 'p2') return EDeviceType.Pro2;
 
   // unknown device
   return EDeviceType.Unknown;
@@ -68,13 +54,14 @@ export const getDeviceType = (features?: Features): IDeviceType => {
 export const getDeviceTypeByBleName = (name?: string): IDeviceType => {
   if (!name) return EDeviceType.Unknown;
 
-  if (name.startsWith('BixinKey')) return EDeviceType.Classic;
-  if (name.startsWith('K')) return EDeviceType.Classic;
+  if (/^BixinKey/i.test(name)) return EDeviceType.Classic;
+  if (/^K/i.test(name)) return EDeviceType.Classic;
 
-  if (name.startsWith('T')) return EDeviceType.Touch;
-  if (name.startsWith('Touch')) return EDeviceType.Touch;
+  if (/^T/i.test(name)) return EDeviceType.Touch;
+  if (/^Touch/i.test(name)) return EDeviceType.Touch;
 
-  if (name.startsWith('Pro')) return EDeviceType.Pro;
+  if (/\bPro\s*2\b/i.test(name) || /^Pro2/i.test(name)) return EDeviceType.Pro2;
+  if (/\bPro\b/i.test(name) || /^Pro/i.test(name)) return EDeviceType.Pro;
 
   return EDeviceType.Unknown;
 };
@@ -85,15 +72,14 @@ export const getDeviceTypeByBleName = (name?: string): IDeviceType => {
  */
 export const getDeviceBleName = (features?: Features): string | null => {
   if (features == null) return null;
-  return features.onekey_ble_name || features.ble_name || null;
+  return features.bleName || null;
 };
 
 /**
  * Get Connected Device UUID by features
  */
 export const getDeviceUUID = (features: Features) => {
-  const serialNo = features.onekey_serial_no || features.onekey_serial || features.serial_no;
-  return serialNo ?? '';
+  return features.serialNo ?? '';
 };
 
 /**
@@ -128,8 +114,8 @@ export const getMethodVersionRange = (
   getVersionRange: (deviceModel: IDeviceType | IDeviceModel) => IVersionRange | undefined
 ): IVersionRange | undefined => {
   const deviceType = getDeviceType(features);
-  let versionRange: IVersionRange | undefined = getVersionRange(deviceType);
 
+  const versionRange = getVersionRange(deviceType);
   if (versionRange) {
     return versionRange;
   }
@@ -142,22 +128,25 @@ export const getMethodVersionRange = (
   ];
   for (const model of modelFallbacks) {
     if (DeviceModelToTypes[model].includes(deviceType)) {
-      versionRange = getVersionRange(model);
+      const versionRange = getVersionRange(model);
       if (versionRange) {
         return versionRange;
       }
     }
   }
 
-  return versionRange;
+  return undefined;
 };
 
+export const isMethodVersionRangeUnsupported = (versionRange?: IVersionRange): boolean =>
+  versionRange?.unsupported === true;
+
 export const getFirmwareType = (features: Features | undefined) => {
   if (!features) {
     return EFirmwareType.Universal;
   }
-  if (features.fw_vendor === 'OneKey Bitcoin-only') {
-    return EFirmwareType.BitcoinOnly;
+  if (features.firmwareType) {
+    return features.firmwareType;
   }
   // old firmware
   return features?.capabilities?.length > 0 &&

package/src/utils/deviceVersionUtils.ts

@@ -8,12 +8,8 @@ import type { Features, IVersionArray } from '../types';
 export const getDeviceFirmwareVersion = (features: Features | undefined): IVersionArray => {
   if (!features) return [0, 0, 0];
 
-  if (semver.valid(features.onekey_firmware_version)) {
-    return features.onekey_firmware_version?.split('.') as unknown as IVersionArray;
-  }
-
-  if (semver.valid(features.onekey_version)) {
-    return features.onekey_version?.split('.') as unknown as IVersionArray;
+  if (features.firmwareVersion && semver.valid(features.firmwareVersion)) {
+    return features.firmwareVersion.split('.').map(Number) as IVersionArray;
   }
 
   return [0, 0, 0];
@@ -23,7 +19,7 @@ export const getDeviceFirmwareVersion = (features: Features | undefined): IVersi
  * Get Connected Device bluetooth firmware version by features
  */
 export const getDeviceBLEFirmwareVersion = (features: Features): IVersionArray => {
-  const bleVer = features?.onekey_ble_version || features?.ble_ver;
+  const bleVer = features?.bleVersion;
 
   if (!bleVer) {
     return [0, 0, 0];
@@ -46,24 +42,10 @@ export const getDeviceBootloaderVersion = (features: Features | undefined): IVer
   if (!features) return [0, 0, 0];
 
   // classic1s 3.5.0 pro 4.6.0
-  if (semver.valid(features.onekey_boot_version)) {
-    return features.onekey_boot_version?.split('.') as unknown as IVersionArray;
+  if (features.bootloaderVersion && semver.valid(features.bootloaderVersion)) {
+    return features.bootloaderVersion.split('.').map(Number) as IVersionArray;
   }
 
-  // low version hardware
-  if (!features.bootloader_version) {
-    if (features.bootloader_mode) {
-      return [
-        features?.major_version ?? 0,
-        features?.minor_version ?? 0,
-        features?.patch_version ?? 0,
-      ];
-    }
-    return [0, 0, 0];
-  }
-  if (semver.valid(features.bootloader_version)) {
-    return features.bootloader_version?.split('.') as unknown as IVersionArray;
-  }
   return [0, 0, 0];
 };
 
@@ -71,8 +53,8 @@ export const getDeviceBootloaderVersion = (features: Features | undefined): IVer
  * Get Connected Device boardloader version by features
  */
 export const getDeviceBoardloaderVersion = (features: Features): IVersionArray => {
-  if (semver.valid(features?.onekey_board_version)) {
-    return features?.onekey_board_version?.split('.') as unknown as IVersionArray;
+  if (features?.boardVersion && semver.valid(features.boardVersion)) {
+    return features.boardVersion.split('.').map(Number) as IVersionArray;
   }
 
   return [0, 0, 0];

package/src/utils/findDefectiveBatchDevice.ts

@@ -5,7 +5,7 @@ import type { Features } from '../types';
 /**
  * 检测故障固件设备
  * 检测规则：
- * - 序列号范围：21032200001 到 21032201500 (从 onekey_serial 字段提取)
+ * - 序列号范围：21032200001 到 21032201500
  * - SE版本为 1.1.0.2
  *
  * 对齐之前版本的检测逻辑
@@ -13,13 +13,13 @@ import type { Features } from '../types';
 export const findDefectiveBatchDevice = (features: Features) => {
   if (!features) return;
 
-  const { onekey_serial: onekeySerial, se_ver: seVer } = features;
-  if (!onekeySerial) return;
+  const { serialNo, seVersion } = features;
+  if (!serialNo) return;
 
-  const versionNum = +onekeySerial.slice(5);
+  const versionNum = +serialNo.slice(5);
   if (Number.isNaN(versionNum)) return;
 
-  return versionNum >= 21032200001 && versionNum <= 21032201500 && seVer === '1.1.0.2';
+  return versionNum >= 21032200001 && versionNum <= 21032201500 && seVersion === '1.1.0.2';
 };
 
 /**
@@ -29,7 +29,7 @@ export const getDefectiveDeviceInfo = (features: Features) => {
   if (!findDefectiveBatchDevice(features)) return null;
   const serialNo = getDeviceUUID(features);
   const deviceType = getDeviceType(features);
-  const seVersion = features.se_ver;
+  const { seVersion } = features;
 
   return {
     serialNo,

package/src/utils/index.ts

@@ -11,6 +11,7 @@ export {
   getDeviceUUID,
   getDeviceLabel,
   getMethodVersionRange,
+  isMethodVersionRangeUnsupported,
   getFirmwareType,
 } from './deviceInfoUtils';
 export {