@onekeyfe/hd-core 0.3.20 → 0.3.21

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 +6 -5
  3. package/package.json +4 -4
  4. package/src/api/evm/EVMSignTypedData.ts +7 -5
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":"AAEA,OAAO,EAGL,UAAU,EACV,eAAe,EACf,SAAS,EACV,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,KAAK,EAAE,4BAA4B,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAQ5F,oBAAY,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;;;;IAuIK,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;IA4BD,eAAe;;;;;IAQf,aAAa,CAAC,IAAI,EAAE,4BAA4B,CAAC,0BAA0B,CAAC;IAe5E,eAAe,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO;IA8BnC,gBAAgB;IAcV,GAAG;CAsEV"}
1
+ {"version":3,"file":"EVMSignTypedData.d.ts","sourceRoot":"","sources":["../../../src/api/evm/EVMSignTypedData.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,UAAU,EACV,eAAe,EACf,SAAS,EACV,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,KAAK,EAAE,4BAA4B,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAQ5F,oBAAY,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;;;;IAuIK,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;IA4BD,eAAe;;;;;IAQf,aAAa,CAAC,IAAI,EAAE,4BAA4B,CAAC,0BAA0B,CAAC;IAiB5E,eAAe,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO;IA8BnC,gBAAgB;IAcV,GAAG;CAsEV"}
package/dist/index.js CHANGED
@@ -27694,13 +27694,14 @@ class EVMSignTypedData extends BaseMethod {
27694
27694
  const data = lodash.get(item.message, 'data', undefined);
27695
27695
  if (!data)
27696
27696
  return false;
27697
- let biggerLimit = 1536;
27697
+ let biggerLimit = 1024;
27698
27698
  const currentVersion = getDeviceFirmwareVersion(this.device.features).join('.');
27699
- const supportSignTypedVersion = '4.4.0';
27700
- if (semver__default["default"].lt(currentVersion, supportSignTypedVersion)) {
27701
- biggerLimit = 1024;
27699
+ const supportBiggerDataVersion = '4.4.0';
27700
+ if (semver__default["default"].gte(currentVersion, supportBiggerDataVersion)) {
27701
+ biggerLimit = 1536;
27702
27702
  }
27703
- return data.replace('0x', '').length > biggerLimit;
27703
+ const startIndex = data.startsWith('0x') ? 2 : 0;
27704
+ return (data.length - startIndex) / 2 > biggerLimit;
27704
27705
  }
27705
27706
  hasNestedArrays(item) {
27706
27707
  if (!item)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/hd-core",
3
- "version": "0.3.20",
3
+ "version": "0.3.21",
4
4
  "description": "> TODO: description",
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": "^0.3.20",
29
- "@onekeyfe/hd-transport": "^0.3.20",
28
+ "@onekeyfe/hd-shared": "^0.3.21",
29
+ "@onekeyfe/hd-transport": "^0.3.21",
30
30
  "axios": "^0.27.2",
31
31
  "bignumber.js": "^9.0.2",
32
32
  "bytebuffer": "^5.0.1",
@@ -44,5 +44,5 @@
44
44
  "@types/semver": "^7.3.9",
45
45
  "ripple-keypairs": "^1.1.4"
46
46
  },
47
- "gitHead": "5f8d884e626673cc315994acc08d36b6f391b5c1"
47
+ "gitHead": "7d052f9affce1324c5585ebd918d4ce3bc275406"
48
48
  }
package/src/api/evm/EVMSignTypedData.ts CHANGED
@@ -304,15 +304,17 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
304
304
  const data = get(item.message, 'data', undefined) as string | undefined;
305
305
  if (!data) return false;
306
306
 
307
- let biggerLimit = 1536; // 1.5k
307
+ let biggerLimit = 1024; // 1k
308
+
308
309
  const currentVersion = getDeviceFirmwareVersion(this.device.features).join('.');
309
- const supportSignTypedVersion = '4.4.0';
310
+ const supportBiggerDataVersion = '4.4.0';
310
311
 
311
- if (semver.lt(currentVersion, supportSignTypedVersion)) {
312
- biggerLimit = 1024; // 1k
312
+ if (semver.gte(currentVersion, supportBiggerDataVersion)) {
313
+ biggerLimit = 1536; // 1.5k
313
314
  }
314
315
 
315
- return data.replace('0x', '').length > biggerLimit;
316
+ const startIndex = data.startsWith('0x') ? 2 : 0;
317
+ return (data.length - startIndex) / 2 > biggerLimit;
316
318
  }
317
319
 
318
320
  hasNestedArrays(item: any): boolean {