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

package/src/api/FirmwareUpdateV2.ts

@@ -15,7 +15,14 @@ import { validateParams } from './helpers/paramsValidator';
 import { DevicePool } from '../device/DevicePool';
 import { getBinary, getInfo, getSysResourceBinary } from './firmware/getBinary';
 import { updateResources, uploadFirmware } from './firmware/uploadFirmware';
-import { LoggerNames, getDeviceFirmwareVersion, getDeviceUUID, getLogger, wait } from '../utils';
+import {
+  LoggerNames,
+  getDeviceBootloaderVersion,
+  getDeviceFirmwareVersion,
+  getDeviceUUID,
+  getLogger,
+  wait,
+} from '../utils';
 import { FirmwareUpdateTipMessage, createUiMessage } from '../events/ui-request';
 import { DeviceModelToTypes } from '../types';
 import { DataManager } from '../data-manager';
@@ -222,7 +229,7 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
     const isBoot183ClassicUpBle =
       this.params.updateType === 'firmware' &&
       deviceType === EDeviceType.Classic &&
-      features.bootloader_version === '1.8.3';
+      getDeviceBootloaderVersion(features).join('.') === '1.8.3';
     return isMini || isBoot183ClassicUpBle;
   }
 

package/src/api/FirmwareUpdateV3.ts

@@ -18,6 +18,7 @@ import { DataManager } from '../data-manager';
 import { FirmwareUpdateBaseMethod } from './firmware/FirmwareUpdateBaseMethod';
 import { DevicePool } from '../device/DevicePool';
 import { DEVICE } from '../events';
+import { buildProtocolV1FeaturesPayload } from '../deviceProfile';
 
 import type { FirmwareUpdateV3Params } from '../types/api/firmwareUpdate';
 import type { Deferred, EFirmwareType } from '@onekeyfe/hd-shared';
@@ -386,7 +387,7 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
           }),
         ]);
         getFeaturesTimeoutCount = 0;
-        const features = featuresRes.message;
+        const features = buildProtocolV1FeaturesPayload(featuresRes.message, this.device.features);
         const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
         const bleVersion = getDeviceBLEFirmwareVersion(features).join('.');
         const firmwareVersion = getDeviceFirmwareVersion(features).join('.');

package/src/api/FirmwareUpdateV4.ts

