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

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-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, 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';
@@ -56,6 +56,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 +79,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;
     /**
@@ -464,6 +467,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 +532,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,4 +1,4 @@
-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, 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';
@@ -56,6 +56,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 +79,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;
     /**
@@ -464,6 +467,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 +532,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.js

@@ -54,6 +54,38 @@ var LOCKED_ERROR_CODES = /* @__PURE__ */ new Set(["5515", "21781", "6982", "2701
 var USER_REJECTED_CODES = /* @__PURE__ */ new Set(["6985", "27013"]);
 var WRONG_APP_CODES = /* @__PURE__ */ new Set(["6e00", "28160", "6d00", "27904", "6a83", "27267"]);
 var APP_NOT_INSTALLED_CODES = /* @__PURE__ */ new Set(["6807", "26631"]);
+var STEP_BLIND_SIGN_FALLBACK = "signer.eth.steps.blindSignTransactionFallback";
+function getEthAppErrorCode(err) {
+  if (!err || typeof err !== "object") return null;
+  const e = err;
+  if (e._tag === "EthAppCommandError" && typeof e.errorCode === "string") {
+    return e.errorCode.toLowerCase();
+  }
+  const orig = e.originalError;
+  if (orig?._tag === "EthAppCommandError" && typeof orig.errorCode === "string") {
+    return orig.errorCode.toLowerCase();
+  }
+  return null;
+}
+function mapEthAppError(ethCode, lastStep) {
+  switch (ethCode) {
+    case "6a80":
+      if (lastStep === STEP_BLIND_SIGN_FALLBACK) {
+        return import_hwk_adapter_core.HardwareErrorCode.EvmBlindSigningRequired;
+      }
+      return null;
+    case "6984":
+      return import_hwk_adapter_core.HardwareErrorCode.EvmClearSignPluginMissing;
+    case "6a84":
+      return import_hwk_adapter_core.HardwareErrorCode.EvmDataTooLarge;
+    case "6501":
+      return import_hwk_adapter_core.HardwareErrorCode.EvmTxTypeNotSupported;
+    case "911c":
+      return import_hwk_adapter_core.HardwareErrorCode.AppTooOld;
+    default:
+      return null;
+  }
+}
 function isDeviceLockedError(err) {
   if (!err || typeof err !== "object") return false;
   const e = err;
@@ -145,12 +177,32 @@ function mapLedgerError(err) {
   } else if (isTimeoutError(err)) {
     code = import_hwk_adapter_core.HardwareErrorCode.OperationTimeout;
   } else {
-    code = import_hwk_adapter_core.HardwareErrorCode.UnknownError;
+    const ethCode = getEthAppErrorCode(err);
+    const lastStep = err && typeof err === "object" ? err._lastStep : void 0;
+    const mapped = ethCode ? mapEthAppError(ethCode, lastStep) : null;
+    code = mapped ?? import_hwk_adapter_core.HardwareErrorCode.UnknownError;
+  }
+  const appName = err && typeof err === "object" ? err.appName : void 0;
+  return { code, message: (0, import_hwk_adapter_core.enrichErrorMessage)(code, originalMessage), appName };
+}
+
+// src/utils/debugLog.ts
+var DEBUG = false;
+function debugLog(...args) {
+  if (DEBUG) {
+    console.debug(...args);
+  }
+}
+function debugError(...args) {
+  if (DEBUG) {
+    console.error(...args);
   }
-  return { code, message: (0, import_hwk_adapter_core.enrichErrorMessage)(code, originalMessage) };
 }
 
 // src/adapter/LedgerAdapter.ts
+function formatDeviceMismatchError(expected, actual) {
+  return `Wrong device: expected ${expected}, got ${actual}`;
+}
 var _LedgerAdapter = class _LedgerAdapter {
   constructor(connector) {
     this.vendor = "ledger";
@@ -243,7 +295,7 @@ var _LedgerAdapter = class _LedgerAdapter {
   async searchDevices() {
     await this._ensureDevicePermission();
     const devices = await this.connector.searchDevices();
-    console.log("[DMK] adapter.searchDevices raw:", JSON.stringify(devices));
+    debugLog("[DMK] adapter.searchDevices raw:", JSON.stringify(devices));
     for (const d of devices) {
       if (d.connectId) {
         this._discoveredDevices.set(d.connectId, this.connectorDeviceToDeviceInfo(d));
@@ -293,8 +345,18 @@ var _LedgerAdapter = class _LedgerAdapter {
   // ---------------------------------------------------------------------------
   async callChain(connectId, deviceId, chain, method, params, skipFingerprint = false) {
     await this._ensureDevicePermission(connectId, deviceId);
-    if (!skipFingerprint && !await this._verifyDeviceFingerprint(connectId, deviceId, chain)) {
-      return (0, import_hwk_adapter_core2.failure)(import_hwk_adapter_core2.HardwareErrorCode.DeviceMismatch, "Wrong device connected");
+    if (!skipFingerprint) {
+      const fp = await this._verifyDeviceFingerprint(
+        connectId,
+        deviceId,
+        chain
+      );
+      if (!fp.success) {
+        return (0, import_hwk_adapter_core2.failure)(
+          import_hwk_adapter_core2.HardwareErrorCode.DeviceMismatch,
+          formatDeviceMismatchError(fp.expected, fp.actual)
+        );
+      }
     }
     try {
       const result = await this.connectorCall(connectId, method, params);
@@ -309,8 +371,18 @@ var _LedgerAdapter = class _LedgerAdapter {
    */
   async callChainBatch(connectId, deviceId, chain, method, params, onProgress, skipFingerprint = false) {
     await this._ensureDevicePermission(connectId, deviceId);
-    if (!skipFingerprint && !await this._verifyDeviceFingerprint(connectId, deviceId, chain)) {
-      return (0, import_hwk_adapter_core2.failure)(import_hwk_adapter_core2.HardwareErrorCode.DeviceMismatch, "Wrong device connected");
+    if (!skipFingerprint) {
+      const fp = await this._verifyDeviceFingerprint(
+        connectId,
+        deviceId,
+        chain
+      );
+      if (!fp.success) {
+        return (0, import_hwk_adapter_core2.failure)(
+          import_hwk_adapter_core2.HardwareErrorCode.DeviceMismatch,
+          formatDeviceMismatchError(fp.expected, fp.actual)
+        );
+      }
     }
     const results = [];
     for (let i = 0; i < params.length; i++) {
@@ -374,6 +446,9 @@ var _LedgerAdapter = class _LedgerAdapter {
   btcSignTransaction(connectId, deviceId, params) {
     return this.callChain(connectId, deviceId, "btc", "btcSignTransaction", params);
   }
+  btcSignPsbt(connectId, deviceId, params) {
+    return this.callChain(connectId, deviceId, "btc", "btcSignPsbt", params);
+  }
   btcSignMessage(connectId, deviceId, params) {
     return this.callChain(connectId, deviceId, "btc", "btcSignMessage", params);
   }
@@ -476,7 +551,7 @@ var _LedgerAdapter = class _LedgerAdapter {
     );
     try {
       const address = await this._deriveAddressForFingerprint(connectId, chain);
-      console.log("[LedgerAdapter] getChainFingerprint address:", address?.substring(0, 20));
+      debugLog("[LedgerAdapter] getChainFingerprint address:", address?.substring(0, 20));
       return (0, import_hwk_adapter_core2.success)((0, import_hwk_adapter_core2.deriveDeviceFingerprint)(address));
     } catch (err) {
       console.error(
@@ -490,19 +565,24 @@ var _LedgerAdapter = class _LedgerAdapter {
   /**
    * 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).
    */
   async _verifyDeviceFingerprint(connectId, deviceId, chain) {
-    if (!deviceId) return true;
+    if (!deviceId) return { success: true };
     try {
       const address = await this._deriveAddressForFingerprint(connectId, chain);
       const fingerprint = (0, import_hwk_adapter_core2.deriveDeviceFingerprint)(address);
-      return fingerprint === deviceId;
+      if (fingerprint === deviceId) {
+        return { success: true };
+      }
+      return { success: false, expected: deviceId, actual: fingerprint };
     } catch (err) {
       const mapped = mapLedgerError(err);
       if (mapped.code === import_hwk_adapter_core2.HardwareErrorCode.WrongApp || mapped.code === import_hwk_adapter_core2.HardwareErrorCode.DeviceLocked) {
-        return true;
+        return { success: true };
       }
       throw err;
     }
@@ -658,7 +738,7 @@ var _LedgerAdapter = class _LedgerAdapter {
    * 4. On disconnect error: clears stale session, re-connects, retries once
    */
   async connectorCall(connectId, method, params) {
-    console.log("[LedgerAdapter] connectorCall:", method, "connectId:", connectId || "(empty)");
+    debugLog("[LedgerAdapter] connectorCall:", method, "connectId:", connectId || "(empty)");
     const resolvedConnectId = await this.ensureConnected(connectId);
     const sessionId = this._sessions.get(resolvedConnectId);
     console.log(
@@ -678,7 +758,7 @@ var _LedgerAdapter = class _LedgerAdapter {
       return await this.connector.call(sessionId, method, params);
     } catch (err) {
       const errObj = err;
-      console.log("[LedgerAdapter] connectorCall error:", method, {
+      debugLog("[LedgerAdapter] connectorCall error:", method, {
         message: errObj?.message,
         _tag: errObj?._tag,
         errorCode: errObj?.errorCode,
@@ -687,7 +767,7 @@ var _LedgerAdapter = class _LedgerAdapter {
         isLocked: isDeviceLockedError(err)
       });
       if (isDeviceDisconnectedError(err)) {
-        console.log("[LedgerAdapter] disconnected, retrying with fresh connection...");
+        debugLog("[LedgerAdapter] disconnected, retrying with fresh connection...");
         this._discoveredDevices.clear();
         return this._retryWithFreshConnection(resolvedConnectId, method, params, err);
       }
@@ -696,7 +776,7 @@ var _LedgerAdapter = class _LedgerAdapter {
         return this.connector.call(sessionId, method, params);
       }
       if (isTimeoutError(err)) {
-        console.log("[LedgerAdapter] timeout, retrying with fresh connection...");
+        debugLog("[LedgerAdapter] timeout, retrying with fresh connection...");
         this._discoveredDevices.delete(resolvedConnectId);
         return this._retryWithFreshConnection(resolvedConnectId, method, params, err);
       }
@@ -748,13 +828,13 @@ var _LedgerAdapter = class _LedgerAdapter {
    * Uses mapLedgerError to parse Ledger DMK error codes into HardwareErrorCode values.
    */
   errorToFailure(err) {
-    console.error("[LedgerAdapter] error:", err);
+    debugError("[LedgerAdapter] error:", err);
     if (err && typeof err === "object" && "code" in err && typeof err.code === "number") {
       const e = err;
-      return (0, import_hwk_adapter_core2.failure)(e.code, e.message ?? "Unknown error");
+      return (0, import_hwk_adapter_core2.failure)(e.code, e.message ?? "Unknown error", e.appName);
     }
     const mapped = mapLedgerError(err);
-    return (0, import_hwk_adapter_core2.failure)(mapped.code, mapped.message);
+    return (0, import_hwk_adapter_core2.failure)(mapped.code, mapped.message, mapped.appName);
   }
   registerEventListeners() {
     this.connector.on("device-connect", this.deviceConnectHandler);
@@ -975,14 +1055,14 @@ var LedgerDeviceManager = class {
     if (this._discoverySub) {
       return Promise.resolve();
     }
-    console.log("[DMK] requestDevice() starting persistent BLE scan");
+    debugLog("[DMK] requestDevice() starting persistent BLE scan");
     this._discoverySub = this._dmk.startDiscovering({}).subscribe({
       next: (d) => {
-        console.log("[DMK] BLE discovered:", d.name || d.id);
+        debugLog("[DMK] BLE discovered:", d.name || d.id);
         this._discovered.set(d.id, d);
       },
       error: (err) => {
-        console.error("[DMK] BLE scan error:", err);
+        debugError("[DMK] BLE scan error:", err);
         this._discoverySub = null;
       }
     });
@@ -1033,12 +1113,23 @@ var LedgerDeviceManager = class {
   }
 };
 
+// src/signer/SignerManager.ts
+var import_device_signer_kit_ethereum = require("@ledgerhq/device-signer-kit-ethereum");
+var import_context_module = require("@ledgerhq/context-module");
+
 // src/signer/deviceActionToPromise.ts
 var import_device_management_kit = require("@ledgerhq/device-management-kit");
 var DEFAULT_TIMEOUT_MS = 3e4;
+var DEBUG_DMK_OBSERVABLE = false;
+function debugLog2(...args) {
+  if (DEBUG_DMK_OBSERVABLE) {
+    console.debug(...args);
+  }
+}
 function deviceActionToPromise(action, onInteraction, timeoutMs = DEFAULT_TIMEOUT_MS) {
   return new Promise((resolve, reject) => {
     let settled = false;
+    let lastStep;
     let sub;
     let timer = null;
     const resetTimer = () => {
@@ -1054,12 +1145,13 @@ function deviceActionToPromise(action, onInteraction, timeoutMs = DEFAULT_TIMEOU
       }
     };
     resetTimer();
-    console.log("[DMK-Observable] subscribing to action.observable...");
+    debugLog2("[DMK-Observable] subscribing to action.observable...");
     sub = action.observable.subscribe({
       next: (state) => {
-        console.log("[DMK-Observable] next received");
         resetTimer();
-        console.log(
+        const step = state?.intermediateValue?.step;
+        if (step) lastStep = step;
+        debugLog2(
           "[DMK-Observable] state:",
           JSON.stringify({
             status: state.status,
@@ -1080,7 +1172,7 @@ function deviceActionToPromise(action, onInteraction, timeoutMs = DEFAULT_TIMEOU
           if (timer) clearTimeout(timer);
           onInteraction?.("interaction-complete");
           sub?.unsubscribe();
-          reject(state.error);
+          rejectWithLastStep(state.error, lastStep, reject);
         } else if (state.status === import_device_management_kit.DeviceActionStatus.Pending && onInteraction) {
           const interaction = state.intermediateValue?.requiredUserInteraction;
           if (interaction && interaction !== "none") {
@@ -1093,7 +1185,7 @@ function deviceActionToPromise(action, onInteraction, timeoutMs = DEFAULT_TIMEOU
           settled = true;
           if (timer) clearTimeout(timer);
           sub?.unsubscribe();
-          reject(err);
+          rejectWithLastStep(err, lastStep, reject);
         }
       },
       complete: () => {
@@ -1106,6 +1198,20 @@ function deviceActionToPromise(action, onInteraction, timeoutMs = DEFAULT_TIMEOU
     });
   });
 }
+function rejectWithLastStep(err, lastStep, reject) {
+  if (err && typeof err === "object" && lastStep) {
+    try {
+      Object.defineProperty(err, "_lastStep", {
+        value: lastStep,
+        configurable: true,
+        enumerable: false,
+        writable: true
+      });
+    } catch {
+    }
+  }
+  reject(err);
+}
 
 // src/signer/SignerEth.ts
 function hexToBytes(hex) {
@@ -1123,7 +1229,7 @@ var SignerEth = class {
   }
   async getAddress(derivationPath, options) {
     const checkOnDevice = options?.checkOnDevice ?? false;
-    console.log("[DMK] getAddress \u2192 DMK:", { derivationPath, checkOnDevice });
+    debugLog("[DMK] getAddress \u2192 DMK:", { derivationPath, checkOnDevice });
     const action = this._sdk.getAddress(derivationPath, {
       checkOnDevice
     });
@@ -1166,10 +1272,10 @@ var SignerManager = class _SignerManager {
   async getOrCreate(sessionId) {
     const hadCached = this._cache.has(sessionId);
     this._cache.delete(sessionId);
-    console.log("[DMK] SignerManager.getOrCreate:", { sessionId, hadCached, creating: true });
+    debugLog("[DMK] SignerManager.getOrCreate:", { sessionId, hadCached, creating: true });
     const builder = await this._builderFn({ dmk: this._dmk, sessionId });
     const sdkSigner = builder.build();
-    console.log("[DMK] SignerManager: new signer built");
+    debugLog("[DMK] SignerManager: new signer built");
     const signer = new SignerEth(sdkSigner);
     this._cache.set(sessionId, signer);
     return signer;
@@ -1181,13 +1287,9 @@ var SignerManager = class _SignerManager {
     this._cache.clear();
   }
   static _defaultBuilder() {
-    let BuilderClass = null;
-    return async (args) => {
-      if (!BuilderClass) {
-        const mod = await import("@ledgerhq/device-signer-kit-ethereum");
-        BuilderClass = mod.SignerEthBuilder;
-      }
-      return new BuilderClass(args);
+    return (args) => {
+      const contextModule = new import_context_module.ContextModuleBuilder({}).removeDefaultLoaders().build();
+      return new import_device_signer_kit_ethereum.SignerEthBuilder(args).withContextModule(contextModule);
     };
   }
 };
@@ -1205,7 +1307,7 @@ async function evmGetAddress(ctx, sessionId, params) {
   const signer = await _getEthSigner(ctx, sessionId);
   const path = normalizePath(params.path);
   const checkOnDevice = params.showOnDevice ?? false;
-  console.log("[DMK] evmGetAddress -> signer.getAddress:", { path, checkOnDevice });
+  debugLog("[DMK] evmGetAddress -> signer.getAddress:", { path, checkOnDevice });
   try {
     const result = await signer.getAddress(path, { checkOnDevice });
     return { address: result.address, publicKey: result.publicKey };
@@ -1486,6 +1588,33 @@ async function btcSignTransaction(ctx, sessionId, params) {
     throw ctx.wrapError(err);
   }
 }
+async function btcSignPsbt(ctx, sessionId, params) {
+  if (!params.psbt) {
+    throw Object.assign(
+      new Error("btcSignPsbt requires params.psbt"),
+      { code: import_hwk_adapter_core4.HardwareErrorCode.InvalidParams }
+    );
+  }
+  const btcSigner = await _createBtcSigner(ctx, sessionId);
+  try {
+    const { DefaultWallet, DefaultDescriptorTemplate } = await ctx.importLedgerKit(
+      "@ledgerhq/device-signer-kit-bitcoin"
+    );
+    const path = normalizePath(params.path || "84'/0'/0'");
+    const purpose = path.split("/")[0]?.replace("'", "");
+    let template = DefaultDescriptorTemplate.NATIVE_SEGWIT;
+    if (purpose === "44") template = DefaultDescriptorTemplate.LEGACY;
+    else if (purpose === "49") template = DefaultDescriptorTemplate.NESTED_SEGWIT;
+    else if (purpose === "86") template = DefaultDescriptorTemplate.TAPROOT;
+    const wallet = new DefaultWallet(path, template);
+    const signatures = await btcSigner.signPsbt(wallet, params.psbt);
+    const signedPsbtHex = _applySignaturesToPsbt(params.psbt, signatures);
+    return { signedPsbt: signedPsbtHex };
+  } catch (err) {
+    ctx.invalidateSession(sessionId);
+    throw ctx.wrapError(err);
+  }
+}
 async function btcSignMessage(ctx, sessionId, params) {
   const btcSigner = await _createBtcSigner(ctx, sessionId);
   const path = normalizePath(params.path);
@@ -1526,6 +1655,52 @@ async function _createBtcSigner(ctx, sessionId) {
   };
   return signer;
 }
+function _applySignaturesToPsbt(psbtHex, signatures) {
+  const raw = (0, import_hwk_adapter_core4.hexToBytes)(psbtHex);
+  const result = [];
+  let pos = 0;
+  for (let i = 0; i < 5; i++) result.push(raw[pos++]);
+  while (pos < raw.length && raw[pos] !== 0) {
+    const { bytes: kv, end } = readKeyValue(raw, pos);
+    kv.forEach((b) => result.push(b));
+    pos = end;
+  }
+  result.push(raw[pos++]);
+  const sigsByInput = /* @__PURE__ */ new Map();
+  for (const sig of signatures) {
+    if (!sigsByInput.has(sig.inputIndex)) sigsByInput.set(sig.inputIndex, []);
+    sigsByInput.get(sig.inputIndex).push(sig);
+  }
+  for (let inputIdx = 0; pos < raw.length; inputIdx++) {
+    while (pos < raw.length && raw[pos] !== 0) {
+      const { bytes: kv, end } = readKeyValue(raw, pos);
+      kv.forEach((b) => result.push(b));
+      pos = end;
+    }
+    const inputSigs = sigsByInput.get(inputIdx) || [];
+    for (const sig of inputSigs) {
+      if (sig.tapleafHash && sig.tapleafHash.length > 0) {
+        const key = new Uint8Array(1 + 32 + 32);
+        key[0] = 20;
+        key.set(sig.pubkey.subarray(0, 32), 1);
+        key.set(sig.tapleafHash, 33);
+        writeKv(result, key, new Uint8Array(sig.signature));
+      } else if (sig.pubkey.length === 32) {
+        writeKv(result, new Uint8Array([19]), new Uint8Array(sig.signature));
+      } else {
+        const key = new Uint8Array(1 + sig.pubkey.length);
+        key[0] = 2;
+        key.set(sig.pubkey, 1);
+        writeKv(result, key, new Uint8Array(sig.signature));
+      }
+    }
+    result.push(raw[pos++]);
+  }
+  while (pos < raw.length) {
+    result.push(raw[pos++]);
+  }
+  return (0, import_hwk_adapter_core4.bytesToHex)(new Uint8Array(result));
+}
 async function _enrichTaprootPsbt(btcSigner, psbtHex, inputDerivations) {
   const masterFp = await btcSigner.getMasterFingerprint({ skipOpenApp: true });
   const fpBytes = masterFp.length === 4 ? masterFp : new Uint8Array([0, 0, 0, 0]);
@@ -1589,6 +1764,8 @@ async function _enrichTaprootPsbt(btcSigner, psbtHex, inputDerivations) {
 
 // src/connector/chains/sol.ts
 var import_hwk_adapter_core5 = require("@onekeyfe/hwk-adapter-core");
+var import_device_signer_kit_solana = require("@ledgerhq/device-signer-kit-solana");
+var import_context_module2 = require("@ledgerhq/context-module");
 
 // src/signer/SignerSol.ts
 var SignerSol = class {
@@ -1661,8 +1838,8 @@ async function solSignMessage(ctx, sessionId, params) {
 }
 async function _createSolSigner(ctx, sessionId) {
   const dmk = await ctx.getOrCreateDmk();
-  const { SignerSolanaBuilder } = await ctx.importLedgerKit("@ledgerhq/device-signer-kit-solana");
-  const sdkSigner = new SignerSolanaBuilder({ dmk, sessionId }).build();
+  const contextModule = new import_context_module2.ContextModuleBuilder({}).removeDefaultLoaders().build();
+  const sdkSigner = new import_device_signer_kit_solana.SignerSolanaBuilder({ dmk, sessionId }).withContextModule(contextModule).build();
   const signer = new SignerSol(sdkSigner);
   signer.onInteraction = (interaction) => {
     ctx.emit("ui-event", {
@@ -1755,8 +1932,8 @@ var AppManager = class {
     if (!(0, import_device_management_kit2.isSuccessCommandResult)(result)) {
       const statusCode = result.statusCode;
       throw Object.assign(
-        new Error(`Failed to open "${appName}": app may not be installed`),
-        { _tag: "OpenAppCommandError", errorCode: String(statusCode ?? ""), statusCode }
+        new Error(`Failed to open "${appName}"`),
+        { _tag: "OpenAppCommandError", errorCode: String(statusCode ?? ""), statusCode, appName }
       );
     }
   }
@@ -2118,7 +2295,7 @@ var LedgerConnectorBase = class {
   // IConnector -- Method dispatch
   // ---------------------------------------------------------------------------
   async call(sessionId, method, params) {
-    console.log("[DMK] call:", method, JSON.stringify(params));
+    debugLog("[DMK] call:", method, JSON.stringify(params));
     switch (method) {
       // EVM
       case "evmGetAddress":
@@ -2136,6 +2313,8 @@ var LedgerConnectorBase = class {
         return btcGetPublicKey(this._ctx, sessionId, params);
       case "btcSignTransaction":
         return btcSignTransaction(this._ctx, sessionId, params);
+      case "btcSignPsbt":
+        return btcSignPsbt(this._ctx, sessionId, params);
       case "btcSignMessage":
         return btcSignMessage(this._ctx, sessionId, params);
       case "btcGetMasterFingerprint":
@@ -2316,7 +2495,15 @@ var LedgerConnectorBase = class {
   _wrapError(err) {
     const mapped = mapLedgerError(err);
     const error = new Error(mapped.message);
-    Object.assign(error, { code: mapped.code });
+    const src = err && typeof err === "object" ? err : {};
+    Object.assign(error, {
+      code: mapped.code,
+      appName: mapped.appName,
+      _tag: src._tag,
+      errorCode: src.errorCode,
+      _lastStep: src._lastStep,
+      originalError: err
+    });
     return error;
   }
 };