@onekeyfe/hd-core 1.2.0-alpha.93 → 1.2.0-alpha.94

package/__tests__/protocol-v2.test.ts

@@ -6159,8 +6159,8 @@ describe('Protocol V2 firmware update targets', () => {
     });
     const imagesBinary = createProtocolV2OkppBinary();
     const bootBinary = createProtocolV2OkppBinary({ payloadHashByte: 0x33 });
-    const imagesSha256 = '1'.repeat(64);
-    const bootSha256 = '2'.repeat(64);
+    const imagesSha256 = bytesToHex(sha256(new Uint8Array(imagesBinary)));
+    const bootSha256 = bytesToHex(sha256(new Uint8Array(bootBinary)));
     const manifest = {
       schema: 1,
       artifact_name: 'pro2-resource',
@@ -6198,11 +6198,38 @@ describe('Protocol V2 firmware update targets', () => {
       ],
     };
     const manifestBinary = new TextEncoder().encode(JSON.stringify(manifest)).buffer;
-    const artifacts = new Map([
-      ['manifest', manifestBinary],
-      ['images', imagesBinary],
-      ['boot', bootBinary],
-    ]);
+    const zip = new JSZip();
+    zip.file('manifest.json', manifestBinary);
+    zip.file('bundles/images/images.okpkg', imagesBinary);
+    zip.file('loaders/bootloader/boot_resource.okpkg', bootBinary);
+    const archiveBinary = await zip.generateAsync({ type: 'arraybuffer' });
+    const preparedEntries = [
+      {
+        entryName: 'manifest.json',
+        artifact: {
+          artifactRef: 'manifest',
+          size: manifestBinary.byteLength,
+          sha256: bytesToHex(sha256(new Uint8Array(manifestBinary))),
+        },
+      },
+      {
+        entryName: 'bundles/images/images.okpkg',
+        artifact: {
+          artifactRef: 'images',
+          size: imagesBinary.byteLength,
+          sha256: imagesSha256,
+        },
+      },
+      {
+        entryName: 'loaders/bootloader/boot_resource.okpkg',
+        artifact: {
+          artifactRef: 'boot',
+          size: bootBinary.byteLength,
+          sha256: bootSha256,
+        },
+      },
+    ];
+    const artifacts = new Map([['archive', archiveBinary]]);
     (method as any).params = {
       targetsToUpdate: ['resource'],
       preparedPlan: {
@@ -6212,32 +6239,12 @@ describe('Protocol V2 firmware update targets', () => {
             role: 'resourceBundle',
             target: 'resource',
             container: 'zip',
-            materializedEntries: [
-              {
-                entryName: 'manifest.json',
-                artifact: {
-                  artifactRef: 'manifest',
-                  size: manifestBinary.byteLength,
-                  sha256: '0'.repeat(64),
-                },
-              },
-              {
-                entryName: 'bundles/images/images.okpkg',
-                artifact: {
-                  artifactRef: 'images',
-                  size: imagesBinary.byteLength,
-                  sha256: imagesSha256,
-                },
-              },
-              {
-                entryName: 'loaders/bootloader/boot_resource.okpkg',
-                artifact: {
-                  artifactRef: 'boot',
-                  size: bootBinary.byteLength,
-                  sha256: bootSha256,
-                },
-              },
-            ],
+            artifact: {
+              artifactRef: 'archive',
+              size: archiveBinary.byteLength,
+              sha256: bytesToHex(sha256(new Uint8Array(archiveBinary))),
+            },
+            materializedEntries: preparedEntries,
           },
         ],
       },
@@ -6264,6 +6271,11 @@ describe('Protocol V2 firmware update targets', () => {
       }),
     ]);
     await Promise.all(sources.map(source => source.source.close()));
