@onekeyfe/hd-core 1.2.8-alpha.4 → 1.2.8-alpha.6

package/__tests__/btc-derive-context-hash.test.ts

@@ -1,11 +1,12 @@
-import { EFirmwareType, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import { EDeviceType, EFirmwareType, HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 import BTCDeriveContextHash from '../src/api/btc/BTCDeriveContextHash';
 import { findMethod } from '../src/api/utils';
 import { getLogBlockLabel, getSafeLogPayload } from '../src/events/logBlockEvent';
 import { createCoreApi } from '../src/inject';
+import { Device } from '../src/device/Device';
 
-import type { Device } from '../src/device/Device';
+import type { DeviceFirmwareRange } from '../src/types';
 
 jest.mock('../src/data/config', () => ({
   getSDKVersion: jest.fn(() => '1.0.0'),
@@ -133,12 +134,36 @@ describe('btcDeriveContextHash', () => {
     method.init();
     expect(method).toBeInstanceOf(BTCDeriveContextHash);
     expect(method.strictCheckDeviceSupport).toBe(true);
-    expect(method.getVersionRange()).toEqual({ classic1s: { min: '3.21.0' } });
     expect(() => method.assertProtocolSupported('V2', EFirmwareType.Universal)).toThrow(
       expect.objectContaining({ errorCode: HardwareErrorCode.DeviceNotSupportMethod })
     );
   });
 
+  test.each([EDeviceType.Classic1s, EDeviceType.ClassicPure])(
+    'resolves the firmware requirement for %s through the device support check',
+    deviceType => {
+      const method = createMethod();
+      const device = Object.create(Device.prototype) as Device;
+      device.getCurrentDeviceType = jest.fn(() => deviceType);
+      const range: DeviceFirmwareRange = method.getVersionRange();
+
+      expect(device.getCurrentMethodVersionRange(type => range[type])).toEqual({ min: '3.21.0' });
+      expect(() => method.assertProtocolSupported('V1', EFirmwareType.Universal)).not.toThrow();
+    }
+  );
+
+  test.each([EDeviceType.Classic, EDeviceType.Mini, EDeviceType.Touch, EDeviceType.Pro])(
+    'keeps %s outside the supported firmware range',
+    deviceType => {
+      const method = createMethod();
+      const device = Object.create(Device.prototype) as Device;
+      device.getCurrentDeviceType = jest.fn(() => deviceType);
+      const range: DeviceFirmwareRange = method.getVersionRange();
+
+      expect(device.getCurrentMethodVersionRange(type => range[type])).toBeUndefined();
+    }
+  );
+
   test('propagates device rejection without returning a secret', async () => {
     const method = createMethod();
     method.init();

package/dist/api/btc/BTCDeriveContextHash.d.ts

@@ -7,6 +7,9 @@ export default class BTCDeriveContextHash extends BaseMethod<BabylonDeriveContex
         classic1s: {
             min: string;
         };
+        classicpure: {
+            min: string;
+        };
     };
     run(): Promise<import("@onekeyfe/hd-transport").BabylonDerivedContextHash>;
 }

package/dist/api/btc/BTCDeriveContextHash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BTCDeriveContextHash.d.ts","sourceRoot":"","sources":["../../../src/api/btc/BTCDeriveContextHash.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,KAAK,EAAE,wBAAwB,EAA2B,MAAM,wBAAwB,CAAC;AAUhG,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,UAAU,CAAC,wBAAwB,CAAC;IACpF,wBAAwB,UAAQ;IAEhC,IAAI;IAgDJ,eAAe;;;;;IAIT,GAAG;CAcV"}
+{"version":3,"file":"BTCDeriveContextHash.d.ts","sourceRoot":"","sources":["../../../src/api/btc/BTCDeriveContextHash.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,KAAK,EAAE,wBAAwB,EAA2B,MAAM,wBAAwB,CAAC;AAUhG,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,UAAU,CAAC,wBAAwB,CAAC;IACpF,wBAAwB,UAAQ;IAEhC,IAAI;IAgDJ,eAAe;;;;;;;;IAOT,GAAG;CAcV"}

package/dist/index.js

@@ -57239,7 +57239,10 @@ class BTCDeriveContextHash extends BaseMethod {
         };
     }
     getVersionRange() {
-        return { classic1s: { min: '3.21.0' } };
+        return {
+            classic1s: { min: '3.21.0' },
+            classicpure: { min: '3.21.0' },
+        };
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.8-alpha.4",
+  "version": "1.2.8-alpha.6",
   "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.8-alpha.4",
-    "@onekeyfe/hd-transport": "1.2.8-alpha.4",
+    "@onekeyfe/hd-shared": "1.2.8-alpha.6",
+    "@onekeyfe/hd-transport": "1.2.8-alpha.6",
     "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": "82fcab32fa1a37d1b82f73da825e39360624e0c9"
+  "gitHead": "eba2e870aaf79093ba41c67eb616f7239527a84b"
 }

package/src/api/btc/BTCDeriveContextHash.ts

@@ -67,7 +67,10 @@ export default class BTCDeriveContextHash extends BaseMethod<BabylonDeriveContex
   }
 
   getVersionRange() {
-    return { classic1s: { min: '3.21.0' } };
+    return {
+      classic1s: { min: '3.21.0' },
+      classicpure: { min: '3.21.0' },
+    };
   }
 
   async run() {