@onekeyfe/hd-core 1.2.0-alpha.8 → 1.2.0-alpha.9

package/src/api/index.ts

@@ -7,6 +7,7 @@ export { default as getDeviceInfo } from './GetDeviceInfo';
 export { default as getOnekeyFeatures } from './GetOnekeyFeatures';
 export { default as getPassphraseState } from './GetPassphraseState';
 export { default as getLogs } from './GetLogs';
+export { default as clearSessionCache } from './ClearSessionCache';
 export { default as checkFirmwareRelease } from './CheckFirmwareRelease';
 export { default as checkBLEFirmwareRelease } from './CheckBLEFirmwareRelease';
 export { default as checkBridgeStatus } from './CheckBridgeStatus';
@@ -47,6 +48,8 @@ export { default as protocolInfoRequest } from './protocol-v2/ProtocolInfoReques
 export { default as ping } from './protocol-v2/Ping';
 export { default as deviceReboot } from './protocol-v2/DeviceReboot';
 export { default as deviceInfoGet } from './protocol-v2/DeviceInfoGet';
+export { default as deviceStatusGet } from './protocol-v2/DeviceStatusGet';
+export { default as deviceSessionGet } from './protocol-v2/DeviceSessionGet';
 export { default as deviceFirmwareUpdate } from './protocol-v2/DeviceFirmwareUpdate';
 export { default as deviceGetFirmwareUpdateStatus } from './protocol-v2/DeviceGetFirmwareUpdateStatus';
 export { default as deviceFactoryInfoSet } from './protocol-v2/DeviceFactoryInfoSet';

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

@@ -0,0 +1,26 @@
+import { BaseMethod } from '../BaseMethod';
+
+export type DeviceSessionGetParams = {
+  sessionId?: string;
+};
+
+export default class DeviceSessionGet extends BaseMethod<DeviceSessionGetParams> {
+  init() {
+    this.requireProtocolV2 = true;
+    this.useDevicePassphraseState = false;
+    this.skipForceUpdateCheck = true;
+    this.params = {
+      sessionId: this.payload.sessionId,
+    };
+  }
+
+  async run() {
+    const payload = this.params.sessionId ? { session_id: this.params.sessionId } : {};
+    const { message } = await this.device.commands.typedCall(
+      'DeviceSessionGet',
+      'DeviceSession',
+      payload
+    );
+    return message;
+  }
+}

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

@@ -0,0 +1,14 @@
+import { BaseMethod } from '../BaseMethod';
+
+export default class DeviceStatusGet extends BaseMethod {
+  init() {
+    this.requireProtocolV2 = true;
+    this.useDevicePassphraseState = false;
+    this.skipForceUpdateCheck = true;
+  }
+
+  async run() {
+    const { message } = await this.device.commands.typedCall('DeviceStatusGet', 'DeviceStatus', {});
+    return message;
+  }
+}

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

@@ -10,7 +10,10 @@ export default class FilesystemFormat extends BaseMethod {
   }
 
   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/helpers.ts

@@ -5,8 +5,8 @@ import { ProtocolV2FirmwareTargetType } from '../../protocols/protocol-v2/firmwa
 
 import type {
   DeviceFirmwareTarget,
-  DeviceFirmwareUpdateRecordFields,
   DeviceFirmwareTargetType,
+  DeviceFirmwareUpdateRecordFields,
   TransportCallOptions,
 } from '@onekeyfe/hd-transport';
 
@@ -138,16 +138,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 +165,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/data/messages/messages-protocol-v2.json

@@ -107,8 +107,6 @@
         "MessageType_FirmwareHash": 89,
         "MessageType_UnlockPath": 93,
         "MessageType_UnlockedPathRequest": 94,
-        "MessageType_UnLockDevice": 10030,
-        "MessageType_UnLockDeviceResponse": 10031,
         "MessageType_SetU2FCounter": 63,
         "MessageType_GetNextU2FCounter": 80,
         "MessageType_NextU2FCounter": 81,
@@ -197,6 +195,7 @@
         "MessageType_EthereumGnosisSafeTxAck": 20118,
         "MessageType_EthereumGnosisSafeTxRequest": 20119,
         "MessageType_EthereumSignTxEIP7702OneKey": 20120,
+        "MessageType_EthereumSignTypedDataQR": 20121,
         "MessageType_NEMGetAddress": 67,
         "MessageType_NEMAddress": 68,
         "MessageType_NEMSignTx": 69,
@@ -454,6 +453,8 @@
         "MessageType_UiviewConfirmTxRequest": 30202,
         "MessageType_UiviewConfirmSignMessageRequest": 30203,
         "MessageType_UiviewResponse": 30204,
