@onekeyfe/hd-core 0.3.19 → 0.3.21

package/dist/api/evm/EVMSignTypedData.d.ts.map

@@ -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"}
+{"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

@@ -22993,11 +22993,11 @@ DataManager.getTransportStatus = (localVersion) => {
 
 const PROTOBUF_MESSAGE_CONFIG = {
     model_mini: [
-        { minVersion: '3.2.0', messageVersion: 'latest' },
+        { minVersion: '3.3.0', messageVersion: 'latest' },
         { minVersion: '0.0.0', messageVersion: 'v1' },
     ],
     model_touch: [
-        { minVersion: '4.4.0', messageVersion: 'latest' },
+        { minVersion: '4.5.0', messageVersion: 'latest' },
         { minVersion: '0.0.0', messageVersion: 'v1' },
     ],
 };
@@ -27694,13 +27694,14 @@ class EVMSignTypedData extends BaseMethod {
         const data = lodash.get(item.message, 'data', undefined);
         if (!data)
             return false;
-        let biggerLimit = 1536;
+        let biggerLimit = 1024;
         const currentVersion = getDeviceFirmwareVersion(this.device.features).join('.');
-        const supportSignTypedVersion = '4.4.0';
-        if (semver__default["default"].lt(currentVersion, supportSignTypedVersion)) {
-            biggerLimit = 1024;
+        const supportBiggerDataVersion = '4.4.0';
+        if (semver__default["default"].gte(currentVersion, supportBiggerDataVersion)) {
+            biggerLimit = 1536;
         }
-        return data.replace('0x', '').length > biggerLimit;
+        const startIndex = data.startsWith('0x') ? 2 : 0;
+        return (data.length - startIndex) / 2 > biggerLimit;
     }
     hasNestedArrays(item) {
         if (!item)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.3.19",
+  "version": "0.3.21",
   "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": "^0.3.19",
-    "@onekeyfe/hd-transport": "^0.3.19",
+    "@onekeyfe/hd-shared": "^0.3.21",
+    "@onekeyfe/hd-transport": "^0.3.21",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -44,5 +44,5 @@
     "@types/semver": "^7.3.9",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "de5329a42e646888dfc9a04cf2e3f840ecafb69a"
+  "gitHead": "7d052f9affce1324c5585ebd918d4ce3bc275406"
 }

package/src/api/evm/EVMSignTypedData.ts

@@ -304,15 +304,17 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
     const data = get(item.message, 'data', undefined) as string | undefined;
     if (!data) return false;
 
-    let biggerLimit = 1536; // 1.5k
+    let biggerLimit = 1024; // 1k
+
     const currentVersion = getDeviceFirmwareVersion(this.device.features).join('.');
-    const supportSignTypedVersion = '4.4.0';
+    const supportBiggerDataVersion = '4.4.0';
 
-    if (semver.lt(currentVersion, supportSignTypedVersion)) {
-      biggerLimit = 1024; // 1k
+    if (semver.gte(currentVersion, supportBiggerDataVersion)) {
+      biggerLimit = 1536; // 1.5k
     }
 
-    return data.replace('0x', '').length > biggerLimit;
+    const startIndex = data.startsWith('0x') ? 2 : 0;
+    return (data.length - startIndex) / 2 > biggerLimit;
   }
 
   hasNestedArrays(item: any): boolean {

package/src/data/messages-config/index.ts

@@ -10,11 +10,11 @@ type DeviceVersionConfig = {
 
 export const PROTOBUF_MESSAGE_CONFIG: DeviceVersionConfig = {
   model_mini: [
-    { minVersion: '3.2.0', messageVersion: 'latest' },
+    { minVersion: '3.3.0', messageVersion: 'latest' },
     { minVersion: '0.0.0', messageVersion: 'v1' },
   ],
   model_touch: [
-    { minVersion: '4.4.0', messageVersion: 'latest' },
+    { minVersion: '4.5.0', messageVersion: 'latest' },
     { minVersion: '0.0.0', messageVersion: 'v1' },
   ],
 };