@onekeyfe/hd-core 0.1.8 → 0.1.9

package/dist/utils/deviceFeaturesUtils.d.ts

@@ -1,98 +1,7 @@
 import type { Features, IVersionArray, IDeviceType, IDeviceModel } from '../types';
-export declare const getDeviceModel: (features?: {
-    vendor: string;
-    onekey_serial: string;
-    se_ver: string;
-    serial_no: string;
-    onekey_version: string;
-    ble_name: string;
-    ble_ver: string;
-    ble_enable: boolean;
-    major_version: number;
-    minor_version: number;
-    patch_version: number;
-    bootloader_mode: boolean | null;
-    device_id: string | null;
-    pin_protection: boolean | null;
-    passphrase_protection: boolean | null;
-    language: string | null;
-    label: string | null;
-    initialized: boolean | null;
-    revision: string | null;
-    bootloader_hash: string | null;
-    imported: boolean | null;
-    unlocked: boolean | null;
-    _passphrase_cached?: boolean | undefined;
-    firmware_present: boolean | null;
-    needs_backup: boolean | null;
-    flags: number | null;
-    model: string;
-    fw_major: number | null;
-    fw_minor: number | null;
-    fw_patch: number | null;
-    fw_vendor: string | null;
-    unfinished_backup: boolean | null;
-    no_backup: boolean | null;
-    recovery_mode: boolean | null;
-    capabilities: ("Capability_Bitcoin" | "Capability_Bitcoin_like" | "Capability_Binance" | "Capability_Cardano" | "Capability_Crypto" | "Capability_EOS" | "Capability_Ethereum" | "Capability_Lisk" | "Capability_Monero" | "Capability_NEM" | "Capability_Ripple" | "Capability_Stellar" | "Capability_Tezos" | "Capability_U2F" | "Capability_Shamir" | "Capability_ShamirGroups" | "Capability_PassphraseEntry")[];
-    backup_type: "Bip39" | "Slip39_Basic" | "Slip39_Advanced" | null;
-    sd_card_present: boolean | null;
-    sd_protection: boolean | null;
-    wipe_code_protection: boolean | null;
-    session_id: string | null;
-    passphrase_always_on_device: boolean | null;
-    safety_checks: "Strict" | "PromptAlways" | "PromptTemporarily" | null;
-    auto_lock_delay_ms: number | null;
-    display_rotation: number | null;
-    experimental_features: boolean | null;
-} | undefined) => IDeviceModel;
-export declare const getDeviceType: (features?: {
-    vendor: string;
-    onekey_serial: string;
-    se_ver: string;
-    serial_no: string;
-    onekey_version: string;
-    ble_name: string;
-    ble_ver: string;
-    ble_enable: boolean;
-    major_version: number;
-    minor_version: number;
-    patch_version: number;
-    bootloader_mode: boolean | null;
-    device_id: string | null;
-    pin_protection: boolean | null;
-    passphrase_protection: boolean | null;
-    language: string | null;
-    label: string | null;
-    initialized: boolean | null;
-    revision: string | null;
-    bootloader_hash: string | null;
-    imported: boolean | null;
-    unlocked: boolean | null;
-    _passphrase_cached?: boolean | undefined;
-    firmware_present: boolean | null;
-    needs_backup: boolean | null;
-    flags: number | null;
-    model: string;
-    fw_major: number | null;
-    fw_minor: number | null;
-    fw_patch: number | null;
-    fw_vendor: string | null;
-    unfinished_backup: boolean | null;
-    no_backup: boolean | null;
-    recovery_mode: boolean | null;
-    capabilities: ("Capability_Bitcoin" | "Capability_Bitcoin_like" | "Capability_Binance" | "Capability_Cardano" | "Capability_Crypto" | "Capability_EOS" | "Capability_Ethereum" | "Capability_Lisk" | "Capability_Monero" | "Capability_NEM" | "Capability_Ripple" | "Capability_Stellar" | "Capability_Tezos" | "Capability_U2F" | "Capability_Shamir" | "Capability_ShamirGroups" | "Capability_PassphraseEntry")[];
-    backup_type: "Bip39" | "Slip39_Basic" | "Slip39_Advanced" | null;
-    sd_card_present: boolean | null;
-    sd_protection: boolean | null;
-    wipe_code_protection: boolean | null;
-    session_id: string | null;
-    passphrase_always_on_device: boolean | null;
-    safety_checks: "Strict" | "PromptAlways" | "PromptTemporarily" | null;
-    auto_lock_delay_ms: number | null;
-    display_rotation: number | null;
-    experimental_features: boolean | null;
-} | undefined) => IDeviceType;
+export declare const getDeviceModel: (features?: import("packages/hd-transport/dist").Features | undefined) => IDeviceModel;
+export declare const getDeviceType: (features?: import("packages/hd-transport/dist").Features | undefined) => IDeviceType;
+export declare const getDeviceTypeOnBootloader: (features?: import("packages/hd-transport/dist").Features | undefined) => IDeviceType;
 export declare const getDeviceTypeByBleName: (name?: string | undefined) => IDeviceType | null;
 export declare const getDeviceTypeByDeviceId: (deviceId?: string | undefined) => IDeviceType;
 export declare const getDeviceUUID: (features: Features) => string;

