@onekeyfe/hd-core 1.1.27-alpha.4 → 1.1.27-alpha.40

package/src/api/cardano/CardanoSignMessage.ts

@@ -14,7 +14,6 @@ export default class CardanoSignMessage extends BaseMethod<CardanoSignMessagePar
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     const { payload } = this;
     validateParams(payload, [

package/src/api/cardano/CardanoSignTransaction.ts

@@ -49,7 +49,6 @@ export default class CardanoSignTransaction extends BaseMethod<any> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     this.hasBundle = !!this.payload?.bundle;
 

package/src/api/conflux/ConfluxSignMessage.ts

@@ -9,7 +9,6 @@ import type { ConfluxSignMessage as HardwareConfluxSignMessage } from '@onekeyfe
 export default class ConfluxSignMessage extends BaseMethod<HardwareConfluxSignMessage> {
   init() {
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/conflux/ConfluxSignMessageCIP23.ts

@@ -9,7 +9,6 @@ import type { ConfluxSignMessageCIP23 as HardwareConfluxSignMessageCIP23 } from
 export default class ConfluxSignMessageCIP23 extends BaseMethod<HardwareConfluxSignMessageCIP23> {
   init() {
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     validateParams(this.payload, [
       { name: 'path', required: true },

package/src/api/conflux/ConfluxSignTransaction.ts

@@ -22,7 +22,6 @@ export default class ConfluxSignTransaction extends BaseMethod {
 
   init() {
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     validateParams(this.payload, [
       { name: 'path', required: true },
@@ -35,7 +34,7 @@ export default class ConfluxSignTransaction extends BaseMethod {
 
     // check if transaction is valid
     const schema: SchemaParam[] = [
-      { name: 'to', type: 'hexString', required: true },
+      { name: 'to', type: 'string', required: true },
       { name: 'value', type: 'hexString', required: true },
       { name: 'gasLimit', type: 'hexString', required: true },
       { name: 'gasPrice', type: 'hexString', required: true },
@@ -48,7 +47,10 @@ export default class ConfluxSignTransaction extends BaseMethod {
 
     validateParams(tx, schema);
 
-    this.formattedTx = formatAnyHex(tx);
+    this.formattedTx = {
+      ...formatAnyHex(tx),
+      to: tx.to,
+    };
   }
 
   processTxRequest = async (request: ConfluxTxRequest, data: string): Promise<ConfluxSignedTx> => {

package/src/api/cosmos/CosmosSignTransaction.ts

@@ -14,7 +14,6 @@ export default class CosmosSignTransaction extends BaseMethod<HardwareCosmosSign
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode];
-    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/device/DeviceRebootToBoardloader.ts

@@ -1,3 +1,5 @@
+import { DeviceRebootType } from '@onekeyfe/hd-transport';
+
 import { BaseMethod } from '../BaseMethod';
 
 import type { RebootToBoardloaderParams } from '../../types/api/deviceRebootToBoardloader';
@@ -21,10 +23,17 @@ export default class DeviceRebootToBoardloader extends BaseMethod<RebootToBoardl
   }
 
   async run() {
+    // Protocol V2 uses DeviceReboot with reboot_type enum.
+    if (this.device.originalDescriptor?.protocolType === 'V2') {
+      const res = await this.device.commands.typedCall('DeviceReboot', 'Success', {
+        reboot_type: DeviceRebootType.Boardloader,
+      });
+      return Promise.resolve(res.message);
+    }
+
     // On Touch devices, messsage code 904 is RebootToBoardloader
     // so BininOutMessageSE message code 904 is used here
     const res = await this.device.commands.typedCall('BixinOutMessageSE', 'Success');
-
     return Promise.resolve(res.message);
   }
 }

package/src/api/device/DeviceRebootToBootloader.ts

@@ -1,3 +1,5 @@
+import { DeviceRebootType } from '@onekeyfe/hd-transport';
+
 import { BaseMethod } from '../BaseMethod';
 
 import type { RebootToBootloader } from '@onekeyfe/hd-transport';
@@ -21,8 +23,15 @@ export default class DeviceRebootToBootloader extends BaseMethod<RebootToBootloa
   }
 
   async run() {
-    const res = await this.device.commands.typedCall('RebootToBootloader', 'Success');
+    // Protocol V2 uses DeviceReboot with reboot_type enum.
+    if (this.device.originalDescriptor?.protocolType === 'V2') {
+      const res = await this.device.commands.typedCall('DeviceReboot', 'Success', {
+        reboot_type: DeviceRebootType.Bootloader,
+      });
+      return Promise.resolve(res.message);
+    }
 
+    const res = await this.device.commands.typedCall('RebootToBootloader', 'Success');
     return Promise.resolve(res.message);
   }
 }

package/src/api/dynex/DnxGetAddress.ts

@@ -1,7 +1,10 @@
+import { createDeviceNotSupportMethodError } from '@onekeyfe/hd-shared';
+
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
+import { getFirmwareType } from '../../utils';
 
 import type { DnxGetAddress as HardwareDnxGetAddress } from '@onekeyfe/hd-transport';
 import type { DnxAddress, DnxGetAddressParams } from '../../types';
@@ -47,6 +50,10 @@ export default class DnxGetAddress extends BaseMethod<HardwareDnxGetAddress[]> {
   }
 
   async run() {
+    if (this.device.originalDescriptor?.protocolType === 'V2') {
+      throw createDeviceNotSupportMethodError(this.name, getFirmwareType(this.device.features));
+    }
+
     const responses: DnxAddress[] = [];
 
     for (let i = 0; i < this.params.length; i++) {

package/src/api/dynex/DnxSignTransaction.ts

@@ -1,8 +1,11 @@
+import { createDeviceNotSupportMethodError } from '@onekeyfe/hd-shared';
+
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { stripHexPrefix } from '../helpers/hexUtils';
+import { getFirmwareType } from '../../utils';
 
 import type { TypedResponseMessage } from '../../device/DeviceCommands';
 import type { DnxSignature } from '../../types';
@@ -14,7 +17,6 @@ export default class DnxSignTransaction extends BaseMethod<DnxSignTx> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     const { payload } = this;
     // init params
@@ -116,6 +118,10 @@ export default class DnxSignTransaction extends BaseMethod<DnxSignTx> {
   }
 
   async run() {
+    if (this.device.originalDescriptor?.protocolType === 'V2') {
+      throw createDeviceNotSupportMethodError(this.name, getFirmwareType(this.device.features));
+    }
+
     const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
 
     const res = await this.device.commands.typedCall('DnxSignTx', 'DnxInputRequest', {

package/src/api/evm/EVMGetAddress.ts

@@ -44,7 +44,7 @@ export default class EvmGetAddress extends BaseMethod<EthereumGetAddressOneKey[]
   }
 
   async getEvmAddress(param: EthereumGetAddressOneKey) {
-    if (TransportManager.getMessageVersion() === 'v1') {
+    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.getMessageVersion() === 'v1') {
+    if (TransportManager.getProtocolV1MessageSchema() === 'v1LegacySchema') {
       return getPublicKeyLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         param,

package/src/api/evm/EVMSignMessage.ts

@@ -13,14 +13,12 @@ export default class EVMSignMessage extends BaseMethod<EthereumSignMessageOneKey
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [
       { name: 'path', required: true },
       { name: 'messageHex', type: 'hexString', required: true },
       { name: 'chainId', type: 'number' },
-      { name: 'usePreInitialize', type: 'boolean' },
     ]);
 
     const { path, messageHex, chainId } = this.payload;
@@ -36,7 +34,7 @@ export default class EVMSignMessage extends BaseMethod<EthereumSignMessageOneKey
   }
 
   async run() {
-    if (TransportManager.getMessageVersion() === 'v1') {
+    if (TransportManager.getProtocolV1MessageSchema() === 'v1LegacySchema') {
       return signMessageLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         params: this.params,

package/src/api/evm/EVMSignMessageEIP712.ts

@@ -5,6 +5,7 @@ import { validateParams } from '../helpers/paramsValidator';
 import { formatAnyHex } from '../helpers/hexUtils';
 
 import type { EthereumSignMessageEIP712 } from '@onekeyfe/hd-transport';
+import type { DeviceFirmwareRange } from '../../types';
 
 /**
  * @deprecated Use EVMSignTypedData instead.
@@ -13,7 +14,6 @@ export default class EVMSignMessageEIP712 extends BaseMethod<EthereumSignMessage
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     validateParams(this.payload, [
       { name: 'path', required: true },
@@ -32,8 +32,12 @@ export default class EVMSignMessageEIP712 extends BaseMethod<EthereumSignMessage
     };
   }
 
-  getVersionRange() {
+  getVersionRange(): DeviceFirmwareRange {
     return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
       model_mini: {
         min: '2.1.9',
       },
@@ -44,6 +48,14 @@ export default class EVMSignMessageEIP712 extends BaseMethod<EthereumSignMessage
   }
 
   async run() {
+    this.checkFeatureVersionLimit(
+      () => true,
+      () => this.getVersionRange(),
+      {
+        strictCheckDeviceSupport: true,
+      }
+    );
+
     const res = await this.device.commands.typedCall(
       'EthereumSignMessageEIP712',
       'EthereumMessageSignature',

package/src/api/evm/EVMSignTransaction.ts

@@ -46,12 +46,10 @@ export default class EVMSignTransaction extends BaseMethod {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     validateParams(this.payload, [
       { name: 'path', required: true },
       { name: 'transaction', type: 'object', required: true },
-      { name: 'usePreInitialize', type: 'boolean' },
     ]);
     const { path, transaction } = this.payload;
     this.addressN = validatePath(path, 3);
@@ -122,7 +120,7 @@ export default class EVMSignTransaction extends BaseMethod {
 
     if (formattedTx == null) throw ERRORS.TypedError('Runtime', 'formattedTx is not set');
 
-    if (TransportManager.getMessageVersion() === 'v1') {
+    if (TransportManager.getProtocolV1MessageSchema() === 'v1LegacySchema') {
       return signTransactionLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         addressN,

package/src/api/evm/EVMSignTypedData.ts

@@ -52,7 +52,6 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     validateParams(this.payload, [
       { name: 'path', required: true },
@@ -61,7 +60,6 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
       { name: 'domainHash', type: 'hexString' },
       { name: 'messageHash', type: 'hexString' },
       { name: 'chainId', type: 'number' },
-      { name: 'usePreInitialize', type: 'boolean' },
     ]);
 
     const { path, data, metamaskV4Compat, domainHash, messageHash, chainId } = this.payload;
@@ -262,8 +260,8 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
 
     let supportTrezor = false;
     let response: MessageResponse<MessageKey>;
-    switch (TransportManager.getMessageVersion()) {
-      case 'v1':
+    switch (TransportManager.getProtocolV1MessageSchema()) {
+      case 'v1LegacySchema':
         supportTrezor = true;
         response = await signTypedDataLegacyV1({
           typedCall: this.device.commands.typedCall.bind(this.device.commands),
@@ -274,7 +272,7 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
         });
         break;
 
-      case 'latest':
+      case 'v1CurrentSchema':
       default:
         supportTrezor = false;
         response = await signTypedData({
@@ -310,8 +308,8 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
   }) {
     if (!domainHash) throw ERRORS.TypedError('Runtime', 'domainHash is required');
 
-    switch (TransportManager.getMessageVersion()) {
-      case 'v1':
+    switch (TransportManager.getProtocolV1MessageSchema()) {
+      case 'v1LegacySchema':
         return signTypedHashLegacyV1({
           typedCall,
           addressN,
@@ -321,7 +319,7 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
           device: this.device,
         });
 
-      case 'latest':
+      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.getMessageVersion() === 'v1') {
+    if (TransportManager.getProtocolV1MessageSchema() === 'v1LegacySchema') {
       return verifyMessageLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         params: this.params,

package/src/api/filecoin/FilecoinSignTransaction.ts

@@ -12,7 +12,6 @@ export default class FilecoinSignTransaction extends BaseMethod<HardwareFilecoin
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode];
-    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/firmware/FirmwareUpdateBaseMethod.ts

@@ -28,6 +28,13 @@ const Log = getLogger(LoggerNames.Method);
 const SESSION_ERROR = 'session not found';
 const FIRMWARE_UPDATE_CONFIRM = 'Firmware install confirmed';
 
+type FirmwareProgressMetadata = {
+  transferredBytes?: number;
+  totalBytes?: number;
+  rateBytesPerSecond?: number;
+  elapsedMs?: number;
+};
+
 const isDeviceDisconnectedError = (error: unknown) => {
   const message = error instanceof Error ? error.message : String(error ?? '');
   return (
@@ -82,12 +89,17 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
    * @description Post the progress message
    * @param progress Post the percentage of the progress
    */
-  postProgressMessage = (progress: number, progressType: IFirmwareUpdateProgressType) => {
+  postProgressMessage = (
+    progress: number,
+    progressType: IFirmwareUpdateProgressType,
+    metadata: FirmwareProgressMetadata = {}
+  ) => {
     this.postMessage(
       createUiMessage(UI_REQUEST.FIRMWARE_PROGRESS, {
         device: this.device.toMessageObject() as KnownDevice,
         progress,
         progressType,
+        ...metadata,
       })
     );
   };
@@ -325,10 +337,12 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
     filePath,
     processedSize,
     totalSize,
+    transferStartTime = Date.now(),
   }: PROTO.FirmwareUpload & {
     filePath: string;
     processedSize?: number;
     totalSize?: number;
+    transferStartTime?: number;
   }) {
     if (!filePath.startsWith('0:')) {
       throw new Error('filePath must start with 0:');
@@ -338,7 +352,6 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
     const chunkSize = 1024 * perPackageSize;
     const totalChunks = Math.ceil(payload.byteLength / chunkSize);
     let offset = 0;
-    let currentFileProcessed = 0;
 
     for (let i = 0; i < totalChunks; i++) {
       const chunkStart = i * chunkSize;
@@ -350,7 +363,7 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
       // Calculate progress based on whether we're tracking overall progress or single file progress
       let progress: number;
       if (totalSize !== undefined && processedSize !== undefined) {
-        currentFileProcessed = processedSize + chunkEnd;
+        const currentFileProcessed = processedSize + chunkEnd;
         progress = Math.min(Math.ceil((currentFileProcessed / totalSize) * 100), 99);
       } else {
         progress = Math.min(Math.ceil(((i + 1) / totalChunks) * 100), 99);
@@ -366,7 +379,17 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
       );
       // @ts-expect-error
       offset += writeRes.message.processed_byte;
-      this.postProgressMessage(progress, 'transferData');
+      const elapsedMs = Date.now() - transferStartTime;
+      const transferredBytes =
+        totalSize !== undefined && processedSize !== undefined ? processedSize + offset : offset;
+      const totalBytes = totalSize ?? payload.byteLength;
+      this.postProgressMessage(progress, 'transferData', {
+        transferredBytes,
+        totalBytes,
+        rateBytesPerSecond:
+          elapsedMs > 0 ? Math.round((transferredBytes / elapsedMs) * 1000) : undefined,
+        elapsedMs,
+      });
     }
 
     // Return processed size only if we're tracking overall progress

package/src/api/helpers/deviceInfo.ts

@@ -0,0 +1,205 @@
+import {
+  getDeviceBLEFirmwareVersion,
+  getDeviceBleName,
+  getDeviceBoardloaderVersion,
+  getDeviceBootloaderVersion,
+  getDeviceFirmwareVersion,
+  getDeviceLabel,
+  getDeviceType,
+  getDeviceUUID,
+  getFirmwareType,
+} from '../../utils';
+
+import type {
+  DeviceInfoProtocol,
+  DeviceInfoSource,
+  DeviceInfoStatus,
+  GetDeviceInfoParams,
+  UnifiedDeviceInfo,
+  UnifiedDeviceInfoRaw,
+  UnifiedDeviceInfoVerify,
+  UnifiedDeviceInfoVersions,
+} from '../../types/api/getDeviceInfo';
+import type { Features, OnekeyFeatures } from '../../types';
+import type { ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
+
+type BuildDeviceInfoParams = {
+  protocol: DeviceInfoProtocol;
+  features?: Features;
+  onekeyFeatures?: OnekeyFeatures;
+  protocolV2DeviceInfo?: ProtocolV2DeviceInfo;
+  sources: DeviceInfoSource[];
+  scope?: GetDeviceInfoParams['scope'];
+  includeRaw?: boolean;
+};
+
+const isMeaningfulVersion = (version?: string | null) => Boolean(version && version !== '0.0.0');
+
+const versionArrayToString = (version?: Array<number | string | null> | null) => {
+  if (!version || version.length === 0) return null;
+  const value = version.join('.');
+  return isMeaningfulVersion(value) ? value : null;
+};
+
+const firstVersion = (...versions: Array<string | null | undefined>) =>
+  versions.find(isMeaningfulVersion) ?? null;
+
+const safeGetDeviceUUID = (features?: Features) => (features ? getDeviceUUID(features) : '');
+
+const shouldIncludeVerify = (scope?: GetDeviceInfoParams['scope']) =>
+  scope === 'verify' || scope === 'full';
+
+const getDeviceMode = (features?: Features): DeviceInfoStatus['mode'] => {
+  if (!features) return 'unknown';
+  if (features.bootloader_mode === true) return 'bootloader';
+  if (features.initialized === false) return 'notInitialized';
+  if (features.initialized === true) return 'normal';
+  return 'unknown';
+};
+
+const normalizeVersions = (
+  features?: Features,
+  onekeyFeatures?: OnekeyFeatures
+): UnifiedDeviceInfoVersions => ({
+  firmware: firstVersion(
+    onekeyFeatures?.onekey_firmware_version,
+    versionArrayToString(getDeviceFirmwareVersion(features))
+  ),
+  bootloader: firstVersion(
+    onekeyFeatures?.onekey_boot_version,
+    versionArrayToString(getDeviceBootloaderVersion(features))
+  ),
+  board: firstVersion(
+    onekeyFeatures?.onekey_board_version,
+    versionArrayToString(features ? getDeviceBoardloaderVersion(features) : undefined)
+  ),
+  ble: firstVersion(
+    onekeyFeatures?.onekey_ble_version,
+    features?.onekey_ble_version,
+    features?.ble_ver,
+    versionArrayToString(features ? getDeviceBLEFirmwareVersion(features) : undefined)
+  ),
+  se01: firstVersion(onekeyFeatures?.onekey_se01_version, features?.onekey_se01_version),
+  se02: firstVersion(onekeyFeatures?.onekey_se02_version, features?.onekey_se02_version),
+  se03: firstVersion(onekeyFeatures?.onekey_se03_version, features?.onekey_se03_version),
+  se04: firstVersion(onekeyFeatures?.onekey_se04_version, features?.onekey_se04_version),
+  se01Boot: firstVersion(
+    onekeyFeatures?.onekey_se01_boot_version,
+    features?.onekey_se01_boot_version
+  ),
+  se02Boot: firstVersion(
+    onekeyFeatures?.onekey_se02_boot_version,
+    features?.onekey_se02_boot_version
+  ),
+  se03Boot: firstVersion(
+    onekeyFeatures?.onekey_se03_boot_version,
+    features?.onekey_se03_boot_version
+  ),
+  se04Boot: firstVersion(
+    onekeyFeatures?.onekey_se04_boot_version,
+    features?.onekey_se04_boot_version
+  ),
+});
+
+const normalizeStatus = (protocol: DeviceInfoProtocol, features?: Features): DeviceInfoStatus => ({
+  mode: getDeviceMode(features),
+  initialized: features?.initialized ?? null,
+  bootloaderMode: features?.bootloader_mode ?? null,
+  unlocked: protocol === 'V2' ? null : features?.unlocked ?? null,
+  passphraseProtection: features?.passphrase_protection ?? null,
+  backupRequired: features?.needs_backup ?? null,
+  language: features?.language ?? null,
+  bleEnabled: (features as { ble_enable?: boolean } | undefined)?.ble_enable ?? null,
+});
+
+const normalizeVerify = (
+  features?: Features,
+  onekeyFeatures?: OnekeyFeatures
+): UnifiedDeviceInfoVerify => {
+  const featureRecord = features as Record<string, string | undefined> | undefined;
+  return {
+    firmwareBuildId: onekeyFeatures?.onekey_firmware_build_id ?? features?.onekey_firmware_build_id,
+    firmwareHash: onekeyFeatures?.onekey_firmware_hash ?? features?.onekey_firmware_hash,
+    bootloaderBuildId: onekeyFeatures?.onekey_boot_build_id ?? features?.onekey_boot_build_id,
+    bootloaderHash: onekeyFeatures?.onekey_boot_hash ?? features?.onekey_boot_hash,
+    boardBuildId: onekeyFeatures?.onekey_board_build_id ?? featureRecord?.onekey_board_build_id,
+    boardHash: onekeyFeatures?.onekey_board_hash ?? features?.onekey_board_hash,
+    bleBuildId: onekeyFeatures?.onekey_ble_build_id ?? features?.onekey_ble_build_id,
+    bleHash: onekeyFeatures?.onekey_ble_hash ?? features?.onekey_ble_hash,
+    se01BuildId: onekeyFeatures?.onekey_se01_build_id ?? features?.onekey_se01_build_id,
+    se01Hash: onekeyFeatures?.onekey_se01_hash ?? featureRecord?.onekey_se01_hash,
+    se02BuildId: onekeyFeatures?.onekey_se02_build_id ?? featureRecord?.onekey_se02_build_id,
+    se02Hash: onekeyFeatures?.onekey_se02_hash ?? featureRecord?.onekey_se02_hash,
+    se03BuildId: onekeyFeatures?.onekey_se03_build_id ?? featureRecord?.onekey_se03_build_id,
+    se03Hash: onekeyFeatures?.onekey_se03_hash ?? featureRecord?.onekey_se03_hash,
+    se04BuildId: onekeyFeatures?.onekey_se04_build_id ?? featureRecord?.onekey_se04_build_id,
+    se04Hash: onekeyFeatures?.onekey_se04_hash ?? featureRecord?.onekey_se04_hash,
+    se01BootBuildId:
+      onekeyFeatures?.onekey_se01_boot_build_id ?? features?.onekey_se01_boot_build_id,
+    se01BootHash: onekeyFeatures?.onekey_se01_boot_hash ?? features?.onekey_se01_boot_hash,
+    se02BootBuildId:
+      onekeyFeatures?.onekey_se02_boot_build_id ?? features?.onekey_se02_boot_build_id,
+    se02BootHash: onekeyFeatures?.onekey_se02_boot_hash ?? features?.onekey_se02_boot_hash,
+    se03BootBuildId:
+      onekeyFeatures?.onekey_se03_boot_build_id ?? features?.onekey_se03_boot_build_id,
+    se03BootHash: onekeyFeatures?.onekey_se03_boot_hash ?? features?.onekey_se03_boot_hash,
+    se04BootBuildId:
+      onekeyFeatures?.onekey_se04_boot_build_id ?? features?.onekey_se04_boot_build_id,
+    se04BootHash: onekeyFeatures?.onekey_se04_boot_hash ?? features?.onekey_se04_boot_hash,
+  };
+};
+
+const normalizeRaw = ({
+  features,
+  onekeyFeatures,
+  protocolV2DeviceInfo,
+}: Pick<
+  BuildDeviceInfoParams,
+  'features' | 'onekeyFeatures' | 'protocolV2DeviceInfo'
+>): UnifiedDeviceInfoRaw => ({
+  ...(features ? { features } : {}),
+  ...(onekeyFeatures ? { onekeyFeatures } : {}),
+  ...(protocolV2DeviceInfo ? { protocolV2DeviceInfo } : {}),
+});
+
+export function buildUnifiedDeviceInfo({
+  protocol,
+  features,
+  onekeyFeatures,
+  protocolV2DeviceInfo,
+  sources,
+  scope = 'basic',
+  includeRaw = false,
+}: BuildDeviceInfoParams): UnifiedDeviceInfo {
+  const mergedFeatures = {
+    ...(features ?? {}),
+    ...(onekeyFeatures ?? {}),
+  } as Features;
+  const hasFeatures = Boolean(features || onekeyFeatures);
+  const sourceFeatures = hasFeatures ? mergedFeatures : undefined;
+  const deviceType = getDeviceType(sourceFeatures);
+  const verify = normalizeVerify(sourceFeatures, onekeyFeatures);
+
+  return {
+    protocol,
+    sources,
+    deviceType,
+    firmwareType: getFirmwareType(sourceFeatures),
+    deviceId: sourceFeatures?.device_id || safeGetDeviceUUID(sourceFeatures),
+    serialNo: safeGetDeviceUUID(sourceFeatures),
+    label: getDeviceLabel(sourceFeatures),
+    bleName: getDeviceBleName(sourceFeatures),
+    status: normalizeStatus(protocol, sourceFeatures),
+    versions: normalizeVersions(sourceFeatures, onekeyFeatures),
+    ...(shouldIncludeVerify(scope) ? { verify } : {}),
+    ...(includeRaw
+      ? {
+          raw: normalizeRaw({
+            features,
+            onekeyFeatures,
+            protocolV2DeviceInfo,
+          }),
+        }
+      : {}),
+  };
+}