+
+    preparedEntries[1].artifact.sha256 = 'f'.repeat(64);
+    await expect((method as any).prepareProtocolV2ResourceArchiveSources()).rejects.toThrow(
+      'entries do not match the approved archive'
+    );
   });
 
   test('binds a prepared resource archive to the selected host generation', () => {
@@ -7754,6 +7766,88 @@ describe('Protocol V2 firmware reconnect identity', () => {
     expect((method as any).protocolV2ExpectedPath).toBe('000000000000');
   });
 
+  test('executes a serial-less Pro2 prepared plan when the live model matches', async () => {
+    const planWithoutDigest = {
+      schemaVersion: 2 as const,
+      executor: 'v4' as const,
+      deviceIdentity: 'unavailable',
+      deviceModel: 'pro2',
+      firmwareType: EFirmwareType.Universal,
+      platform: 'web' as const,
+      targetsToUpdate: ['boot' as const],
+      artifacts: [
+        {
+          artifactId: 'component:boot',
+          role: 'component' as const,
+          target: 'boot' as const,
+          url: 'https://example.com/bootloader.bin',
+          container: 'raw' as const,
+          logicalName: 'bootloader',
+        },
+      ],
+    };
+    const preparedPlan = prepareFirmwareUpdatePlan({
+      plan: {
+        ...planWithoutDigest,
+        planDigest: digestFirmwareUpdateContract(planWithoutDigest),
+      },
+      leaseRef: 'serial-less-v4-executor-test',
+      artifacts: [
+        {
+          artifactId: 'component:boot',
+          artifact: {
+            artifactRef: 'serial-less-bootloader',
+            size: 1,
+            sha256: 'a'.repeat(64),
+          },
+        },
+      ],
+    });
+    const hostBindingGeneration = registerFirmwareUpdateHostBinding({
+      preparedPlanDigest: preparedPlan.preparedPlanDigest,
+      artifactReader: {
+        open: jest.fn(),
+        read: jest.fn(),
+        close: jest.fn(),
+      },
+    });
+    try {
+      const method = new FirmwareUpdateV4({
+        id: 1,
+        payload: {
+          method: 'firmwareUpdateV4',
+          platform: 'web',
+          preparedPlan,
+          hostBindingGeneration,
+        },
+      });
+      method.init();
+      const typedCall = jest.fn().mockResolvedValue({
+        type: 'DeviceInfo',
+        message: { protocol_version: 1, hw: {} },
+      });
+      (method as any).device = stubDevice({
+        originalDescriptor: { protocolType: 'V2', path: 'serial-less-pro2' },
+        features: {
+          deviceType: 'pro2',
+          firmwareVersion: '1.0.0',
+          capabilities: [],
+        },
+        getCommands: () => ({ typedCall }),
+      });
+      (method as any).runProtocolV2PreparedArtifacts = jest
+        .fn()
+        .mockResolvedValue('serial-less-result');
+
+      await expect(method.run()).resolves.toBe('serial-less-result');
+      expect((method as any).runProtocolV2PreparedArtifacts).toHaveBeenCalled();
+      expect((method as any).protocolV2ExpectedSerialNumber).toBeUndefined();
+      expect((method as any).protocolV2ExpectedPath).toBe('serial-less-pro2');
+    } finally {
+      unregisterFirmwareUpdateHostBinding(hostBindingGeneration);
+    }
+  });
+
   test('uses the BLE read limit when reading an existing firmware bundle header', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,

package/dist/api/FirmwareUpdateV4.d.ts

@@ -36,6 +36,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     private getProtocolV2RequestedTargets;
     private getProtocolV2DeviceFeatures;
     private getProtocolV2SerialNumber;
+    private getProtocolV2PreparedPlanDeviceModel;
     private getProtocolV2ConnectionRoute;
     private assertProtocolV2DeviceInfoIdentity;
     private getProtocolV2DeviceInfoTimeout;

package/dist/api/FirmwareUpdateV4.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FirmwareUpdateV4.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV4.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAkD,MAAM,qBAAqB,CAAC;AAyBlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAkC/E,OAAO,KAAK,EAEV,sBAAsB,EAEvB,MAAM,6BAA6B,CAAC;AA2ErC,wBAAgB,wCAAwC,CACtD,UAAU,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,EAC5C,MAAM,EAAE,sBAAsB,QAgB/B;AAgWD,eAAO,MAAM,oCAAoC,WACvC,WAAW,GAAG,UAAU,eACnB,MAAM,GAAG,SAAS,YAKhC,CAAC;AAEF,eAAO,MAAM,iCAAiC,0BACrB,MAAM,uBACR,MAAM,iBACZ,MAAM,eACR,MAAM,SAsBpB,CAAC;AAUF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,wBAAwB,CAAC,sBAAsB,CAAC;IAC5F,OAAO,CAAC,8BAA8B,CAAC,CAAS;IAEhD,OAAO,CAAC,sBAAsB,CAAC,CAAS;IAExC,qBAAqB;IAIrB,OAAO,CAAC,yBAAyB,CAA4B;IAE7D,OAAO,CAAC,2BAA2B,CAAS;IAE5C,OAAO,CAAC,iCAAiC,CAA6B;IAEtE,OAAO,CAAC,6BAA6B,CAAC,CAAW;IAEjD,OAAO,CAAC,6BAA6B,CAAS;IAE9C,IAAI;IAsKJ,OAAO,CAAC,8BAA8B;IAwBhC,GAAG;;;;;YAKK,aAAa;YAsHb,4BAA4B;YAkB5B,0BAA0B;YAY1B,8BAA8B;YAK9B,+BAA+B;YAqG/B,gCAAgC;YA8HhC,qCAAqC;YA0IrC,gCAAgC;YAgBhC,uCAAuC;YAwHvC,8BAA8B;IAsB5C,OAAO,CAAC,8BAA8B;IA0BtC,OAAO,CAAC,kCAAkC;IAc1C,OAAO,CAAC,gCAAgC;IAsDxC,OAAO,CAAC,6BAA6B;YAsBvB,2BAA2B;IAWzC,OAAO,CAAC,yBAAyB;IAKjC,OAAO,CAAC,4BAA4B;IAUpC,OAAO,CAAC,kCAAkC;IAS1C,OAAO,CAAC,8BAA8B;YAMxB,iCAAiC;YAOjC,iCAAiC;YAkBjC,iCAAiC;IAM/C,OAAO,CAAC,uBAAuB;IAI/B,OAAO,CAAC,mCAAmC;IAe3C,OAAO,CAAC,2BAA2B;IAsBnC,OAAO,CAAC,yBAAyB;IAiBjC,OAAO,CAAC,wBAAwB;YAkBlB,iCAAiC;YAuDjC,+BAA+B;IA6E7C,OAAO,CAAC,6BAA6B;YAMvB,8BAA8B;YA+C9B,kCAAkC;IA+BhD,OAAO,CAAC,0BAA0B;IAUlC,OAAO,CAAC,yBAAyB;IAc3B,6BAA6B;YAgCrB,+BAA+B;IAkD7C,OAAO,CAAC,6BAA6B;IAkCrC,OAAO,CAAC,8BAA8B;YA8CxB,uBAAuB;YAiCvB,6BAA6B;YAa7B,uBAAuB;YAiCvB,8BAA8B;YA8D9B,6BAA6B;IAuE3C,OAAO,CAAC,mCAAmC;YAI7B,0BAA0B;IAaxC,OAAO,CAAC,4BAA4B;IAyGpC,OAAO,CAAC,6BAA6B;YAcvB,uCAAuC;YA0JvC,gCAAgC;YAehC,yBAAyB;YAQzB,8BAA8B;IAQ5C,OAAO,CAAC,0BAA0B;YAkBpB,mCAAmC;YAWnC,qCAAqC;YAgDrC,yBAAyB;YA8DzB,8BAA8B;IAU5C,OAAO,CAAC,kCAAkC;YAQ5B,cAAc;YAuCd,6BAA6B;YAW7B,0BAA0B;YAS1B,6BAA6B;YAmB7B,gBAAgB;IAiB9B,OAAO,CAAC,qBAAqB;CAM9B"}
+{"version":3,"file":"FirmwareUpdateV4.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV4.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAkD,MAAM,qBAAqB,CAAC;AAyBlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAkC/E,OAAO,KAAK,EAEV,sBAAsB,EAEvB,MAAM,6BAA6B,CAAC;AA2ErC,wBAAgB,wCAAwC,CACtD,UAAU,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,EAC5C,MAAM,EAAE,sBAAsB,QAgB/B;AAgWD,eAAO,MAAM,oCAAoC,WACvC,WAAW,GAAG,UAAU,eACnB,MAAM,GAAG,SAAS,YAKhC,CAAC;AAEF,eAAO,MAAM,iCAAiC,0BACrB,MAAM,uBACR,MAAM,iBACZ,MAAM,eACR,MAAM,SAsBpB,CAAC;AAUF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,wBAAwB,CAAC,sBAAsB,CAAC;IAC5F,OAAO,CAAC,8BAA8B,CAAC,CAAS;IAEhD,OAAO,CAAC,sBAAsB,CAAC,CAAS;IAExC,qBAAqB;IAIrB,OAAO,CAAC,yBAAyB,CAA4B;IAE7D,OAAO,CAAC,2BAA2B,CAAS;IAE5C,OAAO,CAAC,iCAAiC,CAA6B;IAEtE,OAAO,CAAC,6BAA6B,CAAC,CAAW;IAEjD,OAAO,CAAC,6BAA6B,CAAS;IAE9C,IAAI;IAsKJ,OAAO,CAAC,8BAA8B;IAwBhC,GAAG;;;;;YAKK,aAAa;YAsHb,4BAA4B;YAkB5B,0BAA0B;YAY1B,8BAA8B;YAK9B,+BAA+B;YAqG/B,gCAAgC;YA+HhC,qCAAqC;YA0IrC,gCAAgC;YAgBhC,uCAAuC;YAmJvC,8BAA8B;IAsB5C,OAAO,CAAC,8BAA8B;IA0BtC,OAAO,CAAC,kCAAkC;IAc1C,OAAO,CAAC,gCAAgC;IAsDxC,OAAO,CAAC,6BAA6B;YAsBvB,2BAA2B;IAWzC,OAAO,CAAC,yBAAyB;IAKjC,OAAO,CAAC,oCAAoC;IAY5C,OAAO,CAAC,4BAA4B;IAUpC,OAAO,CAAC,kCAAkC;IAS1C,OAAO,CAAC,8BAA8B;YAMxB,iCAAiC;YAOjC,iCAAiC;YAmBjC,iCAAiC;IAM/C,OAAO,CAAC,uBAAuB;IAI/B,OAAO,CAAC,mCAAmC;IAe3C,OAAO,CAAC,2BAA2B;IAsBnC,OAAO,CAAC,yBAAyB;IAiBjC,OAAO,CAAC,wBAAwB;YAkBlB,iCAAiC;YAuDjC,+BAA+B;IA6E7C,OAAO,CAAC,6BAA6B;YAMvB,8BAA8B;YA+C9B,kCAAkC;IA+BhD,OAAO,CAAC,0BAA0B;IAUlC,OAAO,CAAC,yBAAyB;IAc3B,6BAA6B;YAgCrB,+BAA+B;IAkD7C,OAAO,CAAC,6BAA6B;IAkCrC,OAAO,CAAC,8BAA8B;YA8CxB,uBAAuB;YAiCvB,6BAA6B;YAa7B,uBAAuB;YAiCvB,8BAA8B;YA8D9B,6BAA6B;IAuE3C,OAAO,CAAC,mCAAmC;YAI7B,0BAA0B;IAaxC,OAAO,CAAC,4BAA4B;IAyGpC,OAAO,CAAC,6BAA6B;YAcvB,uCAAuC;YA0JvC,gCAAgC;YAehC,yBAAyB;YAQzB,8BAA8B;IAQ5C,OAAO,CAAC,0BAA0B;YAkBpB,mCAAmC;YAWnC,qCAAqC;YAgDrC,yBAAyB;YA8DzB,8BAA8B;IAU5C,OAAO,CAAC,kCAAkC;YAQ5B,cAAc;YAuCd,6BAA6B;YAW7B,0BAA0B;YAS1B,6BAA6B;YAmB7B,gBAAgB;IAiB9B,OAAO,CAAC,qBAAqB;CAM9B"}

package/dist/index.js

@@ -52052,6 +52052,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 assertFirmwareUpdatePreparedPlanDeviceIdentity({
                     preparedPlan,
                     deviceIdentity: this.protocolV2ExpectedSerialNumber,
+                    deviceModel: this.getProtocolV2PreparedPlanDeviceModel(features),
                 });
                 const hostBinding = resolveFirmwareUpdateHostBinding(memoryHost.hostBindingGeneration, preparedPlan.preparedPlanDigest);
                 this.params.preparedPlan = preparedPlan;
@@ -52176,17 +52177,43 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             if (archiveArtifacts.length !== 1) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 prepared plan must contain exactly one resource archive', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
             }
-            const entries = (_c = archiveArtifacts[0].materializedEntries) !== null && _c !== void 0 ? _c : [];
-            const manifestEntry = entries.find(entry => entry.entryName === 'manifest.json');
-            if (!manifestEntry ||
-                manifestEntry.artifact.size <= 0 ||
-                manifestEntry.artifact.size > PROTOCOL_V2_RESOURCE_MANIFEST_MAX_BYTES) {
+            const archiveArtifact = archiveArtifacts[0];
+            const archiveSource = yield this.openProtocolV2PreparedSource(archiveArtifact.artifact);
+            if (archiveSource.size > PROTOCOL_V2_RESOURCE_TOTAL_MAX_BYTES) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 prepared resource archive exceeds the total size limit', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
+            }
+            let archiveBinary;
+            try {
+                archiveBinary = yield readFirmwareByteSourceFully(archiveSource);
+            }
+            finally {
+                yield archiveSource.close();
+            }
+            const archiveDigest = bytesToHex(sha256.sha256(new Uint8Array(archiveBinary)));
+            if (archiveDigest !== archiveArtifact.artifact.sha256.toLowerCase()) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 prepared resource archive does not match its approved receipt', { firmwareUpdateCode: 'FirmwareArtifactReceiptMismatch' });
+            }
+            const verifiedArchive = yield this.prepareProtocolV2LocalResourceArchive(archiveBinary);
+            const entries = (_c = archiveArtifact.materializedEntries) !== null && _c !== void 0 ? _c : [];
+            const entriesByName = new Map(entries.map(entry => [entry.entryName, entry]));
+            if (entries.length !== verifiedArchive.materializedEntries.length ||
+                verifiedArchive.materializedEntries.some(entry => {
+                    const preparedEntry = entriesByName.get(entry.entryName);
+                    const digest = bytesToHex(sha256.sha256(new Uint8Array(entry.binary)));
+                    return (!preparedEntry ||
+                        preparedEntry.artifact.size !== entry.binary.byteLength ||
+                        preparedEntry.artifact.sha256.toLowerCase() !== digest);
+                })) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 prepared resource entries do not match the approved archive', { firmwareUpdateCode: 'FirmwareArtifactReceiptMismatch' });
+            }
+            const verifiedEntriesByName = new Map(verifiedArchive.materializedEntries.map(entry => [entry.entryName, entry.binary]));
+            const manifestBinary = verifiedEntriesByName.get('manifest.json');
+            if (!manifestBinary) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 prepared resource archive has no valid manifest.json', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
             }
