@onekeyfe/hd-core 1.1.28 → 1.2.0-alpha.1

package/src/api/benfen/BenfenSignMessage.ts

@@ -5,6 +5,7 @@ import { validateParams } from '../helpers/paramsValidator';
 import { stripHexPrefix } from '../helpers/hexUtils';
 
 import type { BenfenSignMessage as HardwareBenfenSignMessage } from '@onekeyfe/hd-transport';
+import type { DeviceFirmwareRange } from '../../types';
 
 export default class BenfenSignMessage extends BaseMethod<HardwareBenfenSignMessage> {
   init() {
@@ -26,8 +27,12 @@ export default class BenfenSignMessage extends BaseMethod<HardwareBenfenSignMess
     };
   }
 
-  getVersionRange() {
+  getVersionRange(): DeviceFirmwareRange {
     return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
       pro: {
         min: '4.12.0',
       },

package/src/api/benfen/BenfenSignTransaction.ts

@@ -8,6 +8,7 @@ import { formatAnyHex } from '../helpers/hexUtils';
 
 import type { BenfenSignTx, BenfenSignedTx, MessageType, TypedCall } from '@onekeyfe/hd-transport';
 import type { TypedResponseMessage } from '../../device/DeviceCommands';
+import type { DeviceFirmwareRange } from '../../types';
 
 export default class BenfenSignTransaction extends BaseMethod<BenfenSignTx> {
   init() {
@@ -33,8 +34,12 @@ export default class BenfenSignTransaction extends BaseMethod<BenfenSignTx> {
     };
   }
 
-  getVersionRange() {
+  getVersionRange(): DeviceFirmwareRange {
     return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
       pro: {
         min: '4.12.0',
       },

package/src/api/btc/BTCGetPublicKey.ts

@@ -78,7 +78,8 @@ export default class BTCGetPublicKey extends BaseMethod<GetPublicKey[]> {
       }
 
       for (const param of this.params) {
-        const versionBytes = getVersionBytes(param.coin_name, param.script_type);
+        // init() 必然设置 coin_name；生成类型里该字段为 optional，这里兜底空串
+        const versionBytes = getVersionBytes(param.coin_name ?? '', param.script_type);
         if (!versionBytes) {
           throw new Error(
             `Invalid coinName, not support generate xpub for scriptType: ${param.script_type}`
@@ -101,7 +102,7 @@ export default class BTCGetPublicKey extends BaseMethod<GetPublicKey[]> {
 
         const path = serializedPath(param.address_n);
 
-        const xpub = createExtendedPublicKey(node, param.coin_name, param.script_type);
+        const xpub = createExtendedPublicKey(node, param.coin_name ?? '', param.script_type);
 
         const rootFingerprint = res.root_fingerprint;
 

package/src/api/btc/BTCSignPsbt.ts

@@ -5,7 +5,6 @@ import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { formatAnyHex } from '../helpers/hexUtils';
 import { getCoinInfo } from './helpers/btcParamsUtils';
-import { getDeviceType } from '../../utils';
 
 import type { SignPsbt } from '@onekeyfe/hd-transport';
 
@@ -50,7 +49,7 @@ export default class BTCSignPsbt extends BaseMethod<SignPsbt> {
     } catch (error) {
       const { message } = error;
 
-      const deviceType = getDeviceType(this.device.features);
+      const deviceType = this.device.getCurrentDeviceType();
       if (
         message.includes('PSBT parse failed') &&
         (deviceType === EDeviceType.Classic1s || deviceType === EDeviceType.ClassicPure)

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

@@ -1,3 +1,5 @@
+import type { DeviceFirmwareRange } from '../../../types';
+
 function isCoinNameInList(coinName: string, coinNames: (string | undefined)[]) {
   for (let i = 0; i < coinNames.length; i++) {
     const coin_name = coinNames[i];
@@ -8,9 +10,13 @@ function isCoinNameInList(coinName: string, coinNames: (string | undefined)[]) {
   return false;
 }
 
-export function getBitcoinForkVersionRange(params: (string | undefined)[]) {
+export function getBitcoinForkVersionRange(params: (string | undefined)[]): DeviceFirmwareRange {
   if (isCoinNameInList('Neurai', params)) {
     return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
       model_mini: {
         min: '3.7.0',
       },

package/src/api/cardano/CardanoSignTransaction.ts

@@ -19,7 +19,6 @@ import {
 } from './helper/auxiliaryData';
 import { gatherWitnessPaths } from './helper/witnesses';
 import { validatePath } from '../helpers/pathUtils';
-import { getDeviceFirmwareVersion, getMethodVersionRange } from '../../utils';
 
 import type { DeviceFirmwareRange } from '../../types';
 import type { CollateralInputWithPath, Path } from './helper/cardanoInputs';
@@ -240,10 +239,9 @@ export default class CardanoSignTransaction extends BaseMethod<any> {
       return;
     }
 
-    const firmwareVersion = getDeviceFirmwareVersion(this.device.features)?.join('.');
+    const firmwareVersion = this.device.getCurrentFirmwareVersionString() ?? '0.0.0';
 
-    const versionRange = getMethodVersionRange(
-      this.device.features,
+    const versionRange = this.device.getCurrentMethodVersionRange(
       type => this.supportConwayVersionRange()[type]
     );
 

package/src/api/conflux/ConfluxSignTransaction.ts

@@ -35,7 +35,7 @@ export default class ConfluxSignTransaction extends BaseMethod {
 
     // check if transaction is valid
     const schema: SchemaParam[] = [
-      { name: 'to', type: 'hexString', required: true },
+      { name: 'to', type: 'string', required: true },
       { name: 'value', type: 'hexString', required: true },
       { name: 'gasLimit', type: 'hexString', required: true },
       { name: 'gasPrice', type: 'hexString', required: true },
@@ -48,7 +48,10 @@ export default class ConfluxSignTransaction extends BaseMethod {
 
     validateParams(tx, schema);
 
-    this.formattedTx = formatAnyHex(tx);
+    this.formattedTx = {
+      ...formatAnyHex(tx),
+      to: tx.to,
+    };
   }
 
   processTxRequest = async (request: ConfluxTxRequest, data: string): Promise<ConfluxSignedTx> => {

package/src/api/device/DeviceFullyUploadResource.ts

@@ -5,7 +5,7 @@ import { UI_REQUEST } from '../../constants/ui-request';
 import { BaseMethod } from '../BaseMethod';
 import { getSysResourceBinary } from '../firmware/getBinary';
 import { updateResources } from '../firmware/uploadFirmware';
-import { getDeviceFirmwareVersion, getDeviceType, getFirmwareType } from '../../utils';
+import { getDeviceFirmwareVersion, getFirmwareType } from '../../utils';
 import { createUiMessage } from '../../events/ui-request';
 import { DataManager } from '../../data-manager';
 
@@ -36,7 +36,7 @@ export default class DeviceFullyUploadResource extends BaseMethod {
   isSupportResourceUpdate(features: Features, updateType: string) {
     if (updateType !== 'firmware') return false;
 
-    const deviceType = getDeviceType(features);
+    const deviceType = this.device.getCurrentDeviceType();
     const isTouchMode = deviceType === EDeviceType.Touch || deviceType === EDeviceType.Pro;
     const currentVersion = getDeviceFirmwareVersion(features).join('.');
 
@@ -52,7 +52,7 @@ export default class DeviceFullyUploadResource extends BaseMethod {
     const deviceFirmwareType = getFirmwareType(features);
     const firmwareType = payload.firmwareType ?? deviceFirmwareType;
 
-    if (!features?.bootloader_mode && features) {
+    if (!device.isBootloader() && features) {
       // check & upgrade firmware resource
       if (features) {
         let { binary } = this.payload;

package/src/api/device/DeviceLock.ts

@@ -8,8 +8,6 @@ export default class DeviceLock extends BaseMethod<LockDevice> {
   }
 
   async run() {
-    const res = await this.device.commands.typedCall('LockDevice', 'Success');
-
-    return Promise.resolve(res.message);
+    return this.device.lockDevice();
   }
 }

package/src/api/device/DeviceRebootToBoardloader.ts

@@ -1,3 +1,5 @@
+import { DevRebootType } from '@onekeyfe/hd-transport';
+
 import { BaseMethod } from '../BaseMethod';
 
 import type { RebootToBoardloaderParams } from '../../types/api/deviceRebootToBoardloader';
@@ -21,10 +23,17 @@ export default class DeviceRebootToBoardloader extends BaseMethod<RebootToBoardl
   }
 
   async run() {
+    // Protocol V2 submodule firmware uses DevReboot with reboot_type enum.
+    if (this.device.isProtocolV2()) {
+      const res = await this.device.commands.typedCall('DevReboot', 'Success', {
+        reboot_type: DevRebootType.Boardloader,
+      });
+      return Promise.resolve(res.message);
+    }
+
     // On Touch devices, messsage code 904 is RebootToBoardloader
     // so BininOutMessageSE message code 904 is used here
     const res = await this.device.commands.typedCall('BixinOutMessageSE', 'Success');
-
     return Promise.resolve(res.message);
   }
 }

package/src/api/device/DeviceRebootToBootloader.ts

@@ -1,3 +1,5 @@
+import { DevRebootType } from '@onekeyfe/hd-transport';
+
 import { BaseMethod } from '../BaseMethod';
 
 import type { RebootToBootloader } from '@onekeyfe/hd-transport';
@@ -21,8 +23,15 @@ export default class DeviceRebootToBootloader extends BaseMethod<RebootToBootloa
   }
 
   async run() {
-    const res = await this.device.commands.typedCall('RebootToBootloader', 'Success');
+    // Protocol V2 submodule firmware uses DevReboot with reboot_type enum.
+    if (this.device.isProtocolV2()) {
+      const res = await this.device.commands.typedCall('DevReboot', 'Success', {
+        reboot_type: DevRebootType.Bootloader,
+      });
+      return Promise.resolve(res.message);
+    }
 
+    const res = await this.device.commands.typedCall('RebootToBootloader', 'Success');
     return Promise.resolve(res.message);
   }
 }

package/src/api/device/DeviceSupportFeatures.ts

@@ -1,9 +1,3 @@
-import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
-
-import {
-  supportInputPinOnSoftware,
-  supportModifyHomescreen,
-} from '../../utils/deviceFeaturesUtils';
 import { BaseMethod } from '../BaseMethod';
 
 export default class DeviceSupportFeatures extends BaseMethod {
@@ -13,13 +7,8 @@ export default class DeviceSupportFeatures extends BaseMethod {
   }
 
   run() {
-    if (!this.device.features)
-      return Promise.reject(
-        ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'Device not initialized')
-      );
-
-    const inputPinOnSoftware = supportInputPinOnSoftware(this.device.features);
-    const modifyHomescreen = supportModifyHomescreen(this.device.features);
+    const inputPinOnSoftware = this.device.supportInputPinOnSoftware();
+    const modifyHomescreen = this.device.supportModifyHomescreen();
     return Promise.resolve({
       inputPinOnSoftware,
       modifyHomescreen,

package/src/api/device/DeviceUpdateBootloader.ts

@@ -9,7 +9,7 @@ import { updateBootloader } from '../firmware/uploadFirmware';
 import { DeviceModelToTypes } from '../../types';
 import { DataManager } from '../../data-manager';
 import { checkBootloaderLength } from '../firmware/updateBootloader';
-import { getDeviceType, getFirmwareType } from '../../utils';
+import { getFirmwareType } from '../../utils';
 
 import type { DeviceUpdateBootloaderParams } from '../../types/api/deviceUpdateBootloader';
 import type { EFirmwareType } from '@onekeyfe/hd-shared';
@@ -74,13 +74,13 @@ export default class DeviceUpdateBootloader extends FirmwareUpdateBaseMethod<any
     }
 
     // Check if device is in bootloader mode
-    if (features && features.bootloader_mode) {
+    if (features && device.isBootloader()) {
       // Use emmcFileWrite + reboot logic for bootloader mode
       this.postTipMessage(FirmwareUpdateTipMessage.UpdateBootloader);
       return this.updateBootloaderWithEmmcFileWrite(device, binary);
     }
 
-    if (features && !features.bootloader_mode) {
+    if (features && !device.isBootloader()) {
       // Use original updateBootloader logic for normal mode
       await updateBootloader(
         this.device.getCommands().typedCall.bind(this.device.getCommands()),
@@ -98,7 +98,7 @@ export default class DeviceUpdateBootloader extends FirmwareUpdateBaseMethod<any
 
     const payload = this.payload as DeviceUpdateBootloaderParams;
 
-    const deviceType = getDeviceType(features);
+    const deviceType = device.getCurrentDeviceType();
     const deviceFirmwareType = getFirmwareType(features);
     const firmwareType = payload.firmwareType ?? deviceFirmwareType;
 

package/src/api/device/DeviceUploadResource.ts

@@ -8,7 +8,6 @@ import { DeviceModelToTypes } from '../../types';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { hexToBytes } from '../helpers/hexUtils';
-import { getDeviceFirmwareVersion, getDeviceType } from '../../utils';
 import { PROTO } from '../../constants';
 
 import type { DeviceUploadResourceParams, DeviceUploadResourceResponse } from '../../types';
@@ -37,8 +36,8 @@ export default class DeviceUploadResource extends BaseMethod<ResourceUpload> {
   }
 
   checkUploadNFTSupport() {
-    const deviceType = getDeviceType(this.device.features);
-    const currentVersion = getDeviceFirmwareVersion(this.device.features).join('.');
+    const deviceType = this.device.getCurrentDeviceType();
+    const currentVersion = this.device.getCurrentFirmwareVersionString() ?? '0.0.0';
     if (!DeviceModelToTypes.model_touch.includes(deviceType)) {
       throw ERRORS.TypedError(HardwareErrorCode.CallMethodError, 'Device Not Support Upload NFT');
     }
@@ -138,8 +137,8 @@ export default class DeviceUploadResource extends BaseMethod<ResourceUpload> {
       };
       response.applyScreen = true;
 
-      const firmwareVersion = getDeviceFirmwareVersion(this.device.features).join('.');
-      const deviceType = getDeviceType(this.device.features);
+      const firmwareVersion = this.device.getCurrentFirmwareVersionString() ?? '0.0.0';
+      const deviceType = this.device.getCurrentDeviceType();
       if (deviceType === EDeviceType.Pro && semver.gte(firmwareVersion, '4.17.0')) {
         response.applyScreen = false;
       }

package/src/api/device/DeviceVerify.ts

@@ -5,7 +5,6 @@ import { bytesToHex } from '@noble/hashes/utils';
 import { formatAnyHex } from '../helpers/hexUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
-import { getDeviceType } from '../../utils';
 import { DeviceModelToTypes } from '../../types';
 
 import type { BixinVerifyDeviceRequest } from '@onekeyfe/hd-transport';
@@ -26,7 +25,7 @@ export default class DeviceVerify extends BaseMethod<BixinVerifyDeviceRequest> {
 
   async run() {
     // For Classic、Mini device we use EthereumSignTypedData
-    const deviceType = getDeviceType(this.device.features);
+    const deviceType = this.device.getCurrentDeviceType();
     let response: DeviceVerifySignature | undefined;
 
     if (DeviceModelToTypes.model_classic.includes(deviceType)) {

package/src/api/dynex/DnxGetAddress.ts

@@ -1,3 +1,5 @@
+import { createDeviceNotSupportMethodError } from '@onekeyfe/hd-shared';
+
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
@@ -47,6 +49,10 @@ export default class DnxGetAddress extends BaseMethod<HardwareDnxGetAddress[]> {
   }
 
   async run() {
+    if (this.device.isProtocolV2()) {
+      throw createDeviceNotSupportMethodError(this.name, this.device.getCurrentFirmwareType());
+    }
+
     const responses: DnxAddress[] = [];
 
     for (let i = 0; i < this.params.length; i++) {

package/src/api/dynex/DnxSignTransaction.ts

@@ -1,3 +1,5 @@
+import { createDeviceNotSupportMethodError } from '@onekeyfe/hd-shared';
+
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
@@ -116,6 +118,10 @@ export default class DnxSignTransaction extends BaseMethod<DnxSignTx> {
   }
 
   async run() {
+    if (this.device.isProtocolV2()) {
+      throw createDeviceNotSupportMethodError(this.name, this.device.getCurrentFirmwareType());
+    }
+
     const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
 
     const res = await this.device.commands.typedCall('DnxSignTx', 'DnxInputRequest', {

package/src/api/evm/EVMGetAddress.ts

@@ -44,7 +44,7 @@ export default class EvmGetAddress extends BaseMethod<EthereumGetAddressOneKey[]
   }
 
   async getEvmAddress(param: EthereumGetAddressOneKey) {
-    if (TransportManager.getMessageVersion() === 'v1') {
+    if (TransportManager.getProtocolV1MessageSchema() === 'v1LegacySchema') {
       return getAddressLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         param,

package/src/api/evm/EVMGetPublicKey.ts

@@ -2,11 +2,10 @@ import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
-import { supportBatchPublicKey } from '../../utils/deviceFeaturesUtils';
 import TransportManager from '../../data-manager/TransportManager';
 import getPublicKey from './latest/getPublicKey';
 import getPublicKeyLegacyV1 from './legacyV1/getPublicKey';
-import { batchGetPublickeys } from '../helpers/batchGetPublickeys';
+import { batchGetPublickeys, supportBatchPublicKeyByDevice } from '../helpers/batchGetPublickeys';
 
 import type { EVMGetPublicKeyParams, EVMPublicKey } from '../../types';
 import type { EthereumGetPublicKey, EthereumGetPublicKeyOneKey } from '@onekeyfe/hd-transport';
@@ -57,7 +56,7 @@ export default class EVMGetPublicKey extends BaseMethod<EthereumGetPublicKeyOneK
   }
 
   getEvmPublicKey(param: EthereumGetPublicKey) {
-    if (TransportManager.getMessageVersion() === 'v1') {
+    if (TransportManager.getProtocolV1MessageSchema() === 'v1LegacySchema') {
       return getPublicKeyLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         param,
@@ -73,7 +72,7 @@ export default class EVMGetPublicKey extends BaseMethod<EthereumGetPublicKeyOneK
   async run() {
     const responses: EVMPublicKey[] = [];
 
-    if (this.useBatch && supportBatchPublicKey(this.device?.features)) {
+    if (this.useBatch && supportBatchPublicKeyByDevice(this.device)) {
       try {
         const res = await batchGetPublickeys(this.device, this.params, 'secp256k1', 60, {
           includeNode: false,

package/src/api/evm/EVMSignMessage.ts

@@ -36,7 +36,7 @@ export default class EVMSignMessage extends BaseMethod<EthereumSignMessageOneKey
   }
 
   async run() {
-    if (TransportManager.getMessageVersion() === 'v1') {
+    if (TransportManager.getProtocolV1MessageSchema() === 'v1LegacySchema') {
       return signMessageLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         params: this.params,

package/src/api/evm/EVMSignMessageEIP712.ts

@@ -5,6 +5,7 @@ import { validateParams } from '../helpers/paramsValidator';
 import { formatAnyHex } from '../helpers/hexUtils';
 
 import type { EthereumSignMessageEIP712 } from '@onekeyfe/hd-transport';
+import type { DeviceFirmwareRange } from '../../types';
 
 /**
  * @deprecated Use EVMSignTypedData instead.
@@ -32,8 +33,12 @@ export default class EVMSignMessageEIP712 extends BaseMethod<EthereumSignMessage
     };
   }
 
-  getVersionRange() {
+  getVersionRange(): DeviceFirmwareRange {
     return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
       model_mini: {
         min: '2.1.9',
       },
@@ -44,6 +49,14 @@ export default class EVMSignMessageEIP712 extends BaseMethod<EthereumSignMessage
   }
 
   async run() {
+    this.checkFeatureVersionLimit(
+      () => true,
+      () => this.getVersionRange(),
+      {
+        strictCheckDeviceSupport: true,
+      }
+    );
+
     const res = await this.device.commands.typedCall(
       'EthereumSignMessageEIP712',
       'EthereumMessageSignature',

package/src/api/evm/EVMSignTransaction.ts

@@ -122,7 +122,7 @@ export default class EVMSignTransaction extends BaseMethod {
 
     if (formattedTx == null) throw ERRORS.TypedError('Runtime', 'formattedTx is not set');
 
-    if (TransportManager.getMessageVersion() === 'v1') {
+    if (TransportManager.getProtocolV1MessageSchema() === 'v1LegacySchema') {
       return signTransactionLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         addressN,

package/src/api/evm/EVMSignTypedData.ts

@@ -9,7 +9,6 @@ import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { formatAnyHex, parseChainId, stripHexStartZeroes } from '../helpers/hexUtils';
-import { getDeviceFirmwareVersion, getDeviceType } from '../../utils';
 import { existCapability } from '../../utils/capabilitieUtils';
 import {
   DeviceModelToTypes,
@@ -26,11 +25,20 @@ import { encodeData, getFieldType, parseArrayType } from '../helpers/typeNameUti
 import type {
   EthereumTypedDataSignature,
   EthereumTypedDataStructAck,
+  EthereumTypedDataStructAckOneKey,
   MessageKey,
   MessageResponse,
   TypedCall,
 } from '@onekeyfe/hd-transport';
 
+/**
+ * EthereumTypedDataStructAckOneKey 与 EthereumTypedDataStructAck 的字段结构与
+ * 枚举数值完全一致（生成产物的 OneKey/Trezor 双份消息），仅枚举名义类型不同；
+ * 这里做无运行时成本的名义转换，避免在调用点散落 any。
+ */
+const toOneKeyStructAck = (ack: EthereumTypedDataStructAck): EthereumTypedDataStructAckOneKey =>
+  ack as unknown as EthereumTypedDataStructAckOneKey;
+
 export type EVMSignTypedDataParams = {
   addressN: number[];
   metamaskV4Compat: boolean;
@@ -130,7 +138,6 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
       if (supportTrezor) {
         response = await typedCall(
           'EthereumTypedDataStructAck',
-          // @ts-ignore
           [
             'EthereumTypedDataStructRequest',
             'EthereumTypedDataValueRequest',
@@ -141,13 +148,12 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
       } else {
         response = await typedCall(
           'EthereumTypedDataStructAckOneKey',
-          // @ts-ignore
           [
             'EthereumTypedDataStructRequestOneKey',
             'EthereumTypedDataValueRequestOneKey',
             'EthereumTypedDataSignatureOneKey',
           ],
-          dataStruckAck
+          toOneKeyStructAck(dataStruckAck)
         );
       }
     }
@@ -183,7 +189,7 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
         } else if (typeof memberData === 'object' && memberData !== null) {
           const memberTypeDefinition = types[memberTypeName][index];
           memberTypeName = memberTypeDefinition.type;
-          memberData = memberData[memberTypeDefinition.name];
+          memberData = (memberData as Record<string, unknown>)[memberTypeDefinition.name];
         } else {
           // TODO
         }
@@ -220,6 +226,15 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
 
     if (response.type === 'EthereumGnosisSafeTxRequest') {
       const { data } = this.params;
+      const verifyingContract = data.domain?.verifyingContract;
+      // EthereumGnosisSafeTxAck.verifyingContract 在 proto 中是 required 字段，
+      // Gnosis Safe 签名缺少 verifyingContract 没有意义，这里给出明确的参数错误。
+      if (!verifyingContract) {
+        throw ERRORS.TypedError(
+          HardwareErrorCode.CallMethodInvalidParameter,
+          'EIP712Domain.verifyingContract is required for Gnosis Safe transaction'
+        );
+      }
       const param = {
         to: data.message.to,
         value: formatAnyHex(new BigNumber(data.message.value).toString(16)),
@@ -232,11 +247,10 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
         refundReceiver: data.message.refundReceiver,
         nonce: formatAnyHex(new BigNumber(data.message.nonce).toString(16)),
         chain_id: parseChainId(data.domain.chainId),
-        verifyingContract: data.domain.verifyingContract,
+        verifyingContract,
       };
       response = await typedCall(
         'EthereumGnosisSafeTxAck',
-        // @ts-ignore
         ['EthereumTypedDataSignature', 'EthereumTypedDataSignatureOneKey'],
         param
       );
@@ -262,8 +276,8 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
 
     let supportTrezor = false;
     let response: MessageResponse<MessageKey>;
-    switch (TransportManager.getMessageVersion()) {
-      case 'v1':
+    switch (TransportManager.getProtocolV1MessageSchema()) {
+      case 'v1LegacySchema':
         supportTrezor = true;
         response = await signTypedDataLegacyV1({
           typedCall: this.device.commands.typedCall.bind(this.device.commands),
@@ -274,7 +288,7 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
         });
         break;
 
-      case 'latest':
+      case 'v1CurrentSchema':
       default:
         supportTrezor = false;
         response = await signTypedData({
@@ -310,8 +324,8 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
   }) {
     if (!domainHash) throw ERRORS.TypedError('Runtime', 'domainHash is required');
 
-    switch (TransportManager.getMessageVersion()) {
-      case 'v1':
+    switch (TransportManager.getProtocolV1MessageSchema()) {
+      case 'v1LegacySchema':
         return signTypedHashLegacyV1({
           typedCall,
           addressN,
@@ -321,7 +335,7 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
           device: this.device,
         });
 
-      case 'latest':
+      case 'v1CurrentSchema':
       default:
         return signTypedHash({
           typedCall,
@@ -348,8 +362,8 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
 
     let biggerLimit = 1024; // 1k
 
-    const currentVersion = getDeviceFirmwareVersion(this.device.features).join('.');
-    const currentDeviceType = getDeviceType(this.device.features);
+    const currentVersion = this.device.getCurrentFirmwareVersionString() ?? '0.0.0';
+    const currentDeviceType = this.device.getCurrentDeviceType();
     const supportBiggerDataVersion = '4.4.0';
 
     const supportBiggerData =
@@ -532,9 +546,9 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
   }
 
   supportSignTyped() {
-    const deviceType = getDeviceType(this.device.features);
+    const deviceType = this.device.getCurrentDeviceType();
     if (DeviceModelToTypes.model_mini.includes(deviceType)) {
-      const currentVersion = getDeviceFirmwareVersion(this.device.features).join('.');
+      const currentVersion = this.device.getCurrentFirmwareVersionString() ?? '0.0.0';
       const supportSignTypedVersion = '2.2.0';
 
       if (semver.lt(currentVersion, supportSignTypedVersion)) {
@@ -564,7 +578,7 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
     // For Classic / Mini:
     // - If parsed typed-data capability is missing, keep using blind-sign.
     // - For Mini with parsed capability, add extra format checks before parsed signing.
-    const deviceType = getDeviceType(this.device.features);
+    const deviceType = this.device.getCurrentDeviceType();
     if (
       DeviceModelToTypes.model_mini.includes(deviceType) &&
       (!supportEip712OnClassic || this.hasClassicFamilyTypedDataFormatViolations(this.params.data))

package/src/api/evm/EVMVerifyMessage.ts

@@ -31,7 +31,7 @@ export default class EVMSignMessage extends BaseMethod<EthereumVerifyMessageOneK
   }
 
   async run() {
-    if (TransportManager.getMessageVersion() === 'v1') {
+    if (TransportManager.getProtocolV1MessageSchema() === 'v1LegacySchema') {
       return verifyMessageLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         params: this.params,