@onekeyfe/hd-core 1.2.0-alpha.141 → 1.2.0-alpha.143

package/__tests__/device-lifecycle-events.test.ts

@@ -1,7 +1,12 @@
 import { EDeviceType, ERRORS, HardwareErrorCode, createDeferred } from '@onekeyfe/hd-shared';
 import { DeviceType, TRANSPORT_EVENT } from '@onekeyfe/hd-transport';
 
-import { initConnector, initCore, isMissingDetectedProtocolV2Error } from '../src/core';
+import {
+  initConnector,
+  initCore,
+  isMissingDetectedProtocolV2Error,
+  isRetryableBleProtocolV2ProbeError,
+} from '../src/core';
 import { DataManager } from '../src/data-manager';
 import TransportManager from '../src/data-manager/TransportManager';
 import { Device } from '../src/device/Device';
@@ -269,6 +274,23 @@ describe('public device lifecycle events', () => {
     }
   );
 
+  test.each([
+    [HardwareErrorCode.RuntimeError, true],
+    [HardwareErrorCode.BleDeviceBondError, false],
+  ] as const)(
+    'retries a Protocol V2 probe mismatch with error code %s: %s',
+    (errorCode, expected) => {
+      const method = { payload: { connectProtocol: 'V2' } } as never;
+      const error = {
+        errorCode,
+        message:
+          'Device protocol mismatch: expected V2, but device did not respond to expected protocol',
+      };
+
+      expect(isRetryableBleProtocolV2ProbeError(method, error)).toBe(expected);
+    }
+  );
+
   test('converts an internal transport disconnect into a public KnownDevice snapshot', () => {
     jest.spyOn(DataManager, 'getSettings').mockReturnValue('react-native' as never);
     core = initCore();

package/__tests__/protocol-v2-resources.test.ts

@@ -1,10 +1,9 @@
 import axios from 'axios';
-import { sha256 } from '@noble/hashes/sha256';
 import { EDeviceType, EFirmwareType, HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 import { DataManager } from '../src/data-manager';
 import {
-  parseProtocolV2ResourceManifest,
+  parseProtocolV2ResourcePackage,
   parseProtocolV2Resources,
 } from '../src/protocols/protocol-v2/resources';
 
@@ -16,9 +15,6 @@ jest.mock('../src/data/config', () => ({
   DEFAULT_DOMAIN: 'https://jssdk.onekey.so/1.0.0-test/',
 }));
 
-const bytesToHex = (bytes: Uint8Array) =>
-  Array.from(bytes, byte => byte.toString(16).padStart(2, '0')).join('');
-
 const resourceSource = {
   archiveUrl: 'https://example.com/resource/pro2-resource.zip',
   archiveSha256: 'a'.repeat(64),
@@ -31,65 +27,21 @@ const neoResourceSource = {
   archiveSize: 12_345_678,
 };
 
-const manifestFiles = [
-  ['bundles/firmware_logo-build.okpkg', 'firmware_logo.okpkg', 'vol0:/bundles/firmware_logo.okpkg'],
-  ['bundles/font/noto-build.okpkg', 'noto.okpkg', 'vol0:/bundles/font/noto.okpkg'],
-  ['bundles/font/roobert-build.okpkg', 'roobert.okpkg', 'vol0:/bundles/font/roobert.okpkg'],
-  [
-    'bundles/images/animation-build.okpkg',
-    'animation.okpkg',
-    'vol0:/bundles/images/animation.okpkg',
-  ],
-  ['bundles/images/images-build.okpkg', 'images.okpkg', 'vol0:/bundles/images/images.okpkg'],
-  [
-    'bundles/images/wallpaper-build.okpkg',
-    'wallpaper.okpkg',
-    'vol0:/bundles/images/wallpaper.okpkg',
-  ],
-  [
-    'bundles/translations/translations-build.okpkg',
-    'translations.okpkg',
-    'vol0:/bundles/translations/translations.okpkg',
-  ],
-  [
-    'loaders/bootloader/boot_resource-build.okpkg',
-    'boot_resource.okpkg',
-    'vol0:/loaders/bootloader/boot_resource.okpkg',
-  ],
-  ['loaders/rom/params-build.okpkg', 'params.okpkg', 'vol0:/loaders/rom/params.okpkg'],
-].map(([archive_path, original_name, device_path], index) => {
-  const binary = new Uint8Array([index + 1]).buffer;
-  return {
-    archive_path,
-    original_name,
-    device_path,
-    size: 1,
-    sha256: bytesToHex(sha256(new Uint8Array(binary))),
-    signed: true,
-    sig_algo: device_path.startsWith('vol0:/bundles/') ? 'ed25519' : 'mldsa65',
-    payload_version: '1.0.0',
-    binary,
-  };
-});
-
-const resourceManifest = {
-  schema: 1,
-  artifact_name: 'pro2-resource-build',
-  release_name: 'resource-build',
-  variant: 'resource',
-  commit: 'a'.repeat(40),
-  short_sha: 'aaaaaaa',
-  timestamp_utc: '20260807_091424',
-  core_version: '1.0.0',
-  key_set: 'dev',
-  device_root: 'vol0:',
-  restore_mode: 'bootloader_update',
-  trees: [
-    { path: 'bundles', device: 'vol0:/bundles' },
-    { path: 'loaders/bootloader', device: 'vol0:/loaders/bootloader' },
-    { path: 'loaders/rom', device: 'vol0:/loaders/rom' },
-  ],
-  files: manifestFiles.map(({ binary: _binary, ...file }) => file),
+const createResourcePackage = (devicePath: string) => {
+  const headerSize = 0x5f90;
+  const bytes = new Uint8Array(headerSize + 1);
+  bytes.set(new TextEncoder().encode('OKPP'), 0);
+  bytes.set(new TextEncoder().encode('RESC'), 0x08);
+  bytes.set(new TextEncoder().encode(devicePath), 0x6c);
+  const view = new DataView(bytes.buffer);
+  view.setUint32(0x04, 1, true);
+  view.setUint32(0x0c, headerSize, true);
+  view.setUint32(0x10, 0x010203, true);
+  view.setUint32(0x14, 1, true);
+  bytes.fill(0x11, 0x200, 0x240);
+  bytes.fill(0x22, 0x240, 0x280);
+  bytes[headerSize] = 0xaa;
+  return bytes;
 };
 
 const createSettings = (configFetcher: ConnectSettings['configFetcher']): ConnectSettings =>
@@ -146,34 +98,36 @@ describe('Pro2 resource configuration', () => {
     DataManager.lastCheckTimestamp = 0;
   });
 
-  test('accepts the manifest source and the CI schema 1 file set', () => {
+  test('accepts the release archive source', () => {
     expect(parseProtocolV2Resources({ source: resourceSource })).toEqual({
       source: resourceSource,
     });
-    expect(parseProtocolV2ResourceManifest(resourceManifest).files).toHaveLength(9);
   });
 
-  test('uses only the resource file list from a manifest', () => {
+  test('reads the version, hashes, and direct device path from a RESC package', () => {
     expect(
-      parseProtocolV2ResourceManifest({
-        files: resourceManifest.files,
-      })
-    ).toEqual({ files: resourceManifest.files });
+      parseProtocolV2ResourcePackage(createResourcePackage('vol0:/bundles/images.okpkg'))
+    ).toEqual({
+      version: [1, 2, 3],
+      payloadLength: 1,
+      devicePath: 'vol0:/bundles/images.okpkg',
+      payloadHash: '11'.repeat(64),
+      headerHash: '22'.repeat(64),
+    });
   });
 
-  test('ignores release metadata and accepts a partial resource file set', () => {
+  test('accepts the boot resource staging path and rejects paths outside resource roots', () => {
     expect(
-      parseProtocolV2ResourceManifest({
-        schema: 1,
-        variant: 'dev_resource',
-        restore_mode: 'bootloader_update',
-        trees: [],
-        files: [resourceManifest.files[0]],
-      })
-    ).toEqual({ files: [resourceManifest.files[0]] });
+      parseProtocolV2ResourcePackage(
+        createResourcePackage('vol0:/loaders/bootloader/boot_resource.okpkg.staging')
+      ).devicePath
+    ).toBe('vol0:/loaders/bootloader/boot_resource.okpkg.staging');
+    expect(() =>
+      parseProtocolV2ResourcePackage(createResourcePackage('vol0:/unexpected/images.okpkg'))
+    ).toThrow('device path');
   });
 
-  test('rejects missing source and malformed manifest paths', () => {
+  test('rejects missing or malformed release sources', () => {
     expect(() => parseProtocolV2Resources({})).toThrow('source is required');
     expect(() =>
       parseProtocolV2Resources({
@@ -193,14 +147,6 @@ describe('Pro2 resource configuration', () => {
         source: { ...resourceSource, archiveSize: 0 },
       })
     ).toThrow('positive integer');
-    expect(() =>
-      parseProtocolV2ResourceManifest({
-        ...resourceManifest,
-        files: resourceManifest.files.map((file, index) =>
-          index === 0 ? { ...file, archive_path: '../outside.okpkg' } : file
-        ),
-      })
-    ).toThrow('archive_path');
   });
 
   test('applies a validated pre-release config and exposes its archive source', async () => {

package/__tests__/protocol-v2.test.ts

@@ -139,21 +139,29 @@ const createJpegBase64 = (width: number, height: number) => {
 
 const createProtocolV2OkppBinary = ({
   version = [1, 2, 3],
+  devicePath = 'vol0:/bundles/images/images.okpkg',
   payloadHashByte = 0x11,
   headerHashByte = 0x22,
 }: {
   version?: [number, number, number];
+  devicePath?: string;
   payloadHashByte?: number;
   headerHashByte?: number;
 } = {}) => {
-  const bytes = new Uint8Array(0x52a0);
+  const headerSize = 0x5f90;
+  const payloadSize = 1;
+  const bytes = new Uint8Array(headerSize + payloadSize);
   bytes.set([0x4f, 0x4b, 0x50, 0x50], 0);
   bytes.set([0x52, 0x45, 0x53, 0x43], 0x08);
   const view = new DataView(bytes.buffer);
-  view.setUint32(0x0c, 0x52a0, true);
+  view.setUint32(0x04, 1, true);
+  view.setUint32(0x0c, headerSize, true);
   view.setUint32(0x10, version[0] * 0x10000 + version[1] * 0x100 + version[2], true);
+  view.setUint32(0x14, payloadSize, true);
+  bytes.set(new TextEncoder().encode(devicePath), 0x6c);
   bytes.fill(payloadHashByte, 0x200, 0x240);
   bytes.fill(headerHashByte, 0x240, 0x280);
+  bytes[headerSize] = 0xaa;
   return bytes.buffer;
 };
 
@@ -6011,7 +6019,7 @@ describe('Protocol V2 firmware update targets', () => {
     expect(typedCall).toHaveBeenCalledTimes(1);
   });
 
-  test('does not fail a completed multi-app install when final app versions are unobservable', () => {
+  test('uses the device firmware version for P1 and install completion for unobservable P2', () => {
     const method = new FirmwareUpdateV4({
       id: 1,
       payload: {
@@ -6019,7 +6027,7 @@ describe('Protocol V2 firmware update targets', () => {
         platform: 'desktop',
         targetsToUpdate: ['app_v1', 'app_v2'],
         expectedTargetVersions: {
-          app_v1: '1.0.0',
+          app_v1: '3.0.0',
           app_v2: '2.0.0',
         },
       },
@@ -6035,7 +6043,7 @@ describe('Protocol V2 firmware update targets', () => {
     expect(() => (method as any).assertExpectedProtocolV2Versions()).not.toThrow();
   });
 
-  test('uses final DeviceInfo versions for both application slots after status polling ends', () => {
+  test('uses the firmware version for P1 and the optional DeviceInfo version for P2', () => {
     const method = new FirmwareUpdateV4({
       id: 1,
       payload: {
@@ -6050,13 +6058,13 @@ describe('Protocol V2 firmware update targets', () => {
     });
     method.init();
     (method as any).protocolV2LatestFinalFeatures = {
-      major_version: 3,
+      major_version: 1,
       minor_version: 0,
       patch_version: 0,
     };
     (method as any).protocolV2LatestFinalDeviceInfo = {
       main_mcu: {
-        application: { version: '1.0.0' },
+        application: { version: '9.9.9' },
         application_data: { version: '2.0.0' },
       },
     };
@@ -6079,7 +6087,7 @@ describe('Protocol V2 firmware update targets', () => {
     });
     method.init();
     (method as any).protocolV2LatestFinalFeatures = {
-      major_version: 3,
+      major_version: 1,
       minor_version: 0,
       patch_version: 0,
     };
@@ -6095,7 +6103,7 @@ describe('Protocol V2 firmware update targets', () => {
     );
   });
 
-  test('rejects unobservable multi-app versions without per-target completion evidence', () => {
+  test('rejects an unobservable P2 version without P2 completion evidence', () => {
     const method = new FirmwareUpdateV4({
       id: 1,
       payload: {
@@ -6103,7 +6111,7 @@ describe('Protocol V2 firmware update targets', () => {
         platform: 'desktop',
         targetsToUpdate: ['app_v1', 'app_v2'],
         expectedTargetVersions: {
-          app_v1: '1.0.0',
+          app_v1: '3.0.0',
           app_v2: '2.0.0',
         },
       },
@@ -6118,7 +6126,7 @@ describe('Protocol V2 firmware update targets', () => {
     (method as any).protocolV2CompletedTargetIds = new Set([4]);
 
     expect(() => (method as any).assertExpectedProtocolV2Versions()).toThrow(
-      'target app_v1 has no observable final version after status fallback'
+      'target app_v2 has no observable final version after status fallback'
     );
   });
 
@@ -7228,7 +7236,7 @@ describe('Protocol V2 firmware update targets', () => {
     });
   });
 
-  test('maps a prepared resource archive manifest to artifact-backed resource sources', async () => {
+  test('maps self-describing packages from a prepared resource archive', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,
       payload: {
@@ -7236,60 +7244,18 @@ describe('Protocol V2 firmware update targets', () => {
       },
     });
     const imagesBinary = createProtocolV2OkppBinary();
-    const bootBinary = createProtocolV2OkppBinary({ payloadHashByte: 0x33 });
+    const bootBinary = createProtocolV2OkppBinary({
+      devicePath: 'vol0:/loaders/bootloader/boot_resource.okpkg.staging',
+      payloadHashByte: 0x33,
+    });
     const imagesSha256 = bytesToHex(sha256(new Uint8Array(imagesBinary)));
     const bootSha256 = bytesToHex(sha256(new Uint8Array(bootBinary)));
-    const manifest = {
-      schema: 1,
-      artifact_name: 'pro2-resource',
-      release_name: 'test-release',
-      variant: 'resource',
-      commit: 'abc123',
-      short_sha: 'abc123',
-      timestamp_utc: '2026-08-09T00:00:00Z',
-      core_version: '1.0.0',
-      key_set: 'production',
-      device_root: 'vol0:',
-      restore_mode: 'bootloader_update',
-      trees: [{ path: 'bundles', device: 'pro2' }],
-      files: [
-        {
-          archive_path: 'bundles/images/images.okpkg',
-          original_name: 'images.okpkg',
-          device_path: 'vol0:/bundles/images/images.okpkg',
-          size: imagesBinary.byteLength,
-          sha256: imagesSha256,
-          signed: true,
-          sig_algo: 'ed25519',
-          payload_version: '1.2.3',
-        },
-        {
-          archive_path: 'loaders/bootloader/boot_resource.okpkg',
-          original_name: 'boot_resource.okpkg',
-          device_path: 'vol0:/loaders/bootloader/boot_resource.okpkg',
-          size: bootBinary.byteLength,
-          sha256: bootSha256,
-          signed: true,
-          sig_algo: 'ed25519',
-          payload_version: '1.2.3',
-        },
-      ],
-    };
-    const manifestBinary = new TextEncoder().encode(JSON.stringify(manifest)).buffer;
     const zip = new JSZip();
-    zip.file('manifest.json', manifestBinary);
     zip.file('bundles/images/images.okpkg', imagesBinary);
     zip.file('loaders/bootloader/boot_resource.okpkg', bootBinary);
+    zip.file('manifest.json', '{"ignored":true}');
     const archiveBinary = await zip.generateAsync({ type: 'arraybuffer' });
     const preparedEntries = [
-      {
-        entryName: 'pro2-resource/manifest.json',
-        artifact: {
-          artifactRef: 'manifest',
-          size: manifestBinary.byteLength,
-          sha256: bytesToHex(sha256(new Uint8Array(manifestBinary))),
-        },
-      },
       {
         entryName: 'pro2-resource/bundles/images/images.okpkg',
         artifact: {
@@ -7352,7 +7318,7 @@ describe('Protocol V2 firmware update targets', () => {
       }),
       expect.objectContaining({
         name: 'boot_resource.okpkg',
-        devicePath: 'vol0:/loaders/bootloader/boot_resource.okpkg',
+        devicePath: 'vol0:/loaders/bootloader/boot_resource.okpkg.staging',
         version: [1, 2, 3],
       }),
     ]);
@@ -7398,9 +7364,9 @@ describe('Protocol V2 firmware update targets', () => {
           },
           materializedEntries: [
             {
-              entryName: 'manifest.json',
+              entryName: 'bundles/images/images.okpkg',
               artifact: {
-                artifactRef: 'resource-manifest',
+                artifactRef: 'resource-package',
                 size: 2,
                 sha256: 'b'.repeat(64),
               },
@@ -7600,9 +7566,9 @@ describe('Protocol V2 firmware update targets', () => {
           },
           materializedEntries: [
             {
-              entryName: 'manifest.json',
+              entryName: 'bundles/images/images.okpkg',
               artifact: {
-                artifactRef: 'prepared-resource-manifest',
+                artifactRef: 'prepared-resource-package',
                 size: 2,
                 sha256: 'b'.repeat(64),
               },
@@ -7659,48 +7625,15 @@ describe('Protocol V2 firmware update targets', () => {
   });
 
   test('converts a local resource ZIP into a local PreparedPlan without matching a remote release', async () => {
-    const imagesBinary = new Uint8Array([1, 2, 3]).buffer;
-    const bootResourceBinary = new Uint8Array([4, 5, 6]).buffer;
-    const manifest = {
-      schema: 1,
-      artifact_name: 'pro2-resource',
-      release_name: 'local-development',
-      variant: 'resource',
-      commit: 'local',
-      short_sha: 'local',
-      timestamp_utc: '2026-08-09T00:00:00Z',
-      core_version: '1.0.0',
-      key_set: 'development',
-      device_root: 'vol0:',
-      restore_mode: 'bootloader_update',
-      trees: [{ path: 'bundles', device: 'pro2' }],
-      files: [
-        {
-          archive_path: 'bundles/images/images.okpkg',
-          original_name: 'images.okpkg',
-          device_path: 'vol0:/bundles/images/images.okpkg',
-          size: imagesBinary.byteLength,
-          sha256: bytesToHex(sha256(new Uint8Array(imagesBinary))),
-          signed: true,
-          sig_algo: 'ed25519',
-          payload_version: '1.0.0',
-        },
-        {
-          archive_path: 'loaders/bootloader/boot_resource.okpkg',
-          original_name: 'boot_resource.okpkg',
-          device_path: 'vol0:/loaders/bootloader/boot_resource.okpkg',
-          size: bootResourceBinary.byteLength,
-          sha256: bytesToHex(sha256(new Uint8Array(bootResourceBinary))),
-          signed: true,
-          sig_algo: 'ed25519',
-          payload_version: '1.0.0',
-        },
-      ],
-    };
+    const imagesBinary = createProtocolV2OkppBinary({ version: [1, 0, 0] });
+    const bootResourceBinary = createProtocolV2OkppBinary({
+      version: [1, 0, 0],
+      devicePath: 'vol0:/loaders/bootloader/boot_resource.okpkg.staging',
+    });
     const zip = new JSZip();
-    zip.file('pro2-resource/manifest.json', JSON.stringify(manifest));
     zip.file('pro2-resource/bundles/images/images.okpkg', imagesBinary);
     zip.file('pro2-resource/loaders/bootloader/boot_resource.okpkg', bootResourceBinary);
+    zip.file('pro2-resource/manifest.json', '{"ignored":true}');
     zip.file('pro2-resource/build-info.txt', 'ignored');
     const resourceArchiveBinary = await zip.generateAsync({ type: 'arraybuffer' });
     const applicationP1Binary = new Uint8Array([7, 8, 9]).buffer;
@@ -7766,7 +7699,7 @@ describe('Protocol V2 firmware update targets', () => {
             }),
             expect.objectContaining({
               name: 'boot_resource.okpkg',
-              devicePath: 'vol0:/loaders/bootloader/boot_resource.okpkg',
+              devicePath: 'vol0:/loaders/bootloader/boot_resource.okpkg.staging',
             }),
           ],
         })
@@ -7777,9 +7710,11 @@ describe('Protocol V2 firmware update targets', () => {
     }
   });
 
-  test('accepts a local resource ZIP without manifest.json', async () => {
-    const imagesBinary = new Uint8Array([1, 2, 3]).buffer;
-    const bootResourceBinary = new Uint8Array([4, 5, 6]).buffer;
+  test('accepts every okpkg in a local resource ZIP and ignores other files', async () => {
+    const imagesBinary = createProtocolV2OkppBinary();
+    const bootResourceBinary = createProtocolV2OkppBinary({
+      devicePath: 'vol0:/loaders/bootloader/boot_resource.okpkg.staging',
+    });
     const zip = new JSZip();
     zip.file('pro2-resource/bundles/images/images.okpkg', imagesBinary);
     zip.file('pro2-resource/loaders/bootloader/boot_resource.okpkg', bootResourceBinary);
@@ -7800,61 +7735,21 @@ describe('Protocol V2 firmware update targets', () => {
       )
     ).resolves.toMatchObject({
       materializedEntries: [
-        { entryName: 'manifest.json' },
-        { entryName: 'bundles/images/images.okpkg', binary: imagesBinary },
+        { entryName: 'pro2-resource/bundles/images/images.okpkg', binary: imagesBinary },
         {
-          entryName: 'loaders/bootloader/boot_resource.okpkg',
+          entryName: 'pro2-resource/loaders/bootloader/boot_resource.okpkg',
           binary: bootResourceBinary,
         },
       ],
     });
   });
 
-  test('rejects a local resource ZIP whose file hash does not match its manifest', async () => {
-    const resourceBinary = new Uint8Array([1, 2, 3]).buffer;
-    const bootResourceBinary = new Uint8Array([4, 5, 6]).buffer;
+  test('rejects a local resource ZIP with duplicate package device paths', async () => {
+    const resourceBinary = createProtocolV2OkppBinary();
+    const duplicateResourceBinary = createProtocolV2OkppBinary({ payloadHashByte: 0x44 });
     const zip = new JSZip();
-    zip.file(
-      'manifest.json',
-      JSON.stringify({
-        schema: 1,
-        artifact_name: 'pro2-resource',
-        release_name: 'local-development',
-        variant: 'resource',
-        commit: 'local',
-        short_sha: 'local',
-        timestamp_utc: '2026-08-09T00:00:00Z',
-        core_version: '1.0.0',
-        key_set: 'development',
-        device_root: 'vol0:',
-        restore_mode: 'bootloader_update',
-        trees: [{ path: 'bundles', device: 'pro2' }],
-        files: [
-          {
-            archive_path: 'bundles/images/images.okpkg',
-            original_name: 'images.okpkg',
-            device_path: 'vol0:/bundles/images/images.okpkg',
-            size: resourceBinary.byteLength,
-            sha256: '0'.repeat(64),
-            signed: true,
-            sig_algo: 'ed25519',
-            payload_version: '1.0.0',
-          },
-          {
-            archive_path: 'loaders/bootloader/boot_resource.okpkg',
-            original_name: 'boot_resource.okpkg',
-            device_path: 'vol0:/loaders/bootloader/boot_resource.okpkg',
-            size: bootResourceBinary.byteLength,
-            sha256: bytesToHex(sha256(new Uint8Array(bootResourceBinary))),
-            signed: true,
-            sig_algo: 'ed25519',
-            payload_version: '1.0.0',
-          },
-        ],
-      })
-    );
     zip.file('bundles/images/images.okpkg', resourceBinary);
-    zip.file('loaders/bootloader/boot_resource.okpkg', bootResourceBinary);
+    zip.file('copies/images.okpkg', duplicateResourceBinary);
     const method = new FirmwareUpdateV4({
       id: 1,
       payload: {
@@ -7869,9 +7764,7 @@ describe('Protocol V2 firmware update targets', () => {
       (method as any).prepareProtocolV2LocalResourceArchive(
         await zip.generateAsync({ type: 'arraybuffer' })
       )
-    ).rejects.toThrow(
-      'Protocol V2 local resource file does not match manifest: bundles/images/images.okpkg'
-    );
+    ).rejects.toThrow('duplicate device path: vol0:/bundles/images/images.okpkg');
   });
 
   test('maps malformed resource ZIPs to a typed firmware preparation error', async () => {
@@ -7901,40 +7794,7 @@ describe('Protocol V2 firmware update targets', () => {
   test('rejects an oversized ZIP entry before allocating its decompressed bytes', async () => {
     const extractEntry = jest.fn();
     const oversizedFileSize = 257 * 1024 * 1024;
-    const manifestBinary = new TextEncoder().encode(
-      JSON.stringify({
-        files: [
-          {
-            archive_path: 'loaders/bootloader/boot_resource.okpkg',
-            original_name: 'boot_resource.okpkg',
-            device_path: 'vol0:/loaders/bootloader/boot_resource.okpkg',
-            size: oversizedFileSize,
-            sha256: '0'.repeat(64),
-            signed: true,
-            sig_algo: 'ed25519',
-          },
-          {
-            archive_path: 'bundles/images/images.okpkg',
-            original_name: 'images.okpkg',
-            device_path: 'vol0:/bundles/images/images.okpkg',
-            size: oversizedFileSize,
-            sha256: '0'.repeat(64),
-            signed: true,
-            sig_algo: 'ed25519',
-          },
-        ],
-      })
-    );
     const zipFiles = {
-      'manifest.json': {
-        name: 'manifest.json',
-        dir: false,
-        _data: {
-          compressedSize: manifestBinary.byteLength,
-          uncompressedSize: manifestBinary.byteLength,
-        },
-        async: jest.fn().mockResolvedValue(manifestBinary.buffer),
-      },
       'loaders/bootloader/boot_resource.okpkg': {
         name: 'loaders/bootloader/boot_resource.okpkg',
         dir: false,
@@ -7965,7 +7825,7 @@ describe('Protocol V2 firmware update targets', () => {
     try {
       await expect(
         (method as any).prepareProtocolV2LocalResourceArchive(new Uint8Array([1]).buffer)
-      ).rejects.toThrow('declared size is invalid');
+      ).rejects.toThrow('resource package size is invalid');
       expect(extractEntry).not.toHaveBeenCalled();
     } finally {
       loadSpy.mockRestore();
@@ -8117,17 +7977,17 @@ describe('Protocol V2 firmware update targets', () => {
             readAt: jest.fn(),
             close: jest.fn(),
           },
-          devicePath: 'vol0:/resource/images/images.okpkg',
+          devicePath: 'vol0:/bundles/images/images.okpkg',
         },
       ],
     });
 
     expect((method as any).protocolV2SourceUpdateProcess).toHaveBeenCalledTimes(1);
     expect((method as any).protocolV2SourceUpdateProcess).toHaveBeenCalledWith(
-      expect.objectContaining({ filePath: 'vol0:/resource/images/images.okpkg' })
+      expect.objectContaining({ filePath: 'vol0:/bundles/images/images.okpkg' })
     );
     expect((method as any).verifyProtocolV2StagedFile).toHaveBeenCalledWith(
-      'vol0:/resource/images/images.okpkg',
+      'vol0:/bundles/images/images.okpkg',
       3
     );
     expect((method as any).protocolV2StartFirmwareUpdate).not.toHaveBeenCalled();
@@ -8162,7 +8022,7 @@ describe('Protocol V2 firmware update targets', () => {
             readAt: jest.fn(),
             close: jest.fn(),
           },
-          devicePath: 'vol0:/loaders/bootloader/boot_resource.okpkg',
+          devicePath: 'vol0:/loaders/bootloader/boot_resource.okpkg.staging',
         },
       ],
     });
@@ -8195,7 +8055,7 @@ describe('Protocol V2 firmware update targets', () => {
         readAt: jest.fn(),
         close: jest.fn(),
       },
-      devicePath: 'vol0:/loaders/bootloader/boot_resource.okpkg',
+      devicePath: 'vol0:/loaders/bootloader/boot_resource.okpkg.staging',
       version: [1, 0, 0],
       payloadHash: '11'.repeat(64),
       headerHash: '22'.repeat(64),
@@ -9267,7 +9127,7 @@ describe('Protocol V2 firmware reconnect identity', () => {
     const readChunkLengths: number[] = [];
     const typedCall = jest.fn((requestType: string, _responseType: string, request: any) => {
       if (requestType === 'FilesystemPathInfoQuery') {
-        return Promise.resolve({ message: { exist: true, directory: false, size: 0x52a0 } });
+        return Promise.resolve({ message: { exist: true, directory: false, size: 0x5f91 } });
       }
       if (requestType === 'FilesystemFileRead') {
         readChunkLengths.push(request.chunk_len);