-            const manifestSource = yield this.openProtocolV2PreparedSource(manifestEntry.artifact);
             let manifestValue;
             try {
-                manifestValue = JSON.parse(new TextDecoder().decode(yield readFirmwareByteSourceFully(manifestSource)));
+                manifestValue = JSON.parse(new TextDecoder().decode(manifestBinary));
             }
             catch (error) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 prepared resource manifest is invalid: ${String(error)}`, { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
@@ -52199,28 +52226,18 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             if (selectedFiles.length > PROTOCOL_V2_RESOURCE_FILE_MAX_COUNT) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 prepared resource archive contains too many files', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
             }
-            const entriesByName = new Map(entries.map(entry => [entry.entryName, entry]));
-            const expectedEntryNames = new Set([
-                'manifest.json',
-                ...selectedFiles.map(file => file.archive_path),
-            ]);
-            if (entries.some(entry => !expectedEntryNames.has(entry.entryName))) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 prepared resource archive contains an unexpected entry', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
-            }
             let totalSize = 0;
             const sources = [];
             for (const [index, file] of selectedFiles.entries()) {
-                const entry = entriesByName.get(file.archive_path);
-                if (!entry ||
-                    entry.artifact.size !== file.size ||
-                    entry.artifact.sha256.toLowerCase() !== file.sha256.toLowerCase()) {
+                const binary = verifiedEntriesByName.get(file.archive_path);
+                if (!binary || binary.byteLength !== file.size) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 prepared resource file does not match manifest: ${file.archive_path}`, { firmwareUpdateCode: 'FirmwareArtifactReceiptMismatch' });
                 }
