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

package/src/api/GetOnekeyFeatures.ts

@@ -1,21 +1,11 @@
 import semver from 'semver';
-import { createDeviceNotSupportMethodError } from '@onekeyfe/hd-shared';
 
 import { UI_REQUEST } from '../constants/ui-request';
 import { fixVersion } from '../utils/deviceFeaturesUtils';
 import { BaseMethod } from './BaseMethod';
 
-import type { OnekeyFeatures } from '../types';
-
-function normalizeOnekeyFirmwareVersion(message: OnekeyFeatures) {
-  if (message.onekey_firmware_version && !semver.valid(message.onekey_firmware_version)) {
-    message.onekey_firmware_version = fixVersion(message.onekey_firmware_version);
-  }
-}
-
 export default class GetOnekeyFeatures extends BaseMethod {
   init() {
-    this.unlockPolicy = 'none';
     this.allowDeviceMode = [
       ...this.allowDeviceMode,
       UI_REQUEST.NOT_INITIALIZE,
@@ -26,12 +16,10 @@ export default class GetOnekeyFeatures extends BaseMethod {
   }
 
   async run() {
-    if (this.device.isProtocolV2()) {
-      throw createDeviceNotSupportMethodError(this.name, this.device.getCurrentFirmwareType());
-    }
-
     const { message } = await this.device.commands.typedCall('OnekeyGetFeatures', 'OnekeyFeatures');
-    normalizeOnekeyFirmwareVersion(message);
+    if (!!message.onekey_firmware_version && !semver.valid(message.onekey_firmware_version)) {
+      message.onekey_firmware_version = fixVersion(message.onekey_firmware_version);
+    }
     return Promise.resolve(message);
   }
 }

package/src/api/GetPassphraseState.ts

@@ -1,4 +1,4 @@
-import { ERRORS, HardwareErrorCode, createDeviceNotSupportMethodError } from '@onekeyfe/hd-shared';
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 import { UI_REQUEST } from '../constants/ui-request';
 import { getPassphraseStateWithRefreshDeviceInfo } from '../utils/deviceFeaturesUtils';
@@ -11,17 +11,18 @@ export default class GetPassphraseState extends BaseMethod {
   }
 
   async run() {
-    if (this.device.isProtocolV2()) {
-      throw createDeviceNotSupportMethodError(this.name, this.device.getCurrentFirmwareType());
-    }
-    if (!this.device.features) {
-      throw ERRORS.TypedError(HardwareErrorCode.DeviceInitializeFailed);
-    }
+    if (!this.device.features)
+      return Promise.reject(ERRORS.TypedError(HardwareErrorCode.DeviceInitializeFailed));
 
     const { passphraseState } = await getPassphraseStateWithRefreshDeviceInfo(this.device);
 
-    const passphraseProtection = this.device.getCurrentPassphraseProtection();
+    const { features } = this.device;
+
+    // refresh device info
+    if (features && features.passphrase_protection === true) {
+      return Promise.resolve(passphraseState);
+    }
 
-    return Promise.resolve(passphraseProtection === true ? passphraseState : undefined);
+    return Promise.resolve(undefined);
   }
 }

package/src/api/PromptWebDeviceAccess.ts

@@ -51,18 +51,9 @@ export default class PromptWebDeviceAccess extends BaseMethod {
         }
 
         if (isWebUsbEnv) {
-          const usbDevice = device as USBDevice;
-          let path = usbDevice.serialNumber ?? '';
-          if (!path) {
-            // Early Pro2 boards have no USB serial number. Re-enumeration assigns a
-            // session-stable mock path, which is recovered by USBDevice identity here.
-            const diff = await this.connector?.enumerate();
-            const matched = diff?.descriptors?.find(d => (d as any).device === usbDevice);
-            path = matched?.path ?? '';
-          }
           devicesDescriptor = [
             {
-              path,
+              path: (device as USBDevice).serialNumber ?? '',
               device,
               debug: true,
             },

package/src/api/SearchDevices.ts

@@ -1,13 +1,11 @@
 import { BaseMethod } from './BaseMethod';
 import TransportManager from '../data-manager/TransportManager';
 import { DataManager } from '../data-manager';
-import { LoggerNames, getDeviceTypeByBleName, getLogger } from '../utils';
+import { getDeviceTypeByBleName } from '../utils';
 import { DevicePool } from '../device/DevicePool';
 
 import type DeviceConnector from '../device/DeviceConnector';
 
-const Log = getLogger(LoggerNames.DevicePool);
-
 export default class SearchDevices extends BaseMethod {
   connector?: DeviceConnector;
 
@@ -36,45 +34,17 @@ export default class SearchDevices extends BaseMethod {
         const lowerId = device.id?.toLowerCase();
         if (!seenIds.has(lowerId)) {
           seenIds.add(lowerId);
-          const bleName =
-            device.name ?? (device as unknown as { localName?: string }).localName ?? '';
           devices.push({
             ...device,
             connectId: device.id,
-            serialNo: null,
-            // Legacy BLE discovery identifier. The physical serial number is unavailable here.
-            uuid: device.id,
-            deviceId: null,
-            name: bleName || device.name,
-            deviceType: getDeviceTypeByBleName(bleName),
+            deviceType: getDeviceTypeByBleName(device.name ?? ''),
           });
         }
       }
       return devices;
     }
 
-    const deviceList = [];
-    for (const descriptor of devicesDescriptor) {
-      try {
-        // Discovery is best effort. Browsers may retain WebUSB grants for devices that
-        // are offline, busy, or not ready, so one descriptor must not abort the scan.
-        const result = await DevicePool.getDevices([descriptor], descriptor.path, {
-          connectProtocol: this.payload.connectProtocol,
-          refreshRuntimeState: true,
-        });
-        deviceList.push(...result.deviceList);
-      } catch (error) {
-        const errorCode =
-          error && typeof error === 'object' && 'errorCode' in error
-            ? (error as { errorCode?: unknown }).errorCode
-            : undefined;
-        Log.debug('Skip unavailable device during search', {
-          path: descriptor.path,
-          ...(errorCode !== undefined ? { errorCode } : {}),
-        });
-      }
-    }
-
+    const { deviceList } = await DevicePool.getDevices(devicesDescriptor);
     return deviceList.map(device => device.toMessageObject());
   }
 }

package/src/api/alephium/AlephiumGetAddress.ts

@@ -4,7 +4,7 @@ import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
 
 import type { AlephiumGetAddress as HardwareAlephiumGetAddress } from '@onekeyfe/hd-transport';
-import type { AlephiumAddress, AlephiumGetAddressParams, DeviceFirmwareRange } from '../../types';
+import type { AlephiumAddress, AlephiumGetAddressParams } from '../../types';
 
 export default class AlephiumGetAddress extends BaseMethod<HardwareAlephiumGetAddress[]> {
   hasBundle = false;
@@ -43,12 +43,8 @@ export default class AlephiumGetAddress extends BaseMethod<HardwareAlephiumGetAd
     });
   }
 
