@ukeyfe/hardware-core 1.1.25 → 1.1.26

package/src/api/nostr/helper/index.ts

@@ -1,4 +1,4 @@
-import { NostrEvent } from '../../../types/api/nostrSignEvent';
+import type { NostrEvent } from '../../../types/api/nostrSignEvent';
 
 export function validateEvent(event: NostrEvent): boolean {
   if (!(event instanceof Object)) return false;

package/src/api/polkadot/PolkadotGetAddress.ts

@@ -1,10 +1,10 @@
-import { PolkadotGetAddress as HardwarePolkadotGetAddress } from '@ukeyfe/hardware-transport';
-
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
-import { PolkadotAddress, PolkadotGetAddressParams } from '../../types';
-import { getPolkadotVersionRangeWithBundle } from './networks';
+import { getPolkadotVersionRangeWithBundle, parseNetwork } from './networks';
+
+import type { PolkadotGetAddress as HardwarePolkadotGetAddress } from '@ukeyfe/hardware-transport';
+import type { PolkadotAddress, PolkadotGetAddressParams } from '../../types';
 
 export default class PolkadotGetAddress extends BaseMethod<HardwarePolkadotGetAddress[]> {
   hasBundle = false;
@@ -37,7 +37,7 @@ export default class PolkadotGetAddress extends BaseMethod<HardwarePolkadotGetAd
       this.params.push({
         address_n: addressN,
         prefix,
-        network,
+        network: parseNetwork(network),
         show_display: showOnUKey,
       });
     });

package/src/api/polkadot/PolkadotSignTransaction.ts

@@ -1,10 +1,11 @@
-import { PolkadotSignTx as HardwarePolkadotSignTx } from '@ukeyfe/hardware-transport';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
-import { PolkadotSignTransactionParams } from '../../types';
 import { formatAnyHex } from '../helpers/hexUtils';
-import { getPolkadotVersionRange } from './networks';
+import { getPolkadotVersionRange, parseNetwork } from './networks';
+
+import type { PolkadotSignTransactionParams } from '../../types';
+import type { PolkadotSignTx as HardwarePolkadotSignTx } from '@ukeyfe/hardware-transport';
 
 export default class PolkadotSignTransaction extends BaseMethod<HardwarePolkadotSignTx> {
   hasBundle = false;
@@ -17,16 +18,18 @@ export default class PolkadotSignTransaction extends BaseMethod<HardwarePolkadot
     validateParams(this.payload, [
       { name: 'path', required: true },
       { name: 'network', required: true },
+      { name: 'prefix' },
       { name: 'rawTx', type: 'hexString', required: true },
     ]);
 
     // init params
-    const { path, rawTx, network } = this.payload as PolkadotSignTransactionParams;
+    const { path, rawTx, network, prefix } = this.payload as PolkadotSignTransactionParams;
     const addressN = validatePath(path, 3);
 
     this.params = {
       address_n: addressN,
-      network,
+      network: parseNetwork(network),
+      prefix,
       raw_tx: formatAnyHex(rawTx),
     };
   }

package/src/api/polkadot/networks.ts

@@ -8,6 +8,11 @@ enum Networks {
   Astar = 'astar',
   JoyStream = 'joystream',
   Manta = 'manta',
+  Hydration = 'hydration',
+  Bifrost = 'bifrost',
+  BifrostKusama = 'bifrost-ksm',
+  PolkadotAssetHub = 'polkadot-assethub',
+  KusamaAssetHub = 'kusama-assethub',
 }
 
 // All polkadot networks are included in no special case
@@ -54,3 +59,14 @@ export function getPolkadotVersionRangeWithBundle(networks: string[]) {
   }
   return baseVersionRange;
 }
+
+export function parseNetwork(network: string) {
+  switch (network) {
+    case Networks.PolkadotAssetHub:
+      return Networks.Polkadot;
+    case Networks.KusamaAssetHub:
+      return Networks.Kusama;
+    default:
+      return network;
+  }
+}

package/src/api/scdo/ScdoGetAddress.ts

