@onekeyfe/hwk-ledger-adapter 1.1.26-alpha.100 → 1.1.26-alpha.102

package/dist/index.d.mts

@@ -1,10 +1,18 @@
-import { IHardwareWallet, IConnector, TransportType, IUiHandler, DeviceInfo, Response, ChainCapability, EvmGetAddressParams, EvmAddress, ProgressCallback, EvmGetPublicKeyParams, EvmPublicKey, EvmSignTxParams, EvmSignedTx, EvmSignMsgParams, EvmSignature, EvmSignTypedDataParams, BtcGetAddressParams, BtcAddress, BtcGetPublicKeyParams, BtcPublicKey, BtcSignTxParams, BtcSignedTx, BtcSignMsgParams, BtcSignature, SolGetAddressParams, SolAddress, SolGetPublicKeyParams, SolPublicKey, SolSignTxParams, SolSignedTx, SolSignMsgParams, SolSignature, TronGetAddressParams, TronAddress, TronSignTxParams, TronSignedTx, TronSignMsgParams, TronSignature, HardwareEventMap, DeviceEventListener, ChainForFingerprint, ConnectionType, DeviceDescriptor, ConnectorDevice, ConnectorSession, ConnectorEventType, ConnectorEventMap, DeviceChangeEvent, HardwareErrorCode } from '@onekeyfe/hwk-adapter-core';
+import { IHardwareWallet, IConnector, TransportType, IUiHandler, UiResponseEvent, DeviceInfo, Response, ChainCapability, EvmGetAddressParams, EvmAddress, ProgressCallback, EvmGetPublicKeyParams, EvmPublicKey, EvmSignTxParams, EvmSignedTx, EvmSignMsgParams, EvmSignature, EvmSignTypedDataParams, BtcGetAddressParams, BtcAddress, BtcGetPublicKeyParams, BtcPublicKey, BtcSignTxParams, BtcSignedTx, BtcSignPsbtParams, BtcSignedPsbt, BtcSignMsgParams, BtcSignature, SolGetAddressParams, SolAddress, SolGetPublicKeyParams, SolPublicKey, SolSignTxParams, SolSignedTx, SolSignMsgParams, SolSignature, TronGetAddressParams, TronAddress, TronSignTxParams, TronSignedTx, TronSignMsgParams, TronSignature, HardwareEventMap, DeviceEventListener, ChainForFingerprint, ConnectionType, DeviceDescriptor, ConnectorDevice, ConnectorSession, ConnectorEventType, ConnectorEventMap, DeviceChangeEvent, HardwareErrorCode } from '@onekeyfe/hwk-adapter-core';
 import { DeviceManagementKit, DeviceActionState as DeviceActionState$1, DiscoveredDevice, ExecuteDeviceActionReturnType } from '@ledgerhq/device-management-kit';
 import { Address, Signature, SignerEth as SignerEth$1, TypedData } from '@ledgerhq/device-signer-kit-ethereum';
 import { SignerBtc as SignerBtc$1 } from '@ledgerhq/device-signer-kit-bitcoin';
 import { SignerSolana } from '@ledgerhq/device-signer-kit-solana';
 import Transport from '@ledgerhq/hw-transport';
 
+interface LedgerAdapterOptions {
+    /**
+     * `true` — emit `REQUEST_SELECT_DEVICE` on multi-device discovery and await
+     * `uiResponse({ type: RECEIVE_SELECT_DEVICE, payload: { sdkConnectId } })`.
+     * `false` (default) — silently pick the first device.
+     */
+    handleSelectDevice?: boolean;
+}
 /**
  * Ledger hardware wallet adapter that delegates to an IConnector.
  *
@@ -20,9 +28,11 @@ declare class LedgerAdapter implements IHardwareWallet {
     private readonly connector;
     private readonly emitter;
     private _uiHandler;
+    private readonly _handleSelectDevice;
     private _discoveredDevices;
     private _sessions;
-    constructor(connector: IConnector);
+    private readonly _uiRegistry;
+    constructor(connector: IConnector, options?: LedgerAdapterOptions);
     get activeTransport(): TransportType | null;
     getAvailableTransports(): TransportType[];
     switchTransport(_type: TransportType): Promise<void>;
@@ -35,6 +45,7 @@ declare class LedgerAdapter implements IHardwareWallet {
      */
     resetState(): void;
     dispose(): Promise<void>;
+    uiResponse(response: UiResponseEvent): void;
     searchDevices(): Promise<DeviceInfo[]>;
     connectDevice(connectId: string): Promise<Response<string>>;
     disconnectDevice(connectId: string): Promise<void>;
