@onekeyfe/hd-core 1.2.0-alpha.112 → 1.2.0-alpha.113

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?.main_mcu?.application) {
-    if (deviceInfo?.main_mcu?.romloader) return 'romloader';
-    if (deviceInfo?.main_mcu?.bootloader) return 'bootloader';
+  if (isLegacyProtocolV2ProtocolInfo(protocolInfo) && !deviceInfo?.fw?.application) {
+    if (deviceInfo?.fw?.romloader) return 'romloader';
+    if (deviceInfo?.fw?.bootloader) return 'bootloader';
   }
   return undefined;
 };
@@ -122,7 +122,7 @@ export const supportsProtocolV2Message = (
 export const PROTOCOL_V2_FEATURES_DEVICE_INFO_REQUEST = {
   targets: {
     hw: true,
-    main_mcu: true,
+    fw: 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,
-    main_mcu: true,
+    fw: 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,
-    main_mcu: true,
+    fw: 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 =
-    file.original_name === undefined
-      ? archivePath.split('/').pop() ?? archivePath
-      : assertManifestRelativePath(file.original_name, `files[${index}].original_name`);
+  const originalName = assertManifestRelativePath(
+    file.original_name,
+    `files[${index}].original_name`
+  );
   if (originalName.includes('/')) {
     throw new Error(`Invalid Pro2 resource manifest files[${index}].original_name`);
   }
@@ -122,6 +122,15 @@ 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`);
   }
@@ -131,9 +140,9 @@ function parseProtocolV2ResourceManifestFile(
     device_path: devicePath,
     size: Number(file.size),
     sha256: digest,
-    ...(file.signed === undefined ? {} : { signed: file.signed }),
-    ...(file.sig_algo === undefined ? {} : { sig_algo: file.sig_algo }),
-    ...(file.payload_version === undefined ? {} : { payload_version: file.payload_version }),
+    signed: true,
+    sig_algo: file.sig_algo,
+    payload_version: file.payload_version ?? null,
   };
 }
 
@@ -142,8 +151,15 @@ export function parseProtocolV2ResourceManifest(value: unknown): IProtocolV2Reso
     throw new Error('Invalid Pro2 resource manifest');
   }
   const manifest = value as Partial<IProtocolV2ResourceManifest>;
-  if (!Array.isArray(manifest.files)) {
-    throw new Error('Invalid Pro2 resource manifest files');
+  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');
   }
   const files = manifest.files.map(parseProtocolV2ResourceManifestFile);
   const devicePaths = new Set(files.map(file => file.device_path));
@@ -151,11 +167,34 @@ export function parseProtocolV2ResourceManifest(value: unknown): IProtocolV2Reso
   if (
     files.length === 0 ||
     devicePaths.size !== files.length ||
-    archivePaths.size !== files.length
+    archivePaths.size !== files.length ||
+    !devicePaths.has(PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_PATH) ||
+    !files.some(file => file.device_path.startsWith('vol0:/bundles/'))
   ) {
     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,7 +80,6 @@ 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,16 +76,31 @@ export type IProtocolV2Resources = {
 
 export type IProtocolV2ResourceManifestFile = {
   archive_path: string;
-  original_name?: string;
+  original_name: string;
   device_path: string;
   size: number;
   sha256: string;
-  signed?: boolean;
-  sig_algo?: string;
-  payload_version?: string | null;
+  signed: true;
+  sig_algo: 'ed25519' | 'mldsa65';
+  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[];
 };