@onekeyfe/hd-core 1.2.0-alpha.115 → 1.2.0-alpha.117

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

@@ -1,14 +1,6 @@
 import { BaseMethod } from '../BaseMethod';
-import {
-  PROTOCOL_V2_FIRMWARE_UPDATE_OPTIONS,
-  PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES,
-  isProtocolV2DeviceDisconnectedError,
-  normalizeFirmwareTargets,
-} from './helpers';
-import { UI_REQUEST, createUiMessage } from '../../events/ui-request';
+import { isProtocolV2DeviceDisconnectedError, normalizeFirmwareTargets } from './helpers';
 
-import type { KnownDevice } from '../../types';
-import type { MessageFromOneKey } from '@onekeyfe/hd-transport';
 import type { DeviceFirmwareUpdateParams } from './helpers';
 
 export default class DeviceFirmwareUpdate extends BaseMethod<DeviceFirmwareUpdateParams> {
@@ -31,27 +23,13 @@ export default class DeviceFirmwareUpdate extends BaseMethod<DeviceFirmwareUpdat
   async run() {
     const targets = normalizeFirmwareTargets(this.params);
     try {
-      const res = await this.device.commands.typedCall(
+      await this.device.commands.typedCall('DeviceFirmwareUpdateStage', 'Success', { targets });
+      await this.device.commands.call(
         'DeviceFirmwareUpdateRequest',
-        PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES,
-        {
-          targets,
-        },
-        {
-          ...PROTOCOL_V2_FIRMWARE_UPDATE_OPTIONS,
-          onIntermediateResponse: (response: MessageFromOneKey) => {
-            if (response.type !== 'DeviceFirmwareUpdateStatus') return;
-            this.postMessage(
-              createUiMessage(UI_REQUEST.FIRMWARE_PROGRESS, {
-                device: this.device.toMessageObject() as KnownDevice,
-                progress: 99,
-                progressType: 'installingFirmware',
-              })
-            );
-          },
-        }
+        {},
+        { returnAfterWrite: true }
       );
-      return res.message;
+      return { message: 'Device firmware update started' };
     } catch (error) {
       if (isProtocolV2DeviceDisconnectedError(error)) {
         return {

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

@@ -5,7 +5,7 @@ import { invalidParameter } from '../helpers/filesystemValidation';
 
 export type DeviceInfoGetTargets = {
   hw?: boolean;
-  fw?: boolean;
+  main_mcu?: boolean;
   coprocessor?: boolean;
   se1?: boolean;
   se2?: boolean;
@@ -27,7 +27,7 @@ export type DeviceInfoGetParams = {
 
 const TARGET_KEYS: (keyof DeviceInfoGetTargets)[] = [
   'hw',
-  'fw',
+  'main_mcu',
   'coprocessor',
   'se1',
   'se2',
@@ -39,7 +39,7 @@ const TYPE_KEYS: (keyof DeviceInfoGetTypes)[] = ['version', 'build_id', 'hash',
 
 const DEFAULT_TARGETS: DeviceInfoGetTargets = {
   hw: true,
-  fw: true,
+  main_mcu: true,
   coprocessor: true,
 };
 

package/src/data/messages/messages-protocol-v2.json

@@ -462,9 +462,10 @@
         "MessageType_FilesystemDirMake": 60809,
         "MessageType_FilesystemDirRemove": 60810,
         "MessageType_FilesystemFormat": 60811,
-        "MessageType_DeviceFirmwareUpdateRequest": 61000,
-        "MessageType_DeviceFirmwareUpdateStatusGet": 61001,
-        "MessageType_DeviceFirmwareUpdateStatus": 61002,
+        "MessageType_DeviceFirmwareUpdateStage": 61000,
+        "MessageType_DeviceFirmwareUpdateRequest": 61001,
+        "MessageType_DeviceFirmwareUpdateStatusGet": 61002,
+        "MessageType_DeviceFirmwareUpdateStatus": 61003,
         "MessageType_DeviceSessionGet": 61200,
         "MessageType_DeviceSession": 61201,
         "MessageType_DeviceSessionAskPin": 61202,
@@ -10924,7 +10925,7 @@
           "type": "bytes",
           "id": 1
         },
-        "signing_message": {
+        "signning_message": {
           "type": "bytes",
           "id": 2
         },
@@ -11813,14 +11814,14 @@
           "type": "string",
           "id": 2
         },
-        "burn_in_completed": {
-          "type": "bool",
-          "id": 3
-        },
         "factory_test_completed": {
           "type": "bool",
           "id": 4
         },
+        "factory_burn_in_completed": {
+          "type": "bool",
+          "id": 3
+        },
         "manufacture_time": {
           "type": "DeviceFactoryInfoManufactureTime",
           "id": 5
@@ -11906,7 +11907,7 @@
         }
       }
     },
-    "DeviceFirmwareUpdateRequest": {
+    "DeviceFirmwareUpdateStage": {
       "fields": {
         "targets": {
           "rule": "repeated",
@@ -11915,6 +11916,9 @@
         }
       }
     },
+    "DeviceFirmwareUpdateRequest": {
+      "fields": {}
+    },
     "DeviceFirmwareUpdateRecord": {
       "fields": {
         "target_id": {
@@ -12096,7 +12100,7 @@
           "type": "bool",
           "id": 100
         },
-        "fw": {
+        "main_mcu": {
           "type": "bool",
           "id": 200
         },
@@ -12165,7 +12169,7 @@
           "type": "DeviceHardwareInfo",
           "id": 100
         },
-        "fw": {
+        "main_mcu": {
           "type": "DeviceMainMcuInfo",
           "id": 200
         },
@@ -12703,9 +12707,12 @@
           "id": 1
         },
         "text": {
-          "rule": "required",
           "type": "string",
           "id": 2
+        },
+        "text_id": {
+          "type": "uint32",
+          "id": 3
         }
       }
     },
@@ -12736,7 +12743,6 @@
     "ViewSignPage": {
       "fields": {
         "title": {
-          "rule": "required",
           "type": "string",
           "id": 1
         },
@@ -12770,13 +12776,16 @@
           "options": {
             "default": "LayoutDefault"
           }
+        },
+        "title_id": {
+          "type": "uint32",
+          "id": 8
         }
       }
     },
     "ViewVerifyPage": {
       "fields": {
         "title": {
-          "rule": "required",
           "type": "string",
           "id": 1
         },
@@ -12801,6 +12810,14 @@
         "value_key": {
           "type": "uint32",
           "id": 6
+        },
+        "title_id": {
+          "type": "uint32",
+          "id": 7
+        },
+        "chain_id": {
+          "type": "uint32",
+          "id": 8
         }
       }
     },

package/src/device/DeviceStateMapper.ts

@@ -267,11 +267,11 @@ export const mapProtocolV2DeviceInfoToState = (
         }
       : { mode },
     versions: definedEntries({
-      firmware: imageVersion(info.fw?.application),
-      applicationP1: imageVersion(info.fw?.application),
-      applicationP2: imageVersion(info.fw?.application_data),
-      bootloader: imageVersion(info.fw?.bootloader),
-      board: imageVersion(info.fw?.romloader),
+      firmware: imageVersion(info.main_mcu?.application),
+      applicationP1: imageVersion(info.main_mcu?.application),
+      applicationP2: imageVersion(info.main_mcu?.application_data),
+      bootloader: imageVersion(info.main_mcu?.bootloader),
+      board: imageVersion(info.main_mcu?.romloader),
       ble: imageVersion(info.coprocessor?.application),
       se01: imageVersion(info.se1?.application),
       se02: imageVersion(info.se2?.application),
@@ -283,16 +283,16 @@ export const mapProtocolV2DeviceInfoToState = (
       se04Boot: imageVersion(info.se4?.bootloader),
     }),
     verification: definedEntries({
-      firmwareBuildId: imageBuildId(info.fw?.application),
-      firmwareHash: imageHash(info.fw?.application),
-      applicationP1BuildId: imageBuildId(info.fw?.application),
-      applicationP1Hash: imageHash(info.fw?.application),
-      applicationP2BuildId: imageBuildId(info.fw?.application_data),
-      applicationP2Hash: imageHash(info.fw?.application_data),
-      bootloaderBuildId: imageBuildId(info.fw?.bootloader),
-      bootloaderHash: imageHash(info.fw?.bootloader),
-      boardBuildId: imageBuildId(info.fw?.romloader),
-      boardHash: imageHash(info.fw?.romloader),
+      firmwareBuildId: imageBuildId(info.main_mcu?.application),
+      firmwareHash: imageHash(info.main_mcu?.application),
+      applicationP1BuildId: imageBuildId(info.main_mcu?.application),
+      applicationP1Hash: imageHash(info.main_mcu?.application),
+      applicationP2BuildId: imageBuildId(info.main_mcu?.application_data),
+      applicationP2Hash: imageHash(info.main_mcu?.application_data),
+      bootloaderBuildId: imageBuildId(info.main_mcu?.bootloader),
+      bootloaderHash: imageHash(info.main_mcu?.bootloader),
+      boardBuildId: imageBuildId(info.main_mcu?.romloader),
+      boardHash: imageHash(info.main_mcu?.romloader),
       bleBuildId: imageBuildId(info.coprocessor?.application),
       bleHash: imageHash(info.coprocessor?.application),
       se01BuildId: imageBuildId(info.se1?.application),

package/src/deviceProfile/buildDeviceFeatures.ts

@@ -216,9 +216,9 @@ export const buildProtocolV2FeaturesPayload = ({
   runtimeMode?: ProtocolV2RuntimeMode;
 }): Features => {
   const info = deviceInfo;
-  const fwApplication = info?.fw?.application;
-  const fwBootloader = info?.fw?.bootloader;
-  const fwBoard = info?.fw?.romloader;
+  const fwApplication = info?.main_mcu?.application;
+  const fwBootloader = info?.main_mcu?.bootloader;
+  const fwBoard = info?.main_mcu?.romloader;
   const bleApplication = info?.coprocessor?.application;
   const status = deviceStatus;
   const incomingSerialNo = info?.hw?.serial_no;

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

@@ -104,9 +104,9 @@ export const getProtocolV2RuntimeMode = (
   if (binary === 'application') return 'normal';
   if (binary) return binary;
 
-  if (isLegacyProtocolV2ProtocolInfo(protocolInfo) && !deviceInfo?.fw?.application) {
-    if (deviceInfo?.fw?.romloader) return 'romloader';
-    if (deviceInfo?.fw?.bootloader) return 'bootloader';
+  if (isLegacyProtocolV2ProtocolInfo(protocolInfo) && !deviceInfo?.main_mcu?.application) {
+    if (deviceInfo?.main_mcu?.romloader) return 'romloader';
+    if (deviceInfo?.main_mcu?.bootloader) return 'bootloader';
   }
   return undefined;
 };
@@ -122,7 +122,7 @@ export const supportsProtocolV2Message = (
 export const PROTOCOL_V2_FEATURES_DEVICE_INFO_REQUEST = {
   targets: {
     hw: true,
-    fw: true,
+    main_mcu: true,
     coprocessor: true,
   },
   types: {
@@ -138,7 +138,7 @@ export const PROTOCOL_V2_FEATURES_DEVICE_INFO_REQUEST = {
 export const PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST = {
   targets: {
     hw: true,
-    fw: true,
+    main_mcu: true,
     coprocessor: true,
     se1: true,
     se2: true,
@@ -154,7 +154,7 @@ export const PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST = {
 export const PROTOCOL_V2_FULL_DEVICE_INFO_REQUEST = {
   targets: {
     hw: true,
-    fw: true,
+    main_mcu: true,
     coprocessor: true,
     se1: true,
     se2: true,

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

@@ -107,10 +107,10 @@ function parseProtocolV2ResourceManifestFile(
   }
   const file = value as Partial<IProtocolV2ResourceManifestFile>;
   const archivePath = assertManifestRelativePath(file.archive_path, `files[${index}].archive_path`);
-  const originalName = assertManifestRelativePath(
-    file.original_name,
-    `files[${index}].original_name`
-  );
+  const originalName =
+    file.original_name === undefined
+      ? archivePath.split('/').pop() ?? archivePath
+      : assertManifestRelativePath(file.original_name, `files[${index}].original_name`);
   if (originalName.includes('/')) {
     throw new Error(`Invalid Pro2 resource manifest files[${index}].original_name`);
   }
@@ -122,15 +122,6 @@ function parseProtocolV2ResourceManifestFile(
     throw new Error(`Invalid Pro2 resource manifest files[${index}].size`);
   }
   const digest = normalizeHex(file.sha256, SHA256_HEX_LENGTH, `files[${index}].sha256`);
-  if (file.signed !== true) {
-    throw new Error(`Invalid Pro2 resource manifest files[${index}].signed`);
-  }
-  if (file.sig_algo !== 'ed25519' && file.sig_algo !== 'mldsa65') {
-    throw new Error(`Invalid Pro2 resource manifest files[${index}].sig_algo`);
-  }
-  if (file.payload_version !== null && typeof file.payload_version !== 'string') {
-    throw new Error(`Invalid Pro2 resource manifest files[${index}].payload_version`);
-  }
   if (!archivePath.endsWith('.okpkg') || !originalName.endsWith('.okpkg')) {
     throw new Error(`Invalid Pro2 resource manifest files[${index}] package extension`);
   }
@@ -140,9 +131,9 @@ function parseProtocolV2ResourceManifestFile(
     device_path: devicePath,
     size: Number(file.size),
     sha256: digest,
-    signed: true,
-    sig_algo: file.sig_algo,
-    payload_version: file.payload_version ?? null,
+    ...(file.signed === undefined ? {} : { signed: file.signed }),
+    ...(file.sig_algo === undefined ? {} : { sig_algo: file.sig_algo }),
+    ...(file.payload_version === undefined ? {} : { payload_version: file.payload_version }),
   };
 }
 
@@ -151,15 +142,8 @@ export function parseProtocolV2ResourceManifest(value: unknown): IProtocolV2Reso
     throw new Error('Invalid Pro2 resource manifest');
   }
   const manifest = value as Partial<IProtocolV2ResourceManifest>;
-  if (
-    manifest.schema !== 1 ||
-    manifest.variant !== 'resource' ||
-    manifest.device_root !== 'vol0:' ||
-    manifest.restore_mode !== 'bootloader_update' ||
-    !Array.isArray(manifest.trees) ||
-    !Array.isArray(manifest.files)
-  ) {
-    throw new Error('Invalid Pro2 resource manifest contract');
+  if (!Array.isArray(manifest.files)) {
+    throw new Error('Invalid Pro2 resource manifest files');
   }
   const files = manifest.files.map(parseProtocolV2ResourceManifestFile);
   const devicePaths = new Set(files.map(file => file.device_path));
@@ -167,34 +151,11 @@ export function parseProtocolV2ResourceManifest(value: unknown): IProtocolV2Reso
   if (
     files.length === 0 ||
     devicePaths.size !== files.length ||
-    archivePaths.size !== files.length ||
-    !devicePaths.has(PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_PATH) ||
-    !files.some(file => file.device_path.startsWith('vol0:/bundles/'))
+    archivePaths.size !== files.length
   ) {
     throw new Error('Invalid Pro2 resource manifest file set');
   }
   return {
-    schema: 1,
-    artifact_name: assertManifestString(manifest.artifact_name, 'artifact_name'),
-    release_name: assertManifestString(manifest.release_name, 'release_name'),
-    variant: 'resource',
-    commit: assertManifestString(manifest.commit, 'commit'),
-    short_sha: assertManifestString(manifest.short_sha, 'short_sha'),
-    timestamp_utc: assertManifestString(manifest.timestamp_utc, 'timestamp_utc'),
-    core_version: assertManifestString(manifest.core_version, 'core_version'),
-    key_set: assertManifestString(manifest.key_set, 'key_set'),
-    device_root: 'vol0:',
-    restore_mode: 'bootloader_update',
-    trees: manifest.trees.map((tree, index) => {
-      if (!tree || typeof tree !== 'object') {
-        throw new Error(`Invalid Pro2 resource manifest trees[${index}]`);
-      }
-      const item = tree as { path?: unknown; device?: unknown };
-      return {
-        path: assertManifestRelativePath(item.path, `trees[${index}].path`),
-        device: assertManifestString(item.device, `trees[${index}].device`),
-      };
-    }),
     files,
   };
 }

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

@@ -80,6 +80,7 @@ export async function runMethodWithUnlockPolicy<T = unknown>(
   const requiresPreUnlock =
     device.isProtocolV2() &&
     (method.useDevicePassphraseState || method.unlockPolicy === 'unlock-before-run') &&
+    device.state?.status.initialized !== false &&
     !device.isBootloader?.() &&
     !device.isRomloader?.();
 

package/src/types/settings.ts

@@ -76,31 +76,16 @@ export type IProtocolV2Resources = {
 
 export type IProtocolV2ResourceManifestFile = {
   archive_path: string;
-  original_name: string;
+  original_name?: string;
   device_path: string;
   size: number;
   sha256: string;
-  signed: true;
-  sig_algo: 'ed25519' | 'mldsa65';
-  payload_version: string | null;
+  signed?: boolean;
+  sig_algo?: string;
+  payload_version?: string | null;
 };
 
 export type IProtocolV2ResourceManifest = {
-  schema: 1;
-  artifact_name: string;
-  release_name: string;
-  variant: 'resource';
-  commit: string;
-  short_sha: string;
-  timestamp_utc: string;
-  core_version: string;
-  key_set: string;
-  device_root: 'vol0:';
-  restore_mode: 'bootloader_update';
-  trees: Array<{
-    path: string;
-    device: string;
-  }>;
   files: IProtocolV2ResourceManifestFile[];
 };