Batch-settlement TS sdk

e2e/README.md

@@ -53,6 +53,7 @@ Launches an interactive CLI where you can select:
 - **Clients** - Payment-capable HTTP clients (axios, fetch, httpx, requests, etc.)
 - **Extensions** - Additional features like Bazaar discovery
 - **Protocols** - EVM, SVM, Aptos, and/or Hedera networks
+- **Payment schemes** (when multiple apply) - `exact`, `upto`, or `batch-settlement`
 
 Every valid combination of your selections will be tested. For example, selecting 2 facilitators, 3 servers, and 2 clients will generate and run all compatible test scenarios.
 
@@ -134,6 +135,14 @@ FACILITATOR_HEDERA_PRIVATE_KEY=0x... # Hedera ECDSA private key for facilitator
 FACILITATOR_STELLAR_PRIVATE_KEY=... # Stellar private key for facilitator
 ```
 
+Optional environment variables (batch-settlement scheme):
+
+```bash
+SERVER_EVM_RECEIVER_AUTHORIZER_PRIVATE_KEY=0x... # server-side self-managed claim/refund signer
+CLIENT_EVM_VOUCHER_SIGNER_PRIVATE_KEY=0x...      # EOA the client uses to sign vouchers
+BATCH_SETTLEMENT_RECOVERY=true                   # test client state-loss recovery scenario (default: true)
+```
+
 ### Account Setup Instructions
 
 #### Stellar Testnet

e2e/clients/axios/index.ts

@@ -9,6 +9,7 @@ import {
   UptoEvmScheme as UptoEvmClientScheme,
   type UptoEvmSchemeOptions,
 } from "@x402/evm/upto/client";
+import { BatchSettlementEvmScheme } from "@x402/evm/batch-settlement/client";
 import { ExactEvmSchemeV1 } from "@x402/evm/v1";
 import { toClientEvmSigner } from "@x402/evm";
 import { ExactSvmScheme } from "@x402/svm/exact/client";
@@ -54,6 +55,23 @@ const uptoSchemeOptions: UptoEvmSchemeOptions | undefined = process.env.EVM_RPC_
   ? { rpcUrl: process.env.EVM_RPC_URL }
   : undefined;
 
+// Batch-settlement scheme uses a per-scenario salt (CHANNEL_SALT) so concurrent
+// e2e runs don't collide on the same on-chain channel id. An optional voucher
+// signer (EVM_VOUCHER_SIGNER_PRIVATE_KEY) exercises the alt-EOA voucher branch
+// while deposits keep using the main client signer.
+const channelSalt = process.env.CHANNEL_SALT as `0x${string}` | undefined;
+const voucherSignerKey = process.env.EVM_VOUCHER_SIGNER_PRIVATE_KEY as
+  | `0x${string}`
+  | undefined;
+const voucherSigner = voucherSignerKey
+  ? toClientEvmSigner(privateKeyToAccount(voucherSignerKey), publicClient)
+  : undefined;
+const batchSettlementOptions =
+  channelSalt || voucherSigner
+    ? { ...(channelSalt ? { salt: channelSalt } : {}), ...(voucherSigner ? { voucherSigner } : {}) }
+    : undefined;
+const batchSettlementScheme = new BatchSettlementEvmScheme(evmSigner, batchSettlementOptions);
+
 // Initialize Aptos signer if key is provided
 let aptosAccount: Account | undefined;
 if (process.env.APTOS_PRIVATE_KEY) {
@@ -93,6 +111,7 @@ if (process.env.AVM_PRIVATE_KEY) {
 const client = new x402Client()
   .register("eip155:*", new ExactEvmScheme(evmSigner, evmSchemeOptions))
   .register("eip155:*", new UptoEvmClientScheme(evmSigner, uptoSchemeOptions))
+  .register("eip155:*", batchSettlementScheme)
   .registerV1("base-sepolia", new ExactEvmSchemeV1(evmSigner))
   .registerV1("base", new ExactEvmSchemeV1(evmSigner))
   .register("solana:*", new ExactSvmScheme(svmSigner))
@@ -113,46 +132,119 @@ if (avmSigner) {
 
 const axiosWithPayment = wrapAxiosWithPayment(axios.create(), client);
 
-axiosWithPayment
-  .get(url)
-  .then(async response => {
-    const data = response.data;
-    // Check both v2 (PAYMENT-RESPONSE) and v1 (X-PAYMENT-RESPONSE) headers
-    const paymentResponse =
-      response.headers["payment-response"] || response.headers["x-payment-response"];
-
-    if (!paymentResponse) {
-      // No payment was required
-      const result = {
-        success: true,
-        data: data,
-        status_code: response.status,
-      };
-      console.log(JSON.stringify(result));
-      process.exit(0);
-      return;
-    }
-
-    const decodedPaymentResponse = decodePaymentResponseHeader(paymentResponse);
-
-    const result = {
-      success: decodedPaymentResponse.success,
-      data: data,
-      status_code: response.status,
-      payment_response: decodedPaymentResponse,
-    };
+const batchSettlementPhase = process.env.BATCH_SETTLEMENT_PHASE as
+  | "initial"
+  | "recovery-refund"
+  | "full"
+  | undefined;
+
+/**
+ * Issues a single paid request and returns the parsed result.
+ *
+ * @returns Structured result with response data and decoded payment-response.
+ */
+interface RequestResult {
+  success: boolean;
+  data: unknown;
+  status_code: number;
+  payment_response?: any;
+}
+
+async function issueRequest(): Promise<RequestResult> {
+  const response = await axiosWithPayment.get(url);
+  const paymentResponseHeader =
+    response.headers["payment-response"] || response.headers["x-payment-response"];
+
+  if (!paymentResponseHeader) {
+    return { success: true, data: response.data, status_code: response.status };
+  }
+
+  const decodedPaymentResponse = decodePaymentResponseHeader(paymentResponseHeader);
+  return {
+    success: decodedPaymentResponse.success,
+    data: response.data,
+    status_code: response.status,
+    payment_response: decodedPaymentResponse,
+  };
+}
+
+function aggregateBatchResult(
+  phase: "initial" | "recovery-refund" | "full",
+  results: RequestResult[],
+  details: Record<string, RequestResult>,
+) {
+  const last = results[results.length - 1]!;
+  return {
+    success: results.every(result => result.success),
+    data: {
+      batchSettlement: {
+        phase,
+        requests: results,
+        ...details,
+      },
+    },
+    status_code: last.status_code,
+    payment_response: last.payment_response,
+  };
+}
 
-    // Output structured result as JSON for proxy to parse
+try {
+  if (!batchSettlementPhase) {
+    const result = await issueRequest();
     console.log(JSON.stringify(result));
     process.exit(0);
-  })
-  .catch(error => {
-    console.error(
-      JSON.stringify({
-        success: false,
-        error: error.message || "Request failed",
-        status_code: error.response?.status || 500,
-      }),
+  }
+
+  if (batchSettlementPhase === "initial") {
+    const deposit = await issueRequest();
+    const voucher = await issueRequest();
+    console.log(JSON.stringify(aggregateBatchResult("initial", [deposit, voucher], { deposit, voucher })));
+    process.exit(0);
+  }
+
+  if (batchSettlementPhase === "recovery-refund") {
+    const recoveryVoucher = await issueRequest();
+    const refundSettle = await batchSettlementScheme.refund(url);
+    const refund = {
+      success: refundSettle.success,
+      data: { refund: true },
+      status_code: 200,
+      payment_response: refundSettle,
+    };
+    console.log(
+      JSON.stringify(
+        aggregateBatchResult("recovery-refund", [recoveryVoucher, refund], {
+          recoveryVoucher,
+          refund,
+        }),
+      ),
     );
-    process.exit(1);
-  });
+    process.exit(0);
+  }
+
+  if (batchSettlementPhase === "full") {
+    const deposit = await issueRequest();
+    const voucher = await issueRequest();
+    const refundSettle = await batchSettlementScheme.refund(url);
+    const refund = {
+      success: refundSettle.success,
+      data: { refund: true },
+      status_code: 200,
+      payment_response: refundSettle,
+    };
+    console.log(JSON.stringify(aggregateBatchResult("full", [deposit, voucher, refund], { deposit, voucher, refund })));
+    process.exit(0);
+  }
+
+  throw new Error(`Unknown BATCH_SETTLEMENT_PHASE: ${batchSettlementPhase}`);
+} catch (error: unknown) {
+  const err = error as { message?: string; response?: { status?: number } };
+  console.error(
+    JSON.stringify({
+      success: false,
+      error: err.message || "Request failed",
+      status_code: err.response?.status || 500,
+    }),
+  );
+  process.exit(1);
+}

e2e/clients/axios/test.config.json

@@ -15,10 +15,9 @@
     2
   ],
   "evm": {
-    "transferMethods": [
+    "assetTransferMethods": [
       "eip3009",
-      "permit2",
-      "upto"
+      "permit2"
     ]
   },
   "extensions": [
@@ -39,7 +38,11 @@
       "HEDERA_PRIVATE_KEY",
       "HEDERA_NETWORK",
       "HEDERA_NODE_URL",
-      "STELLAR_PRIVATE_KEY"
+      "STELLAR_PRIVATE_KEY",
+      "CHANNEL_SALT",
+      "BATCH_SETTLEMENT_PHASE",
+      "BATCH_SETTLEMENT_RECOVERY",
+      "EVM_VOUCHER_SIGNER_PRIVATE_KEY"
     ]
   }
 }