@onekeyfe/hwk-ledger-adapter 1.1.26-alpha.104 → 1.1.26-alpha.106

package/dist/index.d.mts

@@ -91,16 +91,20 @@ declare class LedgerAdapter implements IHardwareWallet {
      */
     private _verifyDeviceFingerprintWithSession;
     /**
-     * Derive an address at the fixed testnet path for fingerprint generation.
-     * Uses connectorCall (goes through ensureConnected). For public API use.
-     */
-    private _deriveAddressForFingerprint;
-    /**
-     * Derive an address using an existing sessionId directly.
-     * Does NOT go through connectorCall — safe to call inside connectorCall
-     * without causing queue deadlock.
+     * Compute the chain fingerprint via a caller-supplied call strategy.
+     *
+     * Chains with a native device-side identity primitive (BTC → BIP32 master
+     * fingerprint) short-circuit at the top and return it verbatim, so the value
+     * stays reusable for higher-level use (BIP380 descriptors, PSBT signing).
+     *
+     * All other chains derive a fixed-path address and run it through
+     * `deriveDeviceFingerprint` to produce an opaque seed identifier.
+     *
+     * The two callers (`getChainFingerprint` / `_verifyDeviceFingerprintWithSession`)
+     * differ only in the underlying call mechanism, which is injected as `callMethod`
+     * to avoid queue deadlocks when running inside `connectorCall`.
      */
-    private _deriveAddressWithSession;
+    private _computeChainFingerprint;
     /**
      * Ensure at least one device is connected and return a valid connectId.
      *

package/dist/index.d.ts

@@ -91,16 +91,20 @@ declare class LedgerAdapter implements IHardwareWallet {
      */
     private _verifyDeviceFingerprintWithSession;
     /**
-     * Derive an address at the fixed testnet path for fingerprint generation.
-     * Uses connectorCall (goes through ensureConnected). For public API use.
-     */
-    private _deriveAddressForFingerprint;
-    /**
-     * Derive an address using an existing sessionId directly.
-     * Does NOT go through connectorCall — safe to call inside connectorCall
-     * without causing queue deadlock.
+     * Compute the chain fingerprint via a caller-supplied call strategy.
+     *
+     * Chains with a native device-side identity primitive (BTC → BIP32 master
+     * fingerprint) short-circuit at the top and return it verbatim, so the value
+     * stays reusable for higher-level use (BIP380 descriptors, PSBT signing).
+     *
+     * All other chains derive a fixed-path address and run it through
+     * `deriveDeviceFingerprint` to produce an opaque seed identifier.
+     *
+     * The two callers (`getChainFingerprint` / `_verifyDeviceFingerprintWithSession`)
+     * differ only in the underlying call mechanism, which is injected as `callMethod`
+     * to avoid queue deadlocks when running inside `connectorCall`.
      */
-    private _deriveAddressWithSession;
+    private _computeChainFingerprint;
     /**
      * Ensure at least one device is connected and return a valid connectId.
      *

package/dist/index.js

@@ -529,19 +529,16 @@ var _LedgerAdapter = class _LedgerAdapter {
       this._sessions.size
     );
     await this._ensureDevicePermission(connectId, deviceId);
-    debugLog(
-      "[LedgerAdapter] getChainFingerprint permission ok, calling _deriveAddressForFingerprint"
-    );
+    debugLog("[LedgerAdapter] getChainFingerprint permission ok, computing fingerprint");
     try {
-      const address = await this._deriveAddressForFingerprint(connectId, chain);
-      debugLog("[LedgerAdapter] getChainFingerprint address:", address?.substring(0, 20));
-      return (0, import_hwk_adapter_core2.success)((0, import_hwk_adapter_core2.deriveDeviceFingerprint)(address));
-    } catch (err) {
-      debugError(
-        "[LedgerAdapter] getChainFingerprint error in _deriveAddressForFingerprint:",
+      const fingerprint = await this._computeChainFingerprint(
         chain,
-        err
+        (method, params) => this.connectorCall(connectId, method, params)
       );
+      debugLog("[LedgerAdapter] getChainFingerprint result:", fingerprint?.substring(0, 20));
+      return (0, import_hwk_adapter_core2.success)(fingerprint);
+    } catch (err) {
+      debugError("[LedgerAdapter] getChainFingerprint error:", chain, err);
       return this.errorToFailure(err);
     }
   }
@@ -552,8 +549,10 @@ var _LedgerAdapter = class _LedgerAdapter {
   async _verifyDeviceFingerprintWithSession(sessionId, deviceId, chain) {
     if (!deviceId) return { success: true };
     try {
-      const address = await this._deriveAddressWithSession(sessionId, chain);
-      const fingerprint = (0, import_hwk_adapter_core2.deriveDeviceFingerprint)(address);
+      const fingerprint = await this._computeChainFingerprint(
+        chain,
+        (method, params) => this.connector.call(sessionId, method, params)
+      );
       if (fingerprint === deviceId) {
         return { success: true };
       }
@@ -567,77 +566,36 @@ var _LedgerAdapter = class _LedgerAdapter {
     }
   }
   /**
-   * Derive an address at the fixed testnet path for fingerprint generation.
-   * Uses connectorCall (goes through ensureConnected). For public API use.
+   * Compute the chain fingerprint via a caller-supplied call strategy.
+   *
+   * Chains with a native device-side identity primitive (BTC → BIP32 master
+   * fingerprint) short-circuit at the top and return it verbatim, so the value
+   * stays reusable for higher-level use (BIP380 descriptors, PSBT signing).
+   *
+   * All other chains derive a fixed-path address and run it through
+   * `deriveDeviceFingerprint` to produce an opaque seed identifier.
+   *
+   * The two callers (`getChainFingerprint` / `_verifyDeviceFingerprintWithSession`)
+   * differ only in the underlying call mechanism, which is injected as `callMethod`
+   * to avoid queue deadlocks when running inside `connectorCall`.
    */
-  async _deriveAddressForFingerprint(connectId, chain) {
-    const path = import_hwk_adapter_core2.CHAIN_FINGERPRINT_PATHS[chain];
-    if (chain === "evm") {
-      const result = await this.connectorCall(connectId, "evmGetAddress", {
-        path,
-        showOnDevice: false
-      });
-      return result.address;
-    }
+  async _computeChainFingerprint(chain, callMethod) {
     if (chain === "btc") {
-      const result = await this.connectorCall(connectId, "btcGetPublicKey", {
-        path,
-        showOnDevice: false
-      });
-      return result.xpub;
-    }
-    if (chain === "sol") {
-      const result = await this.connectorCall(connectId, "solGetAddress", {
-        path,
-        showOnDevice: false
-      });
-      return result.address;
-    }
-    if (chain === "tron") {
-      const result = await this.connectorCall(connectId, "tronGetAddress", {
-        path,
-        showOnDevice: false
-      });
-      return result.address;
+      const result = await callMethod("btcGetMasterFingerprint", {});
+      return result.masterFingerprint;
     }
-    throw new Error(`Unsupported chain for fingerprint: ${chain}`);
-  }
-  /**
-   * Derive an address using an existing sessionId directly.
-   * Does NOT go through connectorCall — safe to call inside connectorCall
-   * without causing queue deadlock.
-   */
-  async _deriveAddressWithSession(sessionId, chain) {
     const path = import_hwk_adapter_core2.CHAIN_FINGERPRINT_PATHS[chain];
+    let address;
     if (chain === "evm") {
-      const result = await this.connector.call(sessionId, "evmGetAddress", {
-        path,
-        showOnDevice: false
-      });
-      return result.address;
+      address = (await callMethod("evmGetAddress", { path, showOnDevice: false })).address;
+    } else if (chain === "sol") {
+      address = (await callMethod("solGetAddress", { path, showOnDevice: false })).address;
+    } else if (chain === "tron") {
+      address = (await callMethod("tronGetAddress", { path, showOnDevice: false })).address;
+    } else {
+      throw new Error(`Unsupported chain for fingerprint: ${chain}`);
     }
-    if (chain === "btc") {
-      const result = await this.connector.call(sessionId, "btcGetPublicKey", {
-        path,
-        showOnDevice: false
-      });
-      return result.xpub;
-    }
-    if (chain === "sol") {
-      const result = await this.connector.call(sessionId, "solGetAddress", {
-        path,
-        showOnDevice: false
-      });
-      return result.address;
-    }
-    if (chain === "tron") {
-      const result = await this.connector.call(sessionId, "tronGetAddress", {
-        path,
-        showOnDevice: false
-      });
-      return result.address;
-    }
-    throw new Error(`Unsupported chain for fingerprint: ${chain}`);
+    return (0, import_hwk_adapter_core2.deriveDeviceFingerprint)(address);
   }
   // Ledger WebUSB won't expose a locked device, so we can't auto-detect unlock.
   // The user must press Confirm after unlocking, which triggers a search retry.
@@ -2337,8 +2295,14 @@ var LedgerConnectorBase = class {
         return tronGetAddress(this._ctx, sessionId, params);
       case "tronSignTransaction":
         return tronSignTransaction(this._ctx, sessionId, params);
-      case "tronSignMessage":
-        return tronSignMessage(this._ctx, sessionId, params);
+      case "tronSignMessage": {
+        const p = params;
+        const internalParams = {
+          path: p.path,
+          messageHex: p.messageHex
+        };
+        return tronSignMessage(this._ctx, sessionId, internalParams);
+      }
       default:
         throw new Error(`LedgerConnector: unknown method "${method}"`);
     }