@onekeyfe/hd-core 1.2.5-alpha.1 → 1.2.5-alpha.3

package/__tests__/firmware-update/firmware-upload-source.test.ts

@@ -1,6 +1,10 @@
 import { EDeviceType } from '@onekeyfe/hd-shared';
 
-import { uploadFirmwareFromSource } from '../../src/api/firmware/uploadFirmware';
+import { openFirmwareByteSource } from '../../src/api/firmware/FirmwareArtifactSource';
+import {
+  updateResourceFromSource,
+  uploadFirmwareFromSource,
+} from '../../src/api/firmware/uploadFirmware';
 
 import type { Device } from '../../src/device/Device';
 import type { FirmwareByteSource } from '../../src/api/firmware/FirmwareArtifactSource';
@@ -68,3 +72,71 @@ describe('uploadFirmwareFromSource', () => {
     expect(requestedRanges.some(({ length }) => length === size)).toBe(false);
   });
 });
+
+describe('updateResourceFromSource', () => {
+  it('serves the remaining bytes when Touch requests a full final resource chunk', async () => {
+    const chunkSize = 16 * 1024;
+    const bytes = new Uint8Array(chunkSize * 2 + 3);
+    bytes.fill(0x5a, chunkSize, chunkSize * 2);
+    bytes.set([1, 2, 3], chunkSize * 2);
+    const source = await openFirmwareByteSource({ binary: bytes.buffer });
+    if (!source) {
+      throw new Error('Expected a firmware byte source');
+    }
+    const readAt = jest.spyOn(source, 'readAt');
+    const typedCall = jest
+      .fn()
+      .mockResolvedValueOnce({
+        type: 'ResourceRequest',
+        message: { offset: chunkSize, data_length: chunkSize },
+      })
+      .mockResolvedValueOnce({
+        type: 'ResourceRequest',
+        message: { offset: chunkSize * 2, data_length: chunkSize },
+      })
+      .mockResolvedValueOnce({ type: 'Success', message: { message: 'updated' } });
+
+    try {
+      await expect(
+        updateResourceFromSource(typedCall as never, 'icon.png', source)
+      ).resolves.toEqual({ message: 'updated' });
+      expect(typedCall).toHaveBeenCalledTimes(3);
+      expect(readAt).toHaveBeenNthCalledWith(2, chunkSize, chunkSize);
+      expect(readAt).toHaveBeenNthCalledWith(3, chunkSize * 2, 3);
+      expect(typedCall).toHaveBeenNthCalledWith(
+        2,
+        'ResourceAck',
+        ['ResourceRequest', 'Success'],
+        expect.objectContaining({ data_chunk: '5a'.repeat(chunkSize) })
+      );
+      expect(typedCall).toHaveBeenNthCalledWith(
+        3,
+        'ResourceAck',
+        ['ResourceRequest', 'Success'],
+        expect.objectContaining({ data_chunk: '010203' })
+      );
+    } finally {
+      await source.close();
+    }
+  });
+
+  it('rejects a resource request starting beyond the last byte', async () => {
+    const source = await openFirmwareByteSource({ binary: new Uint8Array(3).buffer });
+    if (!source) {
+      throw new Error('Expected a firmware byte source');
+    }
+    const typedCall = jest.fn().mockResolvedValueOnce({
+      type: 'ResourceRequest',
+      message: { offset: source.size, data_length: 16 * 1024 },
+    });
+
+    try {
+      await expect(
+        updateResourceFromSource(typedCall as never, 'icon.png', source)
+      ).rejects.toThrow('Device requested an invalid firmware resource range');
+      expect(typedCall).toHaveBeenCalledTimes(1);
+    } finally {
+      await source.close();
+    }
+  });
+});

package/__tests__/sol-sign-offchain-message.test.ts

@@ -54,14 +54,6 @@ describe('SolSignOffchainMessage', () => {
     });
   });
 