+        "MessageType_UnLockDevice": 10030,
+        "MessageType_UnLockDeviceResponse": 10031,
         "MessageType_DeviceFactoryInfoSet": 60000,
         "MessageType_DeviceFactoryInfoGet": 60001,
         "MessageType_DeviceFactoryInfo": 60002,
@@ -478,6 +479,12 @@
         "MessageType_Wallpaper": 60432,
         "MessageType_DeviceInfoGet": 60600,
         "MessageType_DeviceInfo": 60601,
+        "MessageType_DeviceStatusGet": 60602,
+        "MessageType_DeviceStatus": 60603,
+        "MessageType_DevGetOnboardingStatus": 60604,
+        "MessageType_DevOnboardingStatus": 60605,
+        "MessageType_DeviceSessionGet": 60606,
+        "MessageType_DeviceSession": 60607,
         "MessageType_FilesystemPermissionFix": 60800,
         "MessageType_FilesystemPathInfo": 60801,
         "MessageType_FilesystemPathInfoQuery": 60802,
@@ -492,7 +499,8 @@
         "MessageType_FilesystemFormat": 60811,
         "MessageType_DeviceFirmwareUpdateRequest": 61000,
         "MessageType_DeviceFirmwareUpdateStatusGet": 61001,
-        "MessageType_DeviceFirmwareUpdateStatus": 61002
+        "MessageType_DeviceFirmwareUpdateStatus": 61002,
+        "MessageType_PortfolioUpdate": 61200
       },
       "reserved": [
         [90, 92],
@@ -5395,6 +5403,37 @@
         }
       }
     },
+    "EthereumSignTypedDataQR": {
+      "fields": {
+        "address_n": {
+          "rule": "repeated",
+          "type": "uint32",
+          "id": 1,
+          "options": {
+            "packed": false
+          }
+        },
+        "json_data": {
+          "type": "bytes",
+          "id": 2
+        },
+        "chain_id": {
+          "type": "uint64",
+          "id": 3
+        },
+        "metamask_v4_compat": {
+          "type": "bool",
+          "id": 4,
+          "options": {
+            "default": true
+          }
+        },
+        "request_id": {
+          "type": "bytes",
+          "id": 5
+        }
+      }
+    },
     "EthereumGetPublicKeyOneKey": {
       "fields": {
         "address_n": {
@@ -11120,6 +11159,26 @@
         }
       }
     },
+    "ViewRawData": {
+      "fields": {
+        "initial_data": {
+          "rule": "required",
+          "type": "string",
+          "id": 1
+        },
+        "placeholder": {
+          "rule": "required",
+          "type": "uint32",
+          "id": 2
+        }
+      }
+    },
+    "ViewSignLayout": {
+      "values": {
+        "LayoutDefault": 0,
+        "LayoutSafeTxCreate": 1
+      }
+    },
     "ViewSignPage": {
       "fields": {
         "title": {
@@ -11139,6 +11198,24 @@
         "tip": {
           "type": "ViewTip",
           "id": 4
+        },
+        "raw_data": {
+          "type": "ViewRawData",
+          "id": 5
+        },
+        "slide_to_confirm": {
+          "type": "bool",
+          "id": 6,
+          "options": {
+            "default": true
+          }
+        },
+        "layout": {
+          "type": "ViewSignLayout",
+          "id": 7,
+          "options": {
+            "default": "LayoutDefault"
+          }
         }
       }
     },
@@ -11892,6 +11969,46 @@
         }
       }
     },
+    "DeviceStatusGet": {
+      "fields": {}
+    },
+    "DevOnboardingStage": {
+      "values": {
+        "DEV_ONBOARDING_STAGE_UNKNOWN": 0,
+        "DEV_ONBOARDING_STAGE_SAFETY_CHECK": 1,
+        "DEV_ONBOARDING_STAGE_PERSONALIZATION": 2,
+        "DEV_ONBOARDING_STAGE_SELECT_SETUP_METHOD": 3,
+        "DEV_ONBOARDING_STAGE_NEW_DEVICE": 4,
+        "DEV_ONBOARDING_STAGE_SELECT_RESTORE_METHOD": 5,
+        "DEV_ONBOARDING_STAGE_RESTORE_MNEMONIC": 6,
+        "DEV_ONBOARDING_STAGE_RESTORE_SEEDCARD": 7,
+        "DEV_ONBOARDING_STAGE_WALLET_READY": 8,
+        "DEV_ONBOARDING_STAGE_SEEDCARD_BACKUP_PROMPT": 9,
+        "DEV_ONBOARDING_STAGE_SELECT_SEEDCARD_BACKUP_METHOD": 10,
+        "DEV_ONBOARDING_STAGE_SEEDCARD_BACKUP": 11,
+        "DEV_ONBOARDING_STAGE_DONE": 12
+      }
+    },
+    "DevGetOnboardingStatus": {
+      "fields": {}
+    },
+    "DevOnboardingStatus": {
+      "fields": {
+        "stage": {
+          "rule": "required",
+          "type": "DevOnboardingStage",
+          "id": 1
+        },
+        "status_code": {
+          "type": "uint32",
+          "id": 2
+        },
+        "detail_code": {
+          "type": "uint32",
+          "id": 3
+        }
+      }
+    },
     "FilesystemPermissionFix": {
       "fields": {}
     },
