@onekeyfe/hd-core 1.0.29 → 1.0.30

package/dist/api/BaseMethod.d.ts

@@ -31,7 +31,9 @@ export declare abstract class BaseMethod<Params = undefined> {
     setDevice(device: Device): void;
     checkFirmwareRelease(): void;
     checkDeviceSupportFeature(): void;
-    protected checkFeatureVersionLimit(checkCondition: () => boolean, getVersionRange: () => DeviceFirmwareRange): void;
+    protected checkFeatureVersionLimit(checkCondition: () => boolean, getVersionRange: () => DeviceFirmwareRange, options?: {
+        strictCheckDeviceSupport?: boolean;
+    }): void;
     checkSafetyLevelOnTestNet(): Promise<void>;
     dispose(): void;
     postPreviousAddressMessage: (data: {

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

@@ -1 +1 @@
-{"version":3,"file":"BaseMethod.d.ts","sourceRoot":"","sources":["../../src/api/BaseMethod.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,eAAe,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAe,MAAM,UAAU,CAAC;AAC5D,OAAO,EAAE,WAAW,EAA4D,MAAM,WAAW,CAAC;AAMlG,8BAAsB,UAAU,CAAC,MAAM,GAAG,SAAS;IACjD,UAAU,EAAE,MAAM,CAAC;IAGnB,MAAM,EAAE,MAAM,CAAC;IAGf,MAAM,EAAE,MAAM,CAAC;IAOf,SAAS,CAAC,EAAE,MAAM,CAAC;IAKnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,WAAW,CAAC,EAAE,MAAM,CAAC;IAKrB,IAAI,EAAE,MAAM,CAAC;IAKb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE7B,SAAS,CAAC,EAAE,eAAe,CAAC;IAK5B,SAAS,EAAE,OAAO,CAAC;IAKnB,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAK7B,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAK5B,qBAAqB,UAAQ;IAK7B,aAAa,UAAS;IAKtB,wBAAwB,UAAQ;IAMhC,oBAAoB,UAAS;IAO7B,wBAAwB,UAAS;IAGjC,WAAW,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC;gBAEhC,OAAO,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,GAAG,CAAA;KAAE;IAYlD,QAAQ,CAAC,IAAI,IAAI,IAAI;IAErB,QAAQ,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAE5B,eAAe,IAAI,mBAAmB;IAItC,SAAS,CAAC,MAAM,EAAE,MAAM;IAKxB,oBAAoB;IAkBpB,yBAAyB;IAczB,SAAS,CAAC,wBAAwB,CAChC,cAAc,EAAE,MAAM,OAAO,EAC7B,eAAe,EAAE,MAAM,mBAAmB;IA0BtC,yBAAyB;IAiB/B,OAAO;IAGP,0BAA0B,SAAU;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,UAOrE;CACH"}
+{"version":3,"file":"BaseMethod.d.ts","sourceRoot":"","sources":["../../src/api/BaseMethod.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,eAAe,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAe,MAAM,UAAU,CAAC;AAC5D,OAAO,EAAE,WAAW,EAA4D,MAAM,WAAW,CAAC;AAMlG,8BAAsB,UAAU,CAAC,MAAM,GAAG,SAAS;IACjD,UAAU,EAAE,MAAM,CAAC;IAGnB,MAAM,EAAE,MAAM,CAAC;IAGf,MAAM,EAAE,MAAM,CAAC;IAOf,SAAS,CAAC,EAAE,MAAM,CAAC;IAKnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,WAAW,CAAC,EAAE,MAAM,CAAC;IAKrB,IAAI,EAAE,MAAM,CAAC;IAKb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE7B,SAAS,CAAC,EAAE,eAAe,CAAC;IAK5B,SAAS,EAAE,OAAO,CAAC;IAKnB,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAK7B,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAK5B,qBAAqB,UAAQ;IAK7B,aAAa,UAAS;IAKtB,wBAAwB,UAAQ;IAMhC,oBAAoB,UAAS;IAO7B,wBAAwB,UAAS;IAGjC,WAAW,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC;gBAEhC,OAAO,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,GAAG,CAAA;KAAE;IAYlD,QAAQ,CAAC,IAAI,IAAI,IAAI;IAErB,QAAQ,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAE5B,eAAe,IAAI,mBAAmB;IAItC,SAAS,CAAC,MAAM,EAAE,MAAM;IAKxB,oBAAoB;IAkBpB,yBAAyB;IAczB,SAAS,CAAC,wBAAwB,CAChC,cAAc,EAAE,MAAM,OAAO,EAC7B,eAAe,EAAE,MAAM,mBAAmB,EAC1C,OAAO,CAAC,EAAE;QACR,wBAAwB,CAAC,EAAE,OAAO,CAAC;KACpC;IAgCG,yBAAyB;IAiB/B,OAAO;IAGP,0BAA0B,SAAU;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,UAOrE;CACH"}

package/dist/api/kaspa/KaspaGetAddress.d.ts

@@ -16,7 +16,7 @@ export default class KaspaGetAddress extends BaseMethod<HardwareKaspaGetAddress[
         pro: {
             min: string;
         };
-        model_classic: {
+        model_classic1s: {
             min: string;
         };
     };

package/dist/api/kaspa/KaspaGetAddress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"KaspaGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/kaspa/KaspaGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,IAAI,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAGpF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAyB,YAAY,EAAE,MAAM,aAAa,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,uBAAuB,EAAE,CAAC;IAChF,SAAS,UAAS;IAElB,IAAI;IAmCJ,eAAe;;;;;;;;IAWf,uBAAuB;;;;;;;;IAWjB,GAAG;CA+BV"}
+{"version":3,"file":"KaspaGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/kaspa/KaspaGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,IAAI,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAGpF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAyB,YAAY,EAAE,MAAM,aAAa,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,uBAAuB,EAAE,CAAC;IAChF,SAAS,UAAS;IAElB,IAAI;IAmCJ,eAAe;;;;;;;;IAWf,uBAAuB;;;;;;;;IAWjB,GAAG;CAkCV"}

package/dist/api/kaspa/KaspaSignTransaction.d.ts

@@ -17,7 +17,7 @@ export default class KaspaSignTransaction extends BaseMethod<KaspaSignTransactio
         pro: {
             min: string;
         };
-        model_classic: {
+        model_classic1s: {
             min: string;
         };
     };

package/dist/api/kaspa/KaspaSignTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"KaspaSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/api/kaspa/KaspaSignTransaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAGnE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAGL,0BAA0B,EAC1B,cAAc,EACf,MAAM,aAAa,CAAC;AAIrB,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,UAAU,CAAC,0BAA0B,CAAC;IACtF,SAAS,UAAS;IAElB,IAAI;IAgEJ,eAAe;;;;;;;;IAWf,uBAAuB;;;;;;;;IAWjB,gBAAgB,CACpB,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,oBAAoB,CAAC,qBAAqB,CAAC,GAAG,oBAAoB,CAAC,eAAe,CAAC,EACxF,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,cAAc,EAAE,GAC1B,OAAO,CAAC,cAAc,EAAE,CAAC;IAsCtB,GAAG;CA4BV"}
+{"version":3,"file":"KaspaSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/api/kaspa/KaspaSignTransaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAGnE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAGL,0BAA0B,EAC1B,cAAc,EACf,MAAM,aAAa,CAAC;AAIrB,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,UAAU,CAAC,0BAA0B,CAAC;IACtF,SAAS,UAAS;IAElB,IAAI;IAgEJ,eAAe;;;;;;;;IAWf,uBAAuB;;;;;;;;IAWjB,gBAAgB,CACpB,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,oBAAoB,CAAC,qBAAqB,CAAC,GAAG,oBAAoB,CAAC,eAAe,CAAC,EACxF,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,cAAc,EAAE,GAC1B,OAAO,CAAC,cAAc,EAAE,CAAC;IAsCtB,GAAG;CA+BV"}

package/dist/index.js

@@ -27054,7 +27054,7 @@ class BaseMethod {
             device: this.device.toMessageObject(),
         }));
     }
-    checkFeatureVersionLimit(checkCondition, getVersionRange) {
+    checkFeatureVersionLimit(checkCondition, getVersionRange, options) {
         var _a;
         if (!checkCondition()) {
             return;
@@ -27062,6 +27062,9 @@ class BaseMethod {
         const firmwareVersion = (_a = getDeviceFirmwareVersion(this.device.features)) === null || _a === void 0 ? void 0 : _a.join('.');
         const versionRange = getMethodVersionRange(this.device.features, type => getVersionRange()[type]);
         if (!versionRange) {
+            if (options === null || options === void 0 ? void 0 : options.strictCheckDeviceSupport) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotSupportMethod, 'Device does not support this method');
+            }
             return;
         }
         if (semver__default["default"].valid(firmwareVersion) && semver__default["default"].lt(firmwareVersion, versionRange.min)) {
@@ -35605,14 +35608,16 @@ class KaspaGetAddress extends BaseMethod {
             pro: {
                 min: '4.14.0',
             },
-            model_classic: {
-                min: '3.13.0',
+            model_classic1s: {
+                min: '3.12.0',
             },
         };
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.checkFeatureVersionLimit(() => this.params.some(param => param.use_tweak === false), () => this.getUseTweakVersionRange());
+            this.checkFeatureVersionLimit(() => this.params.some(param => param.use_tweak === false), () => this.getUseTweakVersionRange(), {
+                strictCheckDeviceSupport: true,
+            });
             const responses = [];
             for (let i = 0; i < this.params.length; i++) {
                 const param = this.params[i];
@@ -35996,8 +36001,8 @@ class KaspaSignTransaction extends BaseMethod {
             pro: {
                 min: '4.14.0',
             },
-            model_classic: {
-                min: '3.13.0',
+            model_classic1s: {
+                min: '3.12.0',
             },
         };
     }
@@ -36030,7 +36035,9 @@ class KaspaSignTransaction extends BaseMethod {
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.checkFeatureVersionLimit(() => this.params.useTweak === false, () => this.getUseTweakVersionRange());
+            this.checkFeatureVersionLimit(() => this.params.useTweak === false, () => this.getUseTweakVersionRange(), {
+                strictCheckDeviceSupport: true,
+            });
             const { raw: rawMessage } = serialize(this.params, 0);
             const input = this.params.inputs[0];
             const { device, params } = this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.0.29",
+  "version": "1.0.30",
   "description": "> TODO: description",
   "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.0.29",
-    "@onekeyfe/hd-transport": "^1.0.29",
+    "@onekeyfe/hd-shared": "^1.0.30",
+    "@onekeyfe/hd-transport": "^1.0.30",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -46,5 +46,5 @@
     "@types/web-bluetooth": "^0.0.21",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "a2cf72c9dd50aec711cbd363ce0f4318da41323c"
+  "gitHead": "e7d0b547c42856f3bf4801ede2cadb593e1cbf8e"
 }

package/src/api/BaseMethod.ts

@@ -1,5 +1,9 @@
 import semver from 'semver';
-import { createNeedUpgradeFirmwareHardwareError } from '@onekeyfe/hd-shared';
+import {
+  createNeedUpgradeFirmwareHardwareError,
+  ERRORS,
+  HardwareErrorCode,
+} from '@onekeyfe/hd-shared';
 import { supportInputPinOnSoftware, supportModifyHomescreen } from '../utils/deviceFeaturesUtils';
 import { createDeviceMessage } from '../events/device';
 import { UI_REQUEST } from '../constants/ui-request';
@@ -152,7 +156,10 @@ export abstract class BaseMethod<Params = undefined> {
 
   protected checkFeatureVersionLimit(
     checkCondition: () => boolean,
-    getVersionRange: () => DeviceFirmwareRange
+    getVersionRange: () => DeviceFirmwareRange,
+    options?: {
+      strictCheckDeviceSupport?: boolean;
+    }
   ) {
     if (!checkCondition()) {
       return;
@@ -165,6 +172,12 @@ export abstract class BaseMethod<Params = undefined> {
     );
 
     if (!versionRange) {
+      if (options?.strictCheckDeviceSupport) {
+        throw ERRORS.TypedError(
+          HardwareErrorCode.DeviceNotSupportMethod,
+          'Device does not support this method'
+        );
+      }
       // Equipment that does not need to be repaired
       return;
     }

package/src/api/kaspa/KaspaGetAddress.ts

@@ -59,8 +59,8 @@ export default class KaspaGetAddress extends BaseMethod<HardwareKaspaGetAddress[
       pro: {
         min: '4.14.0',
       },
-      model_classic: {
-        min: '3.13.0',
+      model_classic1s: {
+        min: '3.12.0',
       },
     };
   }
@@ -69,7 +69,10 @@ export default class KaspaGetAddress extends BaseMethod<HardwareKaspaGetAddress[
     this.checkFeatureVersionLimit(
       // exists use_tweak is false check firmware version
       () => this.params.some(param => param.use_tweak === false),
-      () => this.getUseTweakVersionRange()
+      () => this.getUseTweakVersionRange(),
+      {
+        strictCheckDeviceSupport: true,
+      }
     );
 
     const responses: KaspaAddress[] = [];

package/src/api/kaspa/KaspaSignTransaction.ts

@@ -97,8 +97,8 @@ export default class KaspaSignTransaction extends BaseMethod<KaspaSignTransactio
       pro: {
         min: '4.14.0',
       },
-      model_classic: {
-        min: '3.13.0',
+      model_classic1s: {
+        min: '3.12.0',
       },
     };
   }
@@ -150,7 +150,10 @@ export default class KaspaSignTransaction extends BaseMethod<KaspaSignTransactio
     this.checkFeatureVersionLimit(
       // exists use_tweak is false check firmware version
       () => this.params.useTweak === false,
-      () => this.getUseTweakVersionRange()
+      () => this.getUseTweakVersionRange(),
+      {
+        strictCheckDeviceSupport: true,
+      }
     );
 
     const { raw: rawMessage } = serialize(this.params, 0);