@onekeyfe/hd-core 1.2.0-alpha.23 → 1.2.0-alpha.25

package/src/api/FirmwareUpdate.ts

@@ -133,14 +133,6 @@ export default class FirmwareUpdate extends BaseMethod<Params> {
     const { features, commands } = device;
     const deviceType = device.getCurrentDeviceType();
 
-    // Protocol V2 (Pro2) uses DeviceFirmwareUpdate and must not enter this legacy flow.
-    if (device.isProtocolV2()) {
-      throw ERRORS.TypedError(
-        HardwareErrorCode.RuntimeError,
-        'Protocol V2 firmware update must use firmwareUpdateV4'
-      );
-    }
-
     if (!device.isBootloader() && features) {
       const serialNo = device.getCurrentSerialNo();
       // should go to bootloader mode manually

package/src/api/FirmwareUpdateV3.ts

@@ -140,12 +140,6 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
   }
 
   async run() {
-    if (this.device.isProtocolV2()) {
-      throw ERRORS.TypedError(
-        HardwareErrorCode.RuntimeError,
-        'Protocol V2 firmware update must use firmwareUpdateV4'
-      );
-    }
     Log.debug('FirmwareUpdateV3 strategy: Protocol V1');
     return this.runProtocolV1();
   }

package/src/api/FirmwareUpdateV4.ts

@@ -2,6 +2,7 @@ import { ERRORS, HardwareError, HardwareErrorCode, wait } from '@onekeyfe/hd-sha
 import {
   DeviceRebootType,
   PROTOCOL_V2_BLE_FILE_CHUNK_SIZE,
+  PROTOCOL_V2_BLE_FILE_READ_CHUNK_SIZE,
   PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE,
 } from '@onekeyfe/hd-transport';
 
@@ -393,7 +394,10 @@ export const assertProtocolV2ReconnectIdentity = (
   actualSerialNumber?: string
 ) => {
   if (!expectedSerialNumber || !actualSerialNumber) {
-    return;
+    throw ERRORS.TypedError(
+      HardwareErrorCode.DeviceNotFound,
+      'Protocol V2 reconnect physical identity is unavailable'
+    );
   }
   if (actualSerialNumber !== expectedSerialNumber) {
     throw ERRORS.TypedError(
@@ -414,6 +418,10 @@ export const assertProtocolV2ReconnectIdentity = (
 export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareUpdateV4Params> {
   private protocolV2ExpectedSerialNumber?: string;
 
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
   private protocolV2PreparedSources: FirmwareByteSource[] = [];
 
   private protocolV2ExecutionInLoader = false;
@@ -422,6 +430,8 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
   private protocolV2LatestFinalFeatures?: Features;
 
+  private protocolV2FinalStatusVerified = false;
+
   init() {
     this.allowDeviceMode = [UI_REQUEST.BOOTLOADER, UI_REQUEST.NOT_INITIALIZE];
     this.requireDeviceMode = [];
@@ -538,13 +548,17 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     };
   }
 
-  private getProtocolV2FirmwareChunkSize() {
+  private getProtocolV2FirmwareChunkSize(direction: 'read' | 'write' = 'write') {
     const payloadChunkSize = Number(this.params?.chunkSize);
     const env = DataManager.getSettings('env');
-    const maxChunkSize =
-      this.params?.platform === 'native' || (env && DataManager.isBleConnect(env))
-        ? PROTOCOL_V2_BLE_FILE_CHUNK_SIZE
-        : PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE;
+    const isBle = this.params?.platform === 'native' || (env && DataManager.isBleConnect(env));
+    let maxChunkSize = PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE;
+    if (isBle) {
+      maxChunkSize =
+        direction === 'read'
+          ? PROTOCOL_V2_BLE_FILE_READ_CHUNK_SIZE
+          : PROTOCOL_V2_BLE_FILE_CHUNK_SIZE;
+    }
     if (!Number.isFinite(payloadChunkSize) || payloadChunkSize <= 0) {
       return maxChunkSize;
     }
@@ -555,13 +569,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   }
 
   async run() {
-    if (!this.device.isProtocolV2()) {
-      throw ERRORS.TypedError(
-        HardwareErrorCode.RuntimeError,
-        'firmwareUpdateV4 requires a Protocol V2 device'
-      );
-    }
-
     Log.debug('FirmwareUpdateV4 strategy: Protocol V2');
     return this.runProtocolV2();
   }
@@ -872,9 +879,16 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
               Math.floor(statusVersion / 0x100) % 0x100
             }.${statusVersion % 0x100}`;
       if (!observedVersion) {
-        Log.warn(
-          `Protocol V2 target ${target} has no observable final version; skipping version comparison`
-        );
+        if (this.protocolV2FinalStatusVerified) {
+          Log.warn(
+            `Protocol V2 target ${target} has no observable final version; completed target status is authoritative`
+          );
+        } else {
+          throw ERRORS.TypedError(
+            HardwareErrorCode.FirmwareVerificationFailed,
+            `Protocol V2 target ${target} has no observable final version after status fallback`
+          );
+        }
       } else if (observedVersion !== expectedVersion) {
         throw ERRORS.TypedError(
           HardwareErrorCode.FirmwareVerificationFailed,
@@ -944,8 +958,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         preparedPlan: this.params.preparedPlan,
         deviceIdentity: serialNumber,
       });
-    } else {
+    } else if (this.params?.expectedDeviceId) {
       assertProtocolV2ReconnectIdentity(this.params?.expectedDeviceId, serialNumber);
+    } else {
+      assertProtocolV2ReconnectIdentity(serialNumber, serialNumber);
     }
     this.protocolV2ExpectedSerialNumber = serialNumber;
   }
@@ -1047,7 +1063,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       return null;
     }
 
-    const chunkSize = this.getProtocolV2FirmwareChunkSize();
+    const chunkSize = this.getProtocolV2FirmwareChunkSize('read');
     const chunks: Uint8Array[] = [];
     let offset = 0;
     while (offset < PROTOCOL_V2_OKPP_HEADER_SIZE) {
@@ -1745,6 +1761,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   private async waitForProtocolV2FirmwareUpdateComplete(
     targets: Array<{ target_id: number; path: string }>
   ) {
+    this.protocolV2FinalStatusVerified = false;
     const expectedTargetIds = new Set(targets.map(target => target.target_id));
     const expectedPaths = new Map(targets.map(target => [target.target_id, target.path]));
     const startTime = Date.now();
@@ -1774,6 +1791,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
               expectedPaths
             )
           ) {
+            this.protocolV2FinalStatusVerified = true;
             return;
           }
           lastError = new Error('Protocol V2 firmware targets are still installing');

package/src/api/GetDeviceState.ts

@@ -17,6 +17,10 @@ const isLoaderMode = (mode: string) => mode === 'bootloader' || mode === 'romloa
 export default class GetDeviceState extends BaseMethod<
   Required<Pick<GetDeviceStateParams, 'scope'>>
 > {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   init() {
     const scope = (this.payload.scope ?? 'runtime') as DeviceStateScope;
     if (!Object.prototype.hasOwnProperty.call(SCOPE_SECTIONS, scope)) {

package/src/api/GetFeatures.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 { projectFeatures } from '../device/DeviceStateProjector';
@@ -20,9 +20,6 @@ export default class GetFeatures extends BaseMethod {
     if (this.payload?.detectBootloaderDevice && this.device.isBootloader()) {
       return Promise.reject(ERRORS.TypedError(HardwareErrorCode.DeviceDetectInBootloaderMode));
     }
-    if (this.device.isProtocolV2()) {
-      throw createDeviceNotSupportMethodError(this.name, this.device.getCurrentFirmwareType());
-    }
     const state = await this.device.getDeviceState({
       includeRaw: true,
     });

package/src/api/GetOnekeyFeatures.ts

@@ -1,5 +1,4 @@
 import semver from 'semver';
-import { createDeviceNotSupportMethodError } from '@onekeyfe/hd-shared';
 
 import { UI_REQUEST } from '../constants/ui-request';
 import { fixVersion } from '../utils/deviceFeaturesUtils';
@@ -26,10 +25,6 @@ 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);
     return Promise.resolve(message);

package/src/api/GetPassphraseState.ts

@@ -5,6 +5,10 @@ import { getPassphraseStateWithRefreshDeviceInfo } from '../utils/deviceFeatures
 import { BaseMethod } from './BaseMethod';
 
 export default class GetPassphraseState extends BaseMethod {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   init() {
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
     this.useDevicePassphraseState = false;

package/src/api/OpenWalletSession.ts

@@ -21,13 +21,6 @@ const requiredString = (value: unknown, name: string) => {
   return value.trim();
 };
 
-const optionalBoolean = (value: unknown, name: string) => {
-  if (value !== undefined && typeof value !== 'boolean') {
-    throw invalidParameter(`Parameter [${name}] must be a boolean.`);
-  }
-  return value;
-};
-
 const wasResumed = (session: unknown) =>
   !!session &&
   typeof session === 'object' &&
@@ -53,72 +46,31 @@ const requireHiddenWalletResponse = (session: {
   };
 };
 
-type NormalizedOpenWalletSessionParams = OpenWalletSessionParams & {
-  legacySessionToClear?: {
-    deviceId?: string;
-    passphraseState: string;
-  };
-};
-
-const normalizeParams = (payload: Record<string, unknown>): NormalizedOpenWalletSessionParams => {
-  if (payload.mode !== undefined) {
-    if (
-      payload.mode !== 'standard' &&
-      payload.mode !== 'select-hidden' &&
-      payload.mode !== 'resume-hidden'
-    ) {
-      throw invalidParameter(
-        'Parameter [mode] must be one of standard, select-hidden, or resume-hidden.'
-      );
-    }
-    if (payload.useEmptyPassphrase !== undefined || payload.initSession !== undefined) {
-      throw invalidParameter(
-        'Parameters [useEmptyPassphrase] and [initSession] cannot be used with [mode].'
-      );
-    }
-    if (payload.mode === 'standard' || payload.mode === 'select-hidden') {
-      if (payload.deviceId !== undefined || payload.passphraseState !== undefined) {
-        throw invalidParameter(
-          'Parameters [deviceId] and [passphraseState] are only allowed with mode [resume-hidden].'
-        );
-      }
-      return { mode: payload.mode };
-    }
-    return {
-      mode: 'resume-hidden',
-      deviceId: requiredString(payload.deviceId, 'deviceId'),
-      passphraseState: requiredString(payload.passphraseState, 'passphraseState'),
-    };
+const normalizeParams = (payload: Record<string, unknown>): OpenWalletSessionParams => {
+  if (payload.mode === undefined) {
+    throw invalidParameter('Parameter [mode] is required.');
   }
-
-  const useEmptyPassphrase = optionalBoolean(payload.useEmptyPassphrase, 'useEmptyPassphrase');
-  const initSession = optionalBoolean(payload.initSession, 'initSession');
-  if (useEmptyPassphrase === true) {
-    return { mode: 'standard' };
+  if (
+    payload.mode !== 'standard' &&
+    payload.mode !== 'select-hidden' &&
+    payload.mode !== 'resume-hidden'
+  ) {
+    throw invalidParameter(
+      'Parameter [mode] must be one of standard, select-hidden, or resume-hidden.'
+    );
   }
-  if (initSession === true) {
-    const deviceId =
-      payload.deviceId === undefined ? undefined : requiredString(payload.deviceId, 'deviceId');
-    const passphraseState =
-      payload.passphraseState === undefined
-        ? undefined
-        : requiredString(payload.passphraseState, 'passphraseState');
-    return {
-      mode: 'select-hidden',
-      ...(passphraseState
-        ? {
-            legacySessionToClear: {
-              deviceId,
-              passphraseState,
-            },
-          }
-        : {}),
-    };
+  if (payload.useEmptyPassphrase !== undefined || payload.initSession !== undefined) {
+    throw invalidParameter(
+      'Legacy parameters [useEmptyPassphrase] and [initSession] are not supported by openWalletSession.'
+    );
   }
-
-  const hasWalletBinding = payload.deviceId !== undefined || payload.passphraseState !== undefined;
-  if (!hasWalletBinding) {
-    return { mode: 'select-hidden' };
+  if (payload.mode === 'standard' || payload.mode === 'select-hidden') {
+    if (payload.deviceId !== undefined || payload.passphraseState !== undefined) {
+      throw invalidParameter(
+        'Parameters [deviceId] and [passphraseState] are only allowed with mode [resume-hidden].'
+      );
+    }
+    return { mode: payload.mode };
   }
   return {
     mode: 'resume-hidden',
@@ -127,7 +79,11 @@ const normalizeParams = (payload: Record<string, unknown>): NormalizedOpenWallet
   };
 };
 
-export default class OpenWalletSession extends BaseMethod<NormalizedOpenWalletSessionParams> {
+export default class OpenWalletSession extends BaseMethod<OpenWalletSessionParams> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   init() {
     this.useDevicePassphraseState = false;
     this.skipForceUpdateCheck = true;
@@ -139,33 +95,18 @@ export default class OpenWalletSession extends BaseMethod<NormalizedOpenWalletSe
     const isProtocolV2 = this.device.isProtocolV2();
     const state = await this.device.getDeviceState({ refreshSections: ['status'] });
     let currentDeviceId = state.identity.deviceId;
-    const { legacySessionToClear } = this.params;
     const requireDeviceId = () => {
       if (!currentDeviceId) {
         throw ERRORS.TypedError(HardwareErrorCode.DeviceInitializeFailed);
       }
       return currentDeviceId;
     };
-    const clearLegacySession = () => {
-      const deviceId = requireDeviceId();
-      if (
-        legacySessionToClear &&
-        (!legacySessionToClear.deviceId || legacySessionToClear.deviceId === deviceId)
-      ) {
-        deviceWalletSessionStore.delete(deviceId, legacySessionToClear.passphraseState);
-      }
-    };
     const refreshProtocolV2DeviceId = async () => {
       const refreshedState = await this.device.getDeviceState({ refreshSections: ['status'] });
       currentDeviceId = refreshedState.identity.deviceId;
-      clearLegacySession();
       return requireDeviceId();
     };
 
-    if (!isProtocolV2) {
-      clearLegacySession();
-    }
-
     const protocol = isProtocolV2 ? 'V2' : 'V1';
 
     if (this.params.mode === 'standard') {

package/src/api/PathInfo.ts

@@ -10,9 +10,12 @@ export type PathInfoParams = {
 };
 
 export default class PathInfo extends BaseMethod<PathInfoParams> {
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
   init() {
     // Protocol V2 (Pro2) only; Core rejects non-V2 devices.
-    this.requireProtocolV2 = true;
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
     this.params = {

package/src/api/alephium/AlephiumGetAddress.ts

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

package/src/api/alephium/AlephiumSignMessage.ts

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

package/src/api/alephium/AlephiumSignTransaction.ts

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

package/src/api/algo/AlgoGetAddress.ts

@@ -6,6 +6,10 @@ import type { AlgorandGetAddress as HardwareAlgoGetAddress } from '@onekeyfe/hd-
 import type { AlgoAddress, AlgoGetAddressParams } from '../../types';
 
 export default class AlgoGetAddress extends BaseMethod<HardwareAlgoGetAddress[]> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   hasBundle = false;
 
   init() {

package/src/api/algo/AlgoSignTransaction.ts

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

package/src/api/allnetwork/AllNetworkGetAddressBase.ts

@@ -12,7 +12,6 @@ import { validateParams } from '../helpers/paramsValidator';
 import { PROTO } from '../../constants';
 import { findMethod } from '../utils';
 import { DEVICE, IFRAME, createUiMessage } from '../../events';
-import { isMethodVersionRangeUnsupported } from '../../utils';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { onDeviceButtonHandler } from '../../core';
 import {
@@ -260,6 +259,10 @@ export default abstract class AllNetworkGetAddressBase extends BaseMethod<
     chain_name?: string;
   }[]
 > {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   abortController: AbortController | null = null;
 
   init() {
@@ -459,13 +462,10 @@ export default abstract class AllNetworkGetAddressBase extends BaseMethod<
  * @param method BaseMethod
  */
 function preCheckDeviceSupport(device: Device, method: BaseMethod) {
+  method.assertProtocolSupported(device.getProtocol(), device.getCurrentFirmwareType());
   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());
-  }
-
   if (
     versionRange &&
     semver.valid(versionRange.min) &&
@@ -505,14 +505,6 @@ function handleSkippableHardwareError(
     );
     const currentVersion = device.getCurrentFirmwareVersionString() ?? '0.0.0';
 
-    if (isMethodVersionRangeUnsupported(versionRange)) {
-      error = ERRORS.createDeviceNotSupportMethodError(
-        method.name,
-        device.getCurrentFirmwareType()
-      );
-      return error;
-    }
-
     if (
       versionRange &&
       semver.valid(versionRange.min) &&

package/src/api/aptos/AptosGetAddress.ts

@@ -12,6 +12,10 @@ import type { AptosAddress, AptosGetAddressParams } from '../../types';
 import type { AptosGetAddress as HardwareAptosGetAddress } from '@onekeyfe/hd-transport';
 
 export default class AptosGetAddress extends BaseMethod<HardwareAptosGetAddress[]> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   hasBundle = false;
 
   shouldConfirm = false;

package/src/api/aptos/AptosGetPublicKey.ts

@@ -7,6 +7,10 @@ import { batchGetPublickeys } from '../helpers/batchGetPublickeys';
 import type { AptosGetAddressParams, AptosPublicKey } from '../../types';
 
 export default class AptosGetPublicKey extends BaseMethod<any> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   hasBundle = false;
 
   init() {

package/src/api/aptos/AptosSignInMessage.ts

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

package/src/api/aptos/AptosSignMessage.ts

@@ -7,6 +7,10 @@ import type { AptosSignMessage as HardwareAptosSignMessage } from '@onekeyfe/hd-
 import type { AptosMessageSignature, AptosSignMessageParams } from '../../types';
 
 export default class AptosSignMessage extends BaseMethod<HardwareAptosSignMessage> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];

package/src/api/aptos/AptosSignTransaction.ts

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

package/src/api/benfen/BenfenGetAddress.ts

@@ -1,3 +1,5 @@
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
@@ -8,6 +10,13 @@ import { batchGetPublickeys, supportBatchPublicKeyByDevice } from '../helpers/ba
 import type { BenfenAddress, BenfenGetAddressParams, DeviceFirmwareRange } from '../../types';
 import type { BenfenGetAddress as HardwareBenfenGetAddress } from '@onekeyfe/hd-transport';
 
+const requireAddress = (address: string | undefined): string => {
+  if (address == null) {
+    throw ERRORS.TypedError(HardwareErrorCode.CallMethodError, "Field 'address' is null");
+  }
+  return address;
+};
+
 export default class BenfenGetAddress extends BaseMethod<HardwareBenfenGetAddress[]> {
   hasBundle = false;
 
@@ -48,10 +57,6 @@ export default class BenfenGetAddress extends BaseMethod<HardwareBenfenGetAddres
 
   getVersionRange(): DeviceFirmwareRange {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       pro: {
         min: '4.12.0',
       },
@@ -78,8 +83,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 = requireAddress(addressRes.message.address);
         } else {
           address = publicKeyToAddress(publicKey);
         }
@@ -107,7 +111,7 @@ export default class BenfenGetAddress extends BaseMethod<HardwareBenfenGetAddres
           );
           const result = {
             path: serializedPath(param.address_n),
-            address: hex2BfcAddress(res.message.address ?? ''),
+            address: hex2BfcAddress(requireAddress(res.message.address)),
           };
           if (this.shouldConfirm) {
             this.postPreviousAddressMessage(result);

package/src/api/benfen/BenfenGetPublicKey.ts

@@ -40,10 +40,6 @@ export default class BenfenGetPublicKey extends BaseMethod<any> {
 
   getVersionRange(): DeviceFirmwareRange {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       pro: {
         min: '4.12.0',
       },

package/src/api/benfen/BenfenSignMessage.ts

@@ -29,10 +29,6 @@ export default class BenfenSignMessage extends BaseMethod<HardwareBenfenSignMess
 
   getVersionRange(): DeviceFirmwareRange {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       pro: {
         min: '4.12.0',
       },

package/src/api/benfen/BenfenSignTransaction.ts

@@ -36,10 +36,6 @@ export default class BenfenSignTransaction extends BaseMethod<BenfenSignTx> {
 
   getVersionRange(): DeviceFirmwareRange {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       pro: {
         min: '4.12.0',
       },

package/src/api/btc/BTCGetAddress.ts

@@ -3,7 +3,10 @@ import { getScriptType, serializedPath, validatePath } from '../helpers/pathUtil
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
 import { getCoinInfo } from './helpers/btcParamsUtils';
-import { getBitcoinForkVersionRange } from './helpers/versionLimit';
+import {
+  getBitcoinForkSupportedProtocols,
+  getBitcoinForkVersionRange,
+} from './helpers/versionLimit';
 
 import type { BTCAddress, BTCGetAddressParams } from '../../types/api/btcGetAddress';
 import type { GetAddress } from '@onekeyfe/hd-transport';
@@ -11,6 +14,10 @@ import type { GetAddress } from '@onekeyfe/hd-transport';
 export default class BTCGetAddress extends BaseMethod<GetAddress[]> {
   hasBundle = false;
 
+  getSupportedProtocols() {
+    return getBitcoinForkSupportedProtocols(this.params?.map(param => param.coin_name) ?? []);
+  }
+
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];