-                totalSize += entry.artifact.size;
+                totalSize += binary.byteLength;
                 if (totalSize > PROTOCOL_V2_RESOURCE_TOTAL_MAX_BYTES) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 prepared resource archive exceeds the total size limit', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
                 }
-                const source = yield this.openProtocolV2PreparedSource(entry.artifact);
+                const source = yield this.openProtocolV2MemorySource(binary);
                 const header = source.size >= PROTOCOL_V2_OKPP_HEADER_SIZE
                     ? parseProtocolV2OkppHeader(new Uint8Array(yield source.readAt(0, PROTOCOL_V2_OKPP_HEADER_SIZE)))
                     : null;
@@ -52369,6 +52386,16 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         const serialNumber = (_b = (_a = deviceInfo.hw) === null || _a === void 0 ? void 0 : _a.serial_no) === null || _b === void 0 ? void 0 : _b.trim();
         return serialNumber || undefined;
     }
+    getProtocolV2PreparedPlanDeviceModel(features) {
+        const currentDeviceType = this.device.getCurrentDeviceType();
+        const featureDeviceType = features ? getDeviceType(features) : undefined;
+        const deviceType = currentDeviceType === hdShared.EDeviceType.Pro2 || currentDeviceType === hdShared.EDeviceType.Neo
+            ? currentDeviceType
+            : featureDeviceType;
+        return deviceType === hdShared.EDeviceType.Pro2 || deviceType === hdShared.EDeviceType.Neo
+            ? String(deviceType)
+            : undefined;
+    }
     getProtocolV2ConnectionRoute() {
         var _a, _b, _c, _d, _e;
         const descriptor = this.device.originalDescriptor;
@@ -52404,6 +52431,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 assertFirmwareUpdatePreparedPlanDeviceIdentity({
                     preparedPlan: this.params.preparedPlan,
                     deviceIdentity: serialNumber,
+                    deviceModel: this.getProtocolV2PreparedPlanDeviceModel(this.device.features),
                 });
             }
             else if ((_b = this.params) === null || _b === void 0 ? void 0 : _b.expectedDeviceId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.93",
+  "version": "1.2.0-alpha.94",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.0-alpha.93",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.93",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.94",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.94",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -44,5 +44,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "0cae321e989b47b8c05455b2d59755e5322f2bb1"
+  "gitHead": "8bbaf25f01cd18ae64959efdcae60afb4435f259"
 }

