[SDK] Expose waitUntil parameter in settlePayment()

Author: joaquim-verges

.changeset/yellow-cameras-tease.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Also expose waitUntil param in settlePayment()

packages/thirdweb/src/exports/x402.ts

@@ -7,8 +7,12 @@ export {
 export { wrapFetchWithPayment } from "../x402/fetchWithPayment.js";
 export { settlePayment } from "../x402/settle-payment.js";
 export type {
+  ERC20TokenAmount,
   PaymentArgs,
+  PaymentRequiredResult,
+  SettlePaymentArgs,
   SettlePaymentResult,
+  SupportedSignatureType,
   VerifyPaymentResult,
 } from "../x402/types.js";
 export { verifyPayment } from "../x402/verify-payment.js";

packages/thirdweb/src/x402/facilitator.ts

@@ -9,10 +9,12 @@ import type {
   RequestedPaymentRequirements,
 } from "./schemas.js";
 
+export type WaitUtil = "simulated" | "submitted" | "confirmed";
+
 export type ThirdwebX402FacilitatorConfig = {
   client: ThirdwebClient;
   serverWalletAddress: string;
-  waitUtil?: "simulated" | "submitted" | "confirmed";
+  waitUtil?: WaitUtil;
   vaultAccessToken?: string;
   baseUrl?: string;
 };
@@ -37,6 +39,7 @@ export type ThirdwebX402Facilitator = {
   settle: (
     payload: RequestedPaymentPayload,
     paymentRequirements: RequestedPaymentRequirements,
+    waitUtil?: WaitUtil,
   ) => Promise<FacilitatorSettleResponse>;
   supported: (filters?: {
     chainId: number;
@@ -167,12 +170,14 @@ export function facilitator(
     async settle(
       payload: RequestedPaymentPayload,
       paymentRequirements: RequestedPaymentRequirements,
+      waitUtil?: WaitUtil,
     ): Promise<FacilitatorSettleResponse> {
       const url = config.baseUrl ?? DEFAULT_BASE_URL;
 
       let headers = { "Content-Type": "application/json" };
       const authHeaders = await facilitator.createAuthHeaders();
       headers = { ...headers, ...authHeaders.settle };
+      const waitUtilParam = waitUtil || config.waitUtil;
 
       const res = await fetch(`${url}/settle`, {
         method: "POST",
@@ -181,7 +186,7 @@ export function facilitator(
           x402Version: payload.x402Version,
           paymentPayload: payload,
           paymentRequirements: paymentRequirements,
-          ...(config.waitUtil ? { waitUtil: config.waitUtil } : {}),
+          ...(waitUtilParam ? { waitUtil: waitUtilParam } : {}),
         }),
       });
 

packages/thirdweb/src/x402/settle-payment.ts

@@ -2,7 +2,7 @@ import { stringify } from "../utils/json.js";
 import { decodePaymentRequest } from "./common.js";
 import { safeBase64Encode } from "./encode.js";
 import {
-  type PaymentArgs,
+  type SettlePaymentArgs,
   type SettlePaymentResult,
   x402Version,
 } from "./types.js";
@@ -124,7 +124,7 @@ import {
  * @bridge x402
  */
 export async function settlePayment(
-  args: PaymentArgs,
+  args: SettlePaymentArgs,
 ): Promise<SettlePaymentResult> {
   const { routeConfig = {}, facilitator } = args;
   const { errorMessages } = routeConfig;
@@ -142,6 +142,7 @@ export async function settlePayment(
     const settlement = await facilitator.settle(
       decodedPayment,
       selectedPaymentRequirements,
+      args.waitUntil,
     );
 
     if (settlement.success) {

packages/thirdweb/src/x402/types.ts

@@ -3,7 +3,7 @@ import type z from "zod";
 import type { Chain } from "../chains/types.js";
 import type { Address } from "../utils/address.js";
 import type { Prettify } from "../utils/type-utils.js";
-import type { ThirdwebX402Facilitator } from "./facilitator.js";
+import type { ThirdwebX402Facilitator, WaitUtil } from "./facilitator.js";
 import type {
   FacilitatorNetwork,
   FacilitatorSettleResponse,
@@ -39,6 +39,10 @@ export type PaymentArgs = {
   routeConfig?: PaymentMiddlewareConfig;
 };
 
+export type SettlePaymentArgs = PaymentArgs & {
+  waitUntil?: WaitUtil;
+};
+
 export type PaymentRequiredResult = {
   /** HTTP 402 - Payment Required, verification or processing failed or payment missing */
   status: 402;