@@ -56,6 +67,7 @@ declare class LedgerAdapter implements IHardwareWallet {
     btcGetAddresses(connectId: string, deviceId: string, params: BtcGetAddressParams[], onProgress?: ProgressCallback): Promise<Response<BtcAddress[]>>;
     btcGetPublicKey(connectId: string, deviceId: string, params: BtcGetPublicKeyParams): Promise<Response<BtcPublicKey>>;
     btcSignTransaction(connectId: string, deviceId: string, params: BtcSignTxParams): Promise<Response<BtcSignedTx>>;
+    btcSignPsbt(connectId: string, deviceId: string, params: BtcSignPsbtParams): Promise<Response<BtcSignedPsbt>>;
     btcSignMessage(connectId: string, deviceId: string, params: BtcSignMsgParams): Promise<Response<BtcSignature>>;
     btcGetMasterFingerprint(connectId: string, deviceId: string): Promise<Response<{
         masterFingerprint: string;
@@ -78,8 +90,10 @@ declare class LedgerAdapter implements IHardwareWallet {
     /**
      * Verify that the connected device matches the expected fingerprint.
      *
-     * - If deviceId is empty, verification is skipped (returns true).
+     * - If deviceId is empty, verification is skipped (returns { success: true }).
      * - deviceId is used here as the stored fingerprint to compare against.
+     * - On mismatch, returns both expected and actual fingerprints so the caller
+     *   can surface an informative error (e.g. for logs / bug reports).
      */
     private _verifyDeviceFingerprint;
     /**
@@ -94,25 +108,12 @@ declare class LedgerAdapter implements IHardwareWallet {
      * - Otherwise: search → 1 device: auto-connect, multiple: ask user, 0: throw.
      */
     private static readonly MAX_DEVICE_RETRY;
-    private _deviceConnectResolve;
     private _connectingPromise;
-    private static readonly DEVICE_CONNECT_TIMEOUT_MS;
-    /**
-     * Wait for user to connect and unlock device.
-     * Emits 'ui-request' event via the adapter's own emitter.
-     * The consumer (monorepo adapter wrapper) listens for this and shows UI.
-     * When user confirms, they call adapter.deviceConnectResponse() which resolves this promise.
-     * Times out after 60 seconds if no response is received.
-     */
     private _waitForDeviceConnect;
-    /**
-     * Called by consumer to respond to ui-request-device-connect.
-     * type='confirm' → retry search, type='cancel' → abort.
-     */
-    deviceConnectResponse(type: 'confirm' | 'cancel'): void;
     private ensureConnected;
     private _doConnect;
     private _connectFirstOrSelect;
+    private _chooseDeviceFromList;
     /**
      * Call the connector with automatic session resolution and disconnect retry.
      *
@@ -220,10 +221,7 @@ declare class LedgerConnectorBase implements IConnector {
     disconnect(sessionId: string): Promise<void>;
     call(sessionId: string, method: string, params: unknown): Promise<unknown>;
     cancel(_sessionId: string): Promise<void>;
-    uiResponse(_response: {
-        type: string;
-        payload: unknown;
-    }): void;
+    uiResponse(_response: UiResponseEvent): void;
     on<K extends ConnectorEventType>(event: K, handler: (data: ConnectorEventMap[K]) => void): void;
     off<K extends ConnectorEventType>(event: K, handler: (data: ConnectorEventMap[K]) => void): void;
     reset(): void;
@@ -464,6 +462,11 @@ declare class DmkTransport extends Transport {
  * Convert a DMK DeviceAction (Observable-based) into a Promise.
  * Handles pending -> completed/error state transitions and interaction callbacks.
  *
+ * Tracks the last DMK step observed (e.g. `signer.eth.steps.blindSignTransactionFallback`)
+ * and attaches it to the rejected error as a non-enumerable `_lastStep` property,
+ * so upstream error classifiers can distinguish failure contexts (e.g. Blind signing
+ * disabled vs. generic Invalid data).
+ *
  * @param timeoutMs  Timeout in ms. Resets each time the Observable emits (device is alive).
  *                   Pass 0 to disable. Default: 30s.
  */
@@ -524,6 +527,7 @@ declare function isDeviceLockedError(err: unknown): boolean;
 declare function mapLedgerError(err: unknown): {
     code: HardwareErrorCode;
     message: string;
+    appName?: string;
 };
 
 export { AppManager, type DeviceActionState, type DmkDiscoveredDevice, DmkTransport, LedgerAdapter, LedgerConnectorBase, type LedgerConnectorBaseOptions, LedgerDeviceManager, SignerBtc, type SignerBtcAddress, SignerEth, type SignerEvmAddress, type SignerEvmSignature, SignerManager, SignerSol, type TransportFactory, deviceActionToPromise, isDeviceLockedError, mapLedgerError };

package/dist/index.d.ts

@@ -1,10 +1,18 @@
-import { IHardwareWallet, IConnector, TransportType, IUiHandler, DeviceInfo, Response, ChainCapability, EvmGetAddressParams, EvmAddress, ProgressCallback, EvmGetPublicKeyParams, EvmPublicKey, EvmSignTxParams, EvmSignedTx, EvmSignMsgParams, EvmSignature, EvmSignTypedDataParams, BtcGetAddressParams, BtcAddress, BtcGetPublicKeyParams, BtcPublicKey, BtcSignTxParams, BtcSignedTx, BtcSignMsgParams, BtcSignature, SolGetAddressParams, SolAddress, SolGetPublicKeyParams, SolPublicKey, SolSignTxParams, SolSignedTx, SolSignMsgParams, SolSignature, TronGetAddressParams, TronAddress, TronSignTxParams, TronSignedTx, TronSignMsgParams, TronSignature, HardwareEventMap, DeviceEventListener, ChainForFingerprint, ConnectionType, DeviceDescriptor, ConnectorDevice, ConnectorSession, ConnectorEventType, ConnectorEventMap, DeviceChangeEvent, HardwareErrorCode } from '@onekeyfe/hwk-adapter-core';
+import { IHardwareWallet, IConnector, TransportType, IUiHandler, UiResponseEvent, DeviceInfo, Response, ChainCapability, EvmGetAddressParams, EvmAddress, ProgressCallback, EvmGetPublicKeyParams, EvmPublicKey, EvmSignTxParams, EvmSignedTx, EvmSignMsgParams, EvmSignature, EvmSignTypedDataParams, BtcGetAddressParams, BtcAddress, BtcGetPublicKeyParams, BtcPublicKey, BtcSignTxParams, BtcSignedTx, BtcSignPsbtParams, BtcSignedPsbt, BtcSignMsgParams, BtcSignature, SolGetAddressParams, SolAddress, SolGetPublicKeyParams, SolPublicKey, SolSignTxParams, SolSignedTx, SolSignMsgParams, SolSignature, TronGetAddressParams, TronAddress, TronSignTxParams, TronSignedTx, TronSignMsgParams, TronSignature, HardwareEventMap, DeviceEventListener, ChainForFingerprint, ConnectionType, DeviceDescriptor, ConnectorDevice, ConnectorSession, ConnectorEventType, ConnectorEventMap, DeviceChangeEvent, HardwareErrorCode } from '@onekeyfe/hwk-adapter-core';
 import { DeviceManagementKit, DeviceActionState as DeviceActionState$1, DiscoveredDevice, ExecuteDeviceActionReturnType } from '@ledgerhq/device-management-kit';
 import { Address, Signature, SignerEth as SignerEth$1, TypedData } from '@ledgerhq/device-signer-kit-ethereum';
 import { SignerBtc as SignerBtc$1 } from '@ledgerhq/device-signer-kit-bitcoin';
 import { SignerSolana } from '@ledgerhq/device-signer-kit-solana';
 import Transport from '@ledgerhq/hw-transport';
 
+interface LedgerAdapterOptions {
+    /**
+     * `true` — emit `REQUEST_SELECT_DEVICE` on multi-device discovery and await
+     * `uiResponse({ type: RECEIVE_SELECT_DEVICE, payload: { sdkConnectId } })`.
+     * `false` (default) — silently pick the first device.
+     */
+    handleSelectDevice?: boolean;
+}
 /**
  * Ledger hardware wallet adapter that delegates to an IConnector.
  *
@@ -20,9 +28,11 @@ declare class LedgerAdapter implements IHardwareWallet {
     private readonly connector;
     private readonly emitter;
     private _uiHandler;
+    private readonly _handleSelectDevice;
     private _discoveredDevices;
     private _sessions;
-    constructor(connector: IConnector);
+    private readonly _uiRegistry;
+    constructor(connector: IConnector, options?: LedgerAdapterOptions);
     get activeTransport(): TransportType | null;
     getAvailableTransports(): TransportType[];
     switchTransport(_type: TransportType): Promise<void>;
@@ -35,6 +45,7 @@ declare class LedgerAdapter implements IHardwareWallet {
      */
     resetState(): void;
     dispose(): Promise<void>;
+    uiResponse(response: UiResponseEvent): void;
     searchDevices(): Promise<DeviceInfo[]>;
     connectDevice(connectId: string): Promise<Response<string>>;
     disconnectDevice(connectId: string): Promise<void>;
@@ -56,6 +67,7 @@ declare class LedgerAdapter implements IHardwareWallet {
     btcGetAddresses(connectId: string, deviceId: string, params: BtcGetAddressParams[], onProgress?: ProgressCallback): Promise<Response<BtcAddress[]>>;
     btcGetPublicKey(connectId: string, deviceId: string, params: BtcGetPublicKeyParams): Promise<Response<BtcPublicKey>>;
     btcSignTransaction(connectId: string, deviceId: string, params: BtcSignTxParams): Promise<Response<BtcSignedTx>>;
+    btcSignPsbt(connectId: string, deviceId: string, params: BtcSignPsbtParams): Promise<Response<BtcSignedPsbt>>;
     btcSignMessage(connectId: string, deviceId: string, params: BtcSignMsgParams): Promise<Response<BtcSignature>>;
     btcGetMasterFingerprint(connectId: string, deviceId: string): Promise<Response<{
         masterFingerprint: string;
@@ -78,8 +90,10 @@ declare class LedgerAdapter implements IHardwareWallet {
     /**
      * Verify that the connected device matches the expected fingerprint.
      *
-     * - If deviceId is empty, verification is skipped (returns true).
+     * - If deviceId is empty, verification is skipped (returns { success: true }).
      * - deviceId is used here as the stored fingerprint to compare against.
+     * - On mismatch, returns both expected and actual fingerprints so the caller
+     *   can surface an informative error (e.g. for logs / bug reports).
      */
     private _verifyDeviceFingerprint;
     /**
@@ -94,25 +108,12 @@ declare class LedgerAdapter implements IHardwareWallet {
      * - Otherwise: search → 1 device: auto-connect, multiple: ask user, 0: throw.
      */
     private static readonly MAX_DEVICE_RETRY;
-    private _deviceConnectResolve;
     private _connectingPromise;
-    private static readonly DEVICE_CONNECT_TIMEOUT_MS;
-    /**
-     * Wait for user to connect and unlock device.
-     * Emits 'ui-request' event via the adapter's own emitter.
-     * The consumer (monorepo adapter wrapper) listens for this and shows UI.
-     * When user confirms, they call adapter.deviceConnectResponse() which resolves this promise.
-     * Times out after 60 seconds if no response is received.
-     */
     private _waitForDeviceConnect;
-    /**
-     * Called by consumer to respond to ui-request-device-connect.
-     * type='confirm' → retry search, type='cancel' → abort.
-     */
-    deviceConnectResponse(type: 'confirm' | 'cancel'): void;
     private ensureConnected;
     private _doConnect;
     private _connectFirstOrSelect;
+    private _chooseDeviceFromList;
     /**
      * Call the connector with automatic session resolution and disconnect retry.
      *
@@ -220,10 +221,7 @@ declare class LedgerConnectorBase implements IConnector {
     disconnect(sessionId: string): Promise<void>;
     call(sessionId: string, method: string, params: unknown): Promise<unknown>;
     cancel(_sessionId: string): Promise<void>;
-    uiResponse(_response: {
-        type: string;
-        payload: unknown;
-    }): void;
+    uiResponse(_response: UiResponseEvent): void;
     on<K extends ConnectorEventType>(event: K, handler: (data: ConnectorEventMap[K]) => void): void;
     off<K extends ConnectorEventType>(event: K, handler: (data: ConnectorEventMap[K]) => void): void;
     reset(): void;
@@ -464,6 +462,11 @@ declare class DmkTransport extends Transport {
  * Convert a DMK DeviceAction (Observable-based) into a Promise.
  * Handles pending -> completed/error state transitions and interaction callbacks.
  *
+ * Tracks the last DMK step observed (e.g. `signer.eth.steps.blindSignTransactionFallback`)
+ * and attaches it to the rejected error as a non-enumerable `_lastStep` property,
+ * so upstream error classifiers can distinguish failure contexts (e.g. Blind signing
+ * disabled vs. generic Invalid data).
+ *
  * @param timeoutMs  Timeout in ms. Resets each time the Observable emits (device is alive).
  *                   Pass 0 to disable. Default: 30s.
  */
@@ -524,6 +527,7 @@ declare function isDeviceLockedError(err: unknown): boolean;
 declare function mapLedgerError(err: unknown): {
     code: HardwareErrorCode;
     message: string;
+    appName?: string;
 };
 
 export { AppManager, type DeviceActionState, type DmkDiscoveredDevice, DmkTransport, LedgerAdapter, LedgerConnectorBase, type LedgerConnectorBaseOptions, LedgerDeviceManager, SignerBtc, type SignerBtcAddress, SignerEth, type SignerEvmAddress, type SignerEvmSignature, SignerManager, SignerSol, type TransportFactory, deviceActionToPromise, isDeviceLockedError, mapLedgerError };