package/src/api/FirmwareUpdateV4.ts

@@ -1129,6 +1129,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       assertFirmwareUpdatePreparedPlanDeviceIdentity({
         preparedPlan,
         deviceIdentity: this.protocolV2ExpectedSerialNumber,
+        deviceModel: this.getProtocolV2PreparedPlanDeviceModel(features),
       });
       const hostBinding = resolveFirmwareUpdateHostBinding(
         memoryHost.hostBindingGeneration,
@@ -1320,13 +1321,59 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       );
     }
 
-    const entries = archiveArtifacts[0].materializedEntries ?? [];
-    const manifestEntry = entries.find(entry => entry.entryName === 'manifest.json');
+    const archiveArtifact = archiveArtifacts[0];
+    const archiveSource = await this.openProtocolV2PreparedSource(archiveArtifact.artifact);
+    if (archiveSource.size > PROTOCOL_V2_RESOURCE_TOTAL_MAX_BYTES) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        'Protocol V2 prepared resource archive exceeds the total size limit',
+        { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' }
+      );
+    }
+
+    let archiveBinary: ArrayBuffer;
+    try {
+      archiveBinary = await readFirmwareByteSourceFully(archiveSource);
+    } finally {
+      await archiveSource.close();
+    }
+    const archiveDigest = bytesToHex(sha256(new Uint8Array(archiveBinary)));
+    if (archiveDigest !== archiveArtifact.artifact.sha256.toLowerCase()) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        'Protocol V2 prepared resource archive does not match its approved receipt',
+        { firmwareUpdateCode: 'FirmwareArtifactReceiptMismatch' }
+      );
+    }
+
+    // materializedEntries 由宿主生成，只有与获批 ZIP 的规范字节完全一致后才能使用。
+    const verifiedArchive = await this.prepareProtocolV2LocalResourceArchive(archiveBinary);
+    const entries = archiveArtifact.materializedEntries ?? [];
+    const entriesByName = new Map(entries.map(entry => [entry.entryName, entry] as const));
     if (
-      !manifestEntry ||
-      manifestEntry.artifact.size <= 0 ||
-      manifestEntry.artifact.size > PROTOCOL_V2_RESOURCE_MANIFEST_MAX_BYTES
+      entries.length !== verifiedArchive.materializedEntries.length ||
+      verifiedArchive.materializedEntries.some(entry => {
+        const preparedEntry = entriesByName.get(entry.entryName);
+        const digest = bytesToHex(sha256(new Uint8Array(entry.binary)));
+        return (
+          !preparedEntry ||
+          preparedEntry.artifact.size !== entry.binary.byteLength ||
+          preparedEntry.artifact.sha256.toLowerCase() !== digest
+        );
+      })
     ) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        'Protocol V2 prepared resource entries do not match the approved archive',