-  getVersionRange(): DeviceFirmwareRange {
+  getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       model_touch: {
         min: '4.10.0',
       },

package/src/api/alephium/AlephiumSignMessage.ts

@@ -5,7 +5,6 @@ import { validateParams } from '../helpers/paramsValidator';
 import { stripHexPrefix } from '../helpers/hexUtils';
 
 import type { AlephiumSignMessage as HardwareAlephiumSignMessage } from '@onekeyfe/hd-transport';
-import type { DeviceFirmwareRange } from '../../types';
 
 export default class AlephiumSignMessage extends BaseMethod<HardwareAlephiumSignMessage> {
   init() {
@@ -31,12 +30,8 @@ export default class AlephiumSignMessage extends BaseMethod<HardwareAlephiumSign
     };
   }
 
-  getVersionRange(): DeviceFirmwareRange {
+  getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       model_touch: {
         min: '4.10.0',
       },

package/src/api/alephium/AlephiumSignTransaction.ts

@@ -8,11 +8,10 @@ import { validateParams } from '../helpers/paramsValidator';
 
 import type {
   AlephiumSignedTx,
-  AlephiumTxRequest,
   AlephiumSignTx as HardwareAlephiumSignTx,
   TypedCall,
 } from '@onekeyfe/hd-transport';
-import type { AlephiumSignTransactionParams, DeviceFirmwareRange } from '../../types';
+import type { AlephiumSignTransactionParams } from '../../types';
 import type { TypedResponseMessage } from '../../device/DeviceCommands';
 
 export default class AlephiumSignTransaction extends BaseMethod<HardwareAlephiumSignTx> {
@@ -40,12 +39,8 @@ export default class AlephiumSignTransaction extends BaseMethod<HardwareAlephium
     };
   }
 
-  getVersionRange(): DeviceFirmwareRange {
+  getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       model_touch: {
         min: '4.10.0',
       },
@@ -63,10 +58,7 @@ export default class AlephiumSignTransaction extends BaseMethod<HardwareAlephium
     data: Buffer,
     scriptOpt?: Buffer,
     dataOffset = 0
-    // The final AlephiumTxRequest may return a signature without data_length or address,
-    // so the result accurately uses a union type.
-  ): Promise<AlephiumSignedTx | AlephiumTxRequest> => {
-    const responseType = res.type;
+  ): Promise<AlephiumSignedTx> => {
     if (res.type === 'AlephiumSignedTx') {
       return res.message;
     }
@@ -117,10 +109,7 @@ export default class AlephiumSignTransaction extends BaseMethod<HardwareAlephium
       return this.processTxRequest(typedCall, response, data, scriptOpt, dataOffset);
     }
 
-    throw ERRORS.TypedError(
-      HardwareErrorCode.RuntimeError,
-      `Unknown response type: ${responseType}`
-    );
+    throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, `Unknown response type: ${res.type}`);
   };
 
   async run() {

package/src/api/allnetwork/AllNetworkGetAddressBase.ts

@@ -12,7 +12,7 @@ import { validateParams } from '../helpers/paramsValidator';
 import { PROTO } from '../../constants';
 import { findMethod } from '../utils';
 import { DEVICE, IFRAME, createUiMessage } from '../../events';
-import { isMethodVersionRangeUnsupported } from '../../utils';
+import { getDeviceFirmwareVersion, getFirmwareType, getMethodVersionRange } from '../../utils';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { onDeviceButtonHandler } from '../../core';
 import {
@@ -352,7 +352,6 @@ export default abstract class AllNetworkGetAddressBase extends BaseMethod<
     };
 
     let result: AllNetworkAddress[];
-    let requestError: Error | undefined;
     try {
       method.init();
       method.setDevice?.(this.device);
@@ -395,8 +394,10 @@ export default abstract class AllNetworkGetAddressBase extends BaseMethod<
           rootFingerprint,
         },
       }));
