@onekeyfe/hd-core 0.2.36 → 0.2.38

package/dist/api/device/DeviceUpdateBootloader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceUpdateBootloader.d.ts","sourceRoot":"","sources":["../../../src/api/device/DeviceUpdateBootloader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAQ3C,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,UAAU;IAC5D,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI;IAMJ,cAAc,YAAa,MAAM,UAS/B;IAEI,GAAG;CA4BV"}
+{"version":3,"file":"DeviceUpdateBootloader.d.ts","sourceRoot":"","sources":["../../../src/api/device/DeviceUpdateBootloader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAA6B,MAAM,qBAAqB,CAAC;AAE1E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAQ3C,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,UAAU;IAC5D,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI;IAMJ,cAAc,YAAa,MAAM,UAS/B;IAEI,GAAG;CA+BV"}

package/dist/api/firmware/updateBootloader.d.ts

@@ -1,3 +1,4 @@
 import { Features } from '../../types';
 export declare function checkNeedUpdateBoot(features: Features): boolean;
+export declare function checkBootloaderLength(data: ArrayBuffer): boolean;
 //# sourceMappingURL=updateBootloader.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"updateBootloader.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/updateBootloader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAQvC,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,WAgBrD"}
+{"version":3,"file":"updateBootloader.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/updateBootloader.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAQvC,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,WAgBrD;AAGD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,WAAW,WAiBtD"}

package/dist/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var semver = require('semver');
 var hdShared = require('@onekeyfe/hd-shared');
 var axios = require('axios');
+var ByteBuffer = require('bytebuffer');
 var BigNumber = require('bignumber.js');
 var utils = require('@noble/hashes/utils');
 var blake2s = require('@noble/hashes/blake2s');
@@ -18,6 +19,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var semver__default = /*#__PURE__*/_interopDefaultLegacy(semver);
 var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
+var ByteBuffer__default = /*#__PURE__*/_interopDefaultLegacy(ByteBuffer);
 var BigNumber__default = /*#__PURE__*/_interopDefaultLegacy(BigNumber);
 var JSZip__default = /*#__PURE__*/_interopDefaultLegacy(JSZip);
 
@@ -10849,6 +10851,21 @@ function checkNeedUpdateBoot(features) {
         semver__default["default"].gte(currentVersion, '4.1.0') &&
         semver__default["default"].lte(bootloaderVersion, targetBootloaderVersion.join('.')));
 }
+const INIT_DATA_CHUNK_SIZE$1 = 16 * 1024;
+function checkBootloaderLength(data) {
+    const chunk = new Uint8Array(data.slice(0, Math.min(INIT_DATA_CHUNK_SIZE$1, data.byteLength)));
+    const buffer = ByteBuffer__default["default"].wrap(chunk, undefined, undefined, true);
+    buffer.LE();
+    buffer.readByte();
+    buffer.readByte();
+    buffer.readByte();
+    buffer.readByte();
+    const hdrlen = buffer.readUint32();
+    buffer.readUint32();
+    const codelen = buffer.readUint32();
+    const bootloaderLength = hdrlen + codelen;
+    return bootloaderLength === data.byteLength;
+}
 
 const LOG_EVENT = 'LOG_EVENT';
 const LOG = {
@@ -13513,6 +13530,9 @@ class DeviceUpdateBootloader extends BaseMethod {
                         const resource = yield getSysResourceBinary(resourceUrl);
                         this.postTipMessage('DownloadLatestBootloaderResourceSuccess');
                         if (resource) {
+                            if (!checkBootloaderLength(resource.binary)) {
+                                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CheckDownloadFileError);
+                            }
                             yield updateBootloader(this.device.getCommands().typedCall.bind(this.device.getCommands()), this.postMessage, device, resource.binary);
                             return Promise.resolve(true);
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.2.36",
+  "version": "0.2.38",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,10 +24,11 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.2.36",
-    "@onekeyfe/hd-transport": "^0.2.36",
+    "@onekeyfe/hd-shared": "^0.2.38",
+    "@onekeyfe/hd-transport": "^0.2.38",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
+    "bytebuffer": "^5.0.1",
     "jszip": "^3.10.1",
     "parse-uri": "^1.0.7",
     "semver": "^7.3.7"
@@ -42,5 +43,5 @@
     "@types/semver": "^7.3.9",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "53dfab54b8e9f221b4b855e5f36f2b618ebfcdd9"
+  "gitHead": "5c0a8dd681f9b2ae38b0555a86020b0a28ac3910"
 }

package/src/api/device/DeviceUpdateBootloader.ts

@@ -1,4 +1,4 @@
-import { Deferred } from '@onekeyfe/hd-shared';
+import { Deferred, ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { BaseMethod } from '../BaseMethod';
 import { getSysResourceBinary } from '../firmware/getBinary';
@@ -6,7 +6,7 @@ import { updateBootloader } from '../firmware/uploadFirmware';
 import { createUiMessage } from '../../events/ui-request';
 import type { KnownDevice } from '../../types';
 import { DataManager } from '../../data-manager';
-import { checkNeedUpdateBoot } from '../firmware/updateBootloader';
+import { checkBootloaderLength, checkNeedUpdateBoot } from '../firmware/updateBootloader';
 
 export default class DeviceUpdateBootloader extends BaseMethod {
   checkPromise: Deferred<any> | null = null;
@@ -42,6 +42,9 @@ export default class DeviceUpdateBootloader extends BaseMethod {
           const resource = await getSysResourceBinary(resourceUrl);
           this.postTipMessage('DownloadLatestBootloaderResourceSuccess');
           if (resource) {
+            if (!checkBootloaderLength(resource.binary)) {
+              throw ERRORS.TypedError(HardwareErrorCode.CheckDownloadFileError);
+            }
             await updateBootloader(
               this.device.getCommands().typedCall.bind(this.device.getCommands()),
               this.postMessage,

package/src/api/firmware/updateBootloader.ts

@@ -1,3 +1,4 @@
+import ByteBuffer from 'bytebuffer';
 import semver from 'semver';
 import { Features } from '../../types';
 import { getDeviceType } from '../../utils';
@@ -24,3 +25,23 @@ export function checkNeedUpdateBoot(features: Features) {
     semver.lte(bootloaderVersion, targetBootloaderVersion.join('.'))
   );
 }
+
+const INIT_DATA_CHUNK_SIZE = 16 * 1024;
+export function checkBootloaderLength(data: ArrayBuffer) {
+  const chunk = new Uint8Array(data.slice(0, Math.min(INIT_DATA_CHUNK_SIZE, data.byteLength)));
+  const buffer = ByteBuffer.wrap(chunk, undefined, undefined, true);
+  buffer.LE();
+  // byte 'O', 'K', 'T', 'B'
+  buffer.readByte();
+  buffer.readByte();
+  buffer.readByte();
+  buffer.readByte();
+  // g_header_end - g_header
+  const hdrlen = buffer.readUint32();
+  // word 0
+  buffer.readUint32();
+  // codelen
+  const codelen = buffer.readUint32();
+  const bootloaderLength = hdrlen + codelen;
+  return bootloaderLength === data.byteLength;
+}