@onekeyfe/hwk-ledger-adapter 1.2.5-alpha.4 → 1.2.6-alpha.0

package/dist/index.d.mts

@@ -102,6 +102,8 @@ declare class LedgerAdapter implements IHardwareWallet {
     private readonly _operations;
     private _discoveredDevices;
     private _sessions;
+    private readonly _pendingOperationBindings;
+    private readonly _pendingPickBindings;
     private readonly _sessionTransports;
     private readonly _selectedBleReconnectTargets;
     private readonly _uiRegistry;
@@ -119,6 +121,7 @@ declare class LedgerAdapter implements IHardwareWallet {
     private _pendingConnectorTeardowns;
     private _activeConnectionType;
     private _bindingSelectionRequestId;
+    private _discardPendingBinding;
     private _finishBleBinding;
     private _isBleConnection;
     constructor(connector: IConnector, options?: {
@@ -153,7 +156,7 @@ declare class LedgerAdapter implements IHardwareWallet {
     private _installProgressLastKey;
     private static _createDeviceBusyError;
     connectDevice(searchTargetId: string): Promise<Response<string>>;
-    /** Ledger binds whichever BLE device the user picks; its wallet is not checked. */
+    /** Binds the picked BLE device; with a recorded wallet identity it must match first. */
     bindBleDevice(params: BindBleDeviceParams): Promise<Response<string>>;
     acquireOperation(connectId: string, context: IHardwareConnectionContext): Promise<Response<string>>;
     private _createOperation;
@@ -213,7 +216,7 @@ declare class LedgerAdapter implements IHardwareWallet {
     cancel(connectId?: string): void;
     /** A non-empty deviceId is an expected chain fingerprint, not a transport identifier. */
     getChainFingerprint(connectId: string, deviceId: string, chain: ChainForFingerprint): Promise<Response<string>>;
-    /** Ledger takes the selected BLE endpoint as the device and binds it right away. */
+    /** Saves a picked BLE endpoint; `identity` is set when its wallet was just checked. */
     private _saveSelectedBleBinding;
     private _dropSession;
     /** Verify on the acquired session without re-entering the job queue. */

package/dist/index.d.ts

@@ -102,6 +102,8 @@ declare class LedgerAdapter implements IHardwareWallet {
     private readonly _operations;
     private _discoveredDevices;
     private _sessions;
+    private readonly _pendingOperationBindings;
+    private readonly _pendingPickBindings;
     private readonly _sessionTransports;
     private readonly _selectedBleReconnectTargets;
     private readonly _uiRegistry;
@@ -119,6 +121,7 @@ declare class LedgerAdapter implements IHardwareWallet {
     private _pendingConnectorTeardowns;
     private _activeConnectionType;
     private _bindingSelectionRequestId;
+    private _discardPendingBinding;
     private _finishBleBinding;
     private _isBleConnection;
     constructor(connector: IConnector, options?: {
@@ -153,7 +156,7 @@ declare class LedgerAdapter implements IHardwareWallet {
     private _installProgressLastKey;
     private static _createDeviceBusyError;
     connectDevice(searchTargetId: string): Promise<Response<string>>;
-    /** Ledger binds whichever BLE device the user picks; its wallet is not checked. */
+    /** Binds the picked BLE device; with a recorded wallet identity it must match first. */
     bindBleDevice(params: BindBleDeviceParams): Promise<Response<string>>;
     acquireOperation(connectId: string, context: IHardwareConnectionContext): Promise<Response<string>>;
     private _createOperation;
@@ -213,7 +216,7 @@ declare class LedgerAdapter implements IHardwareWallet {
     cancel(connectId?: string): void;
     /** A non-empty deviceId is an expected chain fingerprint, not a transport identifier. */
     getChainFingerprint(connectId: string, deviceId: string, chain: ChainForFingerprint): Promise<Response<string>>;
-    /** Ledger takes the selected BLE endpoint as the device and binds it right away. */
+    /** Saves a picked BLE endpoint; `identity` is set when its wallet was just checked. */
     private _saveSelectedBleBinding;
     private _dropSession;
     /** Verify on the acquired session without re-entering the job queue. */

package/dist/index.js

@@ -892,6 +892,8 @@ var _LedgerAdapter = class _LedgerAdapter {
     this._operations = new import_hwk_adapter_core3.OperationRegistry({
       vendor: "ledger",
       onEnded: (operation, reason) => {
+        this._discardPendingBinding(this._pendingOperationBindings.get(operation.operationId));
+        this._pendingOperationBindings.delete(operation.operationId);
         this.emitter.emit(import_hwk_adapter_core3.SDK.OPERATION_ENDED, {
           type: import_hwk_adapter_core3.SDK.OPERATION_ENDED,
           payload: { operationId: operation.operationId, reason }
@@ -903,6 +905,11 @@ var _LedgerAdapter = class _LedgerAdapter {
     });
     this._discoveredDevices = /* @__PURE__ */ new Map();
     this._sessions = /* @__PURE__ */ new Map();
+    // An operation's BLE pick is saved by its first call that gets past the wallet check.
+    this._pendingOperationBindings = /* @__PURE__ */ new Map();
+    // A one-shot call's unchecked BLE pick, by connectId. It outlives the call only
+    // through an unlock retry; any other failure drops it with its session.
+    this._pendingPickBindings = /* @__PURE__ */ new Map();
     // Transport each session was opened on, by sessionId. The adapter-wide
     // `_activeConnectionType` moves with every discovery and can go stale.
     this._sessionTransports = /* @__PURE__ */ new Map();
@@ -1031,6 +1038,12 @@ var _LedgerAdapter = class _LedgerAdapter {
     this._jobQueue = new import_hwk_adapter_core3.DeviceJobQueue();
     this.registerEventListeners();
   }
+  _discardPendingBinding(owner, status = "cancelled") {
+    const pending = owner?.pendingBinding;
+    if (!owner || !pending) return;
+    owner.pendingBinding = void 0;
+    if (pending.requestId === this._bindingSelectionRequestId) this._finishBleBinding(status);
+  }
   _finishBleBinding(status) {
     const selectionRequestId = this._bindingSelectionRequestId;
     this._bindingSelectionRequestId = void 0;
@@ -1081,6 +1094,8 @@ var _LedgerAdapter = class _LedgerAdapter {
     this._discoveredDevices.clear();
     this._sessions.clear();
     this._sessionTransports.clear();
+    this._pendingOperationBindings.clear();
+    this._pendingPickBindings.clear();
     this._selectedBleReconnectTargets.clear();
     this._connectingPromise = null;
     this._doConnectAbortController = null;
@@ -1225,8 +1240,9 @@ var _LedgerAdapter = class _LedgerAdapter {
       return this.errorToFailure(error);
     }
   }
-  /** Ledger binds whichever BLE device the user picks; its wallet is not checked. */
+  /** Binds the picked BLE device; with a recorded wallet identity it must match first. */
   async bindBleDevice(params) {
+    const identity = params.identity?.vendor === "ledger" ? params.identity : void 0;
     try {
       return await this._jobQueue.enqueue(
         "__ledger_bind_ble__",
@@ -1241,7 +1257,8 @@ var _LedgerAdapter = class _LedgerAdapter {
           await this._ensureDevicePermission(void 0, void 0, signal);
           const attempt = {
             extra: params.extra,
-            bindingReason: "manual-rebind"
+            bindingReason: "manual-rebind",
+            deferBindingSave: Boolean(identity)
           };
           try {
             const connectId = await this._connectFirstOrSelect(
@@ -1252,6 +1269,45 @@ var _LedgerAdapter = class _LedgerAdapter {
               attempt,
               signal
             );
+            const pending = attempt.pendingBinding;
+            if (identity && pending) {
+              attempt.pendingBinding = void 0;
+              const sessionId = this._sessions.get(connectId);
+              if (!sessionId) {
+                throw (0, import_hwk_adapter_core3.createHwkError)({
+                  code: import_hwk_adapter_core3.HardwareErrorCode.DeviceDisconnected,
+                  message: "Selected Ledger connection ended"
+                });
+              }
+              const fingerprint = await this._computeChainFingerprint(
+                identity.chain,
+                (method, callParams) => this._runConnectorCall(
+                  connectId,
+                  method,
+                  callParams,
+                  signal,
+                  void 0,
+                  void 0,
+                  { autoInstallApp: true },
+                  { connection: { connectId, sessionId } }
+                )
+              );
+              if (fingerprint !== identity.value) {
+                await this._dropSession(connectId, signal);
+                throw (0, import_hwk_adapter_core3.createHwkError)({
+                  code: import_hwk_adapter_core3.HardwareErrorCode.DeviceMismatch,
+                  message: formatDeviceMismatchError(identity.value, fingerprint)
+                });
+              }
+              await this._saveSelectedBleBinding(
+                connectId,
+                pending.requestId,
+                attempt,
+                void 0,
+                signal,
+                identity
+              );
+            }
             if (!attempt.bindingSaved) {
               await this._dropSession(connectId, signal);
               throw (0, import_hwk_adapter_core3.createHwkError)({
@@ -1289,7 +1345,9 @@ var _LedgerAdapter = class _LedgerAdapter {
           await this._ensureDevicePermission(target, void 0, signal);
           const attempt = {
             ...context,
-            extra: context.extra ? { ...context.extra } : void 0
+            extra: context.extra ? { ...context.extra } : void 0,
+            // The operation's calls decide whether the pick is the right wallet.
+            deferBindingSave: true
           };
           try {
             const resolvedConnectId = await this.ensureConnected(
@@ -1300,7 +1358,11 @@ var _LedgerAdapter = class _LedgerAdapter {
               attempt
             );
             _LedgerAdapter._throwIfAborted(signal);
-            return this._createOperation(connectId, resolvedConnectId);
+            const result = this._createOperation(connectId, resolvedConnectId);
+            if (result.success && attempt.pendingBinding) {
+              this._pendingOperationBindings.set(result.payload, attempt);
+            }
+            return result;
           } catch (error) {
             this._finishBleBinding(signal.aborted ? "cancelled" : "failed");
             throw error;
@@ -1915,6 +1977,8 @@ var _LedgerAdapter = class _LedgerAdapter {
       this._uiRegistry.cancel(void 0, void 0, pendingOperationId);
     }
     this._finishBleBinding("cancelled");
+    if (!connectId) this._pendingOperationBindings.clear();
+    else if (pendingOperationId) this._pendingOperationBindings.delete(pendingOperationId);
     const queueKeys = /* @__PURE__ */ new Set();
     if (connectId) queueKeys.add(ledgerQueueKey({ connectId }));
     if (pendingOperationId) queueKeys.add(ledgerQueueKey({ operationId: pendingOperationId }));
@@ -1966,8 +2030,8 @@ var _LedgerAdapter = class _LedgerAdapter {
       return this.errorToFailure(err);
     }
   }
-  /** Ledger takes the selected BLE endpoint as the device and binds it right away. */
-  async _saveSelectedBleBinding(connectId, selectionRequestId, context, operationId, signal) {
+  /** Saves a picked BLE endpoint; `identity` is set when its wallet was just checked. */
+  async _saveSelectedBleBinding(connectId, selectionRequestId, context, operationId, signal, identity) {
     try {
       const outcome = await (0, import_hwk_adapter_core3.requestSaveDeviceBinding)(
         this.emitter,
@@ -1975,6 +2039,7 @@ var _LedgerAdapter = class _LedgerAdapter {
         {
           selectionRequestId,
           connection: { transport: "ble", connectId },
+          ...identity ? { identity } : {},
           extra: context?.extra,
           operationId
         },
@@ -2428,13 +2493,17 @@ var _LedgerAdapter = class _LedgerAdapter {
         signal
       );
       if (context) context.selectedConnection = { connectId: connected, requestId };
-      await this._saveSelectedBleBinding(
-        connected,
-        requestId,
-        context,
-        preserveOperationId,
-        signal
-      );
+      if (context?.deferBindingSave) {
+        context.pendingBinding = { connectId: connected, requestId };
+      } else {
+        await this._saveSelectedBleBinding(
+          connected,
+          requestId,
+          context,
+          preserveOperationId,
+          signal
+        );
+      }
       return connected;
     }
     if (devices.length > 0 && (devices.length > 1 || requiresBleSelection)) {
@@ -2630,7 +2699,13 @@ var _LedgerAdapter = class _LedgerAdapter {
               operationId
             );
           } catch (error) {
-            this._finishBleBinding(signal.aborted ? "cancelled" : "failed");
+            const status = signal.aborted ? "cancelled" : "failed";
+            for (const [pickedConnectId, owner] of this._pendingPickBindings) {
+              this._pendingPickBindings.delete(pickedConnectId);
+              this._discardPendingBinding(owner, status);
+              await this._dropSession(pickedConnectId, signal);
+            }
+            this._finishBleBinding(status);
             throw error;
           } finally {
             if (operationId) {
@@ -2737,7 +2812,13 @@ var _LedgerAdapter = class _LedgerAdapter {
     );
     const inputConnectId = hintedConnectId && hintedConnectId.transport !== "qr" ? hintedConnectId.connectId : connectId;
     const preferredConnectId = fingerprint && !fingerprint.skipFingerprint && selectedBleTarget?.chain === fingerprint.chain && selectedBleTarget.fingerprint === fingerprint.deviceId ? selectedBleTarget.connectId : inputConnectId;
-    const connectionAttempt = { ...commonParams };
+    const checksWallet = Boolean(
+      fingerprint && !fingerprint.skipFingerprint && fingerprint.deviceId
+    );
+    const connectionAttempt = {
+      ...commonParams,
+      deferBindingSave: checksWallet
+    };
     const bundleConnection = installContext?.connection;
     if (bundleConnection && this._sessions.get(bundleConnection.connectId) !== bundleConnection.sessionId) {
       throw (0, import_hwk_adapter_core3.createHwkError)({
@@ -2771,7 +2852,12 @@ var _LedgerAdapter = class _LedgerAdapter {
     }
     try {
       const isBleSession = this._sessionTransports.get(sessionId) === "ble";
-      if (fingerprint && !fingerprint.skipFingerprint && fingerprint.deviceId && !isBleSession) {
+      if (!operationId && connectionAttempt.pendingBinding) {
+        this._pendingPickBindings.set(resolvedConnectId, connectionAttempt);
+      }
+      const bindingOwner = operationId ? this._pendingOperationBindings.get(operationId) : this._pendingPickBindings.get(resolvedConnectId);
+      const pendingBinding = bindingOwner?.pendingBinding?.connectId === resolvedConnectId ? bindingOwner.pendingBinding : void 0;
+      if (fingerprint && checksWallet) {
         const fp = await this._abortable(
           signal,
           this._verifyDeviceFingerprintWithSession(
@@ -2781,11 +2867,38 @@ var _LedgerAdapter = class _LedgerAdapter {
           )
         );
         if (!fp.success) {
+          if (pendingBinding) {
+            this._discardPendingBinding(bindingOwner, "failed");
+            this._pendingPickBindings.delete(resolvedConnectId);
+            if (operationId) {
+              this._pendingOperationBindings.delete(operationId);
+              this._operations.end(operationId, "explicit");
+              await this._dropSession(resolvedConnectId, signal);
+            }
+          }
           throw Object.assign(new Error(formatDeviceMismatchError(fp.expected, fp.actual)), {
             code: import_hwk_adapter_core3.HardwareErrorCode.DeviceMismatch
           });
         }
       }
+      if (pendingBinding && bindingOwner) {
+        bindingOwner.pendingBinding = void 0;
+        if (operationId) this._pendingOperationBindings.delete(operationId);
+        else this._pendingPickBindings.delete(resolvedConnectId);
+        await this._saveSelectedBleBinding(
+          pendingBinding.connectId,
+          pendingBinding.requestId,
+          bindingOwner,
+          operationId,
+          signal,
+          fingerprint && checksWallet ? {
+            vendor: "ledger",
+            type: "chainFingerprint",
+            chain: fingerprint.chain,
+            value: fingerprint.deviceId
+          } : void 0
+        );
+      }
       if (fingerprint && !fingerprint.skipFingerprint && fingerprint.deviceId && !operationId && isBleSession && connectionAttempt.selectedConnection?.connectId === resolvedConnectId) {
         this._selectedBleReconnectTargets.set(connectId, {
           connectId: resolvedConnectId,
@@ -2874,6 +2987,7 @@ var _LedgerAdapter = class _LedgerAdapter {
       }
       if (!operationId && errObj?.code === import_hwk_adapter_core3.HardwareErrorCode.DeviceMismatch) {
         this._sessions.delete(resolvedConnectId);
+        this._sessionTransports.delete(sessionId);
         this._discoveredDevices.delete(resolvedConnectId);
         await this.connector.disconnect(sessionId).catch(() => void 0);
         throw err;