@onekeyfe/hd-core 0.2.35 → 0.2.37

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/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAqBlC,OAAO,EACL,WAAW,EAYZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AA4BxD,eAAO,MAAM,OAAO,YAAmB,WAAW,iBAkQjD,CAAC;AAqMF,eAAO,MAAM,MAAM,0CAkBlB,CAAC;AAoJF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IA8CxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAIzB,CAAC;AAMF,eAAO,MAAM,IAAI,aAAoB,eAAe,aAAa,GAAG,8BAmBnE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAqBlC,OAAO,EACL,WAAW,EAYZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AA4BxD,eAAO,MAAM,OAAO,YAAmB,WAAW,iBA+PjD,CAAC;AAqMF,eAAO,MAAM,MAAM,0CAkBlB,CAAC;AA8IF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IA8CxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAIzB,CAAC;AAMF,eAAO,MAAM,IAAI,aAAoB,eAAe,aAAa,GAAG,8BAmBnE,CAAC"}

package/dist/index.d.ts

@@ -10,7 +10,6 @@ interface CommonParams {
     pollIntervalTime?: number;
     timeout?: number;
     passphraseState?: string;
-    useEmptyPassphrase?: boolean;
     initSession?: boolean;
 }
 declare type Params<T> = CommonParams & T & {

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);
 
@@ -10842,6 +10844,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 = {
@@ -13506,6 +13523,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);
                         }
