@routedock/routedock 0.1.0 → 0.1.2

package/dist/provider.cjs

@@ -2,11 +2,13 @@
 
 var stellarSdk = require('@stellar/stellar-sdk');
 var facilitator = require('@x402/stellar/exact/facilitator');
+var server$1 = require('@x402/stellar/exact/server');
+var server = require('@x402/core/server');
 var stellar = require('@x402/stellar');
 var http = require('@x402/core/http');
-var server$1 = require('@stellar/mpp/charge/server');
-var server = require('mppx/server');
-var server$2 = require('@stellar/mpp/channel/server');
+var server$3 = require('@stellar/mpp/charge/server');
+var server$2 = require('mppx/server');
+var server$4 = require('@stellar/mpp/channel/server');
 
 // src/types.ts
 var RouteDockError = class extends Error {
@@ -45,13 +47,29 @@ var CAIP2 = {
   testnet: "stellar:testnet",
   mainnet: "stellar:pubnet"
 };
+var OZ_FACILITATOR_URL = "https://channels.openzeppelin.com/x402";
 function createX402Handler(opts) {
   const caip2 = CAIP2[opts.network];
   const payeeKeypair = stellarSdk.Keypair.fromSecret(opts.payeeSecretKey);
   const signer = stellar.createEd25519Signer(opts.payeeSecretKey, caip2);
-  const facilitatorScheme = new facilitator.ExactStellarScheme([signer], {
+  const useOzFacilitator = opts.network === "mainnet" && opts.facilitatorApiKey;
+  const localFacilitator = new facilitator.ExactStellarScheme([signer], {
     areFeesSponsored: true
   });
+  let ozServer = null;
+  if (useOzFacilitator) {
+    const apiKey = opts.facilitatorApiKey;
+    const facilitator = new server.HTTPFacilitatorClient({
+      url: OZ_FACILITATOR_URL,
+      createAuthHeaders: async () => ({
+        verify: { Authorization: `Bearer ${apiKey}` },
+        settle: { Authorization: `Bearer ${apiKey}` },
+        supported: { Authorization: `Bearer ${apiKey}` }
+      })
+    });
+    ozServer = new server.x402ResourceServer(facilitator);
+    ozServer.register(caip2, new server$1.ExactStellarScheme());
+  }
   const amountInBaseUnits = String(Math.round(parseFloat(opts.amount) * 1e7));
   const requirements = {
     scheme: "exact",
@@ -62,52 +80,78 @@ function createX402Handler(opts) {
     maxTimeoutSeconds: 60,
     extra: {
       areFeesSponsored: true,
-      facilitatorAddresses: [payeeKeypair.publicKey()]
+      ...useOzFacilitator ? {} : { facilitatorAddresses: [payeeKeypair.publicKey()] }
     }
   };
   return async (req, res, next) => {
     try {
       const paymentHeader = req.headers["payment-signature"] ?? req.headers["x-payment"];
       if (!paymentHeader) {
-        const x402Response = {
-          x402Version: 2,
-          resource: {
+        if (ozServer) {
+          const resourceInfo = {
             url: `${req.protocol}://${req.get("host") ?? ""}${req.originalUrl}`,
             description: opts.manifest.name
-          },
-          accepts: [requirements]
-        };
-        res.status(402).setHeader("Content-Type", "application/json").setHeader("X-Payment-Requirements", http.encodePaymentRequiredHeader(x402Response)).json({ error: "Payment Required" });
+          };
+          const paymentRequired = await ozServer.createPaymentRequiredResponse(
+            [requirements],
+            resourceInfo
+          );
+          res.status(402).setHeader("Content-Type", "application/json").setHeader("X-Payment-Requirements", http.encodePaymentRequiredHeader(paymentRequired)).json({ error: "Payment Required" });
+        } else {
+          const x402Response = {
+            x402Version: 2,
+            resource: {
+              url: `${req.protocol}://${req.get("host") ?? ""}${req.originalUrl}`,
+              description: opts.manifest.name
+            },
+            accepts: [requirements]
+          };
+          res.status(402).setHeader("Content-Type", "application/json").setHeader("X-Payment-Requirements", http.encodePaymentRequiredHeader(x402Response)).json({ error: "Payment Required" });
+        }
         return;
       }
       const payload = http.decodePaymentSignatureHeader(paymentHeader);
-      const verifyResult = await facilitatorScheme.verify(
-        payload,
-        requirements
-      );
-      if (!verifyResult.isValid) {
-        res.status(401).json({
-          error: "Payment verification failed",
-          reason: verifyResult.invalidReason
-        });
-        return;
+      let txHash = null;
+      if (ozServer) {
+        const settleResult = await ozServer.settlePayment(payload, requirements);
+        txHash = settleResult.transaction ?? null;
+        if (settleResult) {
+          res.setHeader(
+            "X-Payment-Response",
+            http.encodePaymentResponseHeader(
+              settleResult
+            )
+          );
+        }
+      } else {
+        const verifyResult = await localFacilitator.verify(
+          payload,
+          requirements
+        );
+        if (!verifyResult.isValid) {
+          res.status(401).json({
+            error: "Payment verification failed",
+            reason: verifyResult.invalidReason
+          });
+          return;
+        }
+        const settleResult = await localFacilitator.settle(
+          payload,
+          requirements
+        );
+        txHash = settleResult.transaction ?? null;
+        if (settleResult) {
+          res.setHeader(
+            "X-Payment-Response",
+            http.encodePaymentResponseHeader(
+              settleResult
+            )
+          );
+        }
       }
-      const settleResult = await facilitatorScheme.settle(
-        payload,
-        requirements
-      );
-      const txHash = settleResult.transaction ?? null;
       if (txHash && opts.onSettled) {
         await opts.onSettled(txHash, opts.amount, "x402");
       }
-      if (settleResult) {
-        res.setHeader(
-          "X-Payment-Response",
-          http.encodePaymentResponseHeader(
-            settleResult
-          )
-        );
-      }
       next();
     } catch (err) {
       console.error("[x402] Settlement error:", err);
@@ -122,10 +166,10 @@ var MPP_NETWORK = {
 function createMppChargeHandler(opts) {
   const networkId = MPP_NETWORK[opts.network];
   const amountHumanReadable = opts.amount;
-  const mppx = server.Mppx.create({
+  const mppx = server$2.Mppx.create({
     secretKey: opts.payeeSecretKey,
     methods: [
-      server$1.stellar.charge({
+      server$3.stellar.charge({
         recipient: opts.manifest.payee,
         currency: opts.assetContract,
         network: networkId,
@@ -135,7 +179,7 @@ function createMppChargeHandler(opts) {
   });
   return async (req, res, next) => {
     try {
-      const fetchReq = server.Request.fromNodeListener(req, res);
+      const fetchReq = server$2.Request.fromNodeListener(req, res);
       const handler = mppx["stellar/charge"];
       const result = await handler({
         amount: amountHumanReadable,
@@ -179,8 +223,10 @@ function createMppSessionHandler(opts) {
   const rateHuman = opts.rate;
   const payeeKeypair = stellarSdk.Keypair.fromSecret(opts.payeeSecretKey);
   const cumulativeKey = `stellar:channel:cumulative:${opts.channelContract}`;
-  const innerStore = server$2.Store.memory();
+  const innerStore = server$4.Store.memory();
   let lastCumulativeAmount = 0n;
+  let voucherCount = 0;
+  let sessionOpened = false;
   const wrappedStore = {
     async get(key) {
       return innerStore.get(key);
@@ -189,16 +235,27 @@ function createMppSessionHandler(opts) {
       await innerStore.put(key, value);
       if (key === cumulativeKey && value && typeof value === "object" && "amount" in value) {
         lastCumulativeAmount = BigInt(value.amount);
+        voucherCount++;
+        if (!sessionOpened) {
+          sessionOpened = true;
+          if (opts.onSessionOpen) {
+            await opts.onSessionOpen(opts.channelContract);
+          }
+        }
+        if (opts.onVoucher) {
+          const humanAmount = (Number(lastCumulativeAmount) / 1e7).toFixed(7);
+          await opts.onVoucher(voucherCount, humanAmount);
+        }
       }
     },
     async delete(key) {
       return innerStore.delete(key);
     }
   };
-  const mppx = server.Mppx.create({
+  const mppx = server$2.Mppx.create({
     secretKey: opts.payeeSecretKey,
     methods: [
-      server$2.stellar.channel({
+      server$4.stellar.channel({
         channel: opts.channelContract,
         commitmentKey: opts.commitmentPublicKey,
         network: networkId,
@@ -216,7 +273,7 @@ function createMppSessionHandler(opts) {
         const closeAmount = body?.amount ? BigInt(body.amount) : lastCumulativeAmount;
         const closeSig = body?.signature ?? lastSignatureHex;
         if (closeAmount > 0n && closeSig) {
-          const closeTxHash = await server$2.close({
+          const closeTxHash = await server$4.close({
             channel: opts.channelContract,
             amount: closeAmount,
             signature: Buffer.from(closeSig, "hex"),
@@ -231,6 +288,9 @@ function createMppSessionHandler(opts) {
         } else {
           res.json({ closeTxHash: null, message: "no vouchers received" });
         }
+        sessionOpened = false;
+        voucherCount = 0;
+        lastCumulativeAmount = 0n;
         return;
       }
       const authHeader = req.headers["authorization"];
@@ -247,7 +307,7 @@ function createMppSessionHandler(opts) {
         } catch {
         }
       }
-      const fetchReq = server.Request.fromNodeListener(req, res);
+      const fetchReq = server$2.Request.fromNodeListener(req, res);
       const result = await mppx.channel({
         amount: rateHuman,
         description: opts.manifest.name
@@ -316,7 +376,9 @@ function routedock(opts) {
           assetContract: opts.assetContract,
           manifest: opts.manifest,
           commitmentPublicKey: opts.commitmentPublicKey,
-          ...opts.onSettled ? { onSettled: opts.onSettled } : {}
+          ...opts.onSettled ? { onSettled: opts.onSettled } : {},
+          ...opts.onSessionOpen ? { onSessionOpen: opts.onSessionOpen } : {},
+          ...opts.onVoucher ? { onVoucher: opts.onVoucher } : {}
         })
       );
     }

package/dist/provider.d.cts

@@ -1,6 +1,6 @@
 import { c as RouteDockManifest, k as SessionStore } from './SessionStore-CCVO0PHM.cjs';
 export { P as PaymentMode, a as PaymentResult, b as PricingConfig, R as RouteDockError, d as RouteDockManifestError, e as RouteDockNoSupportedModeError, f as RouteDockPolicyRejectedError, g as RouteDockSessionError, S as SessionCloseResult, h as SessionHandle, i as SessionPricingConfig, j as SessionState, l as SupabaseSessionStore } from './SessionStore-CCVO0PHM.cjs';
-export { R as RouteDockMiddlewareOptions, r as routedock } from './routedockMiddleware-Beqan6QS.cjs';
+export { R as RouteDockMiddlewareOptions, r as routedock } from './routedockMiddleware-B7WTB3LT.cjs';
 import { RequestHandler } from 'express';
 import '@supabase/supabase-js';
 
@@ -38,6 +38,8 @@ interface MppSessionHandlerOptions {
     manifest: RouteDockManifest;
     commitmentPublicKey: string;
     onSettled?: (txHash: string, totalPaid: string, mode: string) => Promise<void>;
+    onSessionOpen?: (channelId: string) => Promise<void>;
+    onVoucher?: (voucherIndex: number, cumulativeAmount: string) => Promise<void>;
 }
 declare function createMppSessionHandler(opts: MppSessionHandlerOptions): RequestHandler;
 

package/dist/provider.d.ts

@@ -1,6 +1,6 @@
 import { c as RouteDockManifest, k as SessionStore } from './SessionStore-CCVO0PHM.js';
 export { P as PaymentMode, a as PaymentResult, b as PricingConfig, R as RouteDockError, d as RouteDockManifestError, e as RouteDockNoSupportedModeError, f as RouteDockPolicyRejectedError, g as RouteDockSessionError, S as SessionCloseResult, h as SessionHandle, i as SessionPricingConfig, j as SessionState, l as SupabaseSessionStore } from './SessionStore-CCVO0PHM.js';
-export { R as RouteDockMiddlewareOptions, r as routedock } from './routedockMiddleware-CqnyHjhO.js';
+export { R as RouteDockMiddlewareOptions, r as routedock } from './routedockMiddleware-DRgdrycG.js';
 import { RequestHandler } from 'express';
 import '@supabase/supabase-js';
 
@@ -38,6 +38,8 @@ interface MppSessionHandlerOptions {
     manifest: RouteDockManifest;
     commitmentPublicKey: string;
     onSettled?: (txHash: string, totalPaid: string, mode: string) => Promise<void>;
+    onSessionOpen?: (channelId: string) => Promise<void>;
+    onVoucher?: (voucherIndex: number, cumulativeAmount: string) => Promise<void>;
 }
 declare function createMppSessionHandler(opts: MppSessionHandlerOptions): RequestHandler;
 

package/dist/provider.js

@@ -1,5 +1,7 @@
 import { Keypair } from '@stellar/stellar-sdk';
 import { ExactStellarScheme } from '@x402/stellar/exact/facilitator';
+import { ExactStellarScheme as ExactStellarScheme$1 } from '@x402/stellar/exact/server';
+import { HTTPFacilitatorClient, x402ResourceServer } from '@x402/core/server';
 import { createEd25519Signer } from '@x402/stellar';
 import { encodePaymentRequiredHeader, decodePaymentSignatureHeader, encodePaymentResponseHeader } from '@x402/core/http';
 import { stellar } from '@stellar/mpp/charge/server';
@@ -43,13 +45,29 @@ var CAIP2 = {
   testnet: "stellar:testnet",
   mainnet: "stellar:pubnet"
 };
+var OZ_FACILITATOR_URL = "https://channels.openzeppelin.com/x402";
 function createX402Handler(opts) {
   const caip2 = CAIP2[opts.network];
   const payeeKeypair = Keypair.fromSecret(opts.payeeSecretKey);
   const signer = createEd25519Signer(opts.payeeSecretKey, caip2);
-  const facilitatorScheme = new ExactStellarScheme([signer], {
+  const useOzFacilitator = opts.network === "mainnet" && opts.facilitatorApiKey;
+  const localFacilitator = new ExactStellarScheme([signer], {
     areFeesSponsored: true
   });
+  let ozServer = null;
+  if (useOzFacilitator) {
+    const apiKey = opts.facilitatorApiKey;
+    const facilitator = new HTTPFacilitatorClient({
+      url: OZ_FACILITATOR_URL,
+      createAuthHeaders: async () => ({
+        verify: { Authorization: `Bearer ${apiKey}` },
+        settle: { Authorization: `Bearer ${apiKey}` },
+        supported: { Authorization: `Bearer ${apiKey}` }
+      })
+    });
+    ozServer = new x402ResourceServer(facilitator);
+    ozServer.register(caip2, new ExactStellarScheme$1());
+  }
   const amountInBaseUnits = String(Math.round(parseFloat(opts.amount) * 1e7));
   const requirements = {
     scheme: "exact",
@@ -60,52 +78,78 @@ function createX402Handler(opts) {
     maxTimeoutSeconds: 60,
     extra: {
       areFeesSponsored: true,
-      facilitatorAddresses: [payeeKeypair.publicKey()]
+      ...useOzFacilitator ? {} : { facilitatorAddresses: [payeeKeypair.publicKey()] }
     }
   };
   return async (req, res, next) => {
     try {
       const paymentHeader = req.headers["payment-signature"] ?? req.headers["x-payment"];
       if (!paymentHeader) {
-        const x402Response = {
-          x402Version: 2,
-          resource: {
+        if (ozServer) {
+          const resourceInfo = {
             url: `${req.protocol}://${req.get("host") ?? ""}${req.originalUrl}`,
             description: opts.manifest.name
-          },
-          accepts: [requirements]
-        };
-        res.status(402).setHeader("Content-Type", "application/json").setHeader("X-Payment-Requirements", encodePaymentRequiredHeader(x402Response)).json({ error: "Payment Required" });
+          };
+          const paymentRequired = await ozServer.createPaymentRequiredResponse(
+            [requirements],
+            resourceInfo
+          );
+          res.status(402).setHeader("Content-Type", "application/json").setHeader("X-Payment-Requirements", encodePaymentRequiredHeader(paymentRequired)).json({ error: "Payment Required" });
+        } else {
+          const x402Response = {
+            x402Version: 2,
+            resource: {
+              url: `${req.protocol}://${req.get("host") ?? ""}${req.originalUrl}`,
+              description: opts.manifest.name
+            },
+            accepts: [requirements]
+          };
+          res.status(402).setHeader("Content-Type", "application/json").setHeader("X-Payment-Requirements", encodePaymentRequiredHeader(x402Response)).json({ error: "Payment Required" });
+        }
         return;
       }
       const payload = decodePaymentSignatureHeader(paymentHeader);
-      const verifyResult = await facilitatorScheme.verify(
-        payload,
-        requirements
-      );
-      if (!verifyResult.isValid) {
-        res.status(401).json({
-          error: "Payment verification failed",
-          reason: verifyResult.invalidReason
-        });
-        return;
+      let txHash = null;
+      if (ozServer) {
+        const settleResult = await ozServer.settlePayment(payload, requirements);
+        txHash = settleResult.transaction ?? null;
+        if (settleResult) {
+          res.setHeader(
+            "X-Payment-Response",
+            encodePaymentResponseHeader(
+              settleResult
+            )
+          );
+        }
+      } else {
+        const verifyResult = await localFacilitator.verify(
+          payload,
+          requirements
+        );
+        if (!verifyResult.isValid) {
+          res.status(401).json({
+            error: "Payment verification failed",
+            reason: verifyResult.invalidReason
+          });
+          return;
+        }
+        const settleResult = await localFacilitator.settle(
+          payload,
+          requirements
+        );
+        txHash = settleResult.transaction ?? null;
+        if (settleResult) {
+          res.setHeader(
+            "X-Payment-Response",
+            encodePaymentResponseHeader(
+              settleResult
+            )
+          );
+        }
       }
-      const settleResult = await facilitatorScheme.settle(
-        payload,
-        requirements
-      );
-      const txHash = settleResult.transaction ?? null;
       if (txHash && opts.onSettled) {
         await opts.onSettled(txHash, opts.amount, "x402");
       }
-      if (settleResult) {
-        res.setHeader(
-          "X-Payment-Response",
-          encodePaymentResponseHeader(
-            settleResult
-          )
-        );
-      }
       next();
     } catch (err) {
       console.error("[x402] Settlement error:", err);
@@ -179,6 +223,8 @@ function createMppSessionHandler(opts) {
   const cumulativeKey = `stellar:channel:cumulative:${opts.channelContract}`;
   const innerStore = Store.memory();
   let lastCumulativeAmount = 0n;
+  let voucherCount = 0;
+  let sessionOpened = false;
   const wrappedStore = {
     async get(key) {
       return innerStore.get(key);
@@ -187,6 +233,17 @@ function createMppSessionHandler(opts) {
       await innerStore.put(key, value);
       if (key === cumulativeKey && value && typeof value === "object" && "amount" in value) {
         lastCumulativeAmount = BigInt(value.amount);
+        voucherCount++;
+        if (!sessionOpened) {
+          sessionOpened = true;
+          if (opts.onSessionOpen) {
+            await opts.onSessionOpen(opts.channelContract);
+          }
+        }
+        if (opts.onVoucher) {
+          const humanAmount = (Number(lastCumulativeAmount) / 1e7).toFixed(7);
+          await opts.onVoucher(voucherCount, humanAmount);
+        }
       }
     },
     async delete(key) {
@@ -229,6 +286,9 @@ function createMppSessionHandler(opts) {
         } else {
           res.json({ closeTxHash: null, message: "no vouchers received" });
         }
+        sessionOpened = false;
+        voucherCount = 0;
+        lastCumulativeAmount = 0n;
         return;
       }
       const authHeader = req.headers["authorization"];
@@ -314,7 +374,9 @@ function routedock(opts) {
           assetContract: opts.assetContract,
           manifest: opts.manifest,
           commitmentPublicKey: opts.commitmentPublicKey,
-          ...opts.onSettled ? { onSettled: opts.onSettled } : {}
+          ...opts.onSettled ? { onSettled: opts.onSettled } : {},
+          ...opts.onSessionOpen ? { onSessionOpen: opts.onSessionOpen } : {},
+          ...opts.onVoucher ? { onVoucher: opts.onVoucher } : {}
         })
       );
     }

package/dist/{routedockMiddleware-Beqan6QS.d.cts → routedockMiddleware-B7WTB3LT.d.cts}

@@ -26,6 +26,10 @@ interface RouteDockMiddlewareOptions {
     manifest: RouteDockManifest;
     /** Called after each successful on-chain settlement */
     onSettled?: (txHash: string, amount: string, mode: string) => Promise<void>;
+    /** Called when a new mpp-session is opened (first voucher received) */
+    onSessionOpen?: (channelId: string) => Promise<void>;
+    /** Called after each verified voucher in an mpp-session */
+    onVoucher?: (voucherIndex: number, cumulativeAmount: string) => Promise<void>;
 }
 /**
  * Express middleware factory for RouteDock provider endpoints.

package/dist/{routedockMiddleware-CqnyHjhO.d.ts → routedockMiddleware-DRgdrycG.d.ts}

@@ -26,6 +26,10 @@ interface RouteDockMiddlewareOptions {
     manifest: RouteDockManifest;
     /** Called after each successful on-chain settlement */
     onSettled?: (txHash: string, amount: string, mode: string) => Promise<void>;
+    /** Called when a new mpp-session is opened (first voucher received) */
+    onSessionOpen?: (channelId: string) => Promise<void>;
+    /** Called after each verified voucher in an mpp-session */
+    onVoucher?: (voucherIndex: number, cumulativeAmount: string) => Promise<void>;
 }
 /**
  * Express middleware factory for RouteDock provider endpoints.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routedock/routedock",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Unified payment execution layer for autonomous agents on Stellar",
   "license": "MIT",
   "repository": {

package/src/provider/MppSessionHandler.ts

@@ -20,6 +20,8 @@ export interface MppSessionHandlerOptions {
   manifest: RouteDockManifest
   commitmentPublicKey: string
   onSettled?: (txHash: string, totalPaid: string, mode: string) => Promise<void>
+  onSessionOpen?: (channelId: string) => Promise<void>
+  onVoucher?: (voucherIndex: number, cumulativeAmount: string) => Promise<void>
 }
 
 export function createMppSessionHandler(opts: MppSessionHandlerOptions): RequestHandler {
@@ -30,14 +32,29 @@ export function createMppSessionHandler(opts: MppSessionHandlerOptions): Request
 
   const innerStore = Store.memory()
 
-  // Wrap the store to intercept cumulative amount writes
   let lastCumulativeAmount = 0n
+  let voucherCount = 0
+  let sessionOpened = false
+
   const wrappedStore: ReturnType<typeof Store.memory> = {
     async get(key: string) { return innerStore.get(key) },
     async put(key: string, value: unknown) {
       await innerStore.put(key, value)
       if (key === cumulativeKey && value && typeof value === 'object' && 'amount' in (value as Record<string, unknown>)) {
         lastCumulativeAmount = BigInt((value as { amount: string }).amount)
+        voucherCount++
+
+        if (!sessionOpened) {
+          sessionOpened = true
+          if (opts.onSessionOpen) {
+            await opts.onSessionOpen(opts.channelContract)
+          }
+        }
+
+        if (opts.onVoucher) {
+          const humanAmount = (Number(lastCumulativeAmount) / 1e7).toFixed(7)
+          await opts.onVoucher(voucherCount, humanAmount)
+        }
       }
     },
     async delete(key: string) { return innerStore.delete(key) },
@@ -85,6 +102,10 @@ export function createMppSessionHandler(opts: MppSessionHandlerOptions): Request
         } else {
           res.json({ closeTxHash: null, message: 'no vouchers received' })
         }
+
+        sessionOpened = false
+        voucherCount = 0
+        lastCumulativeAmount = 0n
         return
       }
 

package/src/provider/routedockMiddleware.ts

@@ -26,6 +26,10 @@ export interface RouteDockMiddlewareOptions {
   manifest: RouteDockManifest
   /** Called after each successful on-chain settlement */
   onSettled?: (txHash: string, amount: string, mode: string) => Promise<void>
+  /** Called when a new mpp-session is opened (first voucher received) */
+  onSessionOpen?: (channelId: string) => Promise<void>
+  /** Called after each verified voucher in an mpp-session */
+  onVoucher?: (voucherIndex: number, cumulativeAmount: string) => Promise<void>
 }
 
 /**
@@ -97,6 +101,8 @@ export function routedock(opts: RouteDockMiddlewareOptions): RequestHandler {
           manifest: opts.manifest,
           commitmentPublicKey: opts.commitmentPublicKey,
           ...(opts.onSettled ? { onSettled: opts.onSettled } : {}),
+          ...(opts.onSessionOpen ? { onSessionOpen: opts.onSessionOpen } : {}),
+          ...(opts.onVoucher ? { onVoucher: opts.onVoucher } : {}),
         }),
       )
     }