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

package/src/api/GetOnekeyFeatures.ts

@@ -4,7 +4,6 @@ import { UI_REQUEST } from '../constants/ui-request';
 import { fixVersion } from '../utils/deviceFeaturesUtils';
 import { PROTOCOL_V2_DEVICE_INFO_REQUEST } from '../protocols/protocol-v2';
 import { requestProtocolV2DeviceInfo } from '../protocols/protocol-v2/features';
-import { buildProfileFromProtocolV2, buildProtocolV2GetFeaturesPayload } from '../deviceProfile';
 import { BaseMethod } from './BaseMethod';
 
 import type { OnekeyFeatures } from '../types';
@@ -91,23 +90,13 @@ export default class GetOnekeyFeatures extends BaseMethod {
   async run() {
     if (this.device.isProtocolV2()) {
       // V2 没有 OnekeyGetFeatures 消息：
-      // 取完整 DevGetDeviceInfo（含 SE/hash/build_id）后写入 features 兼容视图。
+      // 取完整 DevGetDeviceInfo（含 SE/hash/build_id）后刷新结构化 features 缓存。
       const deviceInfo = await requestProtocolV2DeviceInfo({
         commands: this.device.commands,
         request: PROTOCOL_V2_DEVICE_INFO_REQUEST,
       });
-      const profile = this.device.applyProfileUpdate(
-        buildProfileFromProtocolV2({
-          deviceInfo,
-          sources: ['deviceInfo'],
-          scope: 'verify',
-          fallbackSerialNo: this.device.originalDescriptor?.path,
-        }),
-        deviceInfo
-      );
-      return pickOnekeyFeatures(
-        buildProtocolV2GetFeaturesPayload(profile, deviceInfo) as OnekeyFeatures
-      );
+      const features = this.device.updateProtocolV2Features(deviceInfo);
+      return pickOnekeyFeatures(features as OnekeyFeatures);
     }
 
     const { message } = await this.device.commands.typedCall('OnekeyGetFeatures', 'OnekeyFeatures');

package/src/api/GetPassphraseState.ts

@@ -25,10 +25,10 @@ export default class GetPassphraseState extends BaseMethod {
 
     // refresh device info
     return Promise.resolve({
-      passphrase_state: isProSeries || passphraseProtection === true ? passphraseState : undefined,
-      session_id: newSession ?? features?.session_id ?? undefined,
-      unlocked_attach_pin: unlockedAttachPin ?? features?.unlocked_attach_pin,
-      passphrase_protection: passphraseProtection,
+      passphraseState: isProSeries || passphraseProtection === true ? passphraseState : undefined,
+      sessionId: newSession ?? features?.sessionId ?? undefined,
+      unlockedAttachPin: unlockedAttachPin ?? features?.unlockedAttachPin,
+      passphraseProtection,
     });
   }
 }

package/src/api/firmware/bootloaderHelper.ts

@@ -1,7 +1,7 @@
 import semver from 'semver';
 import { EDeviceType } from '@onekeyfe/hd-shared';
 
-import { getDeviceType } from '../../utils';
+import { getDeviceBootloaderVersion, getDeviceType } from '../../utils';
 
 import type { Features, IVersionArray } from '../../types';
 
@@ -38,9 +38,10 @@ export function shouldUpdateBootloaderForClassicAndMini({
 export function isEnteredManuallyBoot(features: Features, updateType: string) {
   const deviceType = getDeviceType(features);
   const isMini = deviceType === EDeviceType.Mini;
+  const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
   const isBoot183ClassicUpBle =
     updateType === 'firmware' &&
     deviceType === EDeviceType.Classic &&
-    features.bootloader_version === '1.8.3';
+    bootloaderVersion === '1.8.3';
   return isMini || isBoot183ClassicUpBle;
 }

package/src/api/firmware/getBinary.ts

@@ -41,7 +41,7 @@ export const getBinary = async ({
   }
 
   if (version && !semver.eq(releaseInfo.version.join('.'), version.join('.'))) {
-    const touchWithoutVersion = getDeviceType(features) === 'touch' && !features.onekey_version;
+    const touchWithoutVersion = getDeviceType(features) === 'touch' && !features.firmwareVersion;
     if (!touchWithoutVersion) {
       throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'firmware version mismatch');
     }

package/src/api/firmware/releaseHelper.ts

@@ -12,7 +12,7 @@ export const getFirmwareReleaseInfo = (features: Features, firmwareType: EFirmwa
   const firmwareStatus = DataManager.getFirmwareStatus(features, firmwareType);
   const changelog = DataManager.getFirmwareChangelog(features, firmwareType);
   const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
-  const bootloaderMode = !!features.bootloader_mode;
+  const bootloaderMode = !!features.bootloaderMode;
   return {
     status: firmwareStatus,
     changelog,
@@ -25,7 +25,7 @@ export const getBleFirmwareReleaseInfo = (features: Features) => {
   const firmwareStatus = DataManager.getBLEFirmwareStatus(features);
   const changelog = DataManager.getBleFirmwareChangelog(features);
   const release = DataManager.getBleFirmwareLatestRelease(features);
-  const bootloaderMode = !!features.bootloader_mode;
+  const bootloaderMode = !!features.bootloaderMode;
   return {
     status: firmwareStatus,
     changelog,
@@ -52,7 +52,7 @@ export const getBootloaderReleaseInfo = ({
       Object.prototype.hasOwnProperty.call(item, 'en-US')
   );
 
-  const bootloaderMode = !!features.bootloader_mode;
+  const bootloaderMode = !!features.bootloaderMode;
 
   let shouldUpdate = false;
 

package/src/api/firmware/uploadFirmware.ts

@@ -9,6 +9,7 @@ import { DeviceModelToTypes } from '../../types';
 import { bytesToHex } from '../helpers/hexUtils';
 import { DataManager } from '../../data-manager';
 import { DevicePool } from '../../device/DevicePool';
+import { buildProtocolV1FeaturesPayload } from '../../deviceProfile';
 
 import type { KnownDevice } from '../../types';
 import type { TypedCall, TypedResponseMessage } from '../../device/DeviceCommands';
@@ -34,7 +35,7 @@ const isDeviceDisconnectedError = (error: unknown) => {
 
 const postConfirmationMessage = (device: Device) => {
   // only if firmware is already installed. fresh device does not require button confirmation
-  if (device.features?.firmware_present) {
+  if (device.features?.firmwarePresent) {
     device.emit(DEVICE.BUTTON, device, { code: 'ButtonRequest_FirmwareUpdate' });
   }
 };
@@ -109,7 +110,9 @@ export const uploadFirmware = async (
 
     if (isFirmware && !isUpdateBootloader) {
       const newFeatures = await typedCall('GetFeatures', 'Features', {});
-      const deviceBootloaderVersion = getDeviceBootloaderVersion(newFeatures.message).join('.');
+      const deviceBootloaderVersion = getDeviceBootloaderVersion(
+        buildProtocolV1FeaturesPayload(newFeatures.message, device.features)
+      ).join('.');
       const supportUpgradeFileHeader = semver.gte(deviceBootloaderVersion, '2.1.0');
       Log.debug('supportUpgradeFileHeader:', supportUpgradeFileHeader);
 

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

@@ -1,5 +1,5 @@
 import { BaseMethod } from '../BaseMethod';
-import { normalizeDeviceRebootType } from './helpers';
+import { normalizeRebootType } from './helpers';
 
 import type { DeviceRebootParams } from './helpers';
 
@@ -16,8 +16,8 @@ export default class DeviceReboot extends BaseMethod<DeviceRebootParams> {
   }
 
   async run() {
-    const res = await this.device.commands.typedCall('DeviceReboot', 'Success', {
-      reboot_type: normalizeDeviceRebootType(this.params.reboot_type ?? this.params.rebootType),
+    const res = await this.device.commands.typedCall('DevReboot', 'Success', {
+      reboot_type: normalizeRebootType(this.params.reboot_type ?? this.params.rebootType),
     });
     return Promise.resolve(res.message);
   }

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

@@ -1,4 +1,4 @@
-import { DevRebootType, DeviceRebootType } from '@onekeyfe/hd-transport';
+import { DevRebootType } from '@onekeyfe/hd-transport';
 
 import { invalidParameter, validateNonEmptyString } from '../helpers/filesystemValidation';
 
@@ -10,9 +10,7 @@ import type {
 
 export type RebootTypeInput =
   | DevRebootType
-  | DeviceRebootType
   | keyof typeof DevRebootType
-  | keyof typeof DeviceRebootType
   | string
   | number;
 
@@ -56,17 +54,6 @@ const DEV_REBOOT_TYPES: Record<string, DevRebootType> = {
   bootloader: DevRebootType.Bootloader,
 };
 
-const DEVICE_REBOOT_TYPES: Record<string, DeviceRebootType> = {
-  Normal: DeviceRebootType.Normal,
-  normal: DeviceRebootType.Normal,
-  Romloader: DeviceRebootType.Romloader,
-  romloader: DeviceRebootType.Romloader,
-  Boardloader: DeviceRebootType.Romloader,
-  boardloader: DeviceRebootType.Romloader,
-  Bootloader: DeviceRebootType.Bootloader,
-  bootloader: DeviceRebootType.Bootloader,
-};
-
 export const PROTOCOL_V2_FIRMWARE_UPDATE_OPTIONS: TransportCallOptions = {
   intermediateTypes: ['DevFirmwareInstallProgress'],
 };
@@ -143,18 +130,6 @@ export function normalizeRebootType(value: RebootTypeInput | undefined): DevRebo
   return DevRebootType.Normal;
 }
 
-export function normalizeDeviceRebootType(
-  value: RebootTypeInput | undefined
-): DeviceRebootType {
-  if (typeof value === 'number') return value;
-  if (typeof value === 'string') {
-    const numeric = Number(value);
-    if (Number.isFinite(numeric)) return numeric;
-    if (value in DEVICE_REBOOT_TYPES) return DEVICE_REBOOT_TYPES[value];
-  }
-  return DeviceRebootType.Normal;
-}
-
 // 当前 firmware-pro2 子模块的 DevFirmwareTargetType 合法值。
 const VALID_FIRMWARE_TARGET_IDS = new Set<number>([0, 1, 2, 3, 4, 5, 6, 10]);
 

package/src/constants/index.ts

@@ -1,2 +1,11 @@
 export { safeThrowError } from './errors';
-export { Messages as PROTO, TonSignDataType } from '@onekeyfe/hd-transport';
+export {
+  Messages as PROTO,
+  ResourceType,
+  TonSignDataType,
+  TonWalletVersion,
+} from '@onekeyfe/hd-transport';
+export type {
+  HDNodeType,
+  Success as DeviceSuccess,
+} from '@onekeyfe/hd-transport';

package/src/core/index.ts

@@ -56,17 +56,14 @@ import TransportManager from '../data-manager/TransportManager';
 import DeviceConnector from '../device/DeviceConnector';
 import RequestQueue from './RequestQueue';
 import { getSynchronize } from '../utils/getSynchronize';
+import { setProtocolV2DeviceInfoMock } from '../protocols/protocol-v2/features';
 
-import type { ConnectSettings, KnownDevice } from '../types';
+import type { ConnectSettings, Features, KnownDevice } from '../types';
 import type { CoreMessage, IFrameCallMessage, UiPromise, UiPromiseResponse } from '../events';
 import type { DeviceEvents, InitOptions, RunOptions } from '../device/Device';
 import type { SdkTracingContext } from '../utils/tracing';
 import type { Deferred } from '@onekeyfe/hd-shared';
-import type {
-  Features,
-  LowlevelTransportSharedPlugin,
-  OneKeyDeviceInfo,
-} from '@onekeyfe/hd-transport';
+import type { LowlevelTransportSharedPlugin, OneKeyDeviceInfo } from '@onekeyfe/hd-transport';
 import type { BaseMethod } from '../api/BaseMethod';
 
 const Log = getLogger(LoggerNames.Core);
@@ -1115,7 +1112,7 @@ const checkPassphraseEnableState = (method: BaseMethod, features?: Features) =>
 
   const passphraseProtection = method.device
     ? method.device.getCurrentPassphraseProtection()
-    : features?.passphrase_protection;
+    : features?.passphraseProtection;
 
   if (passphraseProtection === true) {
     const hasNoPassphraseState =
@@ -1442,6 +1439,7 @@ export const init = async (
   try {
     try {
       await DataManager.load(settings);
+      setProtocolV2DeviceInfoMock(settings.protocolV2DeviceInfoMockEnabled ?? false);
       initTransport(Transport, plugin);
     } catch {
       Log.error('DataManager.load error');