-  test('maps omitted required signers to an empty repeated field', () => {
-    const method = createMethod({ requiredSigners: undefined });
-
-    method.init();
-
-    expect(method.params.required_signers).toEqual([]);
-  });
-
   test.each([
     { requiredSigners: ['11'], error: '32-byte hex public key' },
     { requiredSigners: [signerB, signerA], error: 'strictly sorted and unique' },

package/dist/api/firmware/uploadFirmware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadFirmware.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/uploadFirmware.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,SAAS,EAAwB,MAAM,6BAA6B,CAAC;AACnF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,WAAW,EAA+B,MAAM,cAAc,CAAC;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAiEnE,eAAO,MAAM,cAAc,eAAsB,MAAM,kBAKtD,CAAC;AASF,eAAO,MAAM,wBAAwB,eACvB,UAAU,GAAG,KAAK,aACnB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,kBAAkB,oBACR,OAAO,uBACJ,OAAO,qBAqJ7B,CAAC;AAEF,eAAO,MAAM,cAAc,eACb,UAAU,GAAG,KAAK,aACnB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM;;wBAOO,OAAO,qBAqB7B,CAAC;AA4OF,eAAO,MAAM,cAAc,cACd,SAAS,YACV,MAAM,QACV,WAAW,mBACA,MAAM,IAAI,qBAc5B,CAAC;AAEF,eAAO,MAAM,wBAAwB,cACxB,SAAS,YACV,MAAM,UACR,kBAAkB,mBACT,MAAM,IAAI,qBAmC5B,CAAC;AAEF,eAAO,MAAM,0BAA0B,cAC1B,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,WACL,cAAc;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,kBAAkB,CAAA;CAAE,CAAC,qBAc1E,CAAC;AAEF,eAAO,MAAM,eAAe,cACf,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBAwBpB,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAChB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,QACR,WAAW,qBAWlB,CAAC;AAEF,eAAO,MAAM,0BAA0B,cAC1B,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,kBAAkB,qBAU3B,CAAC"}
+{"version":3,"file":"uploadFirmware.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/uploadFirmware.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,SAAS,EAAwB,MAAM,6BAA6B,CAAC;AACnF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,WAAW,EAA+B,MAAM,cAAc,CAAC;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAiEnE,eAAO,MAAM,cAAc,eAAsB,MAAM,kBAKtD,CAAC;AASF,eAAO,MAAM,wBAAwB,eACvB,UAAU,GAAG,KAAK,aACnB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,kBAAkB,oBACR,OAAO,uBACJ,OAAO,qBAqJ7B,CAAC;AAEF,eAAO,MAAM,cAAc,eACb,UAAU,GAAG,KAAK,aACnB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM;;wBAOO,OAAO,qBAqB7B,CAAC;AA4OF,eAAO,MAAM,cAAc,cACd,SAAS,YACV,MAAM,QACV,WAAW,mBACA,MAAM,IAAI,qBAc5B,CAAC;AAEF,eAAO,MAAM,wBAAwB,cACxB,SAAS,YACV,MAAM,UACR,kBAAkB,mBACT,MAAM,IAAI,qBAoC5B,CAAC;AAEF,eAAO,MAAM,0BAA0B,cAC1B,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,WACL,cAAc;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,kBAAkB,CAAA;CAAE,CAAC,qBAc1E,CAAC;AAEF,eAAO,MAAM,eAAe,cACf,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBAwBpB,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAChB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,QACR,WAAW,qBAWlB,CAAC;AAEF,eAAO,MAAM,0BAA0B,cAC1B,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,kBAAkB,qBAU3B,CAAC"}

package/dist/index.js

@@ -49779,10 +49779,11 @@ const updateResourceFromSource = (typedCall, fileName, source, onConfirmAfter) =
             !Number.isSafeInteger(dataLength) ||
             dataLength === undefined ||
             dataLength <= 0 ||
-            offset + dataLength > source.size) {
+            offset >= source.size) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Device requested an invalid firmware resource range');
         }
-        const chunk = new Uint8Array(yield source.readAt(offset, dataLength));
+        const chunkLength = Math.min(dataLength, source.size - offset);
+        const chunk = new Uint8Array(yield source.readAt(offset, chunkLength));
         response = yield typedCall('ResourceAck', ['ResourceRequest', 'Success'], {
             data_chunk: bytesToHex$1(chunk),
             hash: bytesToHex$1(blake2s.blake2s(chunk)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.5-alpha.1",
+  "version": "1.2.5-alpha.3",
   "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.5-alpha.1",
-    "@onekeyfe/hd-transport": "1.2.5-alpha.1",
+    "@onekeyfe/hd-shared": "1.2.5-alpha.3",
+    "@onekeyfe/hd-transport": "1.2.5-alpha.3",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "buffer": "^6.0.3",
@@ -46,5 +46,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "30f233d35b22ae22a5849a7130f82c84a24be4db"
+  "gitHead": "f42cd4853a78c57ad8bcaf97872f315b2871aca2"
 }

package/src/api/firmware/uploadFirmware.ts

@@ -568,14 +568,15 @@ export const updateResourceFromSource = async (
       !Number.isSafeInteger(dataLength) ||
       dataLength === undefined ||
       dataLength <= 0 ||
-      offset + dataLength > source.size
+      offset >= source.size
     ) {
       throw ERRORS.TypedError(
         HardwareErrorCode.RuntimeError,
         'Device requested an invalid firmware resource range'
       );
     }
-    const chunk = new Uint8Array(await source.readAt(offset, dataLength));
+    const chunkLength = Math.min(dataLength, source.size - offset);
+    const chunk = new Uint8Array(await source.readAt(offset, chunkLength));
     response = await typedCall('ResourceAck', ['ResourceRequest', 'Success'], {
       data_chunk: bytesToHex(chunk),
       hash: bytesToHex(blake2s(chunk)),