@onekeyfe/hd-core 1.2.0-alpha.13 → 1.2.0-alpha.130

package/src/api/protocol-v2/DeviceUploadWallpaper.ts

@@ -1,10 +1,13 @@
 import { blake2s } from '@noble/hashes/blake2s';
 import { bytesToHex } from '@noble/hashes/utils';
+import { createDeviceNotSupportMethodError } from '@onekeyfe/hd-shared';
 
 import { BaseMethod } from '../BaseMethod';
+import { decodeJpegBase64ToRgba } from '../helpers/base64Data';
 import { invalidParameter } from '../helpers/filesystemValidation';
 import { writeProtocolV2File } from '../helpers/protocolV2FileWrite';
 import { UI_REQUEST, createUiMessage } from '../../events/ui-request';
+import { supportsProtocolV2Message } from '../../protocols/protocol-v2/features';
 import {
   PRO2_WALLPAPER_HEIGHT,
   PRO2_WALLPAPER_WIDTH,
@@ -13,9 +16,7 @@ import {
 } from '../../utils/pro2Wallpaper';
 
 export type DeviceUploadWallpaperParams = {
-  width: number;
-  height: number;
-  rgba: Uint8Array | ArrayBuffer;
+  jpegBase64: string;
   fileName?: string;
   chunkSize?: number;
 };
@@ -27,8 +28,11 @@ export type DeviceUploadWallpaperResponse = {
   message?: string;
 };
 
-const WALLPAPER_DIRECTORY = 'vol0:/wallpapers/user';
+const WALLPAPER_DIRECTORY = 'vol1:/wallpapers';
 const SAFE_FILE_NAME = /^[A-Za-z0-9_-]+(?:\.bin)?$/;
+const DEVICE_SETTINGS_SET_MESSAGE_TYPE = 60412;
+const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE = 60805;
+const FILESYSTEM_DIR_MAKE_MESSAGE_TYPE = 60809;
 
 function normalizeFileName(fileName: string | undefined, data: Uint8Array): string {
   if (fileName !== undefined && (!fileName || !SAFE_FILE_NAME.test(fileName))) {
@@ -41,6 +45,10 @@ function normalizeFileName(fileName: string | undefined, data: Uint8Array): stri
 }
 
 export default class DeviceUploadWallpaper extends BaseMethod<DeviceUploadWallpaperParams> {
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
   private encoded?: { data: Uint8Array; colorFormat: Pro2WallpaperColorFormat };
 
   private directoryReady = false;
@@ -50,32 +58,45 @@ export default class DeviceUploadWallpaper extends BaseMethod<DeviceUploadWallpa
   private path = '';
 
   init() {
-    const { width, height, rgba, fileName, chunkSize } = this.payload;
-    if (width !== PRO2_WALLPAPER_WIDTH || height !== PRO2_WALLPAPER_HEIGHT) {
-      throw invalidParameter(
-        `Pro2 wallpaper dimensions must be ${PRO2_WALLPAPER_WIDTH}x${PRO2_WALLPAPER_HEIGHT}.`
-      );
-    }
-    if (!(rgba instanceof ArrayBuffer) && !ArrayBuffer.isView(rgba)) {
-      throw invalidParameter('Parameter [rgba] must be an ArrayBuffer or Uint8Array.');
-    }
+    const { jpegBase64, fileName, chunkSize } = this.payload;
     if (chunkSize !== undefined && (!Number.isInteger(chunkSize) || chunkSize <= 0)) {
       throw invalidParameter('Parameter [chunkSize] must be a positive integer.');
     }
 
-    const rgbaBytes =
-      rgba instanceof ArrayBuffer
-        ? rgba
-        : new Uint8Array(rgba.buffer, rgba.byteOffset, rgba.byteLength);
-    this.encoded = encodePro2Wallpaper({ width, height, rgba: rgbaBytes });
+    const decoded = decodeJpegBase64ToRgba({
+      jpegBase64,
+      parameterName: 'jpegBase64',
+      expectedWidth: PRO2_WALLPAPER_WIDTH,
+      expectedHeight: PRO2_WALLPAPER_HEIGHT,
+    });
+    this.encoded = encodePro2Wallpaper({
+      width: PRO2_WALLPAPER_WIDTH,
+      height: PRO2_WALLPAPER_HEIGHT,
+      rgba: decoded.data,
+    });
     this.path = `${WALLPAPER_DIRECTORY}/${normalizeFileName(fileName, this.encoded.data)}`;
-    this.params = { width, height, rgba: rgbaBytes, fileName, chunkSize };
-    this.requireProtocolV2 = true;
-    this.unlockPolicy = 'retry-on-locked';
+    this.params = { jpegBase64, fileName, chunkSize };
+    this.unlockPolicy = 'none';
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
   }
 
+  private async assertCapabilities() {
+    const protocolInfo = await this.device.ensureProtocolV2RuntimeContext();
+    const requiredMessageTypes = [
+      DEVICE_SETTINGS_SET_MESSAGE_TYPE,
+      FILESYSTEM_FILE_WRITE_MESSAGE_TYPE,
+      FILESYSTEM_DIR_MAKE_MESSAGE_TYPE,
+    ];
+    if (
+      requiredMessageTypes.some(
+        messageType => !supportsProtocolV2Message(protocolInfo, messageType)
+      )
+    ) {
+      throw createDeviceNotSupportMethodError(this.name, this.device.getCurrentFirmwareType());
+    }
+  }
+
   private async ensureDirectory() {
     if (this.directoryReady) return;
     try {
@@ -100,6 +121,7 @@ export default class DeviceUploadWallpaper extends BaseMethod<DeviceUploadWallpa
       data: encoded.data,
       totalSize: encoded.data.byteLength,
       chunkSize: this.params.chunkSize,
+      maxChunkRetries: 3,
       overwrite: true,
       append: false,
       throwIfAborted: () => this.throwIfAborted(),
@@ -115,11 +137,13 @@ export default class DeviceUploadWallpaper extends BaseMethod<DeviceUploadWallpa
   async run(): Promise<DeviceUploadWallpaperResponse> {
     const { encoded } = this;
     if (!encoded) throw invalidParameter('Wallpaper data has not been initialized.');
+    await this.assertCapabilities();
     await this.ensureDirectory();
     await this.upload();
     const response = await this.device.commands.typedCall('DeviceSettingsSet', 'Success', {
       settings: { wallpaper_path: this.path },
     });
+    await this.device.refreshProtocolV2SettingsAfterMutation();
     return {
       path: this.path,
       size: encoded.data.byteLength,

package/src/api/protocol-v2/FilesystemFormat.ts

@@ -1,9 +1,12 @@
 import { BaseMethod } from '../BaseMethod';
 
 export default class FilesystemFormat extends BaseMethod {
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
   init() {
-    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
-    this.requireProtocolV2 = true;
+    // Protocol V2 (Pro2) only; Core rejects non-V2 devices.
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
     this.params = undefined;

package/src/api/protocol-v2/FilesystemPermissionFix.ts

@@ -1,9 +1,12 @@
 import { BaseMethod } from '../BaseMethod';
 
 export default class FilesystemPermissionFix extends BaseMethod {
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
   init() {
-    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
-    this.requireProtocolV2 = true;
+    // Protocol V2 (Pro2) only; Core rejects non-V2 devices.
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
     this.params = undefined;

package/src/api/protocol-v2/Ping.ts

@@ -1,12 +1,46 @@
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+
 import { BaseMethod } from '../BaseMethod';
 
+// nanopb max_size:64 includes the terminating NUL for string fields.
+export const PROTOCOL_V2_PING_MAX_MESSAGE_BYTES = 63;
+
+const getUtf8ByteLength = (value: string) =>
+  Array.from(value).reduce((length, character) => {
+    const codePoint = character.codePointAt(0) ?? 0;
+    if (codePoint <= 0x7f) return length + 1;
+    if (codePoint <= 0x7ff) return length + 2;
+    if (codePoint <= 0xffff) return length + 3;
+    return length + 4;
+  }, 0);
+
+export function validateProtocolV2PingMessage(value: unknown): string {
+  if (value !== undefined && typeof value !== 'string') {
+    throw ERRORS.TypedError(
+      HardwareErrorCode.CallMethodInvalidParameter,
+      'Protocol V2 Ping message must be a string.'
+    );
+  }
+  const message = value ?? '';
+  if (getUtf8ByteLength(message) > PROTOCOL_V2_PING_MAX_MESSAGE_BYTES) {
+    throw ERRORS.TypedError(
+      HardwareErrorCode.CallMethodInvalidParameter,
+      `Protocol V2 Ping message must not exceed ${PROTOCOL_V2_PING_MAX_MESSAGE_BYTES} UTF-8 bytes.`
+    );
+  }
+  return message;
+}
+
 export default class Ping extends BaseMethod<{ message?: string }> {
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
   init() {
-    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
-    this.requireProtocolV2 = true;
+    // Protocol V2 (Pro2) only; Core rejects non-V2 devices.
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
-    this.params = { message: this.payload.message };
+    this.params = { message: validateProtocolV2PingMessage(this.payload.message) };
   }
 
   async run() {

package/src/api/protocol-v2/ProtocolInfoRequest.ts

@@ -1,16 +1,21 @@
 import { BaseMethod } from '../BaseMethod';
 
 export default class ProtocolInfoRequest extends BaseMethod {
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
   init() {
-    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
-    this.requireProtocolV2 = true;
+    // Protocol V2 (Pro2) only; Core rejects non-V2 devices.
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
     this.params = undefined;
   }
 
   async run() {
-    const res = await this.device.commands.typedCall('ProtocolInfoRequest', 'ProtocolInfo', {});
+    const res = await this.device.commands.typedCall('ProtocolInfoRequest', 'ProtocolInfo', {
+      eventless_wallet_session: true,
+    });
     return Promise.resolve(res.message);
   }
 }

package/src/api/protocol-v2/helpers.ts

@@ -118,6 +118,7 @@ export const isProtocolV2DeviceDisconnectedError = (error: unknown) => {
     message.includes('connection has timed out unexpectedly') ||
     message.includes('connection error has occured') ||
     message.includes('connection error has occurred') ||
+    message.includes('react native ble transport released') ||
     message.includes('multiplatformbleadapter') ||
     message.includes('multipalformebleadapter') ||
     compactMessage.includes('rxerrorerror6') ||
@@ -137,7 +138,6 @@ export function normalizeRebootType(value: RebootTypeInput | undefined): DeviceR
 
 // 与 firmware-pro2 的 proto_target_to_firmware_target 安装白名单保持一致。
 const INSTALLABLE_FIRMWARE_TARGET_IDS = new Set<number>([
-  ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_CRATE,
   ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER,
   ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1,
   ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2,

package/src/api/scdo/ScdoGetAddress.ts

@@ -40,10 +40,6 @@ export default class ScdoGetAddress extends BaseMethod<HardwareScdoGetAddress[]>
 
   getVersionRange(): DeviceFirmwareRange {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       model_touch: {
         min: '4.10.0',
       },

package/src/api/scdo/ScdoSignMessage.ts

@@ -31,10 +31,6 @@ export default class ScdoSignMessage extends BaseMethod<HardwareScdoSignMessage>
 
   getVersionRange(): DeviceFirmwareRange {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       model_touch: {
         min: '4.10.0',
       },

package/src/api/scdo/ScdoSignTransaction.ts

@@ -53,10 +53,6 @@ export default class ScdoSignTransaction extends BaseMethod<HardwareScdoSignTx>
 
   getVersionRange(): DeviceFirmwareRange {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       model_touch: {
         min: '4.10.0',
       },

package/src/api/solana/SolGetAddress.ts

@@ -9,6 +9,10 @@ import type { SolanaAddress, SolanaGetAddressParams } from '../../types';
 export default class SolGetAddress extends BaseMethod<SolanaGetAddress[]> {
   hasBundle = false;
 
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];

package/src/api/solana/SolSignMessage.ts

@@ -7,6 +7,10 @@ import { stripHexPrefix } from '../helpers/hexUtils';
 import type { SolanaSignUnsafeMessage as HardwareSolSignUnsafeMessage } from '@onekeyfe/hd-transport';
 
 export default class SolSignMessage extends BaseMethod<HardwareSolSignUnsafeMessage> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
@@ -30,7 +34,7 @@ export default class SolSignMessage extends BaseMethod<HardwareSolSignUnsafeMess
 
   getVersionRange() {
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       pro: {

package/src/api/solana/SolSignOffchainMessage.ts

@@ -7,6 +7,10 @@ import { stripHexPrefix } from '../helpers/hexUtils';
 import type { SolanaSignOffChainMessage as HardwareSolSignOffChainMessage } from '@onekeyfe/hd-transport';
 
 export default class SolSignOffchainMessage extends BaseMethod<HardwareSolSignOffChainMessage> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
@@ -36,7 +40,7 @@ export default class SolSignOffchainMessage extends BaseMethod<HardwareSolSignOf
 
   getVersionRange() {
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       pro: {

package/src/api/solana/SolSignTransaction.ts

@@ -8,6 +8,10 @@ import type { SolanaSignTransactionParams, SolanaSignedTx } from '../../types';
 import type { SolanaSignTx as HardwareSolanaSignTx } from '@onekeyfe/hd-transport';
 
 export default class SolSignTransaction extends BaseMethod<HardwareSolanaSignTx[]> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   hasBundle = false;
 
   init() {
@@ -43,7 +47,7 @@ export default class SolSignTransaction extends BaseMethod<HardwareSolanaSignTx[
   getVersionRange() {
     if (this.existsVersionedTx()) {
       return {
-        pro2: {
+        model_pro2: {
           min: '0.0.0',
         },
         model_mini: {
@@ -56,7 +60,7 @@ export default class SolSignTransaction extends BaseMethod<HardwareSolanaSignTx[
     }
 
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       classic: {

package/src/api/starcoin/StarcoinGetAddress.ts

@@ -7,6 +7,10 @@ import type { StarcoinGetAddress as HardwareStarcoinGetAddress } from '@onekeyfe
 import type { StarcoinAddress, StarcoinGetAddressParams } from '../../types/api/starcoinGetAddress';
 
 export default class StarcoinGetAddress extends BaseMethod<HardwareStarcoinGetAddress[]> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   hasBundle = false;
 
   init() {

package/src/api/starcoin/StarcoinGetPublicKey.ts

@@ -10,6 +10,10 @@ import type {
 } from '../../types/api/starcoinGetPublicKey';
 
 export default class StarcoinGetPublicKey extends BaseMethod<HardwareStarcoinGetPublicKey[]> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   hasBundle = false;
 
   init() {

package/src/api/starcoin/StarcoinSignMessage.ts

@@ -7,6 +7,10 @@ import { formatAnyHex } from '../helpers/hexUtils';
 import type { StarcoinSignMessage as HardwareStarcoinSignMessage } from '@onekeyfe/hd-transport';
 
 export default class StarcoinSignMessage extends BaseMethod<HardwareStarcoinSignMessage> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];

package/src/api/starcoin/StarcoinSignTransaction.ts

@@ -7,6 +7,10 @@ import { formatAnyHex } from '../helpers/hexUtils';
 import type { StarcoinSignTx } from '@onekeyfe/hd-transport';
 
 export default class StarcoinSignTransaction extends BaseMethod<StarcoinSignTx> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];

package/src/api/starcoin/StarcoinVerifyMessage.ts

@@ -6,6 +6,10 @@ import { formatAnyHex } from '../helpers/hexUtils';
 import type { StarcoinVerifyMessage as HardwareStarcoinVerifyMessage } from '@onekeyfe/hd-transport';
 
 export default class EVMSignMessage extends BaseMethod<HardwareStarcoinVerifyMessage> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];

package/src/api/stellar/StellarGetAddress.ts

@@ -4,7 +4,7 @@ import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
 
 import type { StellarGetAddress as HardwareStellarGetAddress } from '@onekeyfe/hd-transport';
-import type { DeviceFirmwareRange, StellarAddress, StellarGetAddressParams } from '../../types';
+import type { StellarAddress, StellarGetAddressParams } from '../../types';
 
 export default class StellarGetAddress extends BaseMethod<HardwareStellarGetAddress[]> {
   hasBundle = false;
@@ -38,15 +38,6 @@ export default class StellarGetAddress extends BaseMethod<HardwareStellarGetAddr
     });
   }
 
-  getVersionRange(): DeviceFirmwareRange {
-    return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
-    };
-  }
-
   async run() {
     const responses: StellarAddress[] = [];
 

package/src/api/stellar/StellarSignTransaction.ts

@@ -10,11 +10,7 @@ import type {
   StellarSignTx as HardwareStellarSignTx,
   StellarSignedTx,
 } from '@onekeyfe/hd-transport';
-import type {
-  DeviceFirmwareRange,
-  StellarOperation,
-  StellarSignTransactionParams,
-} from '../../types';
+import type { StellarOperation, StellarSignTransactionParams } from '../../types';
 
 // Firmware accepts up to 1024 bytes per chunk; 1 byte = 2 hex chars
 const SOROBAN_CHUNK_BYTES = 1024;
@@ -32,15 +28,6 @@ export default class StellarSignTransaction extends BaseMethod<HardwareStellarSi
     extSent: number;
   };
 
-  getVersionRange(): DeviceFirmwareRange {
-    return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
-    };
-  }
-
   parseOperation = (op: StellarOperation) => {
     switch (op.type) {
       case 'createAccount':

package/src/api/sui/SuiGetAddress.ts

@@ -9,6 +9,10 @@ import type { SuiAddress, SuiGetAddressParams } from '../../types';
 import type { SuiGetAddress as HardwareSuiGetAddress } from '@onekeyfe/hd-transport';
 
 export default class SuiGetAddress extends BaseMethod<HardwareSuiGetAddress[]> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   hasBundle = false;
 
   shouldConfirm = false;
@@ -48,7 +52,7 @@ export default class SuiGetAddress extends BaseMethod<HardwareSuiGetAddress[]> {
 
   getVersionRange() {
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       model_mini: {

package/src/api/sui/SuiGetPublicKey.ts

@@ -7,6 +7,10 @@ import { batchGetPublickeys } from '../helpers/batchGetPublickeys';
 import type { SuiGetAddressParams, SuiPublicKey } from '../../types';
 
 export default class SuiGetPublicKey extends BaseMethod<any> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   hasBundle = false;
 
   init() {
@@ -40,7 +44,7 @@ export default class SuiGetPublicKey extends BaseMethod<any> {
 
   getVersionRange() {
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       model_mini: {

package/src/api/sui/SuiSignMessage.ts

@@ -7,6 +7,10 @@ import { stripHexPrefix } from '../helpers/hexUtils';
 import type { SuiSignMessage as HardwareSuiSignMessage } from '@onekeyfe/hd-transport';
 
 export default class SuiSignMessage extends BaseMethod<HardwareSuiSignMessage> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
@@ -30,7 +34,7 @@ export default class SuiSignMessage extends BaseMethod<HardwareSuiSignMessage> {
 
   getVersionRange() {
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       model_mini: {

package/src/api/sui/SuiSignTransaction.ts

@@ -15,6 +15,10 @@ import type { TypedCall, TypedResponseMessage } from '../../device/DeviceCommand
 type SuiSignTx = Omit<HardwareSuiSignTx, 'data_initial_chunk' | 'data_length'> & HardwareSuiSignTx;
 
 export default class SuiSignTransaction extends BaseMethod<SuiSignTx> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
@@ -39,7 +43,7 @@ export default class SuiSignTransaction extends BaseMethod<SuiSignTx> {
 
   getVersionRange() {
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       model_mini: {

package/src/api/ton/TonGetAddress.ts

@@ -7,6 +7,10 @@ import type { TonGetAddress as HardwareTonGetAddress } from '@onekeyfe/hd-transp
 import type { TonAddress, TonGetAddressParams } from '../../types';
 
 export default class TonGetAddress extends BaseMethod<HardwareTonGetAddress[]> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   hasBundle = false;
 
   shouldConfirm = false;
@@ -57,7 +61,7 @@ export default class TonGetAddress extends BaseMethod<HardwareTonGetAddress[]> {
 
   getVersionRange() {
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       model_touch: {

package/src/api/ton/TonSignData.ts

@@ -8,9 +8,13 @@ import type { TonSignData as HardwareTonSignData } from '@onekeyfe/hd-transport'
 import type { TonSignDataParams } from '../../types/api/tonSignData';
 
 export default class TonSignData extends BaseMethod<HardwareTonSignData> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   init() {
     // Keep strict-check off for touch/classic1s until their firmware release
-    // versions are decided. Pro2 is explicitly allowed by getVersionRange().
+    // versions are decided. Protocol V2 support is declared independently.
     this.strictCheckDeviceSupport = false;
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];

package/src/api/ton/TonSignMessage.ts

@@ -19,6 +19,10 @@ import type {
 import type { TonSignedMessageResponse } from '../../types/api/tonSignMessage';
 
 export default class TonSignMessage extends BaseMethod<HardwareTonSignMessage> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   initState: string | null = null;
 
   init() {
@@ -85,7 +89,7 @@ export default class TonSignMessage extends BaseMethod<HardwareTonSignMessage> {
 
   getVersionRange() {
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       model_touch: {
@@ -170,12 +174,14 @@ export default class TonSignMessage extends BaseMethod<HardwareTonSignMessage> {
     if (!request.init_data_length) {
       const deviceType = this.device.getCurrentDeviceType();
       const hasClassic = DeviceModelToTypes.model_classic1s.includes(deviceType);
-      // use signing_message_repr sign, not exists signning_message, skip validate
-      const hasSigningMessageRepr = request.signning_message == null;
+      const signingMessage = request.signing_message ?? request.signning_message;
+      // Blind signing omits the signing message in both protocol schemas.
+      const shouldSkipValidation = signingMessage == null;
 
       return Promise.resolve({
         ...request,
-        skip_validate: hasClassic || hasSigningMessageRepr,
+        signing_message: signingMessage,
+        skip_validate: hasClassic || shouldSkipValidation,
       });
     }
 

package/src/api/ton/TonSignProof.ts

@@ -7,6 +7,10 @@ import type { TonSignProof as HardwareTonSignProof } from '@onekeyfe/hd-transpor
 import type { TonSignProofParams } from '../../types';
 
 export default class TonSignProof extends BaseMethod<HardwareTonSignProof> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   init() {
     this.strictCheckDeviceSupport = true;
     this.checkDeviceId = true;
@@ -44,7 +48,7 @@ export default class TonSignProof extends BaseMethod<HardwareTonSignProof> {
 
   getVersionRange() {
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       model_touch: {