@onekeyfe/hd-core 1.2.0-alpha.95 → 1.2.0-alpha.96

package/__tests__/firmware-update/firmware-prepared-host-digest.test.ts

@@ -256,6 +256,27 @@ describe('prepared firmware host digest binding', () => {
     expect(directArtifactReader.open).not.toHaveBeenCalled();
   });
 
+  test('FirmwareUpdateV3 does not execute legacy inputs outside the prepared plan', () => {
+    const { artifact, preparedPlan } = createPreparedPlan({
+      executor: 'v3',
+      target: 'firmware',
+    });
+    const method = new FirmwareUpdateV3({
+      id: 1,
+      payload: {
+        method: 'firmwareUpdateV3',
+        platform: 'desktop',
+        artifacts: { firmware: artifact },
+        preparedPlan,
+        bleBinary: new ArrayBuffer(4),
+      },
+    });
+
+    expect(() => method.init()).toThrow(
+      'Prepared firmware plans cannot be combined with legacy firmware inputs'
+    );
+  });
+
   test('DeviceUpdateBootloader rejects a host registered for another prepared plan', async () => {
     const { artifact, preparedPlan } = createPreparedPlan({
       executor: 'v2',

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

@@ -1 +1 @@
-{"version":3,"file":"FirmwareUpdateV3.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV3.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAa/E,OAAO,KAAK,EAEV,sBAAsB,EACvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAiB,MAAM,qBAAqB,CAAC;AAMnE,eAAO,MAAM,gCAAgC,UAAU,CAAC;AAaxD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,wBAAwB,CAAC,sBAAsB,CAAC;IAC5F,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,OAAO,CAAC,gBAAgB,CAAS;IAEjC,OAAO,CAAC,eAAe,CAA4B;IAEnD,IAAI;IAyFE,GAAG;;;;;YAQK,aAAa;IA6D3B,OAAO,CAAC,wBAAwB;YAiBlB,kBAAkB;YAelB,oBAAoB;IAKlC,OAAO,CAAC,wBAAwB;YAgBlB,oBAAoB;YA2DpB,uBAAuB;YAuBvB,4BAA4B;YA+E5B,aAAa;IAyN3B,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,qBAAqB;IAmB7B,OAAO,CAAC,sCAAsC;IAexC,sBAAsB,CAAC,OAAO,EAAE,MAAM;CA+E7C"}
+{"version":3,"file":"FirmwareUpdateV3.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV3.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAa/E,OAAO,KAAK,EAEV,sBAAsB,EACvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAiB,MAAM,qBAAqB,CAAC;AAMnE,eAAO,MAAM,gCAAgC,UAAU,CAAC;AAaxD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,wBAAwB,CAAC,sBAAsB,CAAC;IAC5F,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,OAAO,CAAC,gBAAgB,CAAS;IAEjC,OAAO,CAAC,eAAe,CAA4B;IAEnD,IAAI;IAwGE,GAAG;;;;;YAQK,aAAa;IA6D3B,OAAO,CAAC,wBAAwB;YAiBlB,kBAAkB;YAelB,oBAAoB;IAKlC,OAAO,CAAC,wBAAwB;YAgBlB,oBAAoB;YA2DpB,uBAAuB;YAuBvB,4BAA4B;YA+E5B,aAAa;IAyN3B,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,qBAAqB;IAmB7B,OAAO,CAAC,sCAAsC;IAexC,sBAAsB,CAAC,OAAO,EAAE,MAAM;CA+E7C"}

package/dist/index.js

@@ -50575,7 +50575,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
         this.artifactSources = [];
     }
     init() {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         this.allowDeviceMode = [UI_REQUEST.BOOTLOADER, UI_REQUEST.NOT_INITIALIZE];
         this.requireDeviceMode = [];
         this.useDevicePassphraseState = false;
@@ -50596,6 +50596,18 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
         const preparedPlan = payload.artifacts || payload.preparedPlan
             ? validateFirmwareUpdatePreparedPlan(payload.preparedPlan)
             : undefined;
+        const hasLegacyInputs = [
+            payload.bleVersion,
+            payload.bleBinary,
+            payload.firmwareVersion,
+            payload.firmwareBinary,
+            payload.resourceBinary,
+            payload.bootloaderVersion,
+            payload.bootloaderBinary,
+        ].some(input => input !== undefined);
+        if (preparedPlan && hasLegacyInputs) {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, 'Prepared firmware plans cannot be combined with legacy firmware inputs');
+        }
         const artifactReader = preparedPlan
             ? resolveFirmwareUpdateHostBinding(payload.hostBindingGeneration, preparedPlan.preparedPlanDigest).artifactReader
             : payload.artifactReader;
@@ -50648,7 +50660,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             bootloaderBinary: payload.bootloaderBinary,
             firmwareVersion: payload.firmwareVersion,
             resourceBinary: payload.resourceBinary,
-            firmwareType: payload.firmwareType,
+            firmwareType: (_f = preparedPlan === null || preparedPlan === void 0 ? void 0 : preparedPlan.firmwareType) !== null && _f !== void 0 ? _f : payload.firmwareType,
             platform: payload.platform,
             artifactReader,
             artifacts: payload.artifacts,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.95",
+  "version": "1.2.0-alpha.96",
   "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.95",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.95",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.96",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.96",
     "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": "efd79360b765d83a31d12f2403da4e79ed2ccffc"
+  "gitHead": "cd8982b684556ce3a154d16d5691e21c656f410a"
 }

package/src/api/FirmwareUpdateV3.ts

@@ -82,6 +82,21 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
       payload.artifacts || payload.preparedPlan
         ? validateFirmwareUpdatePreparedPlan(payload.preparedPlan)
         : undefined;
+    const hasLegacyInputs = [
+      payload.bleVersion,
+      payload.bleBinary,
+      payload.firmwareVersion,
+      payload.firmwareBinary,
+      payload.resourceBinary,
+      payload.bootloaderVersion,
+      payload.bootloaderBinary,
+    ].some(input => input !== undefined);
+    if (preparedPlan && hasLegacyInputs) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.CallMethodInvalidParameter,
+        'Prepared firmware plans cannot be combined with legacy firmware inputs'
+      );
+    }
     const artifactReader = preparedPlan
       ? resolveFirmwareUpdateHostBinding(
           payload.hostBindingGeneration,
@@ -140,7 +155,7 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
       bootloaderBinary: payload.bootloaderBinary,
       firmwareVersion: payload.firmwareVersion,
       resourceBinary: payload.resourceBinary,
-      firmwareType: payload.firmwareType,
+      firmwareType: preparedPlan?.firmwareType ?? payload.firmwareType,
       platform: payload.platform,
       artifactReader,
       artifacts: payload.artifacts,