@onekeyfe/hd-core 1.2.0-alpha.52 → 1.2.0-alpha.53

package/src/protocols/protocol-v2/unlockPolicy.ts

@@ -1,105 +1 @@
-export type UnlockPolicy = 'none' | 'unlock-before-run' | 'retry-on-locked';
-
-/**
- * Protocol V2 methods that are safe to replay after a locked response.
- *
- * Keep this as an exact allowlist. Name-pattern matching can silently make a new
- * state-changing method replayable when it happens to share a suffix.
- */
-export const PROTOCOL_V2_RETRY_ON_LOCKED_METHODS = [
-  'cipherKeyValue',
-  'allNetworkGetAddress',
-  'allNetworkGetAddressByLoop',
-  'btcGetAddress',
-  'btcGetPublicKey',
-  'btcSignMessage',
-  'btcSignPsbt',
-  'btcSignTransaction',
-  'btcVerifyMessage',
-  'confluxGetAddress',
-  'confluxSignMessage',
-  'confluxSignTransaction',
-  'evmGetAddress',
-  'evmGetPublicKey',
-  'evmSignMessage',
-  'evmSignTransaction',
-  'evmSignTypedData',
-  'evmVerifyMessage',
-  'starcoinGetAddress',
-  'starcoinGetPublicKey',
-  'starcoinSignMessage',
-  'starcoinSignTransaction',
-  'starcoinVerifyMessage',
-  'nemGetAddress',
-  'nemSignTransaction',
-  'solGetAddress',
-  'solSignTransaction',
-  'solSignOffchainMessage',
-  'solSignMessage',
-  'stellarGetAddress',
-  'stellarSignTransaction',
-  'tronGetAddress',
-  'tronSignMessage',
-  'tronSignTransaction',
-  'nearGetAddress',
-  'nearSignTransaction',
-  'aptosGetAddress',
-  'aptosGetPublicKey',
-  'aptosSignTransaction',
-  'aptosSignMessage',
-  'aptosSignInMessage',
-  'algoGetAddress',
-  'algoSignTransaction',
-  'cosmosGetAddress',
-  'cosmosGetPublicKey',
-  'cosmosSignTransaction',
-  'xrpGetAddress',
-  'xrpSignTransaction',
-  'suiGetAddress',
-  'suiGetPublicKey',
-  'suiSignMessage',
-  'suiSignTransaction',
-  'cardanoGetAddress',
-  'cardanoGetPublicKey',
-  'cardanoSignTransaction',
-  'cardanoSignMessage',
-  'filecoinGetAddress',
-  'filecoinSignTransaction',
-  'polkadotGetAddress',
-  'polkadotSignTransaction',
-  'kaspaGetAddress',
-  'kaspaSignTransaction',
-  'nexaGetAddress',
-  'nexaSignTransaction',
-  'nostrGetPublicKey',
-  'nostrSignEvent',
-  'nostrEncryptMessage',
-  'nostrDecryptMessage',
-  'nostrSignSchnorr',
-  'lnurlAuth',
-  'nervosGetAddress',
-  'nervosSignTransaction',
-  'dnxGetAddress',
-  'dnxSignTransaction',
-  'tonGetAddress',
-  'tonSignMessage',
-  'tonSignProof',
-  'tonSignData',
-  'scdoGetAddress',
-  'scdoSignTransaction',
-  'scdoSignMessage',
-  'alephiumGetAddress',
-  'alephiumSignTransaction',
-  'alephiumSignMessage',
-  'benfenGetAddress',
-  'benfenGetPublicKey',
-  'benfenSignMessage',
-  'benfenSignTransaction',
-  'neoGetAddress',
-  'neoSignTransaction',
-] as const;
-
-const retryOnLockedMethods = new Set<string>(PROTOCOL_V2_RETRY_ON_LOCKED_METHODS);
-
-export const getProtocolV2UnlockPolicy = (methodName: string): UnlockPolicy =>
-  retryOnLockedMethods.has(methodName) ? 'retry-on-locked' : 'none';
+export type UnlockPolicy = 'none' | 'unlock-before-run';

package/src/protocols/protocol-v2/unlockPolicyRunner.ts