@@ -18426,7 +18446,7 @@ const callAPI = (message) => __awaiter(void 0, void 0, void 0, function* () {
     (_a = method.setDevice) === null || _a === void 0 ? void 0 : _a.call(method, device);
     device.on(DEVICE.PIN, onDevicePinHandler);
     device.on(DEVICE.BUTTON, onDeviceButtonHandler);
-    device.on(DEVICE.PASSPHRASE, message.payload.useEmptyPassphrase ? onEmptyPassphraseHandler : onDevicePassphraseHandler);
+    device.on(DEVICE.PASSPHRASE, onDevicePassphraseHandler);
     device.on(DEVICE.PASSPHRASE_ON_DEVICE, onEnterPassphraseOnDeviceHandler);
     device.on(DEVICE.FEATURES, onDeviceFeaturesHandler);
     try {
@@ -18730,9 +18750,7 @@ const cancel = (connectId) => {
 const checkPassphraseSafety = (method, features) => {
     if (!method.useDevicePassphraseState)
         return;
-    if ((features === null || features === void 0 ? void 0 : features.passphrase_protection) === true &&
-        (method.payload.passphraseState == null || method.payload.passphraseState === '') &&
-        !method.payload.useEmptyPassphrase) {
+    if ((features === null || features === void 0 ? void 0 : features.passphrase_protection) === true && !method.payload.passphraseState) {
         DevicePool.clearDeviceCache(method.payload.connectId);
         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceOpenedPassphrase);
     }
@@ -18746,7 +18764,11 @@ const cleanup = () => {
     Log.debug('Cleanup...');
 };
 const removeDeviceListener = (device) => {
-    device.removeAllListeners();
+    device.removeListener(DEVICE.PIN, onDevicePinHandler);
+    device.removeListener(DEVICE.BUTTON, onDeviceButtonHandler);
+    device.removeListener(DEVICE.PASSPHRASE, onDevicePassphraseHandler);
+    device.removeListener(DEVICE.PASSPHRASE_ON_DEVICE, onEnterPassphraseOnDeviceHandler);
+    device.removeListener(DEVICE.FEATURES, onDeviceFeaturesHandler);
     DevicePool.emitter.removeListener(DEVICE.CONNECT, onDeviceConnectHandler);
 };
 const closePopup = () => {
@@ -18802,10 +18824,6 @@ const onDevicePassphraseHandler = (...[device, callback]) => __awaiter(void 0, v
         cache: save,
     });
 });
-const onEmptyPassphraseHandler = (...[_, callback]) => {
-    Log.debug('onEmptyPassphraseHandler');
-    callback({ passphrase: '' });
-};
 const onEnterPassphraseOnDeviceHandler = (...[device]) => {
     postMessage(createUiMessage(UI_REQUEST$1.REQUEST_PASSPHRASE_ON_DEVICE, {
         device: device.toMessageObject(),

package/dist/types/params.d.ts

@@ -4,7 +4,6 @@ export interface CommonParams {
     pollIntervalTime?: number;
     timeout?: number;
     passphraseState?: string;
-    useEmptyPassphrase?: boolean;
     initSession?: boolean;
 }
 export declare type Params<T> = CommonParams & T & {

package/dist/types/params.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["../../src/types/params.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;IAItB,UAAU,CAAC,EAAE,MAAM,CAAC;IAIpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAI1B,OAAO,CAAC,EAAE,MAAM,CAAC;IAIjB,eAAe,CAAC,EAAE,MAAM,CAAC;IAIzB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAI7B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,oBAAY,MAAM,CAAC,CAAC,IAAI,YAAY,GAAG,CAAC,GAAG;IAAE,MAAM,CAAC,EAAE,SAAS,CAAA;CAAE,CAAC;AAElE,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,KAAK,CAAC;IACf,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACpD;AAED,MAAM,WAAW,OAAO,CAAC,CAAC;IACxB,OAAO,EAAE,IAAI,CAAC;IACd,OAAO,EAAE,CAAC,CAAC;CACZ;AAED,oBAAY,QAAQ,CAAC,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC"}
+{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["../../src/types/params.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;IAItB,UAAU,CAAC,EAAE,MAAM,CAAC;IAIpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAI1B,OAAO,CAAC,EAAE,MAAM,CAAC;IAIjB,eAAe,CAAC,EAAE,MAAM,CAAC;IAIzB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,oBAAY,MAAM,CAAC,CAAC,IAAI,YAAY,GAAG,CAAC,GAAG;IAAE,MAAM,CAAC,EAAE,SAAS,CAAA;CAAE,CAAC;AAElE,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,KAAK,CAAC;IACf,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACpD;AAED,MAAM,WAAW,OAAO,CAAC,CAAC;IACxB,OAAO,EAAE,IAAI,CAAC;IACd,OAAO,EAAE,CAAC,CAAC;CACZ;AAED,oBAAY,QAAQ,CAAC,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.2.35",
+  "version": "0.2.37",
   "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.35",
-    "@onekeyfe/hd-transport": "^0.2.35",
+    "@onekeyfe/hd-shared": "^0.2.37",
+    "@onekeyfe/hd-transport": "^0.2.37",
     "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": "3dc0a64c3a036bf1ffbb1959bfc7957091aab1e6"
+  "gitHead": "5d80d2bdb1f7e5863286c3e59064c858b245b3ca"
 }

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;
+}

package/src/core/index.ts

@@ -133,10 +133,7 @@ export const callAPI = async (message: CoreMessage) => {
 
   device.on(DEVICE.PIN, onDevicePinHandler);
   device.on(DEVICE.BUTTON, onDeviceButtonHandler);
-  device.on(
-    DEVICE.PASSPHRASE,
-    message.payload.useEmptyPassphrase ? onEmptyPassphraseHandler : onDevicePassphraseHandler
-  );
+  device.on(DEVICE.PASSPHRASE, onDevicePassphraseHandler);
   device.on(DEVICE.PASSPHRASE_ON_DEVICE, onEnterPassphraseOnDeviceHandler);
   device.on(DEVICE.FEATURES, onDeviceFeaturesHandler);
 
@@ -543,11 +540,7 @@ export const cancel = (connectId?: string) => {
 const checkPassphraseSafety = (method: BaseMethod, features?: Features) => {
   if (!method.useDevicePassphraseState) return;
 
-  if (
-    features?.passphrase_protection === true &&
-    (method.payload.passphraseState == null || method.payload.passphraseState === '') &&
-    !method.payload.useEmptyPassphrase
-  ) {
+  if (features?.passphrase_protection === true && !method.payload.passphraseState) {
     DevicePool.clearDeviceCache(method.payload.connectId);
     throw ERRORS.TypedError(HardwareErrorCode.DeviceOpenedPassphrase);
   }
@@ -564,7 +557,11 @@ const cleanup = () => {
 };
 
 const removeDeviceListener = (device: Device) => {
-  device.removeAllListeners();
+  device.removeListener(DEVICE.PIN, onDevicePinHandler);
+  device.removeListener(DEVICE.BUTTON, onDeviceButtonHandler);
+  device.removeListener(DEVICE.PASSPHRASE, onDevicePassphraseHandler);
+  device.removeListener(DEVICE.PASSPHRASE_ON_DEVICE, onEnterPassphraseOnDeviceHandler);
+  device.removeListener(DEVICE.FEATURES, onDeviceFeaturesHandler);
   DevicePool.emitter.removeListener(DEVICE.CONNECT, onDeviceConnectHandler);
   // DevicePool.emitter.removeListener(DEVICE.DISCONNECT, onDeviceDisconnectHandler);
 };
@@ -644,12 +641,6 @@ const onDevicePassphraseHandler = async (...[device, callback]: DeviceEvents['pa
   });
 };
 
-const onEmptyPassphraseHandler = (...[_, callback]: DeviceEvents['passphrase']) => {
-  Log.debug('onEmptyPassphraseHandler');
-  // send as PassphrasePromptResponse
-  callback({ passphrase: '' });
-};
-
 const onEnterPassphraseOnDeviceHandler = (
   ...[device]: [...DeviceEvents['passphrase_on_device']]
 ) => {

package/src/types/params.ts

@@ -16,10 +16,6 @@ export interface CommonParams {
    * passphrase state
    */
   passphraseState?: string;
-  /**
-   * Use empty passphrase
-   */
-  useEmptyPassphrase?: boolean;
   /**
    * Every init session
    */