@onekeyfe/hd-core 0.2.41 → 0.2.43

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

@@ -19,6 +19,7 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
             min: string;
         };
     };
+    hasNestedArrays(item: any): boolean;
     supportSignTyped(): boolean;
     run(): Promise<import("@onekeyfe/hd-transport").EthereumMessageSignature>;
 }

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":"AAQA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAK3C,OAAO,KAAK,EACV,4BAA4B,EAC5B,0BAA0B,EAC3B,MAAM,kCAAkC,CAAC;AAE1C,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,aAAa;;;;IAmHnB,eAAe;;;;;IAQf,gBAAgB;IAcV,GAAG;CAkDV"}
+{"version":3,"file":"EVMSignTypedData.d.ts","sourceRoot":"","sources":["../../../src/api/evm/EVMSignTypedData.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAK3C,OAAO,KAAK,EACV,4BAA4B,EAC5B,0BAA0B,EAC3B,MAAM,kCAAkC,CAAC;AAE1C,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,aAAa;;;;IAmHnB,eAAe;;;;;IAQf,eAAe,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO;IA8BnC,gBAAgB;IAcV,GAAG;CAqFV"}

package/dist/device/DeviceCommands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceCommands.d.ts","sourceRoot":"","sources":["../../src/device/DeviceCommands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAe,MAAM,wBAAwB,CAAC;AAK/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGvC,aAAK,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;AACxC,aAAK,UAAU,GAAG,MAAM,WAAW,CAAC;AACpC,oBAAY,oBAAoB,CAAC,CAAC,SAAS,UAAU,IAAI;IACvD,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;CACzB,CAAC;AACF,aAAK,oBAAoB,GAAG;KACzB,CAAC,IAAI,MAAM,WAAW,GAAG,oBAAoB,CAAC,CAAC,CAAC;CAClD,CAAC;AACF,oBAAY,sBAAsB,GAAG,oBAAoB,CAAC,MAAM,WAAW,CAAC,CAAC;AAE7E,oBAAY,wBAAwB,GAAG;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAcF,qBAAa,cAAc;IACzB,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,EAAE,SAAS,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC;IAEf,QAAQ,EAAE,OAAO,CAAC;IAElB,WAAW,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAE9C,kBAAkB,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;gBAE/B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAOpC,OAAO,CAAC,aAAa,EAAE,OAAO;IAU9B,IAAI,CACR,IAAI,EAAE,UAAU,EAChB,GAAG,GAAE,sBAAsB,CAAC,SAAS,CAAM,GAC1C,OAAO,CAAC,sBAAsB,CAAC;IAqBlC,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,UAAU,EAAE,EACpD,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,CAAC,EACV,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAE3C,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,UAAU,EAClD,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,CAAC,EACV,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAuC7B,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,sBAAsB,CAAC,SAAS,CAAC;IAK3E,kBAAkB,CAChB,GAAG,EAAE,sBAAsB,EAC3B,QAAQ,EAAE,UAAU,GACnB,OAAO,CAAC,sBAAsB,CAAC;IAqHlC,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,oBAAoB;IAwB/C,iBAAiB;CA2BlB;AAED,oBAAY,SAAS,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC"}
+{"version":3,"file":"DeviceCommands.d.ts","sourceRoot":"","sources":["../../src/device/DeviceCommands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAe,MAAM,wBAAwB,CAAC;AAK/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGvC,aAAK,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;AACxC,aAAK,UAAU,GAAG,MAAM,WAAW,CAAC;AACpC,oBAAY,oBAAoB,CAAC,CAAC,SAAS,UAAU,IAAI;IACvD,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;CACzB,CAAC;AACF,aAAK,oBAAoB,GAAG;KACzB,CAAC,IAAI,MAAM,WAAW,GAAG,oBAAoB,CAAC,CAAC,CAAC;CAClD,CAAC;AACF,oBAAY,sBAAsB,GAAG,oBAAoB,CAAC,MAAM,WAAW,CAAC,CAAC;AAE7E,oBAAY,wBAAwB,GAAG;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAcF,qBAAa,cAAc;IACzB,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,EAAE,SAAS,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC;IAEf,QAAQ,EAAE,OAAO,CAAC;IAElB,WAAW,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAE9C,kBAAkB,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;gBAE/B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAOpC,OAAO,CAAC,aAAa,EAAE,OAAO;IAU9B,IAAI,CACR,IAAI,EAAE,UAAU,EAChB,GAAG,GAAE,sBAAsB,CAAC,SAAS,CAAM,GAC1C,OAAO,CAAC,sBAAsB,CAAC;IAwBlC,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,UAAU,EAAE,EACpD,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,CAAC,EACV,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAE3C,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,UAAU,EAClD,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,CAAC,EACV,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAuC7B,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,sBAAsB,CAAC,SAAS,CAAC;IAK3E,kBAAkB,CAChB,GAAG,EAAE,sBAAsB,EAC3B,QAAQ,EAAE,UAAU,GACnB,OAAO,CAAC,sBAAsB,CAAC;IA0HlC,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,oBAAoB;IAwB/C,iBAAiB;CA2BlB;AAED,oBAAY,SAAS,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC"}

package/dist/index.js

@@ -11902,7 +11902,7 @@ class DeviceCommands {
         });
     }
     call(type, msg = {}) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             Log$6.debug('[DeviceCommands] [call] Sending', type);
             try {
@@ -11914,10 +11914,13 @@ class DeviceCommands {
             }
             catch (error) {
                 Log$6.debug('[DeviceCommands] [call] Received error', error);
-                if (((_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.error) === 'device disconnected during action') {
+                if ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) {
+                    Log$6.debug('error response', error === null || error === void 0 ? void 0 : error.response.data);
+                }
+                if (((_c = (_b = error === null || error === void 0 ? void 0 : error.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.error) === 'device disconnected during action') {
                     return { type: 'BridgeNetworkError', message: {} };
                 }
-                if (((_e = (_d = (_c = error === null || error === void 0 ? void 0 : error.response) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d.error) === null || _e === void 0 ? void 0 : _e.indexOf('Request failed with status code')) !== -1) {
+                if (((_f = (_e = (_d = error === null || error === void 0 ? void 0 : error.response) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.error) === null || _f === void 0 ? void 0 : _f.indexOf('Request failed with status code')) !== -1) {
                     return { type: 'CallMethodError', message: {} };
                 }
                 throw error;
@@ -11989,8 +11992,13 @@ class DeviceCommands {
                     error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FileAlreadyExists);
                 }
             }
-            if (code === 'Failure_UnexpectedMessage' && callType === 'PassphraseAck') {
-                error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.UnexpectPassphrase);
+            if (code === 'Failure_UnexpectedMessage') {
+                if (callType === 'PassphraseAck') {
+                    error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.UnexpectPassphrase);
+                }
+                if (message === 'Not in Signing mode') {
+                    error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NotInSigningMode);
+                }
             }
             if (error) {
                 return Promise.reject(error);
@@ -15408,6 +15416,30 @@ class EVMSignTypedData extends BaseMethod {
             },
         };
     }
+    hasNestedArrays(item) {
+        if (!item)
+            return false;
+        if (Array.isArray(item)) {
+            for (const element of item) {
+                if (Array.isArray(element)) {
+                    return true;
+                }
+                if (typeof element === 'object' && element !== null) {
+                    if (this.hasNestedArrays(element)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        else if (typeof item === 'object' && item !== null) {
+            for (const property in item) {
+                if (this.hasNestedArrays(item[property])) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
     supportSignTyped() {
         const deviceType = getDeviceType(this.device.features);
         if (deviceType === 'classic' || deviceType === 'mini') {
@@ -15450,6 +15482,25 @@ class EVMSignTypedData extends BaseMethod {
                 }
                 return Promise.resolve(response.message);
             }
+            const currentVersion = getDeviceFirmwareVersion(this.device.features).join('.');
+            if (this.hasNestedArrays(this.params.data)) {
+                const supportNestedArraysSignVersion = '4.2.0';
+                if (semver__default["default"].gte(currentVersion, supportNestedArraysSignVersion)) {
+                    validateParams(this.params, [
+                        { name: 'domainHash', type: 'hexString', required: true },
+                        { name: 'messageHash', type: 'hexString', required: true },
+                    ]);
+                    const { domainHash, messageHash } = this.params;
+                    const response = yield this.device.commands.typedCall('EthereumSignTypedHash', 'EthereumTypedDataSignature', {
+                        address_n: addressN,
+                        domain_separator_hash: domainHash !== null && domainHash !== void 0 ? domainHash : '',
+                        message_hash: messageHash,
+                        chain_id: chainId,
+                    });
+                    return Promise.resolve(response.message);
+                }
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodNeedUpgradeFirmware, `Device firmware version is too low, please update to ${supportNestedArraysSignVersion}`, { current: currentVersion, require: supportNestedArraysSignVersion });
+            }
             return this.signTypedData();
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.2.41",
+  "version": "0.2.43",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,8 +24,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.2.41",
-    "@onekeyfe/hd-transport": "^0.2.41",
+    "@onekeyfe/hd-shared": "^0.2.43",
+    "@onekeyfe/hd-transport": "^0.2.43",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -43,5 +43,5 @@
     "@types/semver": "^7.3.9",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "9ca2163be245dda2432f1c6c44a30fb612b7e1d5"
+  "gitHead": "7ba97c0f3dbf636ebb46928cc4c07c208eaf03e7"
 }

package/src/api/evm/EVMSignTypedData.ts

@@ -186,6 +186,36 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
     };
   }
 
+  hasNestedArrays(item: any): boolean {
+    if (!item) return false;
+
+    if (Array.isArray(item)) {
+      // item is an array
+      for (const element of item) {
+        if (Array.isArray(element)) {
+          // element is a nested array
+          return true;
+        }
+        if (typeof element === 'object' && element !== null) {
+          // element is an object, so check its properties recursively
+          if (this.hasNestedArrays(element)) {
+            return true;
+          }
+        }
+      }
+    } else if (typeof item === 'object' && item !== null) {
+      // item is an object, so check its properties recursively
+      // eslint-disable-next-line no-restricted-syntax
+      for (const property in item) {
+        if (this.hasNestedArrays(item[property])) {
+          return true;
+        }
+      }
+    }
+    // no nested arrays found
+    return false;
+  }
+
   supportSignTyped() {
     const deviceType = getDeviceType(this.device.features);
     if (deviceType === 'classic' || deviceType === 'mini') {
@@ -247,6 +277,41 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
       return Promise.resolve(response.message);
     }
 
+    // Touch Pro Sign NestedArrays
+    const currentVersion = getDeviceFirmwareVersion(this.device.features).join('.');
+    if (this.hasNestedArrays(this.params.data)) {
+      const supportNestedArraysSignVersion = '4.2.0';
+
+      // 4.2.0 is the first version that supports nested arrays in signTypedData
+      if (semver.gte(currentVersion, supportNestedArraysSignVersion)) {
+        validateParams(this.params, [
+          { name: 'domainHash', type: 'hexString', required: true },
+          { name: 'messageHash', type: 'hexString', required: true },
+        ]);
+
+        const { domainHash, messageHash } = this.params;
+
+        const response = await this.device.commands.typedCall(
+          'EthereumSignTypedHash',
+          'EthereumTypedDataSignature',
+          {
+            address_n: addressN,
+            domain_separator_hash: domainHash ?? '',
+            message_hash: messageHash,
+            chain_id: chainId,
+          }
+        );
+
+        return Promise.resolve(response.message);
+      }
+
+      throw ERRORS.TypedError(
+        HardwareErrorCode.CallMethodNeedUpgradeFirmware,
+        `Device firmware version is too low, please update to ${supportNestedArraysSignVersion}`,
+        { current: currentVersion, require: supportNestedArraysSignVersion }
+      );
+    }
+
     // For Touch、Pro we use EthereumSignTypedData
     return this.signTypedData();
   }

package/src/device/DeviceCommands.ts

@@ -79,6 +79,9 @@ export class DeviceCommands {
       return res;
     } catch (error) {
       Log.debug('[DeviceCommands] [call] Received error', error);
+      if (error.response?.data) {
+        Log.debug('error response', error?.response.data);
+      }
       if (error?.response?.data?.error === 'device disconnected during action') {
         return { type: 'BridgeNetworkError', message: {} } as any;
       }
@@ -189,8 +192,13 @@ export class DeviceCommands {
         }
       }
 
-      if (code === 'Failure_UnexpectedMessage' && callType === 'PassphraseAck') {
-        error = ERRORS.TypedError(HardwareErrorCode.UnexpectPassphrase);
+      if (code === 'Failure_UnexpectedMessage') {
+        if (callType === 'PassphraseAck') {
+          error = ERRORS.TypedError(HardwareErrorCode.UnexpectPassphrase);
+        }
+        if (message === 'Not in Signing mode') {
+          error = ERRORS.TypedError(HardwareErrorCode.NotInSigningMode);
+        }
       }
 
       if (error) {