+        { firmwareUpdateCode: 'FirmwareArtifactReceiptMismatch' }
+      );
+    }
+
+    const verifiedEntriesByName = new Map(
+      verifiedArchive.materializedEntries.map(entry => [entry.entryName, entry.binary] as const)
+    );
+    const manifestBinary = verifiedEntriesByName.get('manifest.json');
+    if (!manifestBinary) {
       throw ERRORS.TypedError(
         HardwareErrorCode.RuntimeError,
         'Protocol V2 prepared resource archive has no valid manifest.json',
@@ -1334,12 +1381,9 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       );
     }
 
-    const manifestSource = await this.openProtocolV2PreparedSource(manifestEntry.artifact);
     let manifestValue: unknown;
     try {
-      manifestValue = JSON.parse(
-        new TextDecoder().decode(await readFirmwareByteSourceFully(manifestSource))
-      );
+      manifestValue = JSON.parse(new TextDecoder().decode(manifestBinary));
     } catch (error) {
       throw ERRORS.TypedError(
         HardwareErrorCode.RuntimeError,
@@ -1360,35 +1404,18 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       );
     }
 
-    const entriesByName = new Map(entries.map(entry => [entry.entryName, entry] as const));
-    const expectedEntryNames = new Set([
-      'manifest.json',
-      ...selectedFiles.map(file => file.archive_path),
-    ]);
-    if (entries.some(entry => !expectedEntryNames.has(entry.entryName))) {
-      throw ERRORS.TypedError(
-        HardwareErrorCode.RuntimeError,
-        'Protocol V2 prepared resource archive contains an unexpected entry',
-        { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' }
-      );
-    }
-
     let totalSize = 0;
     const sources: ProtocolV2ResourceBundleSource[] = [];
     for (const [index, file] of selectedFiles.entries()) {
-      const entry = entriesByName.get(file.archive_path);
-      if (
-        !entry ||
-        entry.artifact.size !== file.size ||
-        entry.artifact.sha256.toLowerCase() !== file.sha256.toLowerCase()
-      ) {
+      const binary = verifiedEntriesByName.get(file.archive_path);
+      if (!binary || binary.byteLength !== file.size) {
         throw ERRORS.TypedError(
           HardwareErrorCode.RuntimeError,
           `Protocol V2 prepared resource file does not match manifest: ${file.archive_path}`,
           { firmwareUpdateCode: 'FirmwareArtifactReceiptMismatch' }
         );
       }
-      totalSize += entry.artifact.size;
+      totalSize += binary.byteLength;
       if (totalSize > PROTOCOL_V2_RESOURCE_TOTAL_MAX_BYTES) {
         throw ERRORS.TypedError(
           HardwareErrorCode.RuntimeError,
@@ -1396,7 +1423,8 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' }
         );
       }
-      const source = await this.openProtocolV2PreparedSource(entry.artifact);
+      // 使用从获批 ZIP 中提取的规范字节，避免宿主在校验后替换 entry reader 内容。
+      const source = await this.openProtocolV2MemorySource(binary);
       const header =
         source.size >= PROTOCOL_V2_OKPP_HEADER_SIZE
           ? parseProtocolV2OkppHeader(
@@ -1573,6 +1601,18 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     return serialNumber || undefined;
   }
 
+  private getProtocolV2PreparedPlanDeviceModel(features?: Features) {
+    const currentDeviceType = this.device.getCurrentDeviceType();
+    const featureDeviceType = features ? getDeviceType(features) : undefined;
+    const deviceType =
+      currentDeviceType === EDeviceType.Pro2 || currentDeviceType === EDeviceType.Neo
+        ? currentDeviceType
+        : featureDeviceType;
+    return deviceType === EDeviceType.Pro2 || deviceType === EDeviceType.Neo
+      ? String(deviceType)
+      : undefined;
+  }
+
   private getProtocolV2ConnectionRoute() {
     const descriptor = this.device.originalDescriptor;
     return (
@@ -1613,6 +1653,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       assertFirmwareUpdatePreparedPlanDeviceIdentity({
         preparedPlan: this.params.preparedPlan,
         deviceIdentity: serialNumber,
+        deviceModel: this.getProtocolV2PreparedPlanDeviceModel(this.device.features),
       });
     } else if (this.params?.expectedDeviceId) {
       assertProtocolV2ReconnectIdentity(this.params?.expectedDeviceId, serialNumber);