@onekeyfe/hwk-trezor-adapter 1.2.0-alpha.74 → 1.2.0-alpha.76

package/dist/index.d.mts

@@ -28,7 +28,10 @@ declare class TrezorAdapter implements IHardwareWallet {
     private static _normalizeCallArgs;
     private static _splitCommonParams;
     private static _withAllNetworkRequestCommonParams;
+    private static readonly _sensitiveLogKeys;
+    private static _normalizeLogKey;
     private static _sanitizeForLog;
+    private static _redactForLog;
     private static _errorForLog;
     private _setPassphraseRequestContext;
     private static _trezorFailureMessage;
@@ -87,14 +90,13 @@ declare class TrezorAdapter implements IHardwareWallet {
      */
     uiResponse(response: UiResponseEvent): void;
     /**
-     * Returns a stable per-seed identifier suitable for device-match verification.
-     *
-     * Trezor exposes `device_id` in Features — a server-generated UUID written
-     * during `wipe_device` and stable for the life of the seed. Unlike Ledger
-     * (no native id, so a per-chain address is hashed), Trezor's id is global
-     * across chains, so the `chain` argument is accepted for API parity but
-     * ignored. For unsupported chains we still surface the id (since it would
-     * be the same value anyway).
+     * Returns the Trezor `device_id` from Features — a random 12-byte value the
+     * device stores and regenerates on `wipe_device`. It identifies the PHYSICAL
+     * DEVICE, not a seed/wallet: it is shared across passphrase wallets and
+     * changes after wipe/restore, so it suits device-match checks but must NOT be
+     * used as a wallet fingerprint (use `passphraseState` for wallet identity).
+     * Unlike Ledger (which hashes a per-chain address), it is chain-global, so
+     * `chain` is accepted for API parity but ignored.
      */
     getChainFingerprint(connectId: string, _deviceId: string, _chain: ChainForFingerprint): Promise<Response<string>>;
     /**

package/dist/index.d.ts

@@ -28,7 +28,10 @@ declare class TrezorAdapter implements IHardwareWallet {
     private static _normalizeCallArgs;
     private static _splitCommonParams;
     private static _withAllNetworkRequestCommonParams;
+    private static readonly _sensitiveLogKeys;
+    private static _normalizeLogKey;
     private static _sanitizeForLog;
+    private static _redactForLog;
     private static _errorForLog;
     private _setPassphraseRequestContext;
     private static _trezorFailureMessage;
@@ -87,14 +90,13 @@ declare class TrezorAdapter implements IHardwareWallet {
      */
     uiResponse(response: UiResponseEvent): void;
     /**
-     * Returns a stable per-seed identifier suitable for device-match verification.
-     *
-     * Trezor exposes `device_id` in Features — a server-generated UUID written
-     * during `wipe_device` and stable for the life of the seed. Unlike Ledger
-     * (no native id, so a per-chain address is hashed), Trezor's id is global
-     * across chains, so the `chain` argument is accepted for API parity but
-     * ignored. For unsupported chains we still surface the id (since it would
-     * be the same value anyway).
+     * Returns the Trezor `device_id` from Features — a random 12-byte value the
+     * device stores and regenerates on `wipe_device`. It identifies the PHYSICAL
+     * DEVICE, not a seed/wallet: it is shared across passphrase wallets and
+     * changes after wipe/restore, so it suits device-match checks but must NOT be
+     * used as a wallet fingerprint (use `passphraseState` for wallet identity).
+     * Unlike Ledger (which hashes a per-chain address), it is chain-global, so
+     * `chain` is accepted for API parity but ignored.
      */
     getChainFingerprint(connectId: string, _deviceId: string, _chain: ChainForFingerprint): Promise<Response<string>>;
     /**

package/dist/index.js

@@ -74,7 +74,7 @@ var TREZOR_BTC_NETWORK_COIN_MAP = {
   bcash: "Bcash",
   dash: "Dash"
 };
-var TrezorAdapter = class _TrezorAdapter {
+var _TrezorAdapter = class _TrezorAdapter {
   constructor(connector) {
     this.vendor = "trezor";
     this._emitter = new (0, _hwkadaptercore.TypedEventEmitter)();
@@ -122,8 +122,8 @@ var TrezorAdapter = class _TrezorAdapter {
             ...data,
             payload: {
               ...payload,
-              ..._optionalChain([context, 'optionalAccess', _ => _.passphraseState]) !== void 0 ? { passphraseState: context.passphraseState } : {},
-              ..._optionalChain([context, 'optionalAccess', _2 => _2.useEmptyPassphrase]) !== void 0 ? { useEmptyPassphrase: context.useEmptyPassphrase } : {}
+              ..._optionalChain([context, 'optionalAccess', _2 => _2.passphraseState]) !== void 0 ? { passphraseState: context.passphraseState } : {},
+              ..._optionalChain([context, 'optionalAccess', _3 => _3.useEmptyPassphrase]) !== void 0 ? { useEmptyPassphrase: context.useEmptyPassphrase } : {}
             }
           }
         );
@@ -177,9 +177,9 @@ var TrezorAdapter = class _TrezorAdapter {
     return { rest: _nullishCoalesce(params, () => ( {})) };
   }
   static _withAllNetworkRequestCommonParams(item, commonParams) {
-    const autoInstallApp = _optionalChain([commonParams, 'optionalAccess', _3 => _3.autoInstallApp]);
-    const passphraseState = _optionalChain([commonParams, 'optionalAccess', _4 => _4.passphraseState]);
-    const useEmptyPassphrase = _optionalChain([commonParams, 'optionalAccess', _5 => _5.useEmptyPassphrase]);
+    const autoInstallApp = _optionalChain([commonParams, 'optionalAccess', _4 => _4.autoInstallApp]);
+    const passphraseState = _optionalChain([commonParams, 'optionalAccess', _5 => _5.passphraseState]);
+    const useEmptyPassphrase = _optionalChain([commonParams, 'optionalAccess', _6 => _6.useEmptyPassphrase]);
     if (autoInstallApp === void 0 && passphraseState === void 0 && useEmptyPassphrase === void 0) {
       return item;
     }
@@ -190,26 +190,30 @@ var TrezorAdapter = class _TrezorAdapter {
       ...useEmptyPassphrase !== void 0 ? { useEmptyPassphrase } : {}
     };
   }
-  static _sanitizeForLog(value) {
-    if (!value || typeof value !== "object") return value;
-    if (Array.isArray(value)) {
-      return value.map((item) => _TrezorAdapter._sanitizeForLog(item));
+  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());
+  }
+  static _redactForLog(value, seen) {
+    if (ArrayBuffer.isView(value) || value instanceof ArrayBuffer) {
+      return `[BINARY:${value.byteLength}]`;
     }
-    const sensitiveKeys = /* @__PURE__ */ new Set([
-      "credential",
-      "credentials",
-      "host_static_key",
-      "passphrase",
-      "passphraseState",
-      "pin",
-      "trezor_static_public_key"
-    ]);
-    return Object.fromEntries(
+    if (!value || typeof value !== "object") return value;
+    if (seen.has(value)) return "[CIRCULAR]";
+    seen.add(value);
+    const out = Array.isArray(value) ? value.map((item) => _TrezorAdapter._redactForLog(item, seen)) : Object.fromEntries(
       Object.entries(value).map(([key, item]) => [
         key,
-        sensitiveKeys.has(key) ? "[redacted]" : _TrezorAdapter._sanitizeForLog(item)
+        _TrezorAdapter._sensitiveLogKeys.has(_TrezorAdapter._normalizeLogKey(key)) && item !== null && item !== void 0 ? "[redacted]" : _TrezorAdapter._redactForLog(item, seen)
       ])
     );
+    seen.delete(value);
+    return out;
   }
   static _errorForLog(error) {
     if (!error || typeof error !== "object") return error;
@@ -239,8 +243,8 @@ var TrezorAdapter = class _TrezorAdapter {
     };
   }
   static _trezorFailureMessage(error) {
-    const response = _optionalChain([error, 'optionalAccess', _6 => _6.response]);
-    const message = _optionalChain([response, 'optionalAccess', _7 => _7.message]);
+    const response = _optionalChain([error, 'optionalAccess', _7 => _7.response]);
+    const message = _optionalChain([response, 'optionalAccess', _8 => _8.message]);
     if (!message || typeof message !== "object") return {};
     const failureMessage = message;
     return {
@@ -249,7 +253,7 @@ var TrezorAdapter = class _TrezorAdapter {
     };
   }
   static _mapTrezorFailureCode(error) {
-    const directCode = _optionalChain([error, 'optionalAccess', _8 => _8.code]);
+    const directCode = _optionalChain([error, 'optionalAccess', _9 => _9.code]);
     if (directCode === "Device_InitializeFailed") {
       return _hwkadaptercore.HardwareErrorCode.PinCancelled;
     }
@@ -262,7 +266,7 @@ var TrezorAdapter = class _TrezorAdapter {
     if (directCode === "Failure_UnexpectedMessage") {
       return _hwkadaptercore.HardwareErrorCode.MethodNotSupported;
     }
-    const message = _optionalChain([error, 'optionalAccess', _9 => _9.message]);
+    const message = _optionalChain([error, 'optionalAccess', _10 => _10.message]);
     if (typeof message === "string" && message.includes("Failed to execute 'transfer") && message.includes("on 'USBDevice'")) {
       return _hwkadaptercore.HardwareErrorCode.TransportError;
     }
@@ -410,7 +414,7 @@ var TrezorAdapter = class _TrezorAdapter {
   async searchDevices(options) {
     await this._ensureDevicePermission();
     const scanned = await this._connector.searchDevices(
-      _optionalChain([options, 'optionalAccess', _10 => _10.waitForAllTransports]) ? { waitForAll: true } : void 0
+      _optionalChain([options, 'optionalAccess', _11 => _11.waitForAllTransports]) ? { waitForAll: true } : void 0
     );
     const scannedIds = new Set(scanned.map((d) => d.connectId));
     for (const connectId of [...this._devices.keys()]) {
@@ -457,7 +461,7 @@ var TrezorAdapter = class _TrezorAdapter {
     let liveDeviceId = "";
     const topLevelFailureIndexes = /* @__PURE__ */ new Set();
     const isSingleNetworkBundle = params.bundle.every(
-      (item) => item.network === _optionalChain([params, 'access', _11 => _11.bundle, 'access', _12 => _12[0], 'optionalAccess', _13 => _13.network])
+      (item) => item.network === _optionalChain([params, 'access', _12 => _12.bundle, 'access', _13 => _13[0], 'optionalAccess', _14 => _14.network])
     );
     const getLiveDeviceId = async () => {
       if (liveDeviceId) return _hwkadaptercore.success.call(void 0, liveDeviceId);
@@ -517,7 +521,7 @@ var TrezorAdapter = class _TrezorAdapter {
       // One named boolean per abort reason.
       shouldAbortBundle: (response, { index }) => {
         const isSessionLevelFailure = topLevelFailureIndexes.has(index);
-        const isWholeChainForbidden = isSingleNetworkBundle && _optionalChain([response, 'access', _14 => _14.payload, 'optionalAccess', _15 => _15.code]) === _hwkadaptercore.HardwareErrorCode.DevicePathForbidden;
+        const isWholeChainForbidden = isSingleNetworkBundle && _optionalChain([response, 'access', _15 => _15.payload, 'optionalAccess', _16 => _16.code]) === _hwkadaptercore.HardwareErrorCode.DevicePathForbidden;
         return isSessionLevelFailure || isWholeChainForbidden;
       }
     });
@@ -583,14 +587,13 @@ var TrezorAdapter = class _TrezorAdapter {
     this._connector.uiResponse(response);
   }
   /**
-   * Returns a stable per-seed identifier suitable for device-match verification.
-   *
-   * Trezor exposes `device_id` in Features — a server-generated UUID written
-   * during `wipe_device` and stable for the life of the seed. Unlike Ledger
-   * (no native id, so a per-chain address is hashed), Trezor's id is global
-   * across chains, so the `chain` argument is accepted for API parity but
-   * ignored. For unsupported chains we still surface the id (since it would
-   * be the same value anyway).
+   * Returns the Trezor `device_id` from Features — a random 12-byte value the
+   * device stores and regenerates on `wipe_device`. It identifies the PHYSICAL
+   * DEVICE, not a seed/wallet: it is shared across passphrase wallets and
+   * changes after wipe/restore, so it suits device-match checks but must NOT be
+   * used as a wallet fingerprint (use `passphraseState` for wallet identity).
+   * Unlike Ledger (which hashes a per-chain address), it is chain-global, so
+   * `chain` is accepted for API parity but ignored.
    */
   async getChainFingerprint(connectId, _deviceId, _chain) {
     return this._getTrezorDeviceId(connectId);
@@ -746,7 +749,7 @@ var TrezorAdapter = class _TrezorAdapter {
       method: methodName,
       connectId: call.connectId || "(empty)",
       deviceId: deviceId || void 0,
-      params: _TrezorAdapter._sanitizeForLog(call.params)
+      params: _TrezorAdapter._sanitizeForLog(call.params, methodName)
     });
     try {
       const response = await this._jobQueue.enqueue(
@@ -768,7 +771,7 @@ var TrezorAdapter = class _TrezorAdapter {
       debugLog("[TrezorAdapter][RES]", {
         method: methodName,
         success: response.success,
-        payload: _TrezorAdapter._sanitizeForLog(response.payload)
+        payload: _TrezorAdapter._sanitizeForLog(response.payload, methodName)
       });
       return response;
     } catch (error) {
@@ -776,7 +779,7 @@ var TrezorAdapter = class _TrezorAdapter {
       debugLog("[TrezorAdapter][RES]", {
         method: methodName,
         success: false,
-        payload: _TrezorAdapter._sanitizeForLog(response.payload)
+        payload: _TrezorAdapter._sanitizeForLog(response.payload, methodName)
       });
       return response;
     }
@@ -855,7 +858,7 @@ var TrezorAdapter = class _TrezorAdapter {
     if (pending) return pending;
     const promise = (async () => {
       try {
-        if (_optionalChain([signal, 'optionalAccess', _16 => _16.aborted])) {
+        if (_optionalChain([signal, 'optionalAccess', _17 => _17.aborted])) {
           throw Object.assign(new Error("Trezor connection aborted"), {
             code: _hwkadaptercore.HardwareErrorCode.UserAborted
           });
@@ -901,8 +904,8 @@ var TrezorAdapter = class _TrezorAdapter {
         passphraseMode: "prompt"
       })
     );
-    if (_optionalChain([created, 'optionalAccess', _17 => _17.protocol]) === "thp" && !created.thpSessionId) return;
-    if (_optionalChain([created, 'optionalAccess', _18 => _18.protocol]) !== "thp" && _optionalChain([created, 'optionalAccess', _19 => _19.protocol]) !== "v1") return;
+    if (_optionalChain([created, 'optionalAccess', _18 => _18.protocol]) === "thp" && !created.thpSessionId) return;
+    if (_optionalChain([created, 'optionalAccess', _19 => _19.protocol]) !== "thp" && _optionalChain([created, 'optionalAccess', _20 => _20.protocol]) !== "v1") return;
     const state = await this._deriveState(sessionId, signal);
     if (state !== passphraseState) {
       throw Object.assign(
@@ -916,13 +919,13 @@ var TrezorAdapter = class _TrezorAdapter {
   }
   _rememberVerifiedPassphraseSession(connectId, passphraseState, sessionId, created) {
     let session;
-    if (_optionalChain([created, 'optionalAccess', _20 => _20.protocol]) === "thp" && typeof created.thpSessionId === "string") {
+    if (_optionalChain([created, 'optionalAccess', _21 => _21.protocol]) === "thp" && typeof created.thpSessionId === "string") {
       session = {
         sessionId,
         protocol: "thp",
         thpSessionId: created.thpSessionId
       };
-    } else if (_optionalChain([created, 'optionalAccess', _21 => _21.protocol]) === "v1") {
+    } else if (_optionalChain([created, 'optionalAccess', _22 => _22.protocol]) === "v1") {
       session = {
         sessionId,
         protocol: "v1"
@@ -942,7 +945,7 @@ var TrezorAdapter = class _TrezorAdapter {
     }
   }
   async _reuseVerifiedPassphraseSession(connectId, sessionId, passphraseState, signal) {
-    const cached = _optionalChain([this, 'access', _22 => _22._verifiedPassphraseSessionsByConnectId, 'access', _23 => _23.get, 'call', _24 => _24(connectId), 'optionalAccess', _25 => _25.get, 'call', _26 => _26(passphraseState)]);
+    const cached = _optionalChain([this, 'access', _23 => _23._verifiedPassphraseSessionsByConnectId, 'access', _24 => _24.get, 'call', _25 => _25(connectId), 'optionalAccess', _26 => _26.get, 'call', _27 => _27(passphraseState)]);
     if (!cached || cached.sessionId !== sessionId) {
       this._forgetVerifiedPassphraseSession(connectId, passphraseState);
       return false;
@@ -994,7 +997,7 @@ var TrezorAdapter = class _TrezorAdapter {
         showOnDevice: false
       })
     );
-    const state = _optionalChain([derived, 'optionalAccess', _27 => _27.publicKey]);
+    const state = _optionalChain([derived, 'optionalAccess', _28 => _28.publicKey]);
     if (!state) {
       throw Object.assign(new Error("Failed to derive passphrase state (wallet public key)"), {
         code: _hwkadaptercore.HardwareErrorCode.UnknownError
@@ -1020,7 +1023,7 @@ var TrezorAdapter = class _TrezorAdapter {
         signal,
         _TrezorAdapter._callConnector(this._connector, sessionId, "getFeatures", { refresh: true })
       );
-      if (_optionalChain([features, 'optionalAccess', _28 => _28.passphrase_protection]) !== true) {
+      if (_optionalChain([features, 'optionalAccess', _29 => _29.passphrase_protection]) !== true) {
         return _hwkadaptercore.success.call(void 0, null);
       }
       this._rememberVerifiedPassphraseSession(connectId, state, sessionId, created);
@@ -1104,9 +1107,46 @@ var TrezorAdapter = class _TrezorAdapter {
     }
   }
 };
+// Keys are matched after normalizeLogKey, so snake_case/camelCase both hit.
+_TrezorAdapter._sensitiveLogKeys = /* @__PURE__ */ new Set([
+  "credential",
+  "credentials",
+  "entropy",
+  "hoststatickey",
+  "mnemonic",
+  "mnemonics",
+  "passphrase",
+  "passphrasestate",
+  "password",
+  "pin",
+  "privatekey",
+  "seed",
+  "session",
+  "sessionid",
+  "trezorstaticpublickey",
+  "word",
+  "words",
+  "xprv"
+]);
+var TrezorAdapter = _TrezorAdapter;
 
 // src/utils/ethereumDefinitions.ts
 var DEFAULT_ETHEREUM_DEFINITIONS_BASE_URL = "https://data.trezor.io/firmware/eth-definitions";
+var DEFINITIONS_FETCH_TIMEOUT_MS = 2e4;
+async function runWithTimeout(run, timeoutMs = DEFINITIONS_FETCH_TIMEOUT_MS) {
+  let timer;
+  const deadline = new Promise((_, reject) => {
+    timer = setTimeout(
+      () => reject(new Error(`definitions fetch timed out after ${timeoutMs}ms`)),
+      timeoutMs
+    );
+  });
+  try {
+    return await Promise.race([run(), deadline]);
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+}
 function getSlip44FromPath(path) {
   const segments = path.trim().replace(/^m\//i, "").split("/");
   const coinType = segments[1];
@@ -1180,11 +1220,13 @@ async function buildEthereumDefinitionsForSignTx({
 }
 async function fetchDefinitionHex(url, fetchImpl) {
   try {
-    const response = await fetchImpl(url);
-    if (response.status !== 200) {
-      return void 0;
-    }
-    return arrayBufferToHex(await response.arrayBuffer());
+    return await runWithTimeout(async () => {
+      const response = await fetchImpl(url);
+      if (response.status !== 200) {
+        return void 0;
+      }
+      return arrayBufferToHex(await response.arrayBuffer());
+    });
   } catch (e3) {
     return void 0;
   }
@@ -1207,11 +1249,13 @@ async function fetchSolanaTokenDefinition({
     return void 0;
   }
   try {
-    const response = await fetchImpl(`${baseUrl}/${tokenMint}.dat`);
-    if (response.status !== 200) {
-      return void 0;
-    }
-    return Buffer.from(await response.arrayBuffer()).toString("hex");
+    return await runWithTimeout(async () => {
+      const response = await fetchImpl(`${baseUrl}/${tokenMint}.dat`);
+      if (response.status !== 200) {
+        return void 0;
+      }
+      return Buffer.from(await response.arrayBuffer()).toString("hex");
+    });
   } catch (e4) {
     return void 0;
   }