@@ -1,9 +1,10 @@
-import { ScdoGetAddress as HardwareScdoGetAddress } from '@ukeyfe/hardware-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
-import { ScdoAddress, ScdoGetAddressParams } from '../../types';
+
+import type { ScdoGetAddress as HardwareScdoGetAddress } from '@ukeyfe/hardware-transport';
+import type { ScdoAddress, ScdoGetAddressParams } from '../../types';
 
 export default class ScdoGetAddress extends BaseMethod<HardwareScdoGetAddress[]> {
   hasBundle = false;

package/src/api/scdo/ScdoSignMessage.ts

@@ -1,10 +1,11 @@
-import { ScdoSignMessage as HardwareScdoSignMessage } from '@ukeyfe/hardware-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { stripHexPrefix } from '../helpers/hexUtils';
 
+import type { ScdoSignMessage as HardwareScdoSignMessage } from '@ukeyfe/hardware-transport';
+
 export default class ScdoSignMessage extends BaseMethod<HardwareScdoSignMessage> {
   init() {
     this.checkDeviceId = true;

package/src/api/scdo/ScdoSignTransaction.ts

@@ -1,13 +1,19 @@
-import { ScdoSignTx as HardwareScdoSignTx, TypedCall, ScdoSignedTx } from '@ukeyfe/hardware-transport';
 import { bytesToHex } from '@noble/hashes/utils';
+
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
-import { ScdoSignTransactionParams } from '../../types';
-import type { TypedResponseMessage } from '../../device/DeviceCommands';
 import { formatAnyHex, stripHexStartZeroes } from '../helpers/hexUtils';
 
+import type { ScdoSignTransactionParams } from '../../types';
+import type {
+  ScdoSignTx as HardwareScdoSignTx,
+  ScdoSignedTx,
+  TypedCall,
+} from '@ukeyfe/hardware-transport';
+import type { TypedResponseMessage } from '../../device/DeviceCommands';
+
 export default class ScdoSignTransaction extends BaseMethod<HardwareScdoSignTx> {
   init() {
     this.checkDeviceId = true;

package/src/api/solana/SolGetAddress.ts

@@ -1,9 +1,10 @@
-import { SolanaGetAddress } from '@ukeyfe/hardware-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
-import { SolanaAddress, SolanaGetAddressParams } from '../../types';
+
+import type { SolanaGetAddress } from '@ukeyfe/hardware-transport';
+import type { SolanaAddress, SolanaGetAddressParams } from '../../types';
 
 export default class SolGetAddress extends BaseMethod<SolanaGetAddress[]> {
   hasBundle = false;

package/src/api/solana/SolSignMessage.ts

@@ -1,10 +1,11 @@
-import { SolanaSignUnsafeMessage as HardwareSolSignUnsafeMessage } from '@ukeyfe/hardware-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { stripHexPrefix } from '../helpers/hexUtils';
 
+import type { SolanaSignUnsafeMessage as HardwareSolSignUnsafeMessage } from '@ukeyfe/hardware-transport';
+
 export default class SolSignMessage extends BaseMethod<HardwareSolSignUnsafeMessage> {
   init() {
     this.checkDeviceId = true;

package/src/api/solana/SolSignOffchainMessage.ts

@@ -1,10 +1,11 @@
-import { SolanaSignOffChainMessage as HardwareSolSignOffChainMessage } from '@ukeyfe/hardware-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { stripHexPrefix } from '../helpers/hexUtils';
 
+import type { SolanaSignOffChainMessage as HardwareSolSignOffChainMessage } from '@ukeyfe/hardware-transport';
+
 export default class SolSignOffchainMessage extends BaseMethod<HardwareSolSignOffChainMessage> {
   init() {
     this.checkDeviceId = true;

package/src/api/solana/SolSignTransaction.ts

@@ -1,11 +1,12 @@
-import { SolanaSignTx as HardwareSolanaSignTx } from '@ukeyfe/hardware-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
-import { SolanaSignedTx, SolanaSignTransactionParams } from '../../types';
 import { formatAnyHex } from '../helpers/hexUtils';
 
+import type { SolanaSignTransactionParams, SolanaSignedTx } from '../../types';
+import type { SolanaSignTx as HardwareSolanaSignTx } from '@ukeyfe/hardware-transport';
+
 export default class SolSignTransaction extends BaseMethod<HardwareSolanaSignTx[]> {
   hasBundle = false;
 
@@ -27,11 +28,13 @@ export default class SolSignTransaction extends BaseMethod<HardwareSolanaSignTx[
       validateParams(batch, [
         { name: 'path', required: true },
         { name: 'rawTx', type: 'hexString', required: true },
+        { name: 'extraInfo', type: 'object' },
       ]);
 
       this.params.push({
         address_n: addressN,
         raw_tx: formatAnyHex(batch.rawTx),
+        ...(batch.extraInfo ? { extra_info: batch.extraInfo } : undefined),
       });
     });
   }

package/src/api/starcoin/StarcoinGetAddress.ts

@@ -1,9 +1,10 @@
-import { StarcoinGetAddress as HardwareStarcoinGetAddress } from '@ukeyfe/hardware-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
-import { validatePath, serializedPath } from '../helpers/pathUtils';
+import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
-import { StarcoinAddress, StarcoinGetAddressParams } from '../../types/api/starcoinGetAddress';
+
+import type { StarcoinGetAddress as HardwareStarcoinGetAddress } from '@ukeyfe/hardware-transport';
+import type { StarcoinAddress, StarcoinGetAddressParams } from '../../types/api/starcoinGetAddress';
 
 export default class StarcoinGetAddress extends BaseMethod<HardwareStarcoinGetAddress[]> {
   hasBundle = false;

package/src/api/starcoin/StarcoinGetPublicKey.ts

@@ -1,11 +1,12 @@
-import { StarcoinGetPublicKey as HardwareStarcoinGetPublicKey } from '@ukeyfe/hardware-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
-import { validatePath, serializedPath } from '../helpers/pathUtils';
+import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
-import {
-  StarcoinPublicKey,
+
+import type { StarcoinGetPublicKey as HardwareStarcoinGetPublicKey } from '@ukeyfe/hardware-transport';
+import type {
   StarcoinGetPublicKeyParams,
+  StarcoinPublicKey,
 } from '../../types/api/starcoinGetPublicKey';
 
 export default class StarcoinGetPublicKey extends BaseMethod<HardwareStarcoinGetPublicKey[]> {

package/src/api/starcoin/StarcoinSignMessage.ts

@@ -1,10 +1,11 @@
-import { StarcoinSignMessage as HardwareStarcoinSignMessage } from '@ukeyfe/hardware-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { formatAnyHex } from '../helpers/hexUtils';
 
+import type { StarcoinSignMessage as HardwareStarcoinSignMessage } from '@ukeyfe/hardware-transport';
+
 export default class StarcoinSignMessage extends BaseMethod<HardwareStarcoinSignMessage> {
   init() {
     this.checkDeviceId = true;

package/src/api/starcoin/StarcoinSignTransaction.ts

@@ -1,10 +1,11 @@
-import { StarcoinSignTx } from '@ukeyfe/hardware-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { formatAnyHex } from '../helpers/hexUtils';
 
+import type { StarcoinSignTx } from '@ukeyfe/hardware-transport';
+
 export default class StarcoinSignTransaction extends BaseMethod<StarcoinSignTx> {
   init() {
     this.checkDeviceId = true;

package/src/api/starcoin/StarcoinVerifyMessage.ts

@@ -1,9 +1,10 @@
-import { StarcoinVerifyMessage as HardwareStarcoinVerifyMessage } from '@ukeyfe/hardware-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { formatAnyHex } from '../helpers/hexUtils';
 
+import type { StarcoinVerifyMessage as HardwareStarcoinVerifyMessage } from '@ukeyfe/hardware-transport';
+
 export default class EVMSignMessage extends BaseMethod<HardwareStarcoinVerifyMessage> {
   init() {
     this.checkDeviceId = true;

package/src/api/stellar/StellarGetAddress.ts

@@ -1,9 +1,10 @@
-import { StellarGetAddress as HardwareStellarGetAddress } from '@ukeyfe/hardware-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
-import { StellarGetAddressParams, StellarAddress } from '../../types';
+
+import type { StellarGetAddress as HardwareStellarGetAddress } from '@ukeyfe/hardware-transport';
+import type { StellarAddress, StellarGetAddressParams } from '../../types';
 
 export default class StellarGetAddress extends BaseMethod<HardwareStellarGetAddress[]> {
   hasBundle = false;

package/src/api/stellar/StellarSignTransaction.ts

@@ -1,14 +1,16 @@
-import {
-  StellarMemoType,
-  StellarSignedTx,
-  StellarSignTx as HardwareStellarSignTx,
-} from '@ukeyfe/hardware-transport';
+import { StellarMemoType } from '@ukeyfe/hardware-transport';
 import { ERRORS, HardwareErrorCode } from '@ukeyfe/hardware-shared';
+
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
-import { StellarOperation, StellarSignTransactionParams } from '../../types';
+
+import type {
+  StellarSignTx as HardwareStellarSignTx,
+  StellarSignedTx,
+} from '@ukeyfe/hardware-transport';
+import type { StellarOperation, StellarSignTransactionParams } from '../../types';
 
 export default class StellarSignTransaction extends BaseMethod<HardwareStellarSignTx> {
   operations: any[] = [];

package/src/api/sui/SuiGetAddress.ts

@@ -1,14 +1,14 @@
-import { SuiGetAddress as HardwareSuiGetAddress } from '@ukeyfe/hardware-transport';
-
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
-import { SuiAddress, SuiGetAddressParams } from '../../types';
 import { supportBatchPublicKey } from '../../utils/deviceFeaturesUtils';
 import { publicKeyToAddress } from './normalize';
 import { batchGetPublickeys } from '../helpers/batchGetPublickeys';
 
+import type { SuiAddress, SuiGetAddressParams } from '../../types';
+import type { SuiGetAddress as HardwareSuiGetAddress } from '@ukeyfe/hardware-transport';
+
 export default class SuiGetAddress extends BaseMethod<HardwareSuiGetAddress[]> {
   hasBundle = false;
 

package/src/api/sui/SuiGetPublicKey.ts

@@ -2,9 +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 { SuiGetAddressParams, SuiPublicKey } from '../../types';
 import { batchGetPublickeys } from '../helpers/batchGetPublickeys';
 
+import type { SuiGetAddressParams, SuiPublicKey } from '../../types';
+
 export default class SuiGetPublicKey extends BaseMethod<any> {
   hasBundle = false;
 

package/src/api/sui/SuiSignMessage.ts

@@ -1,10 +1,11 @@
-import { SuiSignMessage as HardwareSuiSignMessage } from '@ukeyfe/hardware-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { stripHexPrefix } from '../helpers/hexUtils';
 
+import type { SuiSignMessage as HardwareSuiSignMessage } from '@ukeyfe/hardware-transport';
+
 export default class SuiSignMessage extends BaseMethod<HardwareSuiSignMessage> {
   init() {
     this.checkDeviceId = true;

package/src/api/sui/SuiSignTransaction.ts

@@ -1,6 +1,6 @@
-import { SuiSignTx as HardwareSuiSignTx, TypedCall, SuiSignedTx } from '@ukeyfe/hardware-transport';
 import semver from 'semver';
 import { bytesToHex } from '@noble/hashes/utils';
+
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
@@ -8,6 +8,12 @@ import { validateParams } from '../helpers/paramsValidator';
 import { formatAnyHex } from '../helpers/hexUtils';
 import { getDeviceFirmwareVersion, getDeviceType } from '../../utils';
 import { DeviceModelToTypes } from '../../types';
+
+import type {
+  SuiSignTx as HardwareSuiSignTx,
+  SuiSignedTx,
+  TypedCall,
+} from '@ukeyfe/hardware-transport';
 import type { TypedResponseMessage } from '../../device/DeviceCommands';
 
 type SuiSignTx = Omit<HardwareSuiSignTx, 'data_initial_chunk' | 'data_length'> & HardwareSuiSignTx;

package/src/api/ton/TonGetAddress.ts

@@ -1,10 +1,10 @@
-import { TonGetAddress as HardwareTonGetAddress } from '@ukeyfe/hardware-transport';
-
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
-import { TonAddress, TonGetAddressParams } from '../../types';
+
+import type { TonGetAddress as HardwareTonGetAddress } from '@ukeyfe/hardware-transport';
+import type { TonAddress, TonGetAddressParams } from '../../types';
 
 export default class TonGetAddress extends BaseMethod<HardwareTonGetAddress[]> {
   hasBundle = false;

package/src/api/ton/TonSignMessage.ts

@@ -1,21 +1,24 @@
-import {
-  TonSignMessage as HardwareTonSignMessage,
-  TonSignedMessage,
-  TonTxAck,
-} from '@ukeyfe/hardware-transport';
 import semver from 'semver';
 import BigNumber from 'bignumber.js';
 import { isEmpty } from 'lodash';
+
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
-import { DeviceFirmwareRange, DeviceModelToTypes, TonSignMessageParams } from '../../types';
+import { DeviceModelToTypes } from '../../types';
 import { getDeviceFirmwareVersion, getDeviceType, getMethodVersionRange } from '../../utils';
 import { formatAnyHex, stripHexStartZeroes } from '../helpers/hexUtils';
-import type { TonSignedMessageResponse } from '../../types/api/tonSignMessage';
 import { cutString } from '../helpers/stringUtils';
 
+import type { DeviceFirmwareRange, TonSignMessageParams } from '../../types';
+import type {
+  TonSignMessage as HardwareTonSignMessage,
+  TonSignedMessage,
+  TonTxAck,
+} from '@ukeyfe/hardware-transport';
+import type { TonSignedMessageResponse } from '../../types/api/tonSignMessage';
+
 export default class TonSignMessage extends BaseMethod<HardwareTonSignMessage> {
   initState: string | null = null;
 

package/src/api/ton/TonSignProof.ts

@@ -1,10 +1,10 @@
-import { TonSignProof as HardwareTonSignProof } from '@ukeyfe/hardware-transport';
-
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
-import { TonSignProofParams } from '../../types';
+
+import type { TonSignProof as HardwareTonSignProof } from '@ukeyfe/hardware-transport';
+import type { TonSignProofParams } from '../../types';
 
 export default class TonSignProof extends BaseMethod<HardwareTonSignProof> {
   init() {

package/src/api/tron/TronGetAddress.ts

@@ -1,9 +1,10 @@
-import { TronGetAddress as HardwareTronGetAddress } from '@ukeyfe/hardware-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
-import { TronGetAddressParams, TronAddress } from '../../types';
+
+import type { TronGetAddress as HardwareTronGetAddress } from '@ukeyfe/hardware-transport';
+import type { TronAddress, TronGetAddressParams } from '../../types';
 
 export default class TronGetAddress extends BaseMethod<HardwareTronGetAddress[]> {
   hasBundle = false;

package/src/api/tron/TronSignMessage.ts

@@ -1,13 +1,14 @@
-import {
-  TronSignMessage as HardwareTronSignMessage,
-  TronMessageType,
-} from '@ukeyfe/hardware-transport';
-import { ERRORS, HardwareErrorCode } from '@ukeyfe/hardware-shared';
+import { TronMessageType } from '@ukeyfe/hardware-transport';
+import { createDeviceNotSupportMethodError } from '@ukeyfe/hardware-shared';
+
 import { UI_REQUEST } from '../../constants/ui-request';
 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 '@ukeyfe/hardware-transport';
 
 export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage> {
   init() {
@@ -25,9 +26,9 @@ export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage>
     const addressN = validatePath(path, 3);
 
     if (this.payload.messageType === 'V1' || this.payload.messageType == null) {
-      throw ERRORS.TypedError(
-        HardwareErrorCode.DeviceNotSupportMethod,
-        'not support tron message v1'
+      throw createDeviceNotSupportMethodError(
+        'TronSignMessage',
+        getFirmwareType(this.device.features)
       );
     }
 
@@ -54,6 +55,9 @@ export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage>
       pro: {
         min: '4.16.0',
       },
+      touch: {
+        min: '4.12.0',
+      },
       classic1s: {
         min: '3.13.0',
       },

package/src/api/tron/TronSignTransaction.ts

@@ -1,12 +1,14 @@
-import { TronSignTx } from '@ukeyfe/hardware-transport';
 import { isEmpty } from 'lodash';
+
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
-import { TronTransaction } from '../../types/api/tronSignTransaction';
 import { formatAnyHex } from '../helpers/hexUtils';
-import { DeviceFirmwareRange } from '../../types';
+
+import type { TronTransaction } from '../../types/api/tronSignTransaction';
+import type { TronSignTx } from '@ukeyfe/hardware-transport';
+import type { DeviceFirmwareRange } from '../../types';
 
 export default class TronSignTransaction extends BaseMethod<TronSignTx> {
   parseTx(tx: TronTransaction, address_n: number[]): TronSignTx {
@@ -156,6 +158,9 @@ export default class TronSignTransaction extends BaseMethod<TronSignTx> {
       pro: {
         min: '4.13.0',
       },
+      touch: {
+        min: '4.12.0',
+      },
       model_classic1s: {
         min: '3.12.0',
       },
@@ -176,6 +181,12 @@ export default class TronSignTransaction extends BaseMethod<TronSignTx> {
       pro: {
         min: '4.15.0',
       },
+      touch: {
+        min: '4.12.0',
+      },
+      model_classic1s: {
+        min: '3.13.0',
+      },
     };
   }
 

package/src/api/u2f/GetNextU2FCounter.ts

@@ -1,6 +1,7 @@
-import { GetNextU2FCounter as HardwareGetNextU2FCounter } from '@ukeyfe/hardware-transport';
 import { BaseMethod } from '../BaseMethod';
 
+import type { GetNextU2FCounter as HardwareGetNextU2FCounter } from '@ukeyfe/hardware-transport';
+
 export default class GetNextU2FCounter extends BaseMethod<HardwareGetNextU2FCounter> {
   init() {
     this.useDevicePassphraseState = false;

package/src/api/u2f/SetU2FCounter.ts

@@ -1,6 +1,7 @@
-import { SetU2FCounter as HardwareSetU2FCounter } from '@ukeyfe/hardware-transport';
 import { BaseMethod } from '../BaseMethod';
 
+import type { SetU2FCounter as HardwareSetU2FCounter } from '@ukeyfe/hardware-transport';
+
 export default class SetU2FCounter extends BaseMethod<HardwareSetU2FCounter> {
   init() {
     this.useDevicePassphraseState = false;

package/src/api/utils.ts

@@ -1,6 +1,8 @@
 import { ERRORS, HardwareErrorCode } from '@ukeyfe/hardware-shared';
+
 import * as ApiMethods from './index';
-import { IFrameCallMessage } from '../events';
+
+import type { IFrameCallMessage } from '../events';
 
 export function findMethod(message: IFrameCallMessage & { id?: number }) {
   const { method } = message.payload;

package/src/api/xrp/XrpGetAddress.ts

@@ -1,11 +1,9 @@
-import { deriveAddress } from 'ripple-keypairs';
 import { UI_REQUEST } from '../../constants/ui-request';
-import { XrpAddress, XrpGetAddressParams } from '../../types/api/xrpGetAddress';
-import { supportBatchPublicKey } from '../../utils/deviceFeaturesUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
-import { batchGetPublickeys } from '../helpers/batchGetPublickeys';
+
+import type { XrpAddress, XrpGetAddressParams } from '../../types/api/xrpGetAddress';
 
 export default class XrpGetAddress extends BaseMethod<
   {
@@ -57,22 +55,6 @@ export default class XrpGetAddress extends BaseMethod<
   }
 
   async run() {
-    if (this.hasBundle && supportBatchPublicKey(this.device?.features) && !this.shouldConfirm) {
-      const res = await batchGetPublickeys(this.device, this.params, 'secp256k1', 144);
-      const result = res.public_keys.map((publicKey: string, index: number) => ({
-        path: serializedPath((this.params as unknown as any[])[index].address_n),
-        address: deriveAddress(publicKey),
-        publicKey,
-        pub: publicKey,
-      }));
-
-      validateResult(result, ['address', 'publicKey'], {
-        expectedLength: this.params.length,
-      });
-
-      return Promise.resolve(result);
-    }
-
     const responses: XrpAddress[] = [];
     for (let i = 0; i < this.params.length; i++) {
       const param = this.params[i];

package/src/api/xrp/XrpSignTransaction.ts

@@ -1,9 +1,10 @@
 import { UI_REQUEST } from '../../constants/ui-request';
-import { XrpSignTransactionParams } from '../../types/api/xrpSignTransaction';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { validatePath } from '../helpers/pathUtils';
 
+import type { XrpSignTransactionParams } from '../../types/api/xrpSignTransaction';
+
 export default class XrpGetAddress extends BaseMethod<XrpSignTransactionParams> {
   hasBundle = false;