+      if (method.requestContext) {
+        completeRequestContext(method.requestContext.responseID);
+      }
     } catch (e: any) {
-      requestError = e instanceof Error ? e : new Error(String(e));
       const error = handleSkippableHardwareError(e, this.device, method);
 
       if (error) {
@@ -414,10 +415,13 @@ export default abstract class AllNetworkGetAddressBase extends BaseMethod<
       } else {
         throw e;
       }
-    } finally {
       if (method.requestContext) {
-        completeRequestContext(method.requestContext.responseID, requestError);
+        completeRequestContext(
+          method.requestContext.responseID,
+          e instanceof Error ? e : new Error(String(e))
+        );
       }
+    } finally {
       this.device.off(DEVICE.BUTTON, buttonListener);
       this.device.off(DEVICE.PIN, onSignalAbort);
       this.device.off(DEVICE.PASSPHRASE, onSignalAbort);
@@ -459,12 +463,11 @@ export default abstract class AllNetworkGetAddressBase extends BaseMethod<
  * @param method BaseMethod
  */
 function preCheckDeviceSupport(device: Device, method: BaseMethod) {
-  const versionRange = device.getCurrentMethodVersionRange(type => method.getVersionRange()[type]);
-  const currentVersion = device.getCurrentFirmwareVersionString() ?? '0.0.0';
-
-  if (isMethodVersionRangeUnsupported(versionRange)) {
-    throw ERRORS.createDeviceNotSupportMethodError(method.name, device.getCurrentFirmwareType());
-  }
+  const versionRange = getMethodVersionRange(
+    device.features,
+    type => method.getVersionRange()[type]
+  );
+  const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
 
   if (
     versionRange &&
@@ -475,10 +478,10 @@ function preCheckDeviceSupport(device: Device, method: BaseMethod) {
       currentVersion,
       requireVersion: versionRange.min,
       methodName: method.name,
-      firmwareType: device.getCurrentFirmwareType(),
+      firmwareType: getFirmwareType(device.features),
     });
   } else if (method.strictCheckDeviceSupport && !versionRange) {
-    throw ERRORS.createDeviceNotSupportMethodError(method.name, device.getCurrentFirmwareType());
+    throw ERRORS.createDeviceNotSupportMethodError(method.name, getFirmwareType(device.features));
   }
 }
 
