@onekeyfe/hd-core 1.2.0-alpha.5 → 1.2.0-alpha.50

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

@@ -1,16 +1,22 @@
 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;
   }
 
   async run() {
-    const res = await this.device.commands.typedCall('FilesystemFormat', 'Success', {});
+    const res = await this.device.commands.typedCall('FilesystemFormat', 'Success', {
+      data: true,
+      user: true,
+    });
     return Promise.resolve(res.message);
   }
 }

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

@@ -5,8 +5,8 @@ import { ProtocolV2FirmwareTargetType } from '../../protocols/protocol-v2/firmwa
 
 import type {
   DeviceFirmwareTarget,
-  DeviceFirmwareUpdateRecordFields,
   DeviceFirmwareTargetType,
+  DeviceFirmwareUpdateRecordFields,
   TransportCallOptions,
 } from '@onekeyfe/hd-transport';
 
@@ -118,9 +118,6 @@ 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('transferIn') ||
-    message.includes('transferin') ||
-    message.includes('usbdevice') ||
     message.includes('multiplatformbleadapter') ||
     message.includes('multipalformebleadapter') ||
     compactMessage.includes('rxerrorerror6') ||
@@ -138,16 +135,21 @@ export function normalizeRebootType(value: RebootTypeInput | undefined): DeviceR
   return DeviceRebootType.Normal;
 }
 
-// 当前 firmware-pro2 子模块的 DeviceFirmwareTargetType 合法值从生成 enum 派生，
-// 避免协议枚举增减时这里继续保留过期手写编号。
-const VALID_FIRMWARE_TARGET_IDS = new Set<number>(
-  Object.values(ProtocolV2FirmwareTargetType).filter(value => typeof value === 'number') as number[]
-);
+// 与 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,
+  ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_COPROCESSOR,
+  ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE01,
+  ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE02,
+  ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE03,
+  ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE04,
+]);
 const FIRMWARE_TARGET_ID_BY_NAME = new Map<string, DeviceFirmwareTargetType>(
   Object.entries(ProtocolV2FirmwareTargetType).flatMap(([key, value]) =>
-    VALID_FIRMWARE_TARGET_IDS.has(value)
-      ? [[key, value as DeviceFirmwareTargetType]]
-      : []
+    INSTALLABLE_FIRMWARE_TARGET_IDS.has(value) ? [[key, value as DeviceFirmwareTargetType]] : []
   )
 );
 
@@ -160,14 +162,12 @@ function normalizeTargetId(
   }
   const named = typeof value === 'string' ? FIRMWARE_TARGET_ID_BY_NAME.get(value) : undefined;
   const numeric = named ?? (typeof value === 'number' ? value : Number(value));
