@onekeyfe/hwk-trezor-adapter 1.2.8-alpha.13 → 1.2.8-alpha.130

package/dist/index.d.mts

@@ -50,6 +50,7 @@ declare class TrezorAdapter implements IHardwareWallet {
     private static readonly _sensitiveLogKeys;
     private static _normalizeLogKey;
     private static _sanitizeForLog;
+    private static _responseForLog;
     private static _redactForLog;
     private static _errorForLog;
     private _setPassphraseRequestContext;
@@ -123,8 +124,7 @@ declare class TrezorAdapter implements IHardwareWallet {
     private _getTrezorDeviceId;
     cancel(connectId?: string): void;
     /**
-     * Operation owning the running job: its queue key when pinned, else the live
-     * operation of its connectId, so a mid-call UI request can name it.
+     * Only the operation explicitly supplied to the running job owns its UI requests.
      */
     private _activeOperationId;
     /**

package/dist/index.d.ts

@@ -50,6 +50,7 @@ declare class TrezorAdapter implements IHardwareWallet {
     private static readonly _sensitiveLogKeys;
     private static _normalizeLogKey;
     private static _sanitizeForLog;
+    private static _responseForLog;
     private static _redactForLog;
     private static _errorForLog;
     private _setPassphraseRequestContext;
@@ -123,8 +124,7 @@ declare class TrezorAdapter implements IHardwareWallet {
     private _getTrezorDeviceId;
     cancel(connectId?: string): void;
     /**
-     * Operation owning the running job: its queue key when pinned, else the live
-     * operation of its connectId, so a mid-call UI request can name it.
+     * Only the operation explicitly supplied to the running job owns its UI requests.
      */
     private _activeOperationId;
     /**

package/dist/index.js

@@ -27,6 +27,7 @@
 
 
 
+
 
 
 var _hwkadaptercore = require('@onekeyfe/hwk-adapter-core');
@@ -912,7 +913,8 @@ var _TrezorAdapter = class _TrezorAdapter {
       this._emitter.emit(data.type, { ...data, payload });
     };
     this._onUiEvent = (data) => {
-      this._emitter.emit("ui-event", data);
+      const operationId = this._activeOperationId();
+      this._emitter.emit("ui-event", operationId ? { ...data, operationId } : data);
     };
     this._onThpCredentialsChanged = (data) => {
       this._emitter.emit(_hwkadaptercore.DEVICE.TREZOR_THP_CREDENTIALS_CHANGED, {
@@ -984,11 +986,21 @@ var _TrezorAdapter = class _TrezorAdapter {
   static _normalizeLogKey(key) {
     return key.replace(/[_-]/g, "").toLowerCase();
   }
-  // Mirrors hd-core's logBlockEvent: a signing method's body is the user's
-  // transaction, so it is dropped wholesale; other methods redact by key.
-  static _sanitizeForLog(value, methodName) {
-    if (methodName && /sign/i.test(methodName)) return "[redacted]";
-    return _TrezorAdapter._redactForLog(value, /* @__PURE__ */ new WeakSet());
+  // [REQ]/[RES] bodies: paths, chain ids and flags stay readable; transaction
+  // contents, keys and addresses become length + short hash; secrets are redacted.
+  static _sanitizeForLog(value, methodName, role = "params") {
+    return _hwkadaptercore.summarizeForLog.call(void 0, value, { method: methodName, role });
+  }
+  // A failure payload is an error record, so its message/error text stays readable.
+  static _responseForLog(response, methodName) {
+    if (response.success) {
+      return _TrezorAdapter._sanitizeForLog(response.payload, methodName, "result");
+    }
+    const out = _hwkadaptercore.summarizeForLog.call(void 0, 
+      { error: response.payload },
+      { method: methodName, role: "result" }
+    );
+    return out && typeof out === "object" ? out.error : out;
   }
   static _redactForLog(value, seen) {
     if (ArrayBuffer.isView(value) || value instanceof ArrayBuffer) {
@@ -1009,14 +1021,17 @@ var _TrezorAdapter = class _TrezorAdapter {
   static _errorForLog(error) {
     if (!error || typeof error !== "object") return error;
     const typed = error;
-    return _TrezorAdapter._sanitizeForLog({
-      name: typed.name,
-      message: typed.message,
-      code: typed.code,
-      errorCode: typed.errorCode,
-      statusCode: typed.statusCode,
-      response: typed.response
-    });
+    return _TrezorAdapter._redactForLog(
+      {
+        name: typed.name,
+        message: typed.message,
+        code: typed.code,
+        errorCode: typed.errorCode,
+        statusCode: typed.statusCode,
+        response: typed.response
+      },
+      /* @__PURE__ */ new WeakSet()
+    );
   }
   _setPassphraseRequestContext(connectId, context) {
     const previous = this._passphraseRequestContextByConnectId.get(connectId);
@@ -1413,6 +1428,10 @@ var _TrezorAdapter = class _TrezorAdapter {
   }
   async _releaseOperationConnection(operation) {
     const { connectId } = operation;
+    const activeKey = _optionalChain([this, 'access', _49 => _49._jobQueue, 'access', _50 => _50.getActiveJob, 'call', _51 => _51(), 'optionalAccess', _52 => _52.deviceId]);
+    if (activeKey !== void 0 && !_hwkadaptercore.isHardwareOperationId.call(void 0, activeKey) && (activeKey === connectId || activeKey === "" || activeKey === operation.device.deviceId)) {
+      return;
+    }
     const connecting = this._connectingPromises.has(connectId);
     this._connectingPromises.delete(connectId);
     const sessionId = this._sessions.get(connectId);
@@ -1450,7 +1469,7 @@ var _TrezorAdapter = class _TrezorAdapter {
     const bundleContext = {};
     const topLevelFailureIndexes = /* @__PURE__ */ new Set();
     const isSingleNetworkBundle = params.bundle.every(
-      (item) => item.network === _optionalChain([params, 'access', _49 => _49.bundle, 'access', _50 => _50[0], 'optionalAccess', _51 => _51.network])
+      (item) => item.network === _optionalChain([params, 'access', _53 => _53.bundle, 'access', _54 => _54[0], 'optionalAccess', _55 => _55.network])
     );
     const getLiveDeviceId = async (expectedDeviceId) => {
       if (liveDeviceId) return _hwkadaptercore.success.call(void 0, liveDeviceId);
@@ -1463,7 +1482,7 @@ var _TrezorAdapter = class _TrezorAdapter {
       if (deviceIdResponse.success) {
         liveDeviceId = deviceIdResponse.payload;
         if (!target.payload.operationId) {
-          effectiveTargetId = _nullishCoalesce(_optionalChain([bundleContext, 'access', _52 => _52.connection, 'optionalAccess', _53 => _53.connectId]), () => ( effectiveTargetId));
+          effectiveTargetId = _nullishCoalesce(_optionalChain([bundleContext, 'access', _56 => _56.connection, 'optionalAccess', _57 => _57.connectId]), () => ( effectiveTargetId));
         }
       }
       return deviceIdResponse;
@@ -1528,14 +1547,14 @@ var _TrezorAdapter = class _TrezorAdapter {
         // One named boolean per abort reason.
         shouldAbortBundle: (response, { index }) => {
           const isSessionLevelFailure = topLevelFailureIndexes.has(index);
-          const isWholeChainForbidden = isSingleNetworkBundle && _optionalChain([response, 'access', _54 => _54.payload, 'optionalAccess', _55 => _55.code]) === _hwkadaptercore.HardwareErrorCode.DevicePathForbidden;
+          const isWholeChainForbidden = isSingleNetworkBundle && _optionalChain([response, 'access', _58 => _58.payload, 'optionalAccess', _59 => _59.code]) === _hwkadaptercore.HardwareErrorCode.DevicePathForbidden;
           const { code } = _nullishCoalesce(response.payload, () => ( {}));
           return isSessionLevelFailure || isWholeChainForbidden || _hwkadaptercore.isWalletSafetyFailure.call(void 0, code) || _hwkadaptercore.isUserRefusal.call(void 0, code) || _hwkadaptercore.isConnectionLost.call(void 0, code);
         }
       });
     } finally {
       cancelScope.release();
-      _optionalChain([releaseOperationRetention, 'optionalCall', _56 => _56()]);
+      _optionalChain([releaseOperationRetention, 'optionalCall', _60 => _60()]);
     }
   }
   getFeatures(connectId, operationContext) {
@@ -1579,7 +1598,7 @@ var _TrezorAdapter = class _TrezorAdapter {
     if (!internalModel) {
       return _hwkadaptercore.failure.call(void 0, _hwkadaptercore.HardwareErrorCode.UnknownError, "Device internal_model unavailable");
     }
-    const challengeHex = _nullishCoalesce(_optionalChain([params, 'access', _57 => _57.challenge, 'optionalAccess', _58 => _58.toLowerCase, 'call', _59 => _59()]), () => ( Buffer.from(_utils.randomBytes.call(void 0, 32)).toString("hex")));
+    const challengeHex = _nullishCoalesce(_optionalChain([params, 'access', _61 => _61.challenge, 'optionalAccess', _62 => _62.toLowerCase, 'call', _63 => _63()]), () => ( Buffer.from(_utils.randomBytes.call(void 0, 32)).toString("hex")));
     const challenge = Buffer.from(challengeHex, "hex");
     const proofRes = await this._callDeviceManagerMethod(
       "authenticateDevice",
@@ -1637,20 +1656,24 @@ var _TrezorAdapter = class _TrezorAdapter {
     );
   }
   async _getTrezorDeviceId(connectId, expectedDeviceId, commonParams, bundleContext) {
-    const hasConnectionContext = _optionalChain([commonParams, 'optionalAccess', _60 => _60.knownConnections]) !== void 0 || _optionalChain([commonParams, 'optionalAccess', _61 => _61.extra]) !== void 0;
+    const hasConnectionContext = _optionalChain([commonParams, 'optionalAccess', _64 => _64.knownConnections]) !== void 0 || _optionalChain([commonParams, 'optionalAccess', _65 => _65.extra]) !== void 0;
     const features = bundleContext || hasConnectionContext ? await this._callMethod(
       "getFeatures",
       connectId,
       hasConnectionContext || !connectId ? expectedDeviceId : void 0,
-      hasConnectionContext ? {
-        operationId: commonParams.operationId,
-        knownConnections: commonParams.knownConnections,
-        extra: commonParams.extra,
-        allowDeviceSelection: commonParams.allowDeviceSelection,
-        supportedTransports: commonParams.supportedTransports,
-        passphraseState: commonParams.passphraseState,
-        useEmptyPassphrase: commonParams.useEmptyPassphrase
-      } : {},
+      {
+        // Routing limits always apply: the connection found here is reused by the whole
+        // bundle, so dropping them would let a bundle open a transport the host excluded.
+        operationId: _optionalChain([commonParams, 'optionalAccess', _66 => _66.operationId]),
+        knownConnections: _optionalChain([commonParams, 'optionalAccess', _67 => _67.knownConnections]),
+        extra: _optionalChain([commonParams, 'optionalAccess', _68 => _68.extra]),
+        allowDeviceSelection: _optionalChain([commonParams, 'optionalAccess', _69 => _69.allowDeviceSelection]),
+        supportedTransports: _optionalChain([commonParams, 'optionalAccess', _70 => _70.supportedTransports]),
+        ...hasConnectionContext ? {
+          passphraseState: commonParams.passphraseState,
+          useEmptyPassphrase: commonParams.useEmptyPassphrase
+        } : {}
+      },
       false,
       bundleContext
     ) : await this.getFeatures(
@@ -1681,7 +1704,7 @@ var _TrezorAdapter = class _TrezorAdapter {
     const userAbortReason = Object.assign(new Error("User aborted operation"), {
       code: _hwkadaptercore.HardwareErrorCode.UserAborted
     });
-    const activeJobId = _optionalChain([this, 'access', _62 => _62._jobQueue, 'access', _63 => _63.getActiveJob, 'call', _64 => _64(), 'optionalAccess', _65 => _65.deviceId]);
+    const activeJobId = _optionalChain([this, 'access', _71 => _71._jobQueue, 'access', _72 => _72.getActiveJob, 'call', _73 => _73(), 'optionalAccess', _74 => _74.deviceId]);
     const targetId = _nullishCoalesce(connectId, () => ( activeJobId));
     if (targetId) {
       let resolvedConnectId = targetId;
@@ -1695,7 +1718,7 @@ var _TrezorAdapter = class _TrezorAdapter {
         }
       }
       const interactionForPhysicalId = !operationId && connectId ? this._operations.findActiveByConnectionKey(connectId) : void 0;
-      const pendingOperationId = _nullishCoalesce(operationId, () => ( _optionalChain([interactionForPhysicalId, 'optionalAccess', _66 => _66.operationId])));
+      const pendingOperationId = _nullishCoalesce(operationId, () => ( _optionalChain([interactionForPhysicalId, 'optionalAccess', _75 => _75.operationId])));
       if (!connectId) {
         this._uiRegistry.cancel();
       } else if (pendingOperationId) {
@@ -1710,7 +1733,7 @@ var _TrezorAdapter = class _TrezorAdapter {
       for (const key of queueKeys) {
         this._jobQueue.cancelActiveAndPending(key, userAbortReason);
       }
-      if (resolvedConnectId) {
+      if (resolvedConnectId && (activeJobId === void 0 || ownsConnectorInteraction)) {
         void this._connector.cancel(_nullishCoalesce(this._sessions.get(resolvedConnectId), () => ( resolvedConnectId)));
       }
       return;
@@ -1723,11 +1746,10 @@ var _TrezorAdapter = class _TrezorAdapter {
     }
   }
   /**
-   * Operation owning the running job: its queue key when pinned, else the live
-   * operation of its connectId, so a mid-call UI request can name it.
+   * Only the operation explicitly supplied to the running job owns its UI requests.
    */
   _activeOperationId() {
-    return this._operations.findOperationIdByJobKey(_optionalChain([this, 'access', _67 => _67._jobQueue, 'access', _68 => _68.getActiveJob, 'call', _69 => _69(), 'optionalAccess', _70 => _70.deviceId]));
+    return this._operations.findOperationIdByJobKey(_optionalChain([this, 'access', _76 => _76._jobQueue, 'access', _77 => _77.getActiveJob, 'call', _78 => _78(), 'optionalAccess', _79 => _79.deviceId]));
   }
   /**
    * Routes to BOTH the adapter's local UI registry (preemption decisions,
@@ -1761,7 +1783,7 @@ var _TrezorAdapter = class _TrezorAdapter {
    * the THP session selection).
    */
   getPassphraseState(connectId, passphraseState, operationContext) {
-    const expectedIdentity = _optionalChain([operationContext, 'optionalAccess', _71 => _71.expectedDeviceIdentity]);
+    const expectedIdentity = _optionalChain([operationContext, 'optionalAccess', _80 => _80.expectedDeviceIdentity]);
     if (expectedIdentity && (expectedIdentity.vendor !== "trezor" || expectedIdentity.type !== "deviceId")) {
       return Promise.resolve(
         _hwkadaptercore.failure.call(void 0, _hwkadaptercore.HardwareErrorCode.InvalidParams, "Trezor device identity is required")
@@ -1769,7 +1791,7 @@ var _TrezorAdapter = class _TrezorAdapter {
     }
     const target = _hwkadaptercore.resolveHardwareOperationTarget.call(void 0, 
       connectId,
-      _optionalChain([operationContext, 'optionalAccess', _72 => _72.operationId]),
+      _optionalChain([operationContext, 'optionalAccess', _81 => _81.operationId]),
       "trezor"
     );
     if (!target.success) return Promise.resolve(target);
@@ -1790,7 +1812,7 @@ var _TrezorAdapter = class _TrezorAdapter {
         let selectionRequestId;
         let verified = false;
         try {
-          if (!operationId && _optionalChain([expectedIdentity, 'optionalAccess', _73 => _73.value]) && (!connectId || _optionalChain([operationContext, 'optionalAccess', _74 => _74.knownConnections]) !== void 0)) {
+          if (!operationId && _optionalChain([expectedIdentity, 'optionalAccess', _82 => _82.value]) && (!connectId || _optionalChain([operationContext, 'optionalAccess', _83 => _83.knownConnections]) !== void 0)) {
             const resolved = await this._resolveExpectedDeviceConnectId(
               expectedIdentity.value,
               signal,
@@ -1799,9 +1821,9 @@ var _TrezorAdapter = class _TrezorAdapter {
             resolvedConnectId = resolved.connectId;
             selectionRequestId = resolved.selectionRequestId;
           }
-          if (_optionalChain([expectedIdentity, 'optionalAccess', _75 => _75.value])) {
+          if (_optionalChain([expectedIdentity, 'optionalAccess', _84 => _84.value])) {
             if (!operationId) await this._ensureSession(resolvedConnectId, signal);
-            if (_optionalChain([this, 'access', _76 => _76._devices, 'access', _77 => _77.get, 'call', _78 => _78(resolvedConnectId), 'optionalAccess', _79 => _79.deviceId]) !== expectedIdentity.value) {
+            if (_optionalChain([this, 'access', _85 => _85._devices, 'access', _86 => _86.get, 'call', _87 => _87(resolvedConnectId), 'optionalAccess', _88 => _88.deviceId]) !== expectedIdentity.value) {
               return _hwkadaptercore.failure.call(void 0, 
                 _hwkadaptercore.HardwareErrorCode.DeviceMismatch,
                 "Trezor device identity does not match"
@@ -1821,7 +1843,7 @@ var _TrezorAdapter = class _TrezorAdapter {
               signal,
               operationId
             );
-            if (result.success && _optionalChain([expectedIdentity, 'optionalAccess', _80 => _80.value])) {
+            if (result.success && _optionalChain([expectedIdentity, 'optionalAccess', _89 => _89.value])) {
               await this._emitVerifiedBinding(
                 expectedIdentity.value,
                 resolvedConnectId,
@@ -1848,7 +1870,7 @@ var _TrezorAdapter = class _TrezorAdapter {
         rejectIfBusy: true,
         busyError: _TrezorAdapter._createDeviceBusyError("getPassphraseState")
       }
-    ).catch((error) => this._errorToFailure(error)).finally(() => _optionalChain([releaseOperationRetention, 'optionalCall', _81 => _81()]));
+    ).catch((error) => this._errorToFailure(error)).finally(() => _optionalChain([releaseOperationRetention, 'optionalCall', _90 => _90()]));
   }
   evmGetAddress(connectId, deviceId, params) {
     return this._callWalletMethod("evmGetAddress", connectId, deviceId, params);
@@ -1912,7 +1934,7 @@ var _TrezorAdapter = class _TrezorAdapter {
     return result;
   }
   async _callConnector(sessionId, method, params, signal) {
-    if (_optionalChain([signal, 'optionalAccess', _82 => _82.aborted])) {
+    if (_optionalChain([signal, 'optionalAccess', _91 => _91.aborted])) {
       throw _nullishCoalesce(signal.reason, () => ( new Error("Aborted")));
     }
     this._assertConnectorIdle(method);
@@ -1962,7 +1984,7 @@ var _TrezorAdapter = class _TrezorAdapter {
   }
   /** Transports the connector offers and the host's model table allows; discovery opens no other. */
   _allowedTransports(context) {
-    const supported = _optionalChain([context, 'optionalAccess', _83 => _83.supportedTransports]);
+    const supported = _optionalChain([context, 'optionalAccess', _92 => _92.supportedTransports]);
     const available = this._availableTransports();
     return supported ? available.filter((transport) => supported.includes(transport)) : available;
   }
@@ -2050,7 +2072,7 @@ var _TrezorAdapter = class _TrezorAdapter {
     return this._callMethod(methodName, connectId, deviceId, params, true);
   }
   _callDeviceManagerMethod(methodName, connectId, params, operationContext) {
-    const expectedIdentity = _optionalChain([operationContext, 'optionalAccess', _84 => _84.expectedDeviceIdentity]);
+    const expectedIdentity = _optionalChain([operationContext, 'optionalAccess', _93 => _93.expectedDeviceIdentity]);
     if (expectedIdentity && (expectedIdentity.vendor !== "trezor" || expectedIdentity.type !== "deviceId")) {
       return Promise.resolve(
         _hwkadaptercore.failure.call(void 0, 
@@ -2062,14 +2084,14 @@ var _TrezorAdapter = class _TrezorAdapter {
     return this._callMethod(
       methodName,
       connectId,
-      _optionalChain([expectedIdentity, 'optionalAccess', _85 => _85.value]),
+      _optionalChain([expectedIdentity, 'optionalAccess', _94 => _94.value]),
       {
         ...params && typeof params === "object" ? params : {},
-        knownConnections: _optionalChain([operationContext, 'optionalAccess', _86 => _86.knownConnections]),
-        extra: _optionalChain([operationContext, 'optionalAccess', _87 => _87.extra]),
-        allowDeviceSelection: _optionalChain([operationContext, 'optionalAccess', _88 => _88.allowDeviceSelection]),
-        supportedTransports: _optionalChain([operationContext, 'optionalAccess', _89 => _89.supportedTransports]),
-        ..._optionalChain([operationContext, 'optionalAccess', _90 => _90.operationId]) ? { operationId: operationContext.operationId } : {}
+        knownConnections: _optionalChain([operationContext, 'optionalAccess', _95 => _95.knownConnections]),
+        extra: _optionalChain([operationContext, 'optionalAccess', _96 => _96.extra]),
+        allowDeviceSelection: _optionalChain([operationContext, 'optionalAccess', _97 => _97.allowDeviceSelection]),
+        supportedTransports: _optionalChain([operationContext, 'optionalAccess', _98 => _98.supportedTransports]),
+        ..._optionalChain([operationContext, 'optionalAccess', _99 => _99.operationId]) ? { operationId: operationContext.operationId } : {}
       },
       false
     );
@@ -2107,7 +2129,7 @@ var _TrezorAdapter = class _TrezorAdapter {
           let effectiveConnectId = call.connectId;
           let selectionRequestId;
           try {
-            if (!_optionalChain([bundleContext, 'optionalAccess', _91 => _91.connection]) && !operationId && deviceId && (!connectId || _optionalChain([commonParams, 'access', _92 => _92.connectionContext, 'optionalAccess', _93 => _93.knownConnections]) !== void 0)) {
+            if (!_optionalChain([bundleContext, 'optionalAccess', _100 => _100.connection]) && !operationId && deviceId && (!connectId || _optionalChain([commonParams, 'access', _101 => _101.connectionContext, 'optionalAccess', _102 => _102.knownConnections]) !== void 0)) {
               const resolved = await this._resolveExpectedDeviceConnectId(
                 deviceId,
                 signal,
@@ -2120,7 +2142,7 @@ var _TrezorAdapter = class _TrezorAdapter {
             return this._errorToFailure(error);
           }
           const response2 = await this._callWithRetry(
-            _nullishCoalesce(_optionalChain([bundleContext, 'optionalAccess', _94 => _94.connection, 'optionalAccess', _95 => _95.connectId]), () => ( effectiveConnectId)),
+            _nullishCoalesce(_optionalChain([bundleContext, 'optionalAccess', _103 => _103.connection, 'optionalAccess', _104 => _104.connectId]), () => ( effectiveConnectId)),
             methodName,
             call.params,
             deviceId || "",
@@ -2145,7 +2167,7 @@ var _TrezorAdapter = class _TrezorAdapter {
       debugLog("[TrezorAdapter][RES]", {
         method: methodName,
         success: response.success,
-        payload: _TrezorAdapter._sanitizeForLog(response.payload, methodName)
+        payload: _TrezorAdapter._responseForLog(response, methodName)
       });
       return response;
     } catch (error) {
@@ -2153,11 +2175,11 @@ var _TrezorAdapter = class _TrezorAdapter {
       debugLog("[TrezorAdapter][RES]", {
         method: methodName,
         success: false,
-        payload: _TrezorAdapter._sanitizeForLog(response.payload, methodName)
+        payload: _TrezorAdapter._responseForLog(response, methodName)
       });
       return response;
     } finally {
-      _optionalChain([releaseOperationRetention, 'optionalCall', _96 => _96()]);
+      _optionalChain([releaseOperationRetention, 'optionalCall', _105 => _105()]);
     }
   }
   async _callWithRetry(connectId, methodName, params, expectedDeviceId, requiresWalletIntent, allowRetry, signal, operationId, selectionRequestId, bundleContext) {
@@ -2169,7 +2191,7 @@ var _TrezorAdapter = class _TrezorAdapter {
       useEmptyPassphrase
     });
     try {
-      if (_optionalChain([bundleContext, 'optionalAccess', _97 => _97.connection])) {
+      if (_optionalChain([bundleContext, 'optionalAccess', _106 => _106.connection])) {
         const pinned = bundleContext.connection;
         if (this._sessions.get(pinned.connectId) !== pinned.sessionId) {
           return _hwkadaptercore.failure.call(void 0, 
@@ -2194,7 +2216,7 @@ var _TrezorAdapter = class _TrezorAdapter {
         bundleContext.connection = { connectId, sessionId };
       }
       if (expectedDeviceId) {
-        const actualDeviceId = _optionalChain([this, 'access', _98 => _98._devices, 'access', _99 => _99.get, 'call', _100 => _100(connectId), 'optionalAccess', _101 => _101.deviceId]);
+        const actualDeviceId = _optionalChain([this, 'access', _107 => _107._devices, 'access', _108 => _108.get, 'call', _109 => _109(connectId), 'optionalAccess', _110 => _110.deviceId]);
         if (!actualDeviceId || actualDeviceId !== expectedDeviceId) {
           return _hwkadaptercore.failure.call(void 0, 
             _hwkadaptercore.HardwareErrorCode.DeviceMismatch,
@@ -2319,7 +2341,7 @@ var _TrezorAdapter = class _TrezorAdapter {
     if (pending) return pending;
     const stateGeneration = this._stateGeneration;
     const promise = (async () => {
-      if (_optionalChain([signal, 'optionalAccess', _102 => _102.aborted])) {
+      if (_optionalChain([signal, 'optionalAccess', _111 => _111.aborted])) {
         throw Object.assign(new Error("Trezor connection aborted"), {
           code: _hwkadaptercore.HardwareErrorCode.UserAborted
         });
@@ -2366,13 +2388,13 @@ var _TrezorAdapter = class _TrezorAdapter {
     ) : [];
     const mismatchedDeviceIds = [];
     const knownConnection = this._knownDeviceConnections.get(expectedDeviceId);
-    const knownUsbIds = _optionalChain([context, 'optionalAccess', _103 => _103.knownConnections]) !== void 0 ? context.knownConnections.flatMap(
+    const knownUsbIds = _optionalChain([context, 'optionalAccess', _112 => _112.knownConnections]) !== void 0 ? context.knownConnections.flatMap(
       (connection) => connection.transport === "usb" ? [connection.connectId] : []
-    ) : [_optionalChain([knownConnection, 'optionalAccess', _104 => _104.usbConnectId])].filter((id) => Boolean(id));
-    const suppliedBleIds = _optionalChain([context, 'optionalAccess', _105 => _105.knownConnections, 'optionalAccess', _106 => _106.flatMap, 'call', _107 => _107(
+    ) : [_optionalChain([knownConnection, 'optionalAccess', _113 => _113.usbConnectId])].filter((id) => Boolean(id));
+    const suppliedBleIds = _optionalChain([context, 'optionalAccess', _114 => _114.knownConnections, 'optionalAccess', _115 => _115.flatMap, 'call', _116 => _116(
       (connection) => connection.transport === "ble" ? [connection.connectId] : []
     )]);
-    const knownBleIds = _optionalChain([suppliedBleIds, 'optionalAccess', _108 => _108.length]) ? suppliedBleIds : [_optionalChain([knownConnection, 'optionalAccess', _109 => _109.bleConnectId])].filter((id) => Boolean(id));
+    const knownBleIds = _optionalChain([suppliedBleIds, 'optionalAccess', _117 => _117.length]) ? suppliedBleIds : [_optionalChain([knownConnection, 'optionalAccess', _118 => _118.bleConnectId])].filter((id) => Boolean(id));
     const usbCandidates = candidates.filter(
       (device) => device.connectionType === "usb" && (!knownUsbIds.length || knownUsbIds.includes(device.connectId))
     );
@@ -2381,7 +2403,7 @@ var _TrezorAdapter = class _TrezorAdapter {
       const probeOpensSession = !this._hasSessionOrConnect(candidate.connectId);
       try {
         sessionId = await this._ensureSession(candidate.connectId, signal, "usb");
-        const actualDeviceId = _nullishCoalesce(_optionalChain([this, 'access', _110 => _110._devices, 'access', _111 => _111.get, 'call', _112 => _112(candidate.connectId), 'optionalAccess', _113 => _113.deviceId]), () => ( ""));
+        const actualDeviceId = _nullishCoalesce(_optionalChain([this, 'access', _119 => _119._devices, 'access', _120 => _120.get, 'call', _121 => _121(candidate.connectId), 'optionalAccess', _122 => _122.deviceId]), () => ( ""));
         if (actualDeviceId === expectedDeviceId) return { connectId: candidate.connectId };
         mismatchedDeviceIds.push(actualDeviceId || "unknown");
       } catch (error) {
@@ -2413,7 +2435,7 @@ var _TrezorAdapter = class _TrezorAdapter {
       );
       const probeOpensSession = !this._hasSessionOrConnect(knownBleConnectId);
       await this._ensureSession(knownBleConnectId, signal, "ble");
-      const actualDeviceId = _optionalChain([this, 'access', _114 => _114._devices, 'access', _115 => _115.get, 'call', _116 => _116(knownBleConnectId), 'optionalAccess', _117 => _117.deviceId]);
+      const actualDeviceId = _optionalChain([this, 'access', _123 => _123._devices, 'access', _124 => _124.get, 'call', _125 => _125(knownBleConnectId), 'optionalAccess', _126 => _126.deviceId]);
       if (actualDeviceId === expectedDeviceId) return { connectId: knownBleConnectId };
       if (probeOpensSession) await this._disconnectSession(knownBleConnectId);
       throw _hwkadaptercore.createHwkError.call(void 0, {
@@ -2421,13 +2443,13 @@ var _TrezorAdapter = class _TrezorAdapter {
         message: "The bound Trezor Bluetooth device has a different identity"
       });
     }
-    if (_optionalChain([context, 'optionalAccess', _118 => _118.supportedTransports]) && !context.supportedTransports.includes("ble")) {
+    if (_optionalChain([context, 'optionalAccess', _127 => _127.supportedTransports]) && !context.supportedTransports.includes("ble")) {
       throw _hwkadaptercore.createHwkError.call(void 0, {
         code: _hwkadaptercore.HardwareErrorCode.DeviceNotFound,
         message: "This Trezor model has no Bluetooth transport; connect it over USB"
       });
     }
-    if (_optionalChain([context, 'optionalAccess', _119 => _119.allowDeviceSelection]) === false) {
+    if (_optionalChain([context, 'optionalAccess', _128 => _128.allowDeviceSelection]) === false) {
       throw _hwkadaptercore.createHwkError.call(void 0, {
         code: _hwkadaptercore.HardwareErrorCode.DeviceNotFound,
         message: "No known Trezor connection is available"
@@ -2438,9 +2460,9 @@ var _TrezorAdapter = class _TrezorAdapter {
   async _selectBleDeviceForBinding(expectedDeviceId, signal, context, reason) {
     const availableTransports = this._allowedTransports(context);
     const allowUsbFallback = reason !== "manual-rebind" && availableTransports.includes("usb");
-    const knownUsbIds = _optionalChain([context, 'optionalAccess', _120 => _120.knownConnections]) ? context.knownConnections.flatMap(
+    const knownUsbIds = _optionalChain([context, 'optionalAccess', _129 => _129.knownConnections]) ? context.knownConnections.flatMap(
       (connection) => connection.transport === "usb" ? [connection.connectId] : []
-    ) : [_optionalChain([this, 'access', _121 => _121._knownDeviceConnections, 'access', _122 => _122.get, 'call', _123 => _123(expectedDeviceId), 'optionalAccess', _124 => _124.usbConnectId])];
+    ) : [_optionalChain([this, 'access', _130 => _130._knownDeviceConnections, 'access', _131 => _131.get, 'call', _132 => _132(expectedDeviceId), 'optionalAccess', _133 => _133.usbConnectId])];
     if (availableTransports.includes("ble")) {
       await _TrezorAdapter._abortable(
         signal,
@@ -2482,7 +2504,7 @@ var _TrezorAdapter = class _TrezorAdapter {
             transport: "ble",
             reason
           },
-          extra: _optionalChain([context, 'optionalAccess', _125 => _125.extra]),
+          extra: _optionalChain([context, 'optionalAccess', _134 => _134.extra]),
           operationId: this._activeOperationId()
         }
       });
@@ -2498,7 +2520,7 @@ var _TrezorAdapter = class _TrezorAdapter {
         this._emitBindingStatus(requestId, signal.aborted ? "cancelled" : "failed");
         throw error;
       }
-      if (_optionalChain([this, 'access', _126 => _126._devices, 'access', _127 => _127.get, 'call', _128 => _128(selected.connectId), 'optionalAccess', _129 => _129.deviceId]) !== expectedDeviceId) {
+      if (_optionalChain([this, 'access', _135 => _135._devices, 'access', _136 => _136.get, 'call', _137 => _137(selected.connectId), 'optionalAccess', _138 => _138.deviceId]) !== expectedDeviceId) {
         if (probeOpensSession) await this._disconnectSession(selected.connectId);
         rejectedConnectId = selected.connectId;
         rejectedConnectIds.add(selected.connectId);
@@ -2524,7 +2546,7 @@ var _TrezorAdapter = class _TrezorAdapter {
     const known = _nullishCoalesce(this._knownDeviceConnections.get(deviceId), () => ( { deviceId }));
     if (device.connectionType === "ble") {
       known.bleConnectId = connectId;
-    } else if (device.connectionType === "usb" && _optionalChain([device, 'access', _130 => _130.capabilities, 'optionalAccess', _131 => _131.persistentDeviceIdentity])) {
+    } else if (device.connectionType === "usb" && _optionalChain([device, 'access', _139 => _139.capabilities, 'optionalAccess', _140 => _140.persistentDeviceIdentity])) {
       known.usbConnectId = connectId;
     }
     this._knownDeviceConnections.set(deviceId, known);
@@ -2543,7 +2565,7 @@ var _TrezorAdapter = class _TrezorAdapter {
         selectionRequestId,
         connection: { transport: "ble", connectId },
         identity: { vendor: "trezor", type: "deviceId", value: deviceId },
-        extra: _optionalChain([context, 'optionalAccess', _132 => _132.extra]),
+        extra: _optionalChain([context, 'optionalAccess', _141 => _141.extra]),
         operationId: this._activeOperationId()
       },
       signal
@@ -2579,7 +2601,7 @@ var _TrezorAdapter = class _TrezorAdapter {
         signal
       )
     );
-    if (_optionalChain([created, 'optionalAccess', _133 => _133.protocol]) === "thp" && !created.thpSessionId || _optionalChain([created, 'optionalAccess', _134 => _134.protocol]) !== "thp" && _optionalChain([created, 'optionalAccess', _135 => _135.protocol]) !== "v1") {
+    if (_optionalChain([created, 'optionalAccess', _142 => _142.protocol]) === "thp" && !created.thpSessionId || _optionalChain([created, 'optionalAccess', _143 => _143.protocol]) !== "thp" && _optionalChain([created, 'optionalAccess', _144 => _144.protocol]) !== "v1") {
       throw _hwkadaptercore.createHwkError.call(void 0, {
         code: _hwkadaptercore.HardwareErrorCode.TransportError,
         message: "Cannot verify the requested Trezor wallet session"
@@ -2598,13 +2620,13 @@ var _TrezorAdapter = class _TrezorAdapter {
   }
   _rememberVerifiedPassphraseSession(connectId, passphraseState, sessionId, created) {
     let session;
-    if (_optionalChain([created, 'optionalAccess', _136 => _136.protocol]) === "thp" && typeof created.thpSessionId === "string") {
+    if (_optionalChain([created, 'optionalAccess', _145 => _145.protocol]) === "thp" && typeof created.thpSessionId === "string") {
       session = {
         sessionId,
         protocol: "thp",
         thpSessionId: created.thpSessionId
       };
-    } else if (_optionalChain([created, 'optionalAccess', _137 => _137.protocol]) === "v1") {
+    } else if (_optionalChain([created, 'optionalAccess', _146 => _146.protocol]) === "v1") {
       session = {
         sessionId,
         protocol: "v1"
@@ -2624,7 +2646,7 @@ var _TrezorAdapter = class _TrezorAdapter {
     }
   }
   async _reuseVerifiedPassphraseSession(connectId, sessionId, passphraseState, signal) {
-    const cached = _optionalChain([this, 'access', _138 => _138._verifiedPassphraseSessionsByConnectId, 'access', _139 => _139.get, 'call', _140 => _140(connectId), 'optionalAccess', _141 => _141.get, 'call', _142 => _142(passphraseState)]);
+    const cached = _optionalChain([this, 'access', _147 => _147._verifiedPassphraseSessionsByConnectId, 'access', _148 => _148.get, 'call', _149 => _149(connectId), 'optionalAccess', _150 => _150.get, 'call', _151 => _151(passphraseState)]);
     if (!cached || cached.sessionId !== sessionId) {
       this._forgetVerifiedPassphraseSession(connectId, passphraseState);
       return false;
@@ -2691,7 +2713,7 @@ var _TrezorAdapter = class _TrezorAdapter {
         signal
       )
     );
-    const state = _optionalChain([derived, 'optionalAccess', _143 => _143.publicKey]);
+    const state = _optionalChain([derived, 'optionalAccess', _152 => _152.publicKey]);
     if (!state) {
       throw Object.assign(new Error("Failed to derive passphrase state (wallet public key)"), {
         code: _hwkadaptercore.HardwareErrorCode.UnknownError
@@ -2728,7 +2750,7 @@ var _TrezorAdapter = class _TrezorAdapter {
         signal,
         this._callConnector(sessionId, "getFeatures", { refresh: true }, signal)
       );
-      if (_optionalChain([features, 'optionalAccess', _144 => _144.passphrase_protection]) !== true) {
+      if (_optionalChain([features, 'optionalAccess', _153 => _153.passphrase_protection]) !== true) {
         return _hwkadaptercore.success.call(void 0, null);
       }
       this._rememberVerifiedPassphraseSession(connectId, state, sessionId, created);
@@ -2776,7 +2798,7 @@ var _TrezorAdapter = class _TrezorAdapter {
     }
     const trustedNumericCode = typeof typed.code === "number" && KNOWN_HARDWARE_ERROR_CODES.has(typed.code) ? typed.code : void 0;
     const code = _nullishCoalesce(_nullishCoalesce(trustedNumericCode, () => ( _TrezorAdapter._mapTrezorFailureCode(error))), () => ( _hwkadaptercore.HardwareErrorCode.UnknownError));
-    const stampedOrigin = _optionalChain([error, 'optionalAccess', _145 => _145.origin]);
+    const stampedOrigin = _optionalChain([error, 'optionalAccess', _154 => _154.origin]);
     const origin = stampedOrigin === "device" || stampedOrigin === "transport" || stampedOrigin === "host" ? stampedOrigin : _hwkadaptercore.defaultOriginForCode.call(void 0, code);
     const params = typed.params && typeof typed.params === "object" ? typed.params : void 0;
     return _hwkadaptercore.failure.call(void 0,