@@ -500,18 +503,11 @@ function handleSkippableHardwareError(
     e.message?.includes('Failure_UnexpectedMessage') ||
     e.message?.includes('Failure_UnknownMessage')
   ) {
-    const versionRange = device.getCurrentMethodVersionRange(
+    const versionRange = getMethodVersionRange(
+      device.features,
       type => method.getVersionRange()[type]
     );
-    const currentVersion = device.getCurrentFirmwareVersionString() ?? '0.0.0';
-
-    if (isMethodVersionRangeUnsupported(versionRange)) {
-      error = ERRORS.createDeviceNotSupportMethodError(
-        method.name,
-        device.getCurrentFirmwareType()
-      );
-      return error;
-    }
+    const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
 
     if (
       versionRange &&
@@ -522,12 +518,12 @@ function handleSkippableHardwareError(
         currentVersion,
         requireVersion: versionRange.min,
         methodName: method.name,
-        firmwareType: device.getCurrentFirmwareType(),
+        firmwareType: getFirmwareType(device.features),
       });
     } else {
       error = ERRORS.createDeviceNotSupportMethodError(
         method.name,
-        device.getCurrentFirmwareType()
+        getFirmwareType(device.features)
       );
     }
   } else if (

package/src/api/aptos/AptosGetAddress.ts

@@ -5,8 +5,9 @@ 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 { hexToBytes } from '../helpers/hexUtils';
-import { batchGetPublickeys, supportBatchPublicKeyByDevice } from '../helpers/batchGetPublickeys';
+import { batchGetPublickeys } from '../helpers/batchGetPublickeys';
 
 import type { AptosAddress, AptosGetAddressParams } from '../../types';
 import type { AptosGetAddress as HardwareAptosGetAddress } from '@onekeyfe/hd-transport';
@@ -65,7 +66,7 @@ export default class AptosGetAddress extends BaseMethod<HardwareAptosGetAddress[
   }
 
   async run() {
-    const supportsBatchPublicKey = supportBatchPublicKeyByDevice(this.device);
+    const supportsBatchPublicKey = supportBatchPublicKey(this.device?.features);
     let responses: AptosAddress[] = [];
     if (supportsBatchPublicKey) {
       const publicKeyRes = await batchGetPublickeys(this.device, this.params, 'ed25519', 637);

package/src/api/benfen/BenfenGetAddress.ts

@@ -3,9 +3,10 @@ import { validateParams, validateResult } from '../helpers/paramsValidator';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { hex2BfcAddress, publicKeyToAddress } from './normalize';
-import { batchGetPublickeys, supportBatchPublicKeyByDevice } from '../helpers/batchGetPublickeys';
+import { supportBatchPublicKey } from '../../utils/deviceFeaturesUtils';
+import { batchGetPublickeys } from '../helpers/batchGetPublickeys';
 
-import type { BenfenAddress, BenfenGetAddressParams, DeviceFirmwareRange } from '../../types';
+import type { BenfenAddress, BenfenGetAddressParams } from '../../types';
 import type { BenfenGetAddress as HardwareBenfenGetAddress } from '@onekeyfe/hd-transport';
 
 export default class BenfenGetAddress extends BaseMethod<HardwareBenfenGetAddress[]> {
@@ -46,12 +47,8 @@ export default class BenfenGetAddress extends BaseMethod<HardwareBenfenGetAddres
     });
   }
 
-  getVersionRange(): DeviceFirmwareRange {
+  getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       pro: {
         min: '4.12.0',
       },
@@ -62,7 +59,7 @@ export default class BenfenGetAddress extends BaseMethod<HardwareBenfenGetAddres
   }
 
   async run() {
-    const supportsBatchPublicKey = supportBatchPublicKeyByDevice(this.device);
+    const supportsBatchPublicKey = supportBatchPublicKey(this.device?.features);
     let responses: BenfenAddress[] = [];
 
     if (supportsBatchPublicKey) {
@@ -78,8 +75,7 @@ export default class BenfenGetAddress extends BaseMethod<HardwareBenfenGetAddres
             'BenfenAddress',
             param
           );
-          // BenfenAddress.address is optional in proto but always present on success.
-          address = addressRes.message.address ?? '';
+          address = addressRes.message.address;
         } else {
           address = publicKeyToAddress(publicKey);
         }
@@ -107,7 +103,7 @@ export default class BenfenGetAddress extends BaseMethod<HardwareBenfenGetAddres
           );
           const result = {
             path: serializedPath(param.address_n),
-            address: hex2BfcAddress(res.message.address ?? ''),
+            address: hex2BfcAddress(res.message.address),
           };
           if (this.shouldConfirm) {
             this.postPreviousAddressMessage(result);

package/src/api/benfen/BenfenGetPublicKey.ts

@@ -4,7 +4,7 @@ import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { batchGetPublickeys } from '../helpers/batchGetPublickeys';
 
-import type { BenfenGetPublicKeyParams, BenfenPublicKey, DeviceFirmwareRange } from '../../types';
+import type { BenfenGetPublicKeyParams, BenfenPublicKey } from '../../types';
 
 export default class BenfenGetPublicKey extends BaseMethod<any> {
   hasBundle = false;
@@ -38,12 +38,8 @@ export default class BenfenGetPublicKey extends BaseMethod<any> {
     });
   }
 