@@ -7,7 +7,14 @@ import {
 
 import { FirmwareUpdateTipMessage, UI_REQUEST } from '../events/ui-request';
 import { validateParams } from './helpers/paramsValidator';
-import { LoggerNames, getFirmwareType, getLogger } from '../utils';
+import {
+  LoggerNames,
+  getDeviceBLEFirmwareVersion,
+  getDeviceBootloaderVersion,
+  getDeviceFirmwareVersion,
+  getFirmwareType,
+  getLogger,
+} from '../utils';
 import { getBinary, getSysResourceBinary } from './firmware/getBinary';
 import { DataManager } from '../data-manager';
 import { FirmwareUpdateBaseMethod } from './firmware/FirmwareUpdateBaseMethod';
@@ -18,7 +25,6 @@ import {
   protocolV2FileNameToTargetId,
 } from '../protocols/protocol-v2';
 import { requestProtocolV2DeviceInfo } from '../protocols/protocol-v2/features';
-import { buildProfileFromProtocolV2 } from '../deviceProfile';
 import {
   PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES,
   getProtocolV2UnknownErrorText,
@@ -164,8 +170,8 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   }
 
   private async runProtocolV2() {
-    const legacyFeatures = await this.getProtocolV2LegacyFeatures();
-    const deviceFirmwareType = getFirmwareType(legacyFeatures);
+    const deviceFeatures = await this.getProtocolV2DeviceFeatures();
+    const deviceFirmwareType = getFirmwareType(deviceFeatures);
     const firmwareType = this.params.firmwareType ?? deviceFirmwareType;
 
     let resourceBinary: ArrayBuffer | null = null;
@@ -173,9 +179,9 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     let bootloaderBinary: ArrayBuffer | null = null;
     try {
       this.postTipMessage(FirmwareUpdateTipMessage.StartDownloadFirmware);
-      resourceBinary = await this.prepareResourceBinary(firmwareType, legacyFeatures);
-      fwBinaryMap = await this.prepareFirmwareAndBleBinary(firmwareType, legacyFeatures);
-      bootloaderBinary = await this.prepareBootloaderBinary(firmwareType, legacyFeatures);
+      resourceBinary = await this.prepareResourceBinary(firmwareType, deviceFeatures);
+      fwBinaryMap = await this.prepareFirmwareAndBleBinary(firmwareType, deviceFeatures);
+      bootloaderBinary = await this.prepareBootloaderBinary(firmwareType, deviceFeatures);
       // 按 DevFirmwareTargetType 拆分的目标二进制（显式 target_id，不走文件名推断）
       fwBinaryMap.push(...this.collectExplicitTargetBinaries());
       this.postTipMessage(FirmwareUpdateTipMessage.FinishDownloadFirmware);
@@ -208,9 +214,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     return versions;
   }
 
-  private async getProtocolV2LegacyFeatures() {
+  private async getProtocolV2DeviceFeatures(): Promise<Features> {
     if (typeof this.device.getFeatures === 'function') {
-      return this.device.getFeatures();
+      const features = await this.device.getFeatures();
+      if (features) return features;
     }
     if (this.device.features) {
       return this.device.features;
@@ -258,11 +265,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     if (typeof this.device.isBootloader === 'function') {
       return this.device.isBootloader();
     }
-    const profile = this.device.profile;
-    if (profile?.status?.mode === 'bootloader' || profile?.status?.bootloaderMode === true) {
-      return true;
-    }
-    return !!this.device.features?.bootloader_mode;
+    return !!this.device.features?.bootloaderMode;
   }
 
   async enterProtocolV2BootloaderMode() {
@@ -314,11 +317,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       'application_p2.bin',
       ProtocolV2FirmwareTargetType.TARGET_MAIN_APP
     );
-    push(
-      this.params.coprocessorBinary,
-      'coprocessor.bin',
-      ProtocolV2FirmwareTargetType.TARGET_BT
-    );
+    push(this.params.coprocessorBinary, 'coprocessor.bin', ProtocolV2FirmwareTargetType.TARGET_BT);
     push(this.params.se01Binary, 'se01.bin', ProtocolV2FirmwareTargetType.TARGET_SE1);
     push(this.params.se02Binary, 'se02.bin', ProtocolV2FirmwareTargetType.TARGET_SE2);
     push(this.params.se03Binary, 'se03.bin', ProtocolV2FirmwareTargetType.TARGET_SE3);
@@ -571,14 +570,13 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   }
 
   private async waitForProtocolV2FinalFeatures() {
-    const profile = await this.waitForProtocolV2ReconnectAndProfile(
+    const features = await this.waitForProtocolV2ReconnectAndFeatures(
       PROTOCOL_V2_BOOTLOADER_RECONNECT_TIMEOUT
     );
-    this.device.updateProfile?.(profile);
 
-    const bootloaderVersion = profile.versions.bootloader ?? '0.0.0';
-    const bleVersion = profile.versions.ble ?? '0.0.0';
-    const firmwareVersion = profile.versions.firmware ?? '0.0.0';
+    const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
+    const bleVersion = getDeviceBLEFirmwareVersion(features).join('.');
+    const firmwareVersion = getDeviceFirmwareVersion(features).join('.');
     if (firmwareVersion === '0.0.0') {
       Log.warn(
         'Protocol V2 firmware update finished but app firmware version is still 0.0.0. This is allowed for Pro2 debug BLE-only update flows.'
@@ -592,7 +590,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     };
   }
 
-  private async waitForProtocolV2ReconnectAndProfile(timeout: number) {
+  private async waitForProtocolV2ReconnectAndFeatures(timeout: number) {
     const startTime = Date.now();
     let lastError: unknown;
 
@@ -605,12 +603,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           // 更新完成判定只需要各 target 版本号；scope 与请求内容保持一致
           request: PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST,
         });
-        return buildProfileFromProtocolV2({
-          deviceInfo,
-          sources: ['deviceInfo'],
-          scope: 'versions',
-          fallbackSerialNo: this.device.originalDescriptor?.path,
-        });
+        return this.device.updateProtocolV2Features(deviceInfo);
       } catch (error) {
         lastError = error;
         Log.log('Protocol V2 normal mode not ready, polling Ping: ', error);

package/src/api/GetDeviceInfo.ts

@@ -57,7 +57,7 @@ function shouldReadOnekeyFeatures(params: GetDeviceInfoParams) {
 }
 
 function supportOnekeyFeatures(features?: Features) {
-  if (!features || features.bootloader_mode) return false;
+  if (!features || features.bootloaderMode) return false;
 
   const deviceType = getDeviceType(features);
   return ![
@@ -109,14 +109,8 @@ export default class GetDeviceInfo extends BaseMethod<GetDeviceInfoParams> {
       sources,
       scope: this.params.scope,
       includeRaw: this.params.includeRaw,
-      fallbackSerialNo: this.device.originalDescriptor?.path,
     });
-    // 缓存走字段级合并：basic 请求不能降级已有的完整 profile；返回值仍按请求 scope 给出
-    if (typeof this.device.applyProfileUpdate === 'function') {
-      this.device.applyProfileUpdate(profile, protocolV2DeviceInfo);
-    } else {
-      this.device.updateProfile?.(profile);
-    }
+    this.device.updateProtocolV2Features(protocolV2DeviceInfo);
     return profile;
   }
 
@@ -127,26 +121,25 @@ export default class GetDeviceInfo extends BaseMethod<GetDeviceInfoParams> {
 
     const sources: DeviceInfoSource[] = ['features'];
     const { features } = this.device;
-    let onekeyFeatures: OnekeyFeatures | undefined;
+    let protocolV1OneKeyFeatures: OnekeyFeatures | undefined;
 
     if (shouldReadOnekeyFeatures(this.params) && supportOnekeyFeatures(features)) {
       const { message } = await this.device.commands.typedCall(
         'OnekeyGetFeatures',
         'OnekeyFeatures'
       );
-      onekeyFeatures = normalizeOnekeyFeatures(message);
-      sources.push('onekeyFeatures');
+      protocolV1OneKeyFeatures = normalizeOnekeyFeatures(message);
+      sources.push('protocolV1OneKeyFeatures');
     }
 
     const profile = buildProfileFromProtocolV1({
       protocol: 'V1',
       features,
-      onekeyFeatures,
+      protocolV1OneKeyFeatures,
       sources,
       scope: this.params.scope,
       includeRaw: this.params.includeRaw,
     });
-    this.device.updateProfile?.(profile);
     return profile;
   }
 }

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

@@ -26,8 +26,8 @@ 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,
+      session_id: newSession ?? features?.sessionId ?? undefined,
+      unlocked_attach_pin: unlockedAttachPin ?? features?.unlockedAttachPin,
       passphrase_protection: 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/tron/TronSignMessage.ts

@@ -47,7 +47,6 @@ export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage>
     return {
       pro2: {
         min: '0.0.0',
-        unsupported: true,
       },
       model_mini: {
         min: '2.5.0',

package/src/api/tron/TronSignTransaction.ts

@@ -150,7 +150,6 @@ export default class TronSignTransaction extends BaseMethod<TronSignTx> {
     return {
       pro2: {
         min: '0.0.0',
-        unsupported: true,
       },
       model_mini: {
         min: '2.5.0',

package/src/core/index.ts

@@ -57,16 +57,12 @@ import DeviceConnector from '../device/DeviceConnector';
 import RequestQueue from './RequestQueue';
 import { getSynchronize } from '../utils/getSynchronize';
 
-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 +1111,7 @@ const checkPassphraseEnableState = (method: BaseMethod, features?: Features) =>
 
   const passphraseProtection = method.device
     ? method.device.getCurrentPassphraseProtection()
-    : features?.passphrase_protection;
+    : features?.passphraseProtection;
 
   if (passphraseProtection === true) {
     const hasNoPassphraseState =

package/src/data-manager/DataManager.ts

@@ -114,11 +114,11 @@ export default class DataManager {
 
     const deviceFirmwareType = getFirmwareType(features);
     const deviceFirmwareVersion = getDeviceFirmwareVersion(features);
-    if (features.firmware_present === false) {
+    if (features.firmwarePresent === false) {
       return 'none';
     }
 
-    if (DeviceModelToTypes.model_mini.includes(deviceType) && features.bootloader_mode) {
+    if (DeviceModelToTypes.model_mini.includes(deviceType) && features.bootloaderMode) {
       return 'unknown';
     }
 
@@ -264,8 +264,8 @@ export default class DataManager {
     const targetDeviceConfigList = this.deviceMap[deviceType]?.[firmwareUpdateField] ?? [];
 
     if (
-      features.firmware_present === false ||
-      (DeviceModelToTypes.model_classic.includes(deviceType) && features.bootloader_mode)
+      features.firmwarePresent === false ||
+      (DeviceModelToTypes.model_classic.includes(deviceType) && features.bootloaderMode)
     ) {
       // Always return least changelog
       return getReleaseChangelog(targetDeviceConfigList, '0.0.0');