@onekeyfe/hd-core 1.1.34-alpha.2 → 1.1.34-alpha.3

package/src/api/device/DeviceSettings.ts

@@ -1,10 +1,31 @@
 import { HardwareErrorCode, TypedError } from '@onekeyfe/hd-shared';
+import { DeviceSettingsPage } from '@onekeyfe/hd-transport';
 
 import { BaseMethod } from '../BaseMethod';
+import { invalidParameter } from '../helpers/filesystemValidation';
 import { validateParams } from '../helpers/paramsValidator';
+import {
+  mapApplySettingsToState,
+  mapCommonSettingsToProtocolV2,
+  mapDeviceSettingsToState,
+} from '../../device/DeviceStateMapper';
+import { getProtocolV2SettingsBehavior } from '../../protocols/protocol-v2/settingsUnlockPolicy';
 import { LANGUAGE_LABELS } from '../../utils/deviceSettings';
 
 import type { ApplySettings } from '@onekeyfe/hd-transport';
+import type { DeviceSettingsParams } from '../../types/api/deviceSettings';
+
+const settingsPageForPayload = (
+  payload: DeviceSettingsParams
+): DeviceSettingsPage.DevicePassphrase | DeviceSettingsPage.DeviceAirgap | undefined => {
+  if (payload.usePassphrase !== undefined) {
+    return DeviceSettingsPage.DevicePassphrase;
+  }
+  if (payload.airgapMode !== undefined) {
+    return DeviceSettingsPage.DeviceAirgap;
+  }
+  return undefined;
+};
 
 export default class DeviceSettings extends BaseMethod<ApplySettings> {
   init() {
@@ -24,7 +45,16 @@ export default class DeviceSettings extends BaseMethod<ApplySettings> {
       { name: 'experimentalFeatures', type: 'boolean' },
       { name: 'autoShutdownDelayMs', type: 'number' },
       { name: 'changeBrightness', type: 'boolean' },
+      { name: 'brightness', type: 'number' },
       { name: 'hapticFeedback', type: 'boolean' },
+      { name: 'bluetoothEnabled', type: 'boolean' },
+      { name: 'airgapMode', type: 'boolean' },
+      { name: 'animationEnabled', type: 'boolean' },
+      { name: 'tapToWake', type: 'boolean' },
+      { name: 'deviceNameDisplayEnabled', type: 'boolean' },
+      { name: 'fidoEnabled', type: 'boolean' },
+      { name: 'usbLockEnabled', type: 'boolean' },
+      { name: 'randomKeypad', type: 'boolean' },
     ]);
 
     // init params
@@ -45,6 +75,28 @@ export default class DeviceSettings extends BaseMethod<ApplySettings> {
         : undefined),
       haptic_feedback: this.payload.hapticFeedback,
     };