@@ -0,0 +1,118 @@
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import { DeviceSessionPinType } from '@onekeyfe/hd-transport';
+
+import { LoggerNames, getLogger } from '../../utils';
+import { isProtocolV2UiEnabled, resolveProtocolV2UiInteraction } from './uiInteraction';
+import { refreshProtocolV2DeviceStatus } from './walletSession';
+
+import type { BaseMethod } from '../../api/BaseMethod';
+import type { Device } from '../../device/Device';
+import type { HardwareUiInteractionMeta } from '../../events';
+import type { ProtocolV2UiInteractionCoordinator } from './uiInteraction';
+
+const Log = getLogger(LoggerNames.Core);
+
+export type ProtocolV2UnlockContext = {
+  preflightCompleted: boolean;
+};
+
+export const createProtocolV2UnlockContext = (): ProtocolV2UnlockContext => ({
+  preflightCompleted: false,
+});
+
+type RunnableMethod = Pick<
+  BaseMethod,
+  | 'run'
+  | 'unlockPolicy'
+  | 'useDevicePassphraseState'
+  | 'protocolV2UiInteraction'
+  | 'protocolV2UiMode'
+  | 'params'
+  | 'payload'
+> & {
+  name?: string;
+  protocolV2UnlockContext?: ProtocolV2UnlockContext;
+};
+
+type UiInteractionCoordinator = Pick<
+  ProtocolV2UiInteractionCoordinator,
+  'enterMethodInteraction' | 'enterUnlockInteraction'
+>;
+
+type RunMethodWithUnlockPolicyOptions<T> = {
+  context?: ProtocolV2UnlockContext;
+  uiCoordinator?: UiInteractionCoordinator;
+  afterStatusBeforeUnlock?: () => void | Promise<void>;
+  prepare?: () => Promise<void>;
+  run?: () => Promise<T>;
+};
+
+export async function runMethodWithUnlockPolicy<T = unknown>(
+  method: RunnableMethod,
+  device: Device,
+  options: RunMethodWithUnlockPolicyOptions<T> = {}
+): Promise<T> {
+  const {
+    context = createProtocolV2UnlockContext(),
+    uiCoordinator,
+    afterStatusBeforeUnlock,
+    prepare,
+    run: configuredRun,
+  } = options;
+  const run = configuredRun ?? (() => method.run() as Promise<T>);
+  method.protocolV2UnlockContext = context;
+
+  const shouldEmitUi = isProtocolV2UiEnabled(method);
+  const shouldCoordinateUi = shouldEmitUi && uiCoordinator !== undefined;
+  const requiresPreUnlock =
+    device.isProtocolV2() &&
+    (method.useDevicePassphraseState || method.unlockPolicy === 'unlock-before-run') &&
+    !device.isBootloader?.() &&
+    !device.isRomloader?.();
+
+  if (requiresPreUnlock && !context.preflightCompleted) {
+    const status = await refreshProtocolV2DeviceStatus(device);
+    if (typeof status?.unlocked !== 'boolean') {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        'Protocol V2 DeviceStatus did not report an explicit unlock state.'
+      );
+    }
+
+    await afterStatusBeforeUnlock?.();
+
+    if (!status.unlocked) {
+      const unlockInteraction: HardwareUiInteractionMeta | undefined = shouldCoordinateUi
+        ? uiCoordinator.enterUnlockInteraction(method.name)
+        : undefined;
+      const unlockedStatus = await device.unlockDevice(
+        DeviceSessionPinType.Main,
+        shouldCoordinateUi
+          ? { emitUiEvent: false, interaction: unlockInteraction }
+          : {
+              source: 'unlock-coordinator',
+              reason: 'device-locked',
+              deviceOnly: true,
+              method: method.name,
+            }
+      );
+      if (unlockedStatus?.unlocked !== true) {
+        throw ERRORS.TypedError(
+          HardwareErrorCode.RuntimeError,
+          'Protocol V2 device remained locked after the unlock flow.'
+        );
+      }
+      Log.debug('Protocol V2 pre-unlock completed', { method: method.name });
+    }
+
+    context.preflightCompleted = true;
+  }
+
+  await prepare?.();
+
+  if (shouldCoordinateUi) {
+    uiCoordinator.enterMethodInteraction(resolveProtocolV2UiInteraction(method));
+  }
+
+  return run();
+}

package/src/protocols/protocol-v2/walletSession.ts

@@ -1,5 +1,5 @@
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
-import { DeviceSessionPinType } from '@onekeyfe/hd-transport';
+import { DeviceSessionPinType, DeviceSessionSeedDomain } from '@onekeyfe/hd-transport';
 
 import { DEVICE } from '../../events';
 import { assertCompleteDeviceSession } from './deviceSession';
