@onekeyfe/hd-core 1.1.15-alpha.0 → 1.1.16-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/api/evm/EVMSignTypedData.d.ts.map +1 -1
  2. package/dist/index.js +2 -7
  3. package/package.json +4 -4
  4. package/src/api/evm/EVMSignTypedData.ts +7 -12
package/dist/api/evm/EVMSignTypedData.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EVMSignTypedData.d.ts","sourceRoot":"","sources":["../../../src/api/evm/EVMSignTypedData.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,UAAU,EACV,eAAe,EACf,SAAS,EAEV,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAK3C,OAAO,EAEL,KAAK,4BAA4B,EACjC,KAAK,0BAA0B,EAChC,MAAM,aAAa,CAAC;AAQrB,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,IAAI,EAAE,4BAA4B,CAAC,0BAA0B,CAAC,CAAC;IAC/D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAU,CAAC,sBAAsB,CAAC;IAC9E,IAAI;IAqCE,mBAAmB,CAAC,EACxB,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,aAAa,GACd,EAAE;QACD,SAAS,EAAE,SAAS,CAAC;QACrB,QAAQ,EAAE,4BAA4B,CAAC,0BAA0B,CAAC,CAAC;QACnE,QAAQ,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;QACtC,aAAa,EAAE,OAAO,CAAC;KACxB;;;;IA+JK,aAAa;;;;IAsCnB,aAAa,CAAC,EACZ,SAAS,EACT,QAAQ,EACR,OAAO,EACP,UAAU,EACV,WAAW,GACZ,EAAE;QACD,SAAS,EAAE,SAAS,CAAC;QACrB,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;QAC/B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;KACjC;IA2BD,eAAe;;;;;IAQf,aAAa,CAAC,IAAI,EAAE,4BAA4B,CAAC,0BAA0B,CAAC;IAiB5E,eAAe,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO;IA8BnC,gBAAgB;IAcV,GAAG;CAgFV"}
1
+ {"version":3,"file":"EVMSignTypedData.d.ts","sourceRoot":"","sources":["../../../src/api/evm/EVMSignTypedData.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,UAAU,EACV,eAAe,EACf,SAAS,EAEV,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAK3C,OAAO,EAEL,KAAK,4BAA4B,EACjC,KAAK,0BAA0B,EAChC,MAAM,aAAa,CAAC;AAQrB,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,IAAI,EAAE,4BAA4B,CAAC,0BAA0B,CAAC,CAAC;IAC/D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAU,CAAC,sBAAsB,CAAC;IAC9E,IAAI;IAqCE,mBAAmB,CAAC,EACxB,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,aAAa,GACd,EAAE;QACD,SAAS,EAAE,SAAS,CAAC;QACrB,QAAQ,EAAE,4BAA4B,CAAC,0BAA0B,CAAC,CAAC;QACnE,QAAQ,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;QACtC,aAAa,EAAE,OAAO,CAAC;KACxB;;;;IA+JK,aAAa;;;;IAsCnB,aAAa,CAAC,EACZ,SAAS,EACT,QAAQ,EACR,OAAO,EACP,UAAU,EACV,WAAW,GACZ,EAAE;QACD,SAAS,EAAE,SAAS,CAAC;QACrB,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;QAC/B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;KACjC;IA2BD,eAAe;;;;;IAQf,aAAa,CAAC,IAAI,EAAE,4BAA4B,CAAC,0BAA0B,CAAC;IAiB5E,eAAe,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO;IA8BnC,gBAAgB;IAcV,GAAG;CA2EV"}
package/dist/index.js CHANGED
@@ -32941,14 +32941,9 @@ class EVMSignTypedData extends BaseMethod {
32941
32941
  throw hdShared.ERRORS.TypedError('Device_InitializeFailed', 'Device initialization failed. Please try again.');
32942
32942
  }
32943
32943
  const { addressN, chainId } = this.params;
32944
+ const supportEip712OnClassic = existCapability(this.device.features, hdTransport.Enum_Capability.Capability_EthereumTypedData);
32944
32945
  const deviceType = getDeviceType(this.device.features);
32945
- if (DeviceModelToTypes.model_mini.includes(deviceType)) {
32946
- const currentVersion = getDeviceFirmwareVersion(this.device.features).join('.');
32947
- const isClassic1sOrPure = deviceType === hdShared.EDeviceType.Classic1s || deviceType === hdShared.EDeviceType.ClassicPure;
32948
- if ((isClassic1sOrPure && semver__default["default"].gte(currentVersion, '3.14.0')) ||
32949
- existCapability(this.device.features, hdTransport.Enum_Capability.Capability_EthereumTypedData)) {
32950
- return this.signTypedData();
32951
- }
32946
+ if (DeviceModelToTypes.model_mini.includes(deviceType) && !supportEip712OnClassic) {
32952
32947
  validateParams(this.params, [
32953
32948
  { name: 'domainHash', type: 'hexString', required: true },
32954
32949
  { name: 'messageHash', type: 'hexString', required: true },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/hd-core",
3
- "version": "1.1.15-alpha.0",
3
+ "version": "1.1.16-alpha.0",
4
4
  "description": "Core processes and APIs for communicating with OneKey hardware devices.",
5
5
  "author": "OneKey",
6
6
  "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
25
25
  "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
26
26
  },
27
27
  "dependencies": {
28
- "@onekeyfe/hd-shared": "1.1.15-alpha.0",
29
- "@onekeyfe/hd-transport": "1.1.15-alpha.0",
28
+ "@onekeyfe/hd-shared": "1.1.16-alpha.0",
29
+ "@onekeyfe/hd-transport": "1.1.16-alpha.0",
30
30
  "axios": "1.12.2",
31
31
  "bignumber.js": "^9.0.2",
32
32
  "bytebuffer": "^5.0.1",
@@ -46,5 +46,5 @@
46
46
  "@types/web-bluetooth": "^0.0.21",
47
47
  "ripple-keypairs": "^1.3.1"
48
48
  },
49
- "gitHead": "245ea1716ad2ee2b21450b34b875c1d9b3ee6de0"
49
+ "gitHead": "5176cda0516c2c6112cb8e70ba5e7d6d7a8ebfdd"
50
50
  }
package/src/api/evm/EVMSignTypedData.ts CHANGED
@@ -401,20 +401,15 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
401
401
 
402
402
  const { addressN, chainId } = this.params;
403
403
 
404
+ // Classic1s / ClassicPure 3.14.0+, supported EthereumSignTypedDataOneKey
405
+ const supportEip712OnClassic = existCapability(
406
+ this.device.features,
407
+ Enum_Capability.Capability_EthereumTypedData
408
+ );
409
+
404
410
  // For Classic、Mini device we use EthereumSignTypedData
405
411
  const deviceType = getDeviceType(this.device.features);
406
- if (DeviceModelToTypes.model_mini.includes(deviceType)) {
407
- // Classic1s / ClassicPure 3.14.0+, supported EthereumSignTypedDataOneKey
408
- const currentVersion = getDeviceFirmwareVersion(this.device.features).join('.');
409
- const isClassic1sOrPure =
410
- deviceType === EDeviceType.Classic1s || deviceType === EDeviceType.ClassicPure;
411
- if (
412
- (isClassic1sOrPure && semver.gte(currentVersion, '3.14.0')) ||
413
- existCapability(this.device.features, Enum_Capability.Capability_EthereumTypedData)
414
- ) {
415
- return this.signTypedData();
416
- }
417
-
412
+ if (DeviceModelToTypes.model_mini.includes(deviceType) && !supportEip712OnClassic) {
418
413
  validateParams(this.params, [
419
414
  { name: 'domainHash', type: 'hexString', required: true },
420
415
  { name: 'messageHash', type: 'hexString', required: true },