+    const page = settingsPageForPayload(this.payload);
+    const directSettings = mapCommonSettingsToProtocolV2(this.payload);
+    const hasConflictingPages =
+      this.payload.usePassphrase !== undefined && this.payload.airgapMode !== undefined;
+    const combinesPageWithDirectSettings =
+      page !== undefined && Object.keys(directSettings).length > 0;
+    if (hasConflictingPages || combinesPageWithDirectSettings) {
+      // V1 may still accept passphrase plus direct settings. Suppress only the
+      // Protocol V2 pre-run interaction; run() returns the protocol-specific error.
+      this.unlockPolicy = 'none';
+      this.protocolV2UiInteraction = undefined;
+      return;
+    }
+    const behavior =
+      page === undefined
+        ? getProtocolV2SettingsBehavior({
+            kind: 'direct',
+            settings: directSettings,
+          })
+        : getProtocolV2SettingsBehavior({ kind: 'page', page });
+    this.unlockPolicy = behavior.unlockPolicy;
+    this.protocolV2UiInteraction = behavior.uiInteraction;
   }
 
   getVersionRange() {
@@ -60,9 +112,78 @@ export default class DeviceSettings extends BaseMethod<ApplySettings> {
 
   async run() {
     try {
+      if (this.device.isProtocolV2()) {
+        const settings = mapCommonSettingsToProtocolV2(this.payload);
+        const requestedPassphrase = this.payload.usePassphrase;
+        const requestedAirgap = this.payload.airgapMode;
+        const hasPassphrasePage = requestedPassphrase !== undefined;
+        const hasAirgapPage = requestedAirgap !== undefined;
+
+        if (hasPassphrasePage && hasAirgapPage) {
+          throw invalidParameter(
+            'Protocol V2 passphrase and air-gap settings must be changed in separate calls.'
+          );
+        }
+        if ((hasPassphrasePage || hasAirgapPage) && Object.keys(settings).length > 0) {
+          throw invalidParameter(
+            'Protocol V2 on-device settings must not be combined with direct settings.'
+          );
+        }
+        if (requestedPassphrase !== undefined) {
+          const current = await this.device.getDeviceState({ refreshSections: ['status'] });
+          if (current.status.passphraseProtection === requestedPassphrase) {
+            return { message: 'Settings already match requested value.' };
+          }
+
+          const res = await this.device.commands.typedCall('DeviceSettingsPageShow', 'Success', {
+            page: DeviceSettingsPage.DevicePassphrase,
+          });
+          const updated = await this.device.getDeviceState({ refreshSections: ['status'] });
+          if (updated.status.passphraseProtection !== requestedPassphrase) {
+            throw TypedError(
+              HardwareErrorCode.RuntimeError,
+              'Protocol V2 passphrase setting did not reach the requested value.'
+            );
+          }
+          return res.message;
+        }
+        if (requestedAirgap !== undefined) {
+          const current = await this.device.getDeviceState({ refreshSections: ['settings'] });
+          if (current.settings.airgapMode === requestedAirgap) {
+            return { message: 'Settings already match requested value.' };
+          }
+
+          const res = await this.device.commands.typedCall('DeviceSettingsPageShow', 'Success', {
+            page: DeviceSettingsPage.DeviceAirgap,
+          });
+          const updated = await this.device.getDeviceState({ refreshSections: ['settings'] });
+          if (updated.settings.airgapMode !== requestedAirgap) {
+            throw TypedError(
+              HardwareErrorCode.RuntimeError,
+              'Protocol V2 air-gap setting did not reach the requested value.'
+            );
+          }
+          return res.message;
+        }
+        if (Object.keys(settings).length === 0) {
+          throw invalidParameter('No Protocol V2 compatible setting provided.');
+        }
+
+        const res = await this.device.commands.typedCall('DeviceSettingsSet', 'Success', {
+          settings,
+        });
+        this.device.updateState(mapDeviceSettingsToState(settings), 'apply-settings');
+        return res.message;
+      }
+
+      if (this.payload.airgapMode !== undefined) {
+        throw invalidParameter('Air-gap settings are not supported by Protocol V1.');
+      }
+
       const res = await this.device.commands.typedCall('ApplySettings', 'Success', {
         ...this.params,
       });
+      this.device.updateState(mapApplySettingsToState(this.params), 'apply-settings');
       return res.message;
     } catch (error) {
       if (error.message?.toLowerCase().includes('no setting provided')) {

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/DeviceUnlock.ts

@@ -5,6 +5,15 @@ import type { LockDevice } from '@onekeyfe/hd-transport';
 export default class DeviceUnlock extends BaseMethod<LockDevice> {
   init() {
     this.useDevicePassphraseState = false;
+    this.unlockPolicy = 'none';
+    this.protocolV2UiInteraction = {
+      request: 'pin',
+      source: 'method-lifecycle',
+      reason: 'device-unlock',
+      completion: 'operation-completed',
+      deviceOnly: true,
+      operation: 'unlock-device',
+    };
   }
 
   async run() {

package/src/api/device/DeviceUpdateBootloader.ts

@@ -5,16 +5,20 @@ import { UI_REQUEST } from '../../constants/ui-request';
 import { FirmwareUpdateTipMessage } from '../../events/ui-request';
 import { FirmwareUpdateBaseMethod } from '../firmware/FirmwareUpdateBaseMethod';
 import { getSysResourceBinary } from '../firmware/getBinary';
-import { updateBootloader } from '../firmware/uploadFirmware';
+import { updateBootloader, updateBootloaderFromSource } from '../firmware/uploadFirmware';
 import { DeviceModelToTypes } from '../../types';
 import { DataManager } from '../../data-manager';
-import { checkBootloaderLength } from '../firmware/updateBootloader';
-import { getDeviceType, getFirmwareType } from '../../utils';
+import { checkBootloaderLength, checkBootloaderSourceLength } from '../firmware/updateBootloader';
+import { openFirmwareByteSource } from '../firmware/FirmwareArtifactSource';
+import { FirmwareCheckpointWriter } from '../firmware/FirmwareCheckpoint';
+import { resolveFirmwareUpdateHostBinding } from '../firmware/FirmwareHostBinding';
+import { assertFirmwareUpdatePreparedPlanBinding } from '../firmware/FirmwareUpdatePreparedPlan';
 
 import type { DeviceUpdateBootloaderParams } from '../../types/api/deviceUpdateBootloader';
 import type { EFirmwareType } from '@onekeyfe/hd-shared';
 import type { Device } from '../../device/Device';
 import type { Features } from '../../types';
+import type { FirmwareByteSource } from '../firmware/FirmwareArtifactSource';
 
 export default class DeviceUpdateBootloader extends FirmwareUpdateBaseMethod<any> {
   init() {
@@ -44,17 +48,94 @@ export default class DeviceUpdateBootloader extends FirmwareUpdateBaseMethod<any
     return true;
   }
 
+  async updateBootloaderWithEmmcFileWriteFromSource(_device: Device, source: FirmwareByteSource) {
+    const filePath = '0:boot/bootloader.bin';
+
+    this.postTipMessage(FirmwareUpdateTipMessage.StartTransferData);
+    await this.emmcCommonUpdateProcessFromSource({
+      source,
+      filePath,
+    });
+    this.postTipMessage(FirmwareUpdateTipMessage.ConfirmOnDevice);
+    await this.reboot(RebootType.Normal);
+    this.postTipMessage(FirmwareUpdateTipMessage.UpdateBootloaderSuccess);
+    return true;
+  }
+
   async updateTouchBootloader({
     device,
     features,
     firmwareType,
+    binary: preparedBinary,
+    source: preparedSource,
+    checkpointWriter,
   }: {
     device: Device;
     features?: Features;
     firmwareType: EFirmwareType;
+    binary?: ArrayBuffer;
+    source?: FirmwareByteSource;
+    checkpointWriter: FirmwareCheckpointWriter;
   }) {
-    let { binary } = this.payload;
+    if (preparedSource) {
+      if (!(await checkBootloaderSourceLength(preparedSource))) {
+        throw ERRORS.TypedError(HardwareErrorCode.CheckDownloadFileError);
+      }
+      if (features && device.isBootloader()) {
+        this.postTipMessage(FirmwareUpdateTipMessage.UpdateBootloader);
+        await checkpointWriter.commit({
+          stage: 'FILE_TRANSFER_STARTED',
+          target: 'bootloader',
+        });
+        const result = await this.updateBootloaderWithEmmcFileWriteFromSource(
+          device,
+          preparedSource
+        );
+        await checkpointWriter.commit({
+          stage: 'FILE_TRANSFER_COMPLETED',
+          target: 'bootloader',
+        });
+        await checkpointWriter.commit({
+          stage: 'FINAL_VERIFIED',
+          target: 'bootloader',
+        });
+        return result;
+      }
+      if (features && !device.isBootloader()) {
+        await checkpointWriter.commit({
+          stage: 'FILE_TRANSFER_STARTED',
+          target: 'bootloader',
+        });
+        await updateBootloaderFromSource(
+          this.device.getCommands().typedCall.bind(this.device.getCommands()),
+          this.postMessage,
+          device,
+          preparedSource
+        );
+        await checkpointWriter.commit({
+          stage: 'FILE_TRANSFER_COMPLETED',
+          target: 'bootloader',
+        });
+        await checkpointWriter.commit({
+          stage: 'FINAL_VERIFIED',
+          target: 'bootloader',
+        });
+        return true;
+      }
+    }
+
+    let binary = preparedBinary;
     if (!binary) {
+      if (DataManager.getSettings('firmwareManifestMode') === 'external-only') {
+        throw ERRORS.TypedError(
+          HardwareErrorCode.RuntimeError,
+          'Bootloader must be prepared by the external firmware host',
+          {
+            firmwareUpdateCode: 'FirmwareArtifactsNotPrepared',
+            artifactName: 'bootloader',
+          }
+        );
+      }
       this.postTipMessage(FirmwareUpdateTipMessage.CheckLatestUiResource);
       const resourceUrl = features
         ? DataManager.getBootloaderResource(features, firmwareType)
@@ -69,25 +150,50 @@ export default class DeviceUpdateBootloader extends FirmwareUpdateBaseMethod<any
       }
     }
 
-    if (!checkBootloaderLength(binary)) {
+    if (!binary || !checkBootloaderLength(binary)) {
       throw ERRORS.TypedError(HardwareErrorCode.CheckDownloadFileError);
     }
 
     // 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);
+      await checkpointWriter.commit({
+        stage: 'FILE_TRANSFER_STARTED',
+        target: 'bootloader',
+      });
+      const result = await this.updateBootloaderWithEmmcFileWrite(device, binary);
+      await checkpointWriter.commit({
+        stage: 'FILE_TRANSFER_COMPLETED',
+        target: 'bootloader',
+      });
+      await checkpointWriter.commit({
+        stage: 'FINAL_VERIFIED',
+        target: 'bootloader',
+      });
+      return result;
     }
 
-    if (features && !features.bootloader_mode) {
+    if (features && !device.isBootloader()) {
       // Use original updateBootloader logic for normal mode
+      await checkpointWriter.commit({
+        stage: 'FILE_TRANSFER_STARTED',
+        target: 'bootloader',
+      });
       await updateBootloader(
         this.device.getCommands().typedCall.bind(this.device.getCommands()),
         this.postMessage,
         device,
         binary
       );
+      await checkpointWriter.commit({
+        stage: 'FILE_TRANSFER_COMPLETED',
+        target: 'bootloader',
+      });
+      await checkpointWriter.commit({
+        stage: 'FINAL_VERIFIED',
+        target: 'bootloader',
+      });
       return Promise.resolve(true);
     }
   }
@@ -97,13 +203,71 @@ export default class DeviceUpdateBootloader extends FirmwareUpdateBaseMethod<any
     const { features } = device;
 
     const payload = this.payload as DeviceUpdateBootloaderParams;
+    const hostBinding = payload.artifact
+      ? resolveFirmwareUpdateHostBinding(payload.hostBindingGeneration)
+      : undefined;
+    const executionParams = {
+      ...payload,
+      artifactReader: hostBinding?.artifactReader ?? payload.artifactReader,
+      checkpointSink: hostBinding?.checkpointSink ?? payload.checkpointSink,
+    };
+    const checkpointWriter = new FirmwareCheckpointWriter(executionParams, {
+      required: !!hostBinding,
+    });
+    if (payload.artifact) {
+      assertFirmwareUpdatePreparedPlanBinding({
+        preparedPlan: payload.preparedPlan,
+        executor: 'v2',
+        scopeTargets: ['bootloader'],
+        bindings: [
+          {
+            target: 'bootloader',
+            artifact: payload.artifact,
+          },
+        ],
+      });
+      const source = await openFirmwareByteSource({
+        artifact: payload.artifact,
+        reader: executionParams.artifactReader,
+      });
+      if (!source) {
+        throw ERRORS.TypedError(
+          HardwareErrorCode.RuntimeError,
+          'Bootloader artifact is not prepared'
+        );
+      }
+      try {
+        const deviceType = device.getCurrentDeviceType();
+        const deviceFirmwareType = device.getCurrentFirmwareType();
+        const firmwareType = payload.firmwareType ?? deviceFirmwareType;
+        if (DeviceModelToTypes.model_touch.includes(deviceType)) {
+          return await this.updateTouchBootloader({
+            device,
+            features,
+            firmwareType,
+            source,
+            checkpointWriter,
+          });
+        }
+        return true;
+      } finally {
+        await source.close();
+      }
+    }
 
-    const deviceType = getDeviceType(features);
-    const deviceFirmwareType = getFirmwareType(features);
+    const { binary } = payload;
+    const deviceType = device.getCurrentDeviceType();
+    const deviceFirmwareType = device.getCurrentFirmwareType();
     const firmwareType = payload.firmwareType ?? deviceFirmwareType;
 
     if (DeviceModelToTypes.model_touch.includes(deviceType)) {
-      return this.updateTouchBootloader({ device, features, firmwareType });
+      return this.updateTouchBootloader({
+        device,
+        features,
+        firmwareType,
+        binary,
+        checkpointWriter,
+      });
     }
 
     return Promise.resolve(true);

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/device/DeviceWipe.ts

@@ -1,13 +1,32 @@
+import { DeviceSettingsPage } from '@onekeyfe/hd-transport';
+
 import { BaseMethod } from '../BaseMethod';
 
 import type { WipeDevice } from '@onekeyfe/hd-transport';
 
 export default class DeviceWipe extends BaseMethod<WipeDevice> {
   init() {
+    this.unlockPolicy = 'retry-on-locked';
     this.useDevicePassphraseState = false;
+    this.protocolV2UiInteraction = {
+      request: 'button',
+      source: 'method-lifecycle',
+      reason: 'device-management',
+      completion: 'operation-completed',
+      deviceOnly: true,
+      page: DeviceSettingsPage.DeviceReset,
+      operation: 'wipe-device',
+    };
   }
 
   async run() {
+    if (this.device.isProtocolV2()) {
+      const res = await this.device.commands.typedCall('DeviceSettingsPageShow', 'Success', {
+        page: DeviceSettingsPage.DeviceReset,
+      });
+      return Promise.resolve(res.message);
+    }
+
     const res = await this.device.commands.typedCall('WipeDevice', 'Success');
 
     return Promise.resolve(res.message);

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,