@@ -12105,6 +12222,20 @@
       }
     },
     "FilesystemFormat": {
+      "fields": {
+        "data": {
+          "rule": "required",
+          "type": "bool",
+          "id": 1
+        },
+        "user": {
+          "rule": "required",
+          "type": "bool",
+          "id": 2
+        }
+      }
+    },
+    "PortfolioUpdate": {
       "fields": {}
     },
     "google": {

package/src/data/messages/messages.json

@@ -7784,6 +7784,14 @@
         "passphrase_state": {
           "type": "string",
           "id": 1
+        },
+        "_only_main_pin": {
+          "type": "bool",
+          "id": 2
+        },
+        "allow_create_attach_pin": {
+          "type": "bool",
+          "id": 3
         }
       }
     },

package/src/device/Device.ts

@@ -9,6 +9,7 @@ import {
   HardwareError,
   HardwareErrorCode,
   createDeferred,
+  createDeviceNotSupportMethodError,
 } from '@onekeyfe/hd-shared';
 
 import {
@@ -31,6 +32,7 @@ import {
 import { generateInstanceId } from '../utils/tracing';
 // eslint-disable-next-line import/no-cycle
 import { DeviceCommands } from './DeviceCommands';
+import { deviceWalletSessionStore } from './DeviceWalletSessionStore';
 import {
   type DeviceFirmwareRange,
   DeviceModelToTypes,
@@ -53,6 +55,7 @@ import {
   PROTOCOL_V2_STATUS_DEVICE_INFO_REQUEST,
   requestProtocolV2DeviceInfo,
 } from '../protocols/protocol-v2/features';
+import { refreshProtocolV2DeviceStatus } from '../protocols/protocol-v2/walletSession';
 import { buildProtocolV1FeaturesPayload, buildProtocolV2FeaturesPayload } from '../deviceProfile';
 
 import type { PROTO } from '../constants';
@@ -65,6 +68,7 @@ import type { PassphrasePromptResponse } from './DeviceCommands';
 import type { Deferred, HardwareConnectProtocol } from '@onekeyfe/hd-shared';
 import type {
   OneKeyDeviceInfo as DeviceDescriptor,
+  DeviceStatus,
   ProtocolV2DeviceInfo,
   Success,
 } from '@onekeyfe/hd-transport';
@@ -119,8 +123,6 @@ export interface Device {
   emit<K extends keyof DeviceEvents>(type: K, ...args: DeviceEvents[K]): boolean;
 }
 
-const deviceSessionCache: Record<string, string> = {};
-
 /**
  * Pre-populate the device session cache with a known session ID.
  *
@@ -138,8 +140,7 @@ export function preloadSessionCache(
   passphraseState: string,
   sessionId: string
 ): void {
-  const key = `${deviceId}@${passphraseState}`;
-  deviceSessionCache[key] = sessionId;
+  deviceWalletSessionStore.set(deviceId, passphraseState, sessionId);
 }
 
 export class Device extends EventEmitter {
@@ -265,7 +266,7 @@ export class Device extends EventEmitter {
     const connectId = this.getConnectId();
     const deviceId = this.getCurrentDeviceId() || null;
 
-    const features = this.features;
+    const { features } = this;
 
     return {
       /** Android uses Mac address, iOS uses uuid, USB uses uuid  */
@@ -628,13 +629,6 @@ export class Device extends EventEmitter {
     };
   }
 
-  private generateStateKey(deviceId: string, passphraseState?: string) {
-    if (passphraseState) {
-      return `${deviceId}@${passphraseState}`;
-    }
-    return deviceId;
-  }
-
   private getSessionCacheDeviceKey(_deviceId?: string) {
     const deviceId = _deviceId || this.getCurrentDeviceId();
     if (deviceId) return deviceId;
@@ -645,7 +639,6 @@ export class Device extends EventEmitter {
   }
 
   getInternalState(_deviceId?: string) {
-    Log.debug('getInternalState session cache: ', deviceSessionCache);
     Log.debug(
       'getInternalState session param: ',
       `device_id: ${_deviceId}`,
@@ -663,8 +656,7 @@ export class Device extends EventEmitter {
     // downstream call carries it and hits the primary lookup below.
     if (!this.passphraseState) return undefined;
 
-    const usePassKey = this.generateStateKey(deviceId, this.passphraseState);
-    return deviceSessionCache[usePassKey];
+    return deviceWalletSessionStore.get(deviceId, this.passphraseState);
   }
 
   // attach to pin to fix internal state
@@ -680,36 +672,26 @@ export class Device extends EventEmitter {
       `device_id: ${deviceId}`,
       `enablePassphrase: ${enablePassphrase}`,
       `passphraseState: ${passphraseState}`,
-      `sessionId: ${sessionId}`,
-      `featuresSessionId: ${featuresSessionId}`
+      `hasSessionId: ${Boolean(sessionId)}`,
+      `hasFeaturesSessionId: ${Boolean(featuresSessionId)}`
     );
 
     const cacheDeviceKey = this.getSessionCacheDeviceKey(deviceId);
     if (!cacheDeviceKey) return;
 
     if (enablePassphrase) {
-      // update the sessionId
-      if (sessionId) {
-        deviceSessionCache[this.generateStateKey(cacheDeviceKey, passphraseState)] = sessionId;
-      } else if (featuresSessionId) {
-        deviceSessionCache[this.generateStateKey(cacheDeviceKey, passphraseState)] =
-          featuresSessionId;
-      }
-    }
-
-    // delete the old sessionId
-    const oldKey = `${cacheDeviceKey}`;
-    if (deviceSessionCache[oldKey]) {
-      delete deviceSessionCache[oldKey];
+      const walletSessionId =
+        sessionId || featuresSessionId || deviceWalletSessionStore.getPending(cacheDeviceKey);
+      deviceWalletSessionStore.set(cacheDeviceKey, passphraseState, walletSessionId ?? undefined);
     }
 
-    Log.debug('updateInternalState session cache: ', deviceSessionCache);
+    deviceWalletSessionStore.deletePending(cacheDeviceKey);
   }
 
   private setInternalState(state: string, initSession?: boolean) {
     Log.debug(
       'setInternalState session param: ',
-      `state: ${state}`,
+      `hasState: ${Boolean(state)}`,
       `initSession: ${initSession}`,
       `deviceId: ${this.features?.deviceId}`,
       `passphraseState: ${this.passphraseState}`
@@ -720,12 +702,11 @@ export class Device extends EventEmitter {
     const deviceId = this.getSessionCacheDeviceKey();
     if (!deviceId) return;
 
-    const key = this.generateStateKey(deviceId, this.passphraseState);
-
-    if (state) {
-      deviceSessionCache[key] = state;
+    if (this.passphraseState) {
+      deviceWalletSessionStore.set(deviceId, this.passphraseState, state);
+    } else if (initSession) {
+      deviceWalletSessionStore.setPending(deviceId, state);
     }
-    Log.debug('setInternalState done session cache: ', deviceSessionCache);
   }
 
   clearInternalState(_deviceId?: string) {
@@ -733,12 +714,10 @@ export class Device extends EventEmitter {
 
     const deviceId = this.getSessionCacheDeviceKey(_deviceId);
     if (!deviceId) return;
-    const key = `${deviceId}`;
-    delete deviceSessionCache[key];
+    deviceWalletSessionStore.deletePending(deviceId);
 
     if (this.passphraseState) {
-      const usePassKey = this.generateStateKey(deviceId, this.passphraseState);
-      delete deviceSessionCache[usePassKey];
+      deviceWalletSessionStore.delete(deviceId, this.passphraseState);
     }
   }
 
@@ -867,6 +846,7 @@ export class Device extends EventEmitter {
   }
 
   _updateFeatures(protoFeatures: PROTO.Features | Features, initSession?: boolean) {
+    const previousCacheDeviceKey = this.getSessionCacheDeviceKey();
     let feat =
       'protocol' in protoFeatures
         ? protoFeatures
@@ -876,28 +856,50 @@ export class Device extends EventEmitter {
     if (this.features?.sessionId && !feat.sessionId) {
       feat.sessionId = this.features.sessionId;
     }
-    if (this.getCurrentDeviceId() && feat.sessionId) {
-      this.setInternalState(feat.sessionId, initSession);
-    }
     feat.unlocked = feat.unlocked ?? true;
 
     feat = fixFeaturesFirmwareVersion(feat);
 
     this.features = feat;
+    const nextCacheDeviceKey = this.getSessionCacheDeviceKey();
+    if (previousCacheDeviceKey && nextCacheDeviceKey) {
+      deviceWalletSessionStore.migrateDeviceKey(previousCacheDeviceKey, nextCacheDeviceKey);
+    }
+    if (feat.deviceId && feat.sessionId) {
+      this.setInternalState(feat.sessionId, initSession);
+    }
     this.featuresNeedsReload = false;
     this.emit(DEVICE.FEATURES, this, feat);
   }
 
   updateProtocolV2Features(deviceInfo?: ProtocolV2DeviceInfo) {
+    const previousCacheDeviceKey = this.getSessionCacheDeviceKey();
     const features = fixFeaturesFirmwareVersion(
       buildProtocolV2FeaturesPayload(deviceInfo, this.features)
     );
     this.features = features;
+    const nextCacheDeviceKey = this.getSessionCacheDeviceKey();
+    if (previousCacheDeviceKey && nextCacheDeviceKey) {
+      deviceWalletSessionStore.migrateDeviceKey(previousCacheDeviceKey, nextCacheDeviceKey);
+    }
     this.featuresNeedsReload = false;
     this.emit(DEVICE.FEATURES, this, features);
     return features;
   }
 
+  updateProtocolV2Status(status: DeviceStatus) {
+    const previousDeviceInfo = this.features?.raw?.protocolV2DeviceInfo;
+    const previousStatus = previousDeviceInfo?.status;
+    return this.updateProtocolV2Features({
+      ...(previousDeviceInfo ?? {}),
+      protocol_version: previousDeviceInfo?.protocol_version ?? this.features?.protocolVersion ?? 2,
+      status: {
+        ...previousStatus,
+        ...status,
+      },
+    });
+  }
+
   /**
    * 暂时只在 acquire 后更新 Session ID
    * 后续看是否有需要依据 listen 返回结果更新
@@ -1178,8 +1180,7 @@ export class Device extends EventEmitter {
   }
 
   supportUnlockVersionRange(): DeviceFirmwareRange {
-    // 仅适用于 Protocol V1 的 Pro 系列；Pro2 走独立版本线，
-    // 且 Protocol V2 固件从首个版本即支持 UnLockDevice（见 unlockDevice 的 isProtocolV2 短路）。
+    // 仅适用于 Protocol V1 的 Pro 系列；Pro2 走独立的 Protocol V2 解锁流程。
     return {
       pro: {
         min: '4.15.0',
@@ -1188,6 +1189,23 @@ export class Device extends EventEmitter {
   }
 
   async unlockDevice() {
+    if (this.isProtocolV2()) {
+      try {
+        await this.commands.typedCall('UnLockDevice', 'UnLockDeviceResponse');
+      } catch (error) {
+        const errorText =
+          error instanceof Error
+            ? `${error.name} ${error.message}`
+            : String((error as { message?: unknown } | null)?.message ?? error ?? '');
+        if (errorText.includes('Failure_UnexpectedMessage')) {
+          throw createDeviceNotSupportMethodError('deviceUnlock', this.getCurrentFirmwareType());
+        }
+        throw error;
+      }
+
+      return refreshProtocolV2DeviceStatus(this);
+    }
+
     const firmwareVersion = this.getCurrentFirmwareVersionString() ?? '0.0.0';
     const versionRange = this.getCurrentMethodVersionRange(
       type => this.supportUnlockVersionRange()[type]
@@ -1197,9 +1215,7 @@ export class Device extends EventEmitter {
       this.features,
       Enum_Capability.Capability_AttachToPin
     );
-    // Pro2 (Protocol V2) 版本线独立于 Pro 系列，固件从首个版本即支持 UnLockDevice
     const supportUnlock =
-      this.isProtocolV2() ||
       supportAttachPinCapability ||
       (versionRange &&
         semver.valid(firmwareVersion) &&
@@ -1221,14 +1237,6 @@ export class Device extends EventEmitter {
       return Promise.resolve(features);
     }
 
-    // legacy 解锁探测仅适用于 Protocol V1 老固件；V2 固件必然支持 UnLockDevice
-    if (this.isProtocolV2()) {
-      throw ERRORS.TypedError(
-        HardwareErrorCode.RuntimeError,
-        'unlock device error: device firmware does not support UnLockDevice'
-      );
-    }
-
     const { type } = await this.commands.typedCall('GetAddress', 'Address', {
       address_n: [toHardened(44), toHardened(1), toHardened(0), 0, 0],
       coin_name: 'Testnet',