@@ -38,32 +38,74 @@ export async function refreshProtocolV2DeviceStatus(device: Device) {
   return device.updateProtocolV2Status(status);
 }
 
-const negotiateEventlessWalletSession = async (device: Device) => {
-  await device.commands.typedCall('ProtocolInfoRequest', 'ProtocolInfo', {
-    eventless_wallet_session: true,
+export async function ensureProtocolV2WalletSessionUnlocked(device: Device) {
+  if (!device.isProtocolV2() || device.isBootloader?.() || device.isRomloader?.()) {
+    return false;
+  }
+
+  await refreshProtocolV2DeviceStatus(device);
+  if (device.state?.status.unlocked !== false) {
+    return false;
+  }
+
+  await device.unlockDevice(DeviceSessionPinType.Main, {
+    source: 'unlock-coordinator',
+    reason: 'device-locked',
+    deviceOnly: true,
   });
+  return true;
+}
+
+const negotiateEventlessWalletSession = async (device: Device) => {
+  await device.ensureProtocolV2RuntimeContext();
 };
 
 const getDeviceSession = async (device: Device, request: DeviceSessionGet) =>
   device.commands.typedCall('DeviceSessionGet', 'DeviceSession', request);
 
+const buildDeviceSessionGetRequest = ({
+  sessionId,
+  expectedPassphraseState,
+  deriveCardano,
+}: {
+  sessionId?: string;
+  expectedPassphraseState?: string;
+  deriveCardano?: boolean;
+} = {}): DeviceSessionGet => ({
+  ...(sessionId ? { session_id: sessionId } : {}),
+  ...(expectedPassphraseState ? { btc_test_address: expectedPassphraseState } : {}),
+  seed_domains:
+    deriveCardano === undefined
+      ? []
+      : [
+          DeviceSessionSeedDomain.SeedDomain_Standard,
+          ...(deriveCardano ? [DeviceSessionSeedDomain.SeedDomain_Cardano] : []),
+        ],
+});
+
 const askDevicePassphrase = async (device: Device, requestPayload: DeviceSessionAskPassphrase) => {
   await device.commands.typedCall('DeviceSessionAskPassphrase', 'Success', requestPayload);
   await refreshProtocolV2DeviceStatus(device);
 };
 
-const selectDeviceSession = async (device: Device, expectedPassphraseState?: string) => {
+const selectDeviceSession = async (
+  device: Device,
+  expectedPassphraseState?: string,
+  deriveCardano?: boolean
+) => {
   const existsAttachPinUser = device.features?.attachToPinEnabled === true;
   const metadata = {
     source: 'wallet-session-coordinator' as const,
     reason: expectedPassphraseState ? ('session-recovery' as const) : ('open-wallet' as const),
     ...(expectedPassphraseState ? { expectedPassphraseState } : {}),
   };
+  const passphraseInteraction = device.createProtocolV2UiPhaseMetadata?.('passphrase', 'start');
   const response = await device.commands.promptPassphrase(
     {
       existsAttachPinUser,
       deviceOnly: false,
       ...metadata,
+      ...(passphraseInteraction ? { interaction: passphraseInteraction } : {}),
     },
     { cancelDeviceOnReject: false }
   );
@@ -102,9 +144,16 @@ const selectDeviceSession = async (device: Device, expectedPassphraseState?: str
         'Attach PIN wallet selection is unavailable on this device.'
       );
     }
-    device.emit(DEVICE.ATTACH_PIN_ON_DEVICE, device, metadata);
-    await device.unlockDevice(DeviceSessionPinType.AttachToPin);
-    return getDeviceSession(device, {});
+    const attachPinInteraction = device.createProtocolV2UiPhaseMetadata?.('pin', 'start');
+    device.emit(DEVICE.ATTACH_PIN_ON_DEVICE, device, {
+      ...metadata,
+      ...(attachPinInteraction ? { interaction: attachPinInteraction } : {}),
+    });
+    await device.unlockDevice(DeviceSessionPinType.AttachToPin, {
+      emitUiEvent: false,
+      interaction: attachPinInteraction,
+    });
+    return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));
   }
 
   if (hasHostPassphrase) {
@@ -112,12 +161,19 @@ const selectDeviceSession = async (device: Device, expectedPassphraseState?: str
       passphrase: hostPassphrase,
       on_device: false,
     });
-    return getDeviceSession(device, {});
+    return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));
   }
 