-  // 校验值域：仅接受 DeviceFirmwareTargetType 中定义的 target id，
-  // 不再放行任意非负整数。
-  if (Number.isSafeInteger(numeric) && VALID_FIRMWARE_TARGET_IDS.has(numeric)) {
+  if (Number.isSafeInteger(numeric) && INSTALLABLE_FIRMWARE_TARGET_IDS.has(numeric)) {
     return numeric as DeviceFirmwareTargetType;
   }
   throw invalidParameter(
-    `Parameter [${name}] must be a valid firmware target id (one of ${[
-      ...VALID_FIRMWARE_TARGET_IDS,
+    `Parameter [${name}] must be an installable firmware target id (one of ${[
+      ...INSTALLABLE_FIRMWARE_TARGET_IDS,
     ].join(', ')}).`
   );
 }

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];

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];

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() {

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;

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() {

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];

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];

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;

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() {

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;

package/src/api/tron/TronGetAddress.ts

@@ -7,6 +7,10 @@ import type { TronGetAddress as HardwareTronGetAddress } from '@onekeyfe/hd-tran
 import type { TronAddress, TronGetAddressParams } from '../../types';
 
 export default class TronGetAddress extends BaseMethod<HardwareTronGetAddress[]> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   hasBundle = false;
 
   init() {

package/src/api/tron/TronSignMessage.ts

@@ -6,11 +6,16 @@ import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { stripHexPrefix } from '../helpers/hexUtils';
-import { getFirmwareType } from '../../utils';
 
 import type { TronSignMessage as HardwareTronSignMessage } from '@onekeyfe/hd-transport';
 
 export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage> {
+  private isLegacyMessageType = false;
+
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
@@ -26,12 +31,8 @@ export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage>
     const { path, messageHex } = this.payload;
     const addressN = validatePath(path, 3);
 
-    if (this.payload.messageType === 'V1' || this.payload.messageType == null) {
-      throw createDeviceNotSupportMethodError(
-        'TronSignMessage',
-        getFirmwareType(this.device?.features)
-      );
-    }
+    this.isLegacyMessageType =
+      this.payload.messageType === 'V1' || this.payload.messageType == null;
 
     const messageType = TronMessageType.V2;
 
@@ -56,6 +57,9 @@ export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage>
 
   getMessageV2VersionRange() {
     return {
+      pro2: {
+        min: '0.0.0',
+      },
       pro: {
         min: '4.16.0',
       },
@@ -72,6 +76,13 @@ export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage>
   }
 
   async run() {
+    if (this.isLegacyMessageType) {
+      throw createDeviceNotSupportMethodError(
+        'TronSignMessage',
+        this.device.getCurrentFirmwareType()
+      );
+    }
+
     this.checkFeatureVersionLimit(
       () => this.params.message_type === TronMessageType.V2,
       () => this.getMessageV2VersionRange(),

package/src/api/tron/TronSignTransaction.ts

@@ -11,6 +11,10 @@ import type { TronSignTx } from '@onekeyfe/hd-transport';
 import type { DeviceFirmwareRange } from '../../types';
 
 export default class TronSignTransaction extends BaseMethod<TronSignTx> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   parseTx(tx: TronTransaction, address_n: number[]): TronSignTx {
     const unSignTx = {
       address_n,

package/src/api/utils.ts

@@ -2,16 +2,20 @@ import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 import * as ApiMethods from './index';
 
+import type { BaseMethod } from './BaseMethod';
 import type { IFrameCallMessage } from '../events';
 
-export function findMethod(message: IFrameCallMessage & { id?: number }) {
+type MethodConstructor = new (message: IFrameCallMessage & { id?: number }) => BaseMethod<any>;
+
+const publicMethodRegistry = ApiMethods as unknown as Record<string, MethodConstructor>;
+
+export function findMethod(message: IFrameCallMessage & { id?: number }): BaseMethod<any> {
   const { method } = message.payload;
   if (typeof method !== 'string') {
     throw ERRORS.TypedError(HardwareErrorCode.CallMethodInvalidParameter, 'Method is not set');
   }
 
-  // @ts-expect-error
-  const MethodConstructor = ApiMethods[method];
+  const MethodConstructor = publicMethodRegistry[method];
   if (MethodConstructor) {
     return new MethodConstructor(message);
   }

package/src/api/xrp/XrpGetAddress.ts

@@ -11,6 +11,10 @@ export default class XrpGetAddress extends BaseMethod<
     show_display: boolean;
   }[]
 > {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   hasBundle = false;
 
   shouldConfirm = false;

package/src/api/xrp/XrpSignTransaction.ts

@@ -6,6 +6,10 @@ import { validatePath } from '../helpers/pathUtils';
 import type { XrpSignTransactionParams } from '../../types/api/xrpSignTransaction';
 
 export default class XrpGetAddress extends BaseMethod<XrpSignTransactionParams> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   hasBundle = false;
 
   init() {
@@ -30,7 +34,7 @@ export default class XrpGetAddress extends BaseMethod<XrpSignTransactionParams>
       { name: 'payment', type: 'object' },
     ]);
     validateParams(transaction.payment, [
-      { name: 'amount', type: 'uint', required: true },
+      { name: 'amount', type: 'number', required: true },
       { name: 'destination', type: 'string', required: true },
       { name: 'destinationTag', type: 'number' },
     ]);

package/src/constants/index.ts

@@ -5,7 +5,4 @@ export {
   TonSignDataType,
   TonWalletVersion,
 } from '@onekeyfe/hd-transport';
-export type {
-  HDNodeType,
-  Success as DeviceSuccess,
-} from '@onekeyfe/hd-transport';
+export type { HDNodeType, Success as DeviceSuccess } from '@onekeyfe/hd-transport';

package/src/core/RequestQueue.ts

@@ -30,6 +30,7 @@ export default class RequestQueue {
       method.responseID = requestId;
     }
     const abortController = new AbortController();
+    method.abortSignal = abortController.signal;
     const task = { id: requestId, method, abortController };
     this.requestQueue.set(requestId, task);
     return task;