package/dist/utils/deviceFeaturesUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAEnF,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAA0B,YAUpD,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAA0B,WAUnD,CAAC;AAEF,eAAO,MAAM,sBAAsB,iCAAoB,WAAW,GAAG,IAKpE,CAAC;AAEF,eAAO,MAAM,uBAAuB,qCAAwB,WAQ3D,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,QAAQ,WAM/C,CAAC;AAEF,eAAO,MAAM,cAAc,aAAc,QAAQ,WAOhD,CAAC;AAKF,eAAO,MAAM,wBAAwB,aAAc,QAAQ,GAAG,SAAS,kBAOtE,CAAC;AAKF,eAAO,MAAM,2BAA2B,aAAc,QAAQ,KAAG,aAAa,GAAG,IAKhF,CAAC"}
+{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAEnF,eAAO,MAAM,cAAc,4EAA0B,YAUpD,CAAC;AAEF,eAAO,MAAM,aAAa,4EAA0B,WAUnD,CAAC;AAEF,eAAO,MAAM,yBAAyB,4EAA0B,WAS/D,CAAC;AAEF,eAAO,MAAM,sBAAsB,iCAAoB,WAAW,GAAG,IAKpE,CAAC;AAEF,eAAO,MAAM,uBAAuB,qCAAwB,WAQ3D,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,QAAQ,WAM/C,CAAC;AAEF,eAAO,MAAM,cAAc,aAAc,QAAQ,WAOhD,CAAC;AAKF,eAAO,MAAM,wBAAwB,aAAc,QAAQ,GAAG,SAAS,kBAOtE,CAAC;AAKF,eAAO,MAAM,2BAA2B,aAAc,QAAQ,KAAG,aAAa,GAAG,IAKhF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "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.1.8",
-    "@onekeyfe/hd-transport": "^0.1.8",
+    "@onekeyfe/hd-shared": "^0.1.9",
+    "@onekeyfe/hd-transport": "^0.1.9",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "parse-uri": "^1.0.7",
@@ -36,5 +36,5 @@
     "@types/parse-uri": "^1.0.0",
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "d9514ac6207a2561ad107910ab005b3f9e12d794"
+  "gitHead": "6abdc58c1614920bf941d7e56f2768aa76f56932"
 }

package/src/api/CipherKeyValue.ts

@@ -1,4 +1,4 @@
-import { CipherKeyValue as HardwareCipherKeyValue } from '@onekeyfe/hd-transport/src/types/messages';
+import { CipherKeyValue as HardwareCipherKeyValue } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../constants/ui-request';
 import { serializedPath, validatePath } from './helpers/pathUtils';
 import { BaseMethod } from './BaseMethod';

package/src/api/btc/BTCGetAddress.ts

