@routedock/routedock 0.2.0 → 0.3.1

package/dist/provider/fastify.d.ts

@@ -1,6 +1,6 @@
 import { FastifyPluginAsync } from 'fastify';
-import { P as PaymentMode, R as RouteDockManifest } from '../types-DmhmfLzP.js';
-import { O as OrphanedSessionInfo, S as SeenTxStore } from '../MppSessionHandler-CLB5SzgN.js';
+import { P as PaymentMode, h as RouteDockManifest, g as RouteDockLogger } from '../logger-D8_Q2ytp.js';
+import { O as OrphanedSessionInfo, S as SeenTxStore } from '../MppSessionHandler-Bq4S-JTE.js';
 import 'mppx';
 import 'express';
 
@@ -14,8 +14,8 @@ interface RouteDockFastifyOptions {
             channelFactory: string;
         };
     };
-    asset: string;
-    assetContract: string;
+    asset?: string;
+    assetContract?: string;
     payee: string;
     network: 'testnet' | 'mainnet';
     payeeSecretKey: string;
@@ -29,6 +29,11 @@ interface RouteDockFastifyOptions {
     onOrphaned?: (channelId: string, info: OrphanedSessionInfo) => Promise<void>;
     idleTimeoutMs?: number;
     seenTxStore?: SeenTxStore;
+    /**
+     * Structured log sink for every adapter diagnostic (settlement errors,
+     * callback failures, orphaned sessions). Defaults to a console-backed logger.
+     */
+    logger?: RouteDockLogger;
 }
 declare function routedockFastify(opts: RouteDockFastifyOptions): FastifyPluginAsync;
 

package/dist/provider/fastify.js

@@ -5,15 +5,37 @@ import { HTTPFacilitatorClient, x402ResourceServer } from '@x402/core/server';
 import { createEd25519Signer } from '@x402/stellar';
 import { encodePaymentRequiredHeader, decodePaymentSignatureHeader, encodePaymentResponseHeader } from '@x402/core/http';
 import { usdcToStroops } from '@routedock/nulth-sdk';
-import { stellar } from '@stellar/mpp/charge/server';
-import { Mppx, Request } from 'mppx/server';
-import { Store, stellar as stellar$1, close } from '@stellar/mpp/channel/server';
+import { stellar as stellar$1 } from '@stellar/mpp/charge/server';
+import { Request, Mppx } from 'mppx/server';
+import { Store, stellar, close } from '@stellar/mpp/channel/server';
 import { Errors } from 'mppx';
 import { createHash } from 'crypto';
 
 // src/provider/x402Handler.ts
 