-  getVersionRange(): DeviceFirmwareRange {
+  getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       pro: {
         min: '4.12.0',
       },

package/src/api/benfen/BenfenSignMessage.ts

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

package/src/api/benfen/BenfenSignTransaction.ts

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

package/src/api/btc/BTCGetPublicKey.ts

@@ -78,8 +78,7 @@ export default class BTCGetPublicKey extends BaseMethod<GetPublicKey[]> {
       }
 
       for (const param of this.params) {
-        // init() sets coin_name; keep an empty fallback for the generated optional type.
-        const versionBytes = getVersionBytes(param.coin_name ?? '', param.script_type);
+        const versionBytes = getVersionBytes(param.coin_name, param.script_type);
         if (!versionBytes) {
           throw new Error(
             `Invalid coinName, not support generate xpub for scriptType: ${param.script_type}`
@@ -102,7 +101,7 @@ export default class BTCGetPublicKey extends BaseMethod<GetPublicKey[]> {
 
         const path = serializedPath(param.address_n);
 
-        const xpub = createExtendedPublicKey(node, param.coin_name ?? '', param.script_type);
+        const xpub = createExtendedPublicKey(node, param.coin_name, param.script_type);
 
         const rootFingerprint = res.root_fingerprint;
 

package/src/api/btc/BTCSignPsbt.ts

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

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

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

package/src/api/cardano/CardanoSignTransaction.ts

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

package/src/api/conflux/ConfluxSignTransaction.ts

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

package/src/api/device/DeviceCancel.ts

@@ -5,7 +5,6 @@ import type { Cancel } from '@onekeyfe/hd-transport';
 export default class DeviceCancel extends BaseMethod<Cancel> {
   init() {
     this.useDevicePassphraseState = false;
-    this.unlockPolicy = 'none';
   }
 
   async run() {

package/src/api/device/DeviceChangePin.ts

@@ -1,14 +1,10 @@
-import { DeviceSettingsPage } from '@onekeyfe/hd-transport';
-
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
-import { invalidParameter } from '../helpers/filesystemValidation';
 
 import type { ChangePin } from '@onekeyfe/hd-transport';
 
 export default class DeviceChangePin extends BaseMethod<ChangePin> {
   init() {
-    this.unlockPolicy = 'retry-on-locked';
     this.useDevicePassphraseState = false;
 
     // check payload
@@ -17,29 +13,9 @@ export default class DeviceChangePin extends BaseMethod<ChangePin> {
     this.params = {
       remove: this.payload.remove,
     };
-    this.protocolV2UiInteraction = {
-      request: 'button',
-      source: 'method-lifecycle',
-      reason: 'change-pin',
-      completion: 'operation-completed',
-      deviceOnly: true,
-      page: DeviceSettingsPage.DevicePinChange,
-    };
   }
 
   async run() {
-    if (this.device.isProtocolV2()) {
-      if (this.params.remove) {
-        throw invalidParameter(
-          'Parameter [remove=true] is not supported by the Pro2 device PIN page.'
-        );
-      }
-      const res = await this.device.commands.typedCall('DeviceSettingsPageShow', 'Success', {
-        page: DeviceSettingsPage.DevicePinChange,
-      });
-      return Promise.resolve(res.message);
-    }
-
     const res = await this.device.commands.typedCall('ChangePin', 'Success', {
       ...this.params,
     });