-  device.emit(DEVICE.PASSPHRASE_ON_DEVICE, device, metadata);
+  const passphraseOnDeviceInteraction = device.createProtocolV2UiPhaseMetadata?.(
+    'passphrase-on-device',
+    'start'
+  );
+  device.emit(DEVICE.PASSPHRASE_ON_DEVICE, device, {
+    ...metadata,
+    ...(passphraseOnDeviceInteraction ? { interaction: passphraseOnDeviceInteraction } : {}),
+  });
   await askDevicePassphrase(device, { on_device: true });
-  return getDeviceSession(device, {});
+  return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));
 };
 
 export async function getProtocolV2WalletSession(
@@ -128,7 +184,11 @@ export async function getProtocolV2WalletSession(
     initSession?: boolean;
     expectedPassphraseState?: string;
     onlyMainPin?: boolean;
+    /** 业务安全校验遇到 Attach PIN 上下文时直接拒绝，不主动切换钱包。 */
+    rejectAttachPinForMainWallet?: boolean;
+    selectMainWalletBeforeRestore?: boolean;
     resumeOnly?: boolean;
+    deriveCardano?: boolean;
   }
 ) {
   const forceWalletSelection =
@@ -161,17 +221,80 @@ export async function getProtocolV2WalletSession(
       : undefined;
   let response;
   let resumed = false;
+  let mainPinSelected =
+    options?.onlyMainPin === true &&
+    device.features?.unlocked === true &&
+    device.features?.unlockedAttachPin === false;
+
+  const clearCurrentWalletSession = () => {
+    if (options?.onlyMainPin) {
+      device.clearStandardInternalState?.();
+    } else {
+      device.clearInternalState();
+    }
+  };
+
+  const rejectMismatchedAttachPinWallet = async () => {
+    const features = await refreshProtocolV2DeviceStatus(device);
+    if (features.unlockedAttachPin !== true) {
+      return;
+    }
+
+    try {
+      await device.lockDevice();
+    } catch {
+      // Reject the mismatched Attach PIN wallet even when older firmware cannot lock.
+    }
+    if (options?.rejectAttachPinForMainWallet) {
+      device.clearStandardInternalState?.();
+      device.clearInternalState();
+    } else {
+      clearCurrentWalletSession();
+    }
+    throw ERRORS.TypedError(HardwareErrorCode.DeviceCheckUnlockTypeError);
+  };
+
+  if (options?.onlyMainPin && options.rejectAttachPinForMainWallet) {
+    await rejectMismatchedAttachPinWallet();
+  }
+
+  const selectMainPin = async (force = false) => {
+    if (force || !mainPinSelected) {
+      await device.unlockDevice(DeviceSessionPinType.Main, {
+        source: 'wallet-session-coordinator',
+        reason: expectedPassphraseState ? 'session-recovery' : 'open-wallet',
+        deviceOnly: true,
+      });
+      mainPinSelected = true;
+    }
+  };
+
+  const selectStandardWallet = async () => {
+    // Main PIN authenticates the device; an empty host passphrase selects the standard derivation.
+    await selectMainPin();
+    if (device.features?.passphraseProtection === true) {
+      await askDevicePassphrase(device, {
+        passphrase: '',
+        on_device: false,
+      });
+    }
+  };
 
   if (options?.onlyMainPin) {
     expectedPassphraseState = cachedStandardSession?.passphraseState;
     if (cachedStandardSession) {
       try {
-        if (device.features?.unlockedAttachPin === true) {
-          await device.unlockDevice(DeviceSessionPinType.Main);
+        if (options?.selectMainWalletBeforeRestore) {
+          await selectMainPin();
         }
-        response = await getDeviceSession(device, {
-          session_id: cachedStandardSession.sessionId,
-        });
+        response = await getDeviceSession(
+          device,
+          buildDeviceSessionGetRequest({
+            sessionId: cachedStandardSession.sessionId,
+            expectedPassphraseState,
+            deriveCardano: options?.deriveCardano,
+          })
+        );
         resumed = true;
       } catch (error) {
         device.clearStandardInternalState?.();
@@ -183,12 +306,22 @@ export async function getProtocolV2WalletSession(
     }
 
     if (!response) {
-      await device.unlockDevice(DeviceSessionPinType.Main);
-      response = await getDeviceSession(device, {});
+      await selectStandardWallet();
+      response = await getDeviceSession(
+        device,
+        buildDeviceSessionGetRequest({ deriveCardano: options?.deriveCardano })
+      );
     }
   } else if (cachedSessionId && expectedPassphraseState) {
     try {
-      response = await getDeviceSession(device, { session_id: cachedSessionId });
+      response = await getDeviceSession(
+        device,
+        buildDeviceSessionGetRequest({
+          sessionId: cachedSessionId,
+          expectedPassphraseState,
+          deriveCardano: options?.deriveCardano,
+        })
+      );
       resumed = true;
     } catch (error) {
       device.clearInternalState();
@@ -197,6 +330,20 @@ export async function getProtocolV2WalletSession(
       }
       resumed = false;
     }
+  } else if (expectedPassphraseState) {
+    try {
+      response = await getDeviceSession(
+        device,
+        buildDeviceSessionGetRequest({
+          expectedPassphraseState,
+          deriveCardano: options?.deriveCardano,
+        })
+      );
+    } catch (error) {
+      if (options?.resumeOnly || !isWalletSessionInvalidError(error)) {
+        throw error;
+      }
+    }
   }
 
   if (!response) {
@@ -204,7 +351,7 @@ export async function getProtocolV2WalletSession(
       device.clearInternalState();
       throw ERRORS.TypedError(HardwareErrorCode.WalletSessionInvalid);
     }
-    response = await selectDeviceSession(device, expectedPassphraseState);
+    response = await selectDeviceSession(device, expectedPassphraseState, options?.deriveCardano);
   }
 
   let { message } = response;
@@ -220,17 +367,21 @@ export async function getProtocolV2WalletSession(
   }
   if (expectedPassphraseState && expectedPassphraseState !== message.btc_test_address) {
     resumed = false;
+    await rejectMismatchedAttachPinWallet();
     if (options?.resumeOnly) {
       device.clearInternalState();
       throw ERRORS.TypedError(HardwareErrorCode.WalletSessionInvalid);
     }
     if (options?.onlyMainPin) {
       device.clearStandardInternalState?.();
-      await device.unlockDevice(DeviceSessionPinType.Main);
-      response = await getDeviceSession(device, {});
+      await selectStandardWallet();
+      response = await getDeviceSession(
+        device,
+        buildDeviceSessionGetRequest({ deriveCardano: options?.deriveCardano })
+      );
     } else {
       device.clearInternalState();
-      response = await selectDeviceSession(device, expectedPassphraseState);
+      response = await selectDeviceSession(device, expectedPassphraseState, options?.deriveCardano);
     }
     message = response.message;
     try {
@@ -244,11 +395,8 @@ export async function getProtocolV2WalletSession(
       throw error;
     }
     if (expectedPassphraseState !== message.btc_test_address) {
-      if (options?.onlyMainPin) {
-        device.clearStandardInternalState?.();
-      } else {
-        device.clearInternalState();
-      }
+      await rejectMismatchedAttachPinWallet();
+      clearCurrentWalletSession();
       throw ERRORS.TypedError(HardwareErrorCode.DeviceCheckPassphraseStateError);
     }
   }
@@ -269,17 +417,19 @@ export async function getProtocolV2WalletSession(
   return {
     passphraseState: message.btc_test_address,
     newSession: message.session_id,
-    unlockedAttachPin: device.features?.unlockedAttachPin ?? undefined,
+    unlockedAttachPin: mainPinSelected ? false : undefined,
     resumed,
   };
 }
 
 export async function restoreProtocolV2WalletSession(
   device: Device,
-  expectedPassphraseState: string
+  expectedPassphraseState: string,
+  deriveCardano?: boolean
 ) {
   return getProtocolV2WalletSession(device, {
     expectedPassphraseState,
     resumeOnly: true,
+    deriveCardano,
   });
 }

package/src/topLevelInject.ts

@@ -1,7 +1,6 @@
 import EventEmitter from 'events';
 
-import { createCoreApi } from './inject';
-import { unregisterFirmwareUpdateHostBinding } from './api/firmware/FirmwareHostBinding';
+import { createCoreApi, createProtocolAwareCall } from './inject';
 
 import type { ConnectSettings } from './types/settings';
 import type { CoreApi } from './types/api';
@@ -20,6 +19,7 @@ export const topLevelInject = () => {
     if (!lowLevelApi) return Promise.resolve(undefined);
     return lowLevelApi.call(params);
   };
+  const protocolAwareCall = createProtocolAwareCall(call);
   const api: CoreApi = {
     on: <T extends string, P extends (...args: any[]) => any>(type: T, fn: P) => {
       eventEmitter.on(type, fn);
@@ -38,19 +38,18 @@ export const topLevelInject = () => {
       return lowLevelApi?.init(settings) ?? Promise.resolve(false);
     },
 
-    call,
+    call: protocolAwareCall.call,
 
-    ...createCoreApi(call),
+    setDeviceConnectProtocol: protocolAwareCall.setDeviceConnectProtocol,
+
+    ...createCoreApi(protocolAwareCall.call),
 
     removeAllListeners: type => {
       eventEmitter.removeAllListeners(type);
       lowLevelApi?.removeAllListeners(type);
     },
 
-    dispose: async () => {
-      unregisterFirmwareUpdateHostBinding();
-      await lowLevelApi?.dispose();
-    },
+    dispose: () => lowLevelApi?.dispose(),
 
     uiResponse: response => lowLevelApi?.uiResponse(response),
 

package/src/types/api/checkAllFirmwareRelease.ts

@@ -12,7 +12,6 @@ import type {
   IProtocolV2FirmwareComponentTarget,
 } from '../settings';
 import type { FirmwareUpdateV4Target } from './firmwareUpdate';
-import type { FirmwareUpdatePlan, FirmwareUpdatePlanForceTarget } from './firmwareUpdatePlan';
 
 export type FirmwareRelease = {
   shouldUpdate?: boolean;
@@ -60,18 +59,17 @@ export type AllFirmwareRelease = {
   status?: ProtocolV2FirmwareReleaseStatus;
   hasUpgrade?: boolean;
   required?: boolean;
+  resourceStatus?: 'valid' | 'outdated' | 'unknown';
   currentVersions?: DeviceStateVersions;
   components?: ProtocolV2FirmwareComponentRelease[];
   targetsToUpdate?: FirmwareUpdateV4Target[];
   release?: IFirmwareReleaseInfo;
-  firmwareUpdatePlan?: FirmwareUpdatePlan;
 };
 
 export type CheckAllFirmwareReleaseParams = {
   checkBridgeRelease?: boolean;
+  checkFirmwareHash?: boolean;
   firmwareType?: EFirmwareType;
-  platform?: 'native' | 'desktop' | 'ext' | 'web' | 'web-embed';
-  forceUpdateTargets?: FirmwareUpdatePlanForceTarget[];
 };
 
 export declare function checkAllFirmwareRelease(

package/src/types/api/detectDeviceConnectProtocol.ts

@@ -0,0 +1,7 @@
+import type { HardwareConnectProtocol } from '@onekeyfe/hd-shared';
+
+import type { Response } from '../params';
+
+export declare function detectDeviceConnectProtocol(
+  connectId: string
+): Response<HardwareConnectProtocol>;

package/src/types/api/deviceUnlock.ts

@@ -1,4 +1,15 @@
+import type { DeviceSessionPinType } from '@onekeyfe/hd-transport';
 import type { Features } from '../device';
 import type { CommonParams, Response } from '../params';
 
-export declare function deviceUnlock(connectId: string, params?: CommonParams): Response<Features>;
+export type DeviceUnlockParams = {
+  /**
+   * 限定本次解锁允许使用的 PIN 类型。省略时保持兼容行为，仅允许主 PIN。
+   */
+  pinType?: DeviceSessionPinType;
+};
+
+export declare function deviceUnlock(
+  connectId: string,
+  params?: CommonParams & DeviceUnlockParams
+): Response<Features>;

package/src/types/api/deviceUpdateBootloader.ts

@@ -1,15 +1,9 @@
 import type { Success } from '@onekeyfe/hd-transport';
 import type { EFirmwareType } from '@onekeyfe/hd-shared';
-import type { FirmwareArtifactReader, FirmwareArtifactReference } from './firmwareUpdate';
-import type { FirmwareUpdatePreparedPlan } from './firmwareUpdatePreparedPlan';
 import type { Response } from '../params';
 
 export type DeviceUpdateBootloaderParams = {
-  preparedPlan?: FirmwareUpdatePreparedPlan;
-  hostBindingGeneration?: number;
   binary?: ArrayBuffer;
-  artifact?: FirmwareArtifactReference;
-  artifactReader?: FirmwareArtifactReader;
   firmwareType?: EFirmwareType;
 };