-// src/provider/payee.ts
+// src/errors.ts
+var RouteDockError = class extends Error {
+  code;
+  retryable;
+  retryAfterMs;
+  constructor(message, code, retryable, options = {}) {
+    super(message, { cause: options.cause });
+    this.name = "RouteDockError";
+    this.code = code;
+    this.retryable = retryable;
+    if (options.retryAfterMs !== void 0) {
+      this.retryAfterMs = options.retryAfterMs;
+    }
+  }
+};
+var RouteDockManifestError = class extends RouteDockError {
+  constructor(message, options = {}) {
+    super(message, "MANIFEST", false, options);
+    this.name = "RouteDockManifestError";
+  }
+};
+
+// src/internal/payee.ts
 function resolvePayee(manifest, mode) {
   const override = manifest.pricing[mode]?.payee;
   return override ?? manifest.payee;
@@ -24,9 +46,113 @@ function extractPayerAddress(key) {
   return StrKey.isValidEd25519PublicKey(key) || StrKey.isValidMed25519PublicKey(key) ? key : null;
 }
 
+// src/internal/assetUtils.ts
+function normalizeManifestAssets(manifest) {
+  if (manifest.assets && manifest.assets.length > 0) {
+    return manifest.assets;
+  }
+  if (manifest.asset && manifest.asset_contract) {
+    return [
+      {
+        asset: manifest.asset,
+        asset_contract: manifest.asset_contract
+      }
+    ];
+  }
+  throw new RouteDockManifestError(
+    "Manifest must define either assets[] or root asset/asset_contract fields"
+  );
+}
+function getEligibleAssets(manifest, mode, endpoint) {
+  const assets = normalizeManifestAssets(manifest);
+  return assets.filter((asset) => {
+    if (asset.modes && !asset.modes.includes(mode)) {
+      return false;
+    }
+    if (endpoint && asset.endpoints && asset.endpoints.length > 0) {
+      const trimmedEndpoint = endpoint.replace(/^\//, "");
+      if (asset.endpoints.includes(endpoint) || asset.endpoints.includes(trimmedEndpoint)) {
+        return true;
+      }
+      if (manifest.endpoints) {
+        let pathname = endpoint;
+        if (endpoint.startsWith("http://") || endpoint.startsWith("https://")) {
+          try {
+            pathname = new URL(endpoint).pathname;
+          } catch {
+          }
+        }
+        const trimmedPathname = pathname.replace(/^\//, "");
+        const matchesEndpoint = Object.entries(manifest.endpoints).some(([key, desc]) => {
+          const pathMatches = desc.path === pathname || desc.path === endpoint || desc.path.replace(/\/+$/, "") === pathname.replace(/\/+$/, "") || desc.path.replace(/^\//, "") === trimmedPathname;
+          const keyMatches = key === endpoint || key === trimmedEndpoint;
+          if (pathMatches || keyMatches) {
+            return asset.endpoints.includes(key) || asset.endpoints.includes(desc.path) || asset.endpoints.includes(desc.path.replace(/^\//, ""));
+          }
+          return false;
+        });
+        if (!matchesEndpoint) {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    }
+    return true;
+  });
+}
+function resolveAssetContract(manifest, mode, endpoint, explicitContract) {
+  if (manifest.assets && manifest.assets.length > 0) {
+    return selectAsset(manifest, mode, endpoint).asset_contract;
+  }
+  return explicitContract ?? selectAsset(manifest, mode, endpoint).asset_contract;
+}
+function selectAsset(manifest, mode, endpoint) {
+  const eligible = getEligibleAssets(manifest, mode, endpoint);
+  if (eligible.length === 0) {
+    const endpointMsg = endpoint ? ` for endpoint '${endpoint}'` : "";
+    throw new RouteDockManifestError(
+      `No eligible assets found for mode '${mode}'${endpointMsg}`
+    );
+  }
+  return eligible[0];
+}
+
+// src/internal/logger.ts
+function createConsoleLogger() {
+  return (level, message, fields) => {
+    const values = fields ? Object.values(fields) : [];
+    if (values.length > 0) {
+      console[level](message, ...values);
+    } else {
+      console[level](message);
+    }
+  };
+}
+var consoleLogger = createConsoleLogger();
+function resolveLogger(logger, fallback = consoleLogger) {
+  return logger ?? fallback;
+}
+
 // src/provider/SeenTxStore.ts
+var SETTLEMENT_REPLAY_WINDOW_MS = 6e4;
+var MAX_SETTLEMENT_REPLAYS = 1;
+async function checkSettlementReplay(store, key, now = Date.now()) {
+  const record = await store.get(key);
+  if (!record) return { kind: "miss" };
+  const { createdAt } = record;
+  if (createdAt !== void 0 && now - createdAt > SETTLEMENT_REPLAY_WINDOW_MS) {
+    return { kind: "spent" };
+  }
+  if (store.claimReplay) {
+    const replayed = await store.claimReplay(key);
+    if (replayed > MAX_SETTLEMENT_REPLAYS) return { kind: "spent" };
+  }
+  return { kind: "replay", record };
+}
 var InMemorySeenTxStore = class {
   map = /* @__PURE__ */ new Map();
+  replayCounts = /* @__PURE__ */ new Map();
   order = [];
   constructor(maxEntriesOrOptions = 1e4) {
     const options = typeof maxEntriesOrOptions === "number" ? { maxEntries: maxEntriesOrOptions } : maxEntriesOrOptions;
@@ -34,7 +160,8 @@ var InMemorySeenTxStore = class {
     if (options.warn !== false) {
       const isServerless = typeof globalThis.navigator !== "undefined" && globalThis.navigator.userAgent === "Cloudflare-Workers";
       if (isServerless) {
-        console.warn(
+        resolveLogger(options.logger)(
+          "warn",
           "[RouteDock] Using in-memory SeenTxStore: settlement deduplication is NOT durable and resets on every isolate restart. Supply a SupabaseSeenTxStore (or other durable SeenTxStore) for production safety."
         );
       }
@@ -49,21 +176,43 @@ var InMemorySeenTxStore = class {
       this.order.push(key);
       if (this.order.length > this.maxEntries) {
         const evicted = this.order.shift();
-        if (evicted !== void 0) this.map.delete(evicted);
+        if (evicted !== void 0) {
+          this.map.delete(evicted);
+          this.replayCounts.delete(evicted);
+        }
       }
     }
     this.map.set(key, record);
   }
+  claimReplay(key) {
+    if (!this.map.has(key)) return Number.POSITIVE_INFINITY;
+    const next = (this.replayCounts.get(key) ?? 0) + 1;
+    this.replayCounts.set(key, next);
+    return next;
+  }
 };
 async function sha256Hex(input) {
   const buf = new TextEncoder().encode(input);
   const digest = await crypto.subtle.digest("SHA-256", buf);
   return Array.from(new Uint8Array(digest)).map((b) => b.toString(16).padStart(2, "0")).join("");
 }
-async function paymentIdempotencyKey(getHeader) {
+async function paymentIdempotencyKey(getHeader, scope) {
   const material = getHeader("payment-signature") ?? getHeader("x-payment") ?? getHeader("authorization");
   if (!material) return null;
-  return sha256Hex(material);
+  return sha256Hex(
+    [scope.method, scope.path, scope.amount, scope.payTo, material].join("\n")
+  );
+}
+
+// src/provider/settleResult.ts
+function readSettleResult(result) {
+  const settle = result;
+  const failed = (reason) => reason ? { ok: false, reason } : { ok: false };
+  if (!settle || settle.success !== true) return failed(settle?.errorReason);
+  if (typeof settle.transaction !== "string" || settle.transaction.length === 0) {
+    return failed(settle.errorReason);
+  }
+  return { ok: true, txHash: settle.transaction };
 }
 
 // src/provider/x402Handler.ts
@@ -76,7 +225,8 @@ function createX402Handler(opts) {
   const caip2 = CAIP2[opts.network];
   const payeeKeypair = Keypair.fromSecret(opts.payeeSecretKey);
   const signer = createEd25519Signer(opts.payeeSecretKey, caip2);
-  const seenTxStore = opts.seenTxStore ?? new InMemorySeenTxStore();
+  const logger = resolveLogger(opts.logger);
+  const seenTxStore = opts.seenTxStore ?? new InMemorySeenTxStore({ logger });
   const useOzFacilitator = opts.network === "mainnet" && opts.facilitatorApiKey;
   const localFacilitator = new ExactStellarScheme([signer], {
     areFeesSponsored: true
@@ -97,22 +247,29 @@ function createX402Handler(opts) {
   }
   const amountInBaseUnits = String(usdcToUnits(opts.amount));
   const payTo = resolvePayee(opts.manifest, "x402");
-  const requirements = {
-    scheme: "exact",
-    network: caip2,
-    asset: opts.assetContract,
-    amount: amountInBaseUnits,
-    payTo,
-    maxTimeoutSeconds: 60,
-    extra: {
-      areFeesSponsored: true,
-      ...useOzFacilitator ? {} : { facilitatorAddresses: [payeeKeypair.publicKey()] }
-    }
-  };
   return async (req, res, next) => {
     try {
-      const paymentHeader = req.headers["payment-signature"] ?? req.headers["x-payment"];
-      if (!paymentHeader) {
+      const endpoint = req.path || req.originalUrl;
+      const assetContract = resolveAssetContract(
+        opts.manifest,
+        "x402",
+        endpoint,
+        opts.assetContract
+      );
+      const requirements = {
+        scheme: "exact",
+        network: caip2,
+        asset: assetContract,
+        amount: amountInBaseUnits,
+        payTo,
+        maxTimeoutSeconds: 60,
+        extra: {
+          areFeesSponsored: true,
+          ...useOzFacilitator ? {} : { facilitatorAddresses: [payeeKeypair.publicKey()] }
+        }
+      };
+      const respondPaymentRequired = async (error, reason) => {
+        const body = { error, ...reason ? { reason } : {} };
         if (ozServer) {
           const resourceInfo = {
             url: `${req.protocol}://${req.get("host") ?? ""}${req.originalUrl}`,
@@ -122,7 +279,7 @@ function createX402Handler(opts) {
             [requirements],
             resourceInfo
           );
-          res.status(402).setHeader("Content-Type", "application/json").setHeader("X-Payment-Requirements", encodePaymentRequiredHeader(paymentRequired)).json({ error: "Payment Required" });
+          res.status(402).setHeader("Content-Type", "application/json").setHeader("X-Payment-Requirements", encodePaymentRequiredHeader(paymentRequired)).json(body);
         } else {
           const x402Response = {
             x402Version: 2,
@@ -132,19 +289,35 @@ function createX402Handler(opts) {
             },
             accepts: [requirements]
           };
-          res.status(402).setHeader("Content-Type", "application/json").setHeader("X-Payment-Requirements", encodePaymentRequiredHeader(x402Response)).json({ error: "Payment Required" });
+          res.status(402).setHeader("Content-Type", "application/json").setHeader("X-Payment-Requirements", encodePaymentRequiredHeader(x402Response)).json(body);
         }
+      };
+      const paymentHeader = req.headers["payment-signature"] ?? req.headers["x-payment"];
+      if (!paymentHeader) {
+        await respondPaymentRequired("Payment Required");
         return;
       }
-      const idempotencyKey = await paymentIdempotencyKey((name) => {
-        const v = req.headers[name.toLowerCase()];
-        return Array.isArray(v) ? v[0] : v;
-      });
+      const idempotencyKey = await paymentIdempotencyKey(
+        (name) => {
+          const v = req.headers[name.toLowerCase()];
+          return Array.isArray(v) ? v[0] : v;
+        },
+        {
+          method: req.method,
+          path: req.originalUrl.split("?")[0],
+          amount: requirements.amount,
+          payTo: requirements.payTo
+        }
+      );
       if (idempotencyKey) {
-        const cached = await seenTxStore.get(idempotencyKey);
-        if (cached) {
-          if (cached.headers) {
-            for (const [k, val] of Object.entries(cached.headers)) {
+        const replayCheck = await checkSettlementReplay(seenTxStore, idempotencyKey);
+        if (replayCheck.kind === "spent") {
+          res.status(402).json({ error: "Payment already used" });
+          return;
+        }
+        if (replayCheck.kind === "replay") {
+          if (replayCheck.record.headers) {
+            for (const [k, val] of Object.entries(replayCheck.record.headers)) {
               res.setHeader(k, val);
             }
           }
@@ -163,15 +336,18 @@ function createX402Handler(opts) {
       }
       if (ozServer) {
         const settleResult = await ozServer.settlePayment(payload, requirements);
-        txHash = settleResult.transaction ?? null;
-        if (settleResult) {
-          res.setHeader(
-            "X-Payment-Response",
-            encodePaymentResponseHeader(
-              settleResult
-            )
-          );
+        const outcome = readSettleResult(settleResult);
+        if (!outcome.ok) {
+          await respondPaymentRequired("Payment settlement failed", outcome.reason);
+          return;
         }
+        txHash = outcome.txHash;
+        res.setHeader(
+          "X-Payment-Response",
+          encodePaymentResponseHeader(
+            settleResult
+          )
+        );
       } else {
         const verifyResult = await localFacilitator.verify(
           payload,
@@ -188,15 +364,18 @@ function createX402Handler(opts) {
           payload,
           requirements
         );
-        txHash = settleResult.transaction ?? null;
-        if (settleResult) {
-          res.setHeader(
-            "X-Payment-Response",
-            encodePaymentResponseHeader(
-              settleResult
-            )
-          );
+        const outcome = readSettleResult(settleResult);
+        if (!outcome.ok) {
+          await respondPaymentRequired("Payment settlement failed", outcome.reason);
+          return;
         }
+        txHash = outcome.txHash;
+        res.setHeader(
+          "X-Payment-Response",
+          encodePaymentResponseHeader(
+            settleResult
+          )
+        );
       }
       if (idempotencyKey) {
         const headers = {};
@@ -204,17 +383,21 @@ function createX402Handler(opts) {
         if (typeof paymentResponse === "string") {
           headers["X-Payment-Response"] = paymentResponse;
         }
-        await seenTxStore.set(idempotencyKey, { txHash, headers });
+        await seenTxStore.set(idempotencyKey, { txHash, headers, createdAt: Date.now() });
       }
       if (txHash && opts.onSettled) {
         Promise.resolve().then(() => opts.onSettled(txHash, opts.amount, "x402", payerAddress)).catch((err) => {
-          console.error("[x402] onSettled callback error:", err);
+          logger("error", "[x402] onSettled callback error", { error: err });
           opts.onCallbackError?.(err, "onSettled");
         });
       }
       next();
     } catch (err) {
-      console.error("[x402] Settlement error:", err);
+      if (err instanceof RouteDockManifestError) {
+        next(err);
+        return;
+      }
+      logger("error", "[x402] Settlement error", { error: err });
       res.status(500).json({ error: "Payment settlement failed" });
     }
   };
@@ -227,20 +410,37 @@ function createMppChargeHandler(opts) {
   const networkId = MPP_NETWORK[opts.network];
   const amountHumanReadable = opts.amount;
   const recipient = resolvePayee(opts.manifest, "mpp-charge");
-  const seenTxStore = opts.seenTxStore ?? new InMemorySeenTxStore();
-  const mppx = Mppx.create({
-    secretKey: opts.payeeSecretKey,
-    methods: [
-      stellar.charge({
-        recipient,
-        currency: opts.assetContract,
-        network: networkId,
-        feePayer: { envelopeSigner: opts.payeeSecretKey }
-      })
-    ]
-  });
+  const logger = resolveLogger(opts.logger);
+  const seenTxStore = opts.seenTxStore ?? new InMemorySeenTxStore({ logger });
+  const mppxInstances = /* @__PURE__ */ new Map();
+  function getMppx(contract) {
+    let instance = mppxInstances.get(contract);
+    if (!instance) {
+      instance = Mppx.create({
+        secretKey: opts.payeeSecretKey,
+        methods: [
+          stellar$1.charge({
+            recipient,
+            currency: contract,
+            network: networkId,
+            feePayer: { envelopeSigner: opts.payeeSecretKey }
+          })
+        ]
+      });
+      mppxInstances.set(contract, instance);
+    }
+    return instance;
+  }
   return async (req, res, next) => {
     try {
+      const endpoint = req.path || req.originalUrl;
+      const assetContract = resolveAssetContract(
+        opts.manifest,
+        "mpp-charge",
+        endpoint,
+        opts.assetContract
+      );
+      const mppx = getMppx(assetContract);
       let payerAddress = null;
       try {
         const authHeader = req.headers["authorization"];
@@ -256,15 +456,27 @@ function createMppChargeHandler(opts) {
         }
       } catch {
       }
-      const idempotencyKey = await paymentIdempotencyKey((name) => {
-        const v = req.headers[name.toLowerCase()];
-        return Array.isArray(v) ? v[0] : v;
-      });
+      const idempotencyKey = await paymentIdempotencyKey(
+        (name) => {
+          const v = req.headers[name.toLowerCase()];
+          return Array.isArray(v) ? v[0] : v;
+        },
+        {
+          method: req.method,
+          path: req.originalUrl.split("?")[0],
+          amount: amountHumanReadable,
+          payTo: recipient
+        }
+      );
       if (idempotencyKey) {
-        const cached = await seenTxStore.get(idempotencyKey);
-        if (cached) {
-          if (cached.headers) {
-            for (const [k, val] of Object.entries(cached.headers)) {
+        const replayCheck = await checkSettlementReplay(seenTxStore, idempotencyKey);
+        if (replayCheck.kind === "spent") {
+          res.status(402).json({ error: "Payment already used" });
+          return;
+        }
+        if (replayCheck.kind === "replay") {
+          if (replayCheck.record.headers) {
+            for (const [k, val] of Object.entries(replayCheck.record.headers)) {
               res.setHeader(k, val);
             }
           }
@@ -276,7 +488,7 @@ function createMppChargeHandler(opts) {
       const handler = mppx["stellar/charge"];
       const result = await handler({
         amount: amountHumanReadable,
-        currency: opts.assetContract,
+        currency: assetContract,
         recipient,
         description: opts.manifest.name
       })(fetchReq);
@@ -307,12 +519,13 @@ function createMppChargeHandler(opts) {
       if (idempotencyKey) {
         await seenTxStore.set(idempotencyKey, {
           txHash: reference ?? null,
-          headers: receiptHeaders
+          headers: receiptHeaders,
+          createdAt: Date.now()
         });
       }
       if (reference && opts.onSettled) {
         Promise.resolve().then(() => opts.onSettled(reference, opts.amount, "mpp-charge", payerAddress)).catch((err) => {
-          console.error("[mpp-charge] onSettled callback error:", err);
+          logger("error", "[mpp-charge] onSettled callback error", { error: err });
           opts.onCallbackError?.(err, "onSettled");
         });
       }
@@ -413,6 +626,7 @@ function createMppSessionHandler(opts) {
   const networkId = MPP_NETWORK2[opts.network];
   const rateHuman = opts.rate;
   const payeeKeypair = Keypair.fromSecret(opts.payeeSecretKey);
+  const logger = resolveLogger(opts.logger);
   const voucherRecordKey = `routedock:session:voucher:${opts.channelFactory}`;
   const innerStore = Store.memory();
   let record = null;
@@ -464,7 +678,7 @@ function createMppSessionHandler(opts) {
           reason
         });
       } catch (err) {
-        console.error("[mpp-session] onOrphaned handler failed:", err);
+        logger("error", "[mpp-session] onOrphaned handler failed", { error: err });
       }
     }
   }
@@ -511,7 +725,7 @@ function createMppSessionHandler(opts) {
       sessionOpened = true;
       if (opts.onSessionOpen) {
         Promise.resolve().then(() => opts.onSessionOpen(opts.channelFactory, record.payer)).catch((err) => {
-          console.error("[mpp-session] onSessionOpen callback error:", err);
+          logger("error", "[mpp-session] onSessionOpen callback error", { error: err });
           opts.onCallbackError?.(err, "onSessionOpen");
         });
       }
@@ -519,7 +733,7 @@ function createMppSessionHandler(opts) {
     if (opts.onVoucher) {
       const humanAmount = (Number(record.amount) / 1e7).toFixed(7);
       Promise.resolve().then(() => opts.onVoucher(opts.channelFactory, voucherCount, humanAmount, record.signature)).catch((err) => {
-        console.error("[mpp-session] onVoucher callback error:", err);
+        logger("error", "[mpp-session] onVoucher callback error", { error: err });
         opts.onCallbackError?.(err, "onVoucher");
       });
     }
@@ -529,7 +743,7 @@ function createMppSessionHandler(opts) {
     methods: [
       withTypedChannelErrors(
         onVerifiedCredential(
-          stellar$1.channel({
+          stellar.channel({
             channel: opts.channelFactory,
             commitmentKey: opts.commitmentPublicKey,
             network: networkId,
@@ -572,7 +786,7 @@ function createMppSessionHandler(opts) {
           if (opts.onSettled) {
             const totalPaid = (Number(closeAmount) / 1e7).toFixed(7);
             Promise.resolve().then(() => opts.onSettled(closeTxHash, totalPaid, "mpp-session", closePayer)).catch((err) => {
-              console.error("[mpp-session] onSettled callback error:", err);
+              logger("error", "[mpp-session] onSettled callback error", { error: err });
               opts.onCallbackError?.(err, "onSettled");
             });
           }
@@ -583,7 +797,7 @@ function createMppSessionHandler(opts) {
               payeeKeypair.publicKey()
             );
             if (!settlementAddresses) {
-              console.error("[mpp-session] skipped session_settled vault record: payer address unavailable");
+              logger("warn", "[mpp-session] skipped session_settled vault record: payer address unavailable");
             } else {
               try {
                 const { Networks } = await import('@stellar/stellar-sdk');
@@ -606,7 +820,7 @@ function createMppSessionHandler(opts) {
                 preparedTx.sign(payeeKeypair);
                 await server.sendTransaction(preparedTx);
               } catch (recordErr) {
-                console.error("[mpp-session] failed to record session_settled on vault:", recordErr);
+                logger("error", "[mpp-session] failed to record session_settled on vault", { error: recordErr });
               }
             }
           }
@@ -799,12 +1013,13 @@ function routedockFastify(opts) {
           payeeSecretKey: opts.payeeSecretKey,
           network: opts.network,
           amount: x402Price,
-          assetContract: opts.assetContract,
+          ...opts.assetContract ? { assetContract: opts.assetContract } : {},
           ...opts.facilitatorApiKey ? { facilitatorApiKey: opts.facilitatorApiKey } : {},
           manifest: signedManifest,
           ...opts.onSettled ? { onSettled: opts.onSettled } : {},
           ...opts.onCallbackError ? { onCallbackError: opts.onCallbackError } : {},
-          ...opts.seenTxStore ? { seenTxStore: opts.seenTxStore } : {}
+          ...opts.seenTxStore ? { seenTxStore: opts.seenTxStore } : {},
+          ...opts.logger ? { logger: opts.logger } : {}
         })
       );
     }
@@ -818,11 +1033,12 @@ function routedockFastify(opts) {
           payeeSecretKey: opts.payeeSecretKey,
           network: opts.network,
           amount: chargePrice,
-          assetContract: opts.assetContract,
+          ...opts.assetContract ? { assetContract: opts.assetContract } : {},
           manifest: signedManifest,
           ...opts.onSettled ? { onSettled: opts.onSettled } : {},
           ...opts.onCallbackError ? { onCallbackError: opts.onCallbackError } : {},
-          ...opts.seenTxStore ? { seenTxStore: opts.seenTxStore } : {}
+          ...opts.seenTxStore ? { seenTxStore: opts.seenTxStore } : {},
+          ...opts.logger ? { logger: opts.logger } : {}
         })
       );
     }
@@ -840,7 +1056,7 @@ function routedockFastify(opts) {
           network: opts.network,
           channelFactory: sessionPricing.channelFactory,
           rate: sessionPricing.rate,
-          assetContract: opts.assetContract,
+          ...opts.assetContract ? { assetContract: opts.assetContract } : {},
           manifest: signedManifest,
           commitmentPublicKey: opts.commitmentPublicKey,
           ...opts.onSettled ? { onSettled: opts.onSettled } : {},
@@ -848,7 +1064,8 @@ function routedockFastify(opts) {
           ...opts.onVoucher ? { onVoucher: opts.onVoucher } : {},
           ...opts.onCallbackError ? { onCallbackError: opts.onCallbackError } : {},
           ...opts.onOrphaned ? { onOrphaned: opts.onOrphaned } : {},
-          ...opts.idleTimeoutMs != null ? { idleTimeoutMs: opts.idleTimeoutMs } : {}
+          ...opts.idleTimeoutMs != null ? { idleTimeoutMs: opts.idleTimeoutMs } : {},
+          ...opts.logger ? { logger: opts.logger } : {}
         })
       );
     }