@@ -1,4 +1,4 @@
-import { GetAddress } from '@onekeyfe/hd-transport/src/types/messages';
+import { GetAddress } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { getScriptType, serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';

package/src/api/btc/BTCGetPublicKey.ts

@@ -1,4 +1,4 @@
-import { GetPublicKey } from '@onekeyfe/hd-transport/src/types/messages';
+import { GetPublicKey } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { getScriptType, serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';

package/src/api/btc/BTCSignMessage.ts

@@ -1,4 +1,4 @@
-import { SignMessage } from '@onekeyfe/hd-transport/src/types/messages';
+import { SignMessage } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';

package/src/api/btc/BTCSignTransaction.ts

@@ -1,4 +1,4 @@
-import { TxInputType, TxOutputType } from '@onekeyfe/hd-transport/src/types/messages';
+import { TxInputType, TxOutputType } from '@onekeyfe/hd-transport';
 
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import { UI_REQUEST } from '../../constants/ui-request';

package/src/api/btc/BTCVerifyMessage.ts

@@ -1,4 +1,4 @@
-import { VerifyMessage } from '@onekeyfe/hd-transport/src/types/messages';
+import { VerifyMessage } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 
 import { BaseMethod } from '../BaseMethod';

package/src/api/btc/helpers/signtx.ts

@@ -4,7 +4,7 @@ import {
   TxRequest,
   TxRequestSerializedType,
   TypedCall,
-} from '@onekeyfe/hd-transport/src/types/messages';
+} from '@onekeyfe/hd-transport';
 import {
   RefTransaction,
   SignedTransaction,

package/src/api/btc/helpers/signtxLegacy.ts

@@ -5,7 +5,7 @@ import {
   TxRequest,
   TxRequestSerializedType,
   TypedCall,
-} from '@onekeyfe/hd-transport/src/types/messages';
+} from '@onekeyfe/hd-transport';
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import {
   RefTransaction,

package/src/api/device/DeviceBackup.ts

@@ -1,4 +1,4 @@
-import { BackupDevice } from '@onekeyfe/hd-transport/src/types/messages';
+import { BackupDevice } from '@onekeyfe/hd-transport';
 import { BaseMethod } from '../BaseMethod';
 
 export default class DeviceBackup extends BaseMethod<BackupDevice> {

package/src/api/device/DeviceChangePin.ts

@@ -1,4 +1,4 @@
-import { ChangePin } from '@onekeyfe/hd-transport/src/types/messages';
+import { ChangePin } from '@onekeyfe/hd-transport';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 

package/src/api/device/DeviceFlags.ts

@@ -1,4 +1,4 @@
-import { ApplyFlags } from '@onekeyfe/hd-transport/src/types/messages';
+import { ApplyFlags } from '@onekeyfe/hd-transport';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 

package/src/api/device/DeviceRebootToBootloader.ts

@@ -1,4 +1,4 @@
-import { RebootToBootloader } from '@onekeyfe/hd-transport/src/types/messages';
+import { RebootToBootloader } from '@onekeyfe/hd-transport';
 import { BaseMethod } from '../BaseMethod';
 
 // Reboot BootLoader

package/src/api/device/DeviceRecovery.ts

@@ -1,4 +1,4 @@
-import { RecoveryDevice } from '@onekeyfe/hd-transport/src/types/messages';
+import { RecoveryDevice } from '@onekeyfe/hd-transport';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 

package/src/api/device/DeviceReset.ts

@@ -1,4 +1,4 @@
-import { ResetDevice } from '@onekeyfe/hd-transport/src/types/messages';
+import { ResetDevice } from '@onekeyfe/hd-transport';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 

package/src/api/device/DeviceSettings.ts

@@ -1,4 +1,4 @@
-import { ApplySettings } from '@onekeyfe/hd-transport/src/types/messages';
+import { ApplySettings } from '@onekeyfe/hd-transport';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 

package/src/api/device/DeviceUpdateReboot.ts

@@ -1,4 +1,4 @@
-import { BixinReboot } from '@onekeyfe/hd-transport/src/types/messages';
+import { BixinReboot } from '@onekeyfe/hd-transport';
 import { BaseMethod } from '../BaseMethod';
 
 // Upload hint Reboot BootLoader

package/src/api/device/DeviceVerify.ts

@@ -0,0 +1,55 @@
+import { BixinVerifyDeviceRequest } from '@onekeyfe/hd-transport';
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import { formatAnyHex } from '../helpers/hexUtils';
+import { BaseMethod } from '../BaseMethod';
+import { validateParams } from '../helpers/paramsValidator';
+import { getDeviceType } from '../../utils';
+import type { DeviceVerifySignature } from '../../types';
+
+export default class DeviceVerify extends BaseMethod<BixinVerifyDeviceRequest> {
+  init() {
+    // check payload
+    validateParams(this.payload, [{ name: 'dataHex', type: 'hexString' }]);
+
+    // init params
+    this.params = {
+      data: formatAnyHex(this.payload.dataHex),
+    };
+  }
+
+  async run() {
+    // For Classic、Mini device we use EthereumSignTypedData
+    const deviceType = getDeviceType(this.device.features);
+    let response: DeviceVerifySignature | undefined;
+
+    if (deviceType === 'classic') {
+      const res = await this.device.commands.typedCall(
+        'BixinVerifyDeviceRequest',
+        'BixinVerifyDeviceAck',
+        {
+          ...this.params,
+        }
+      );
+      response = res.message;
+    } else if (deviceType === 'mini') {
+      const signatureRes = await this.device.commands.typedCall(
+        'SESignMessage',
+        'SEMessageSignature',
+        {
+          message: this.params.data,
+        }
+      );
+      const certRes = await this.device.commands.typedCall('ReadSEPublicCert', 'SEPublicCert');
+      response = {
+        cert: certRes.message.public_cert,
+        signature: signatureRes.message.signature,
+      };
+    }
+
+    if (response) return Promise.resolve(response);
+
+    return Promise.reject(
+      ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'Device not support verify')
+    );
+  }
+}

package/src/api/device/DeviceWipe.ts

@@ -1,4 +1,4 @@
-import { WipeDevice } from '@onekeyfe/hd-transport/src/types/messages';
+import { WipeDevice } from '@onekeyfe/hd-transport';
 import { BaseMethod } from '../BaseMethod';
 
 export default class DeviceWipe extends BaseMethod<WipeDevice> {

package/src/api/evm/EVMGetAddress.ts

@@ -1,4 +1,4 @@
-import { EthereumGetAddress } from '@onekeyfe/hd-transport/src/types/messages';
+import { EthereumGetAddress } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';

package/src/api/evm/EVMGetPublicKey.ts

@@ -1,4 +1,4 @@
-import { EthereumGetPublicKey } from '@onekeyfe/hd-transport/src/types/messages';
+import { EthereumGetPublicKey } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';

package/src/api/evm/EVMSignMessage.ts

@@ -1,4 +1,4 @@
-import { EthereumSignMessage } from '@onekeyfe/hd-transport/src/types/messages';
+import { EthereumSignMessage } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';

package/src/api/evm/EVMSignMessageEIP712.ts

@@ -1,4 +1,4 @@
-import { EthereumSignMessageEIP712 } from '@onekeyfe/hd-transport/src/types/messages';
+import { EthereumSignMessageEIP712 } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';

package/src/api/evm/EVMSignTransaction.ts

@@ -1,8 +1,4 @@
-import {
-  EthereumSignTx,
-  EthereumSignTxEIP1559,
-  EthereumTxRequest,
-} from '@onekeyfe/hd-transport/src/types/messages';
+import { EthereumSignTx, EthereumSignTxEIP1559, EthereumTxRequest } from '@onekeyfe/hd-transport';
 
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import { UI_REQUEST } from '../../constants/ui-request';

package/src/api/evm/EVMSignTypedData.ts

@@ -1,23 +1,20 @@
 import semver from 'semver';
-import {
-  EthereumMessageSignature,
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import type {
   EthereumTypedDataSignature,
   EthereumTypedDataStructAck,
-  MessageKey,
-} from '@onekeyfe/hd-transport/src/types/messages';
-import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+} from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { formatAnyHex } from '../helpers/hexUtils';
 import { encodeData, getFieldType, parseArrayType } from '../helpers/typeNameUtils';
-import {
+import { getDeviceFirmwareVersion, getDeviceType } from '../../utils/deviceFeaturesUtils';
+import type {
   EthereumSignTypedDataMessage,
   EthereumSignTypedDataTypes,
 } from '../../types/api/evmSignTypedData';
-import { getDeviceFirmwareVersion, getDeviceType } from '../../utils/deviceFeaturesUtils';
-import { TypedResponseMessage } from '../../device/DeviceCommands';
 
 export type EVMSignTypedDataParams = {
   addressN: number[];
@@ -62,120 +59,119 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
     }
   }
 
-  // async signTypedData() {
-  //   const { commands } = this.device;
-  //   const { addressN, data, metamaskV4Compat } = this.params;
-
-  //   const {
-  //     types,
-  //     primaryType,
-  //     domain,
-  //     message,
-  //   }: EthereumSignTypedDataMessage<EthereumSignTypedDataTypes> = data;
-
-  //   let response = await commands.typedCall(
-  //     'EthereumSignTypedData',
-  //     // 'EthereumTypedDataStructRequest|EthereumTypedDataValueRequest|EthereumTypedDataSignature',
-  //     [
-  //       'EthereumTypedDataStructRequest',
-  //       'EthereumTypedDataValueRequest',
-  //       'EthereumTypedDataSignature',
-  //     ],
-  //     {
-  //       address_n: addressN,
-  //       primary_type: primaryType as string,
-  //       metamask_v4_compat: metamaskV4Compat,
-  //     }
-  //   );
-
-  //   while (response.type === 'EthereumTypedDataStructRequest') {
-  //     const { name: typeDefinitionName } = response.message;
-  //     const typeDefinition = types[typeDefinitionName];
-  //     if (typeDefinition === undefined) {
-  //       throw ERRORS.TypedError(
-  //         'Runtime',
-  //         `Type ${typeDefinitionName} was not defined in types object`
-  //       );
-  //     }
-
-  //     const dataStruckAck: EthereumTypedDataStructAck = {
-  //       members: typeDefinition.map(({ name, type: typeName }) => ({
-  //         name,
-  //         type: getFieldType(typeName, types),
-  //       })),
-  //     };
-
-  //     response = await commands.typedCall(
-  //       'EthereumTypedDataStructAck',
-  //       [
-  //         'EthereumTypedDataStructRequest',
-  //         'EthereumTypedDataValueRequest',
-  //         'EthereumTypedDataSignature',
-  //       ] as MessageKey[],
-  //       dataStruckAck
-  //     );
-  //   }
-
-  //   while (response.type === 'EthereumTypedDataValueRequest') {
-  //     const { member_path } = response.message;
-
-  //     let memberData;
-  //     let memberTypeName: string;
-
-  //     const [rootIndex, ...nestedMemberPath] = member_path;
-  //     switch (rootIndex) {
-  //       case 0:
-  //         memberData = domain;
-  //         memberTypeName = 'EIP712Domain';
-  //         break;
-  //       case 1:
-  //         memberData = message;
-  //         memberTypeName = primaryType as string;
-  //         break;
-  //       default:
-  //         throw ERRORS.TypedError('Runtime', 'Root index can only be 0 or 1');
-  //     }
-
-  //     for (const index of nestedMemberPath) {
-  //       if (Array.isArray(memberData)) {
-  //         memberTypeName = parseArrayType(memberTypeName).entryTypeName;
-  //         memberData = memberData[index];
-  //       } else if (typeof memberData === 'object' && memberData !== null) {
-  //         const memberTypeDefinition = types[memberTypeName][index];
-  //         memberTypeName = memberTypeDefinition.type;
-  //         memberData = memberData[memberTypeDefinition.name];
-  //       } else {
-  //         // TODO
-  //       }
-  //     }
-
-  //     let encodedData;
-  //     if (Array.isArray(memberData)) {
-  //       // Sending the length as uint16
-  //       encodedData = encodeData('uint16', memberData.length);
-  //     } else {
-  //       encodedData = encodeData(memberTypeName, memberData);
-  //     }
-
-  //     response = await commands.typedCall(
-  //       'EthereumTypedDataValueAck',
-  //       ['EthereumTypedDataValueRequest', 'EthereumTypedDataSignature'] as MessageKey[],
-  //       {
-  //         value: encodedData,
-  //       }
-  //     );
-  //   }
-
-  //   if (response.type !== 'EthereumTypedDataSignature') {
-  //     throw ERRORS.TypedError('Runtime', 'Unexpected response type');
-  //   }
-
-  //   const { address, signature }: EthereumTypedDataSignature = response.message;
-  //   return {
-  //     address,
-  //     signature,
-  //   };
-  // }
+  async signTypedData() {
+    const { commands } = this.device;
+    const { addressN, data, metamaskV4Compat } = this.params;
+
+    const {
+      types,
+      primaryType,
+      domain,
+      message,
+    }: EthereumSignTypedDataMessage<EthereumSignTypedDataTypes> = data;
+
+    let response = await commands.typedCall(
+      'EthereumSignTypedData',
+      [
+        'EthereumTypedDataStructRequest',
+        'EthereumTypedDataValueRequest',
+        'EthereumTypedDataSignature',
+      ],
+      {
+        address_n: addressN,
+        primary_type: primaryType as string,
+        metamask_v4_compat: metamaskV4Compat,
+      }
+    );
+
+    while (response.type === 'EthereumTypedDataStructRequest') {
+      const { name: typeDefinitionName } = response.message;
+      const typeDefinition = types[typeDefinitionName];
+      if (typeDefinition === undefined) {
+        throw ERRORS.TypedError(
+          'Runtime',
+          `Type ${typeDefinitionName} was not defined in types object`
+        );
+      }
+
+      const dataStruckAck: EthereumTypedDataStructAck = {
+        members: typeDefinition.map(({ name, type: typeName }) => ({
+          name,
+          type: getFieldType(typeName, types),
+        })),
+      };
+
+      response = await commands.typedCall(
+        'EthereumTypedDataStructAck',
+        [
+          'EthereumTypedDataStructRequest',
+          'EthereumTypedDataValueRequest',
+          'EthereumTypedDataSignature',
+        ],
+        dataStruckAck
+      );
+    }
+
+    while (response.type === 'EthereumTypedDataValueRequest') {
+      const { member_path } = response.message;
+
+      let memberData;
+      let memberTypeName: string;
+
+      const [rootIndex, ...nestedMemberPath] = member_path;
+      switch (rootIndex) {
+        case 0:
+          memberData = domain;
+          memberTypeName = 'EIP712Domain';
+          break;
+        case 1:
+          memberData = message;
+          memberTypeName = primaryType as string;
+          break;
+        default:
+          throw ERRORS.TypedError('Runtime', 'Root index can only be 0 or 1');
+      }
+
+      for (const index of nestedMemberPath) {
+        if (Array.isArray(memberData)) {
+          memberTypeName = parseArrayType(memberTypeName).entryTypeName;
+          memberData = memberData[index];
+        } else if (typeof memberData === 'object' && memberData !== null) {
+          const memberTypeDefinition = types[memberTypeName][index];
+          memberTypeName = memberTypeDefinition.type;
+          memberData = memberData[memberTypeDefinition.name];
+        } else {
+          // TODO
+        }
+      }
+
+      let encodedData;
+      if (Array.isArray(memberData)) {
+        // Sending the length as uint16
+        encodedData = encodeData('uint16', memberData.length);
+      } else {
+        encodedData = encodeData(memberTypeName, memberData);
+      }
+
+      response = await commands.typedCall(
+        'EthereumTypedDataValueAck',
+        ['EthereumTypedDataValueRequest', 'EthereumTypedDataSignature'],
+        {
+          value: encodedData,
+        }
+      );
+    }
+
+    if (response.type !== 'EthereumTypedDataSignature') {
+      throw ERRORS.TypedError('Runtime', 'Unexpected response type');
+    }
+
+    const { address, signature }: EthereumTypedDataSignature = response.message;
+    return {
+      address,
+      signature,
+    };
+  }
 
   getVersionRange() {
     return {
@@ -246,7 +242,6 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
     }
 
     // For Touch、Pro we use EthereumSignTypedData
-    // return this.signTypedData();
-    return Promise.resolve(ERRORS.TypedError('Runtime', 'Not implemented'));
+    return this.signTypedData();
   }
 }

package/src/api/evm/EVMVerifyMessage.ts

@@ -1,4 +1,4 @@
-import { EthereumVerifyMessage } from '@onekeyfe/hd-transport/src/types/messages';
+import { EthereumVerifyMessage } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';