update to use nexus keys instead

jnsdls · jnsdls · commit a0e160f390f5 · 2025-10-29T14:39:32.000-07:00
diff --git a/packages/nexus/knip.json b/packages/nexus/knip.json
@@ -1,12 +1,12 @@
 {
-	"$schema": "https://unpkg.com/knip@5/schema.json",
-	"entry": ["src/exports/**"],
-	"ignore": ["src/**/__generated__/**", "**/*.bench.ts"],
-	"ignoreBinaries": ["printf"],
-	"ignoreDependencies": ["tslib"],
-	"project": ["src/**/*.{ts,tsx}"],
-	"rules": {
-		"enumMembers": "off",
-		"optionalPeerDependencies": "off"
-	}
+  "$schema": "https://unpkg.com/knip@5/schema.json",
+  "entry": ["src/exports/**"],
+  "ignore": ["src/**/__generated__/**", "**/*.bench.ts"],
+  "ignoreBinaries": ["printf"],
+  "ignoreDependencies": ["tslib", "thirdweb"],
+  "project": ["src/**/*.{ts,tsx}"],
+  "rules": {
+    "enumMembers": "off",
+    "optionalPeerDependencies": "off"
+  }
 }
diff --git a/packages/nexus/src/exports/nexus.ts b/packages/nexus/src/exports/nexus.ts
@@ -1,25 +1,25 @@
 export type {
-	HTTPRequestStructure,
-	Money,
-	PaymentMiddlewareConfig,
-	Resource,
+  HTTPRequestStructure,
+  Money,
+  PaymentMiddlewareConfig,
+  Resource,
 } from "x402/types";
 export { decodePayment, encodePayment } from "../encode.js";
 export {
-	facilitator,
-	type ThirdwebX402Facilitator,
-	type ThirdwebX402FacilitatorConfig,
-	type WaitUntil,
+  createFacilitator,
+  type ThirdwebX402Facilitator,
+  type ThirdwebX402FacilitatorConfig,
+  type WaitUntil,
 } from "../facilitator.js";
 export { wrapFetchWithPayment } from "../fetchWithPayment.js";
 export { settlePayment } from "../settle-payment.js";
 export type {
-	ERC20TokenAmount,
-	PaymentArgs,
-	PaymentRequiredResult,
-	SettlePaymentArgs,
-	SettlePaymentResult,
-	SupportedSignatureType,
-	VerifyPaymentResult,
+  ERC20TokenAmount,
+  PaymentArgs,
+  PaymentRequiredResult,
+  SettlePaymentArgs,
+  SettlePaymentResult,
+  SupportedSignatureType,
+  VerifyPaymentResult,
 } from "../types.js";
 export { verifyPayment } from "../verify-payment.js";
diff --git a/packages/nexus/src/facilitator.ts b/packages/nexus/src/facilitator.ts
@@ -1,4 +1,3 @@
-import type { ThirdwebClient } from "thirdweb";
 import { stringify } from "thirdweb/utils";
 import type { VerifyResponse } from "x402/types";
 import type {
@@ -12,10 +11,9 @@ import type {
 export type WaitUntil = "simulated" | "submitted" | "confirmed";
 
 export type ThirdwebX402FacilitatorConfig = {
-  client: ThirdwebClient;
-  serverWalletAddress: string;
+  walletSecret: string;
+  walletAddress: string;
   waitUntil?: WaitUntil;
-  vaultAccessToken?: string;
   baseUrl?: string;
 };
 
@@ -47,7 +45,7 @@ export type ThirdwebX402Facilitator = {
   }) => Promise<FacilitatorSupportedResponse>;
 };
 
-const DEFAULT_BASE_URL = "https://api.thirdweb.com/v1/payments/x402";
+const DEFAULT_BASE_URL = "https://nexus-api.thirdweb.com";
 
 /**
  * Creates a facilitator for the x402 payment protocol.
@@ -58,21 +56,17 @@ const DEFAULT_BASE_URL = "https://api.thirdweb.com/v1/payments/x402";
  *
  * @example
  * ```ts
- * import { facilitator } from "thirdweb/x402";
- * import { createThirdwebClient } from "thirdweb";
+ * import { createFacilitator } from "@thirdweb-dev/nexus";
  * import { paymentMiddleware } from 'x402-hono'
  *
- * const client = createThirdwebClient({
- *   secretKey: "your-secret-key",
- * });
- * const thirdwebX402Facilitator = facilitator({
- *   client: client,
- *   serverWalletAddress: "0x1234567890123456789012345678901234567890",
+ * const facilitator = createFacilitator({
+ *   walletSecret: <your-wallet-secret>,
+ *   walletAddress: <your-wallet-address>,
  * });
  *
  * // add the facilitator to any x402 payment middleware
  * const middleware = paymentMiddleware(
- *   "0x1234567890123456789012345678901234567890",
+ *   facilitator.address,
  *   {
  *     "/api/paywall": {
  *       price: "$0.01",
@@ -82,16 +76,16 @@ const DEFAULT_BASE_URL = "https://api.thirdweb.com/v1/payments/x402";
  *       },
  *     },
  *   },
- *   thirdwebX402Facilitator,
+ *   facilitator,
  * );
  * ```
  * 
  * #### Configuration Options
  * 
  * ```ts
- * const thirdwebX402Facilitator = facilitator({
- *   client: client,
- *   serverWalletAddress: "0x1234567890123456789012345678901234567890",
+ * const thirdwebX402Facilitator = createFacilitator({
+ *   walletSecret: <your-wallet-secret>,
+ *   walletAddress: <your-wallet-address>,
  *   // Optional: Wait behavior for settlements
  *   // - "simulated": Only simulate the transaction (fastest)
  *   // - "submitted": Wait until transaction is submitted
@@ -101,43 +95,43 @@ const DEFAULT_BASE_URL = "https://api.thirdweb.com/v1/payments/x402";
 
  * ```
  *
- * @bridge x402
  */
-export function facilitator(
+export function createFacilitator(
   config: ThirdwebX402FacilitatorConfig,
 ): ThirdwebX402Facilitator {
-  const secretKey = config.client.secretKey;
-  if (!secretKey) {
-    throw new Error("Client secret key is required for the x402 facilitator");
+  if (!config.walletSecret) {
+    throw new Error("Wallet secret is required for the x402 facilitator");
   }
-  const serverWalletAddress = config.serverWalletAddress;
-  if (!serverWalletAddress) {
-    throw new Error(
-      "Server wallet address is required for the x402 facilitator",
-    );
+
+  if (!config.walletAddress) {
+    throw new Error("Wallet address is required for the x402 facilitator");
   }
-  const facilitator = {
-    url: (config.baseUrl ?? DEFAULT_BASE_URL) as `${string}://${string}`,
-    address: serverWalletAddress,
-    createAuthHeaders: async () => {
-      return {
-        verify: {
-          "x-secret-key": secretKey,
-        },
-        settle: {
-          "x-secret-key": secretKey,
-          ...(config.vaultAccessToken
-            ? { "x-vault-access-token": config.vaultAccessToken }
-            : {}),
-        },
-        supported: {
-          "x-secret-key": secretKey,
-        },
-        list: {
-          "x-secret-key": secretKey,
-        },
-      };
+
+  const BASE_URL = config.baseUrl ?? DEFAULT_BASE_URL;
+
+  const AUTH_HEADERS = {
+    verify: {
+      authorization: `Bearer ${config.walletSecret}`,
+    },
+    settle: {
+      authorization: `Bearer ${config.walletSecret}`,
+    },
+    supported: {
+      authorization: `Bearer ${config.walletSecret}`,
+    },
+    list: {
+      authorization: `Bearer ${config.walletSecret}`,
     },
+  } as const;
+
+  async function createAuthHeaders() {
+    return AUTH_HEADERS;
+  }
+
+  return {
+    url: BASE_URL as `${string}://${string}`,
+    address: config.walletAddress,
+    createAuthHeaders,
     /**
      * Verifies a payment payload with the facilitator service
      *
@@ -149,13 +143,11 @@ export function facilitator(
       payload: RequestedPaymentPayload,
       paymentRequirements: RequestedPaymentRequirements,
     ): Promise<FacilitatorVerifyResponse> {
-      const url = config.baseUrl ?? DEFAULT_BASE_URL;
-
       let headers = { "Content-Type": "application/json" };
-      const authHeaders = await facilitator.createAuthHeaders();
-      headers = { ...headers, ...authHeaders.verify };
 
-      const res = await fetch(`${url}/verify`, {
+      headers = { ...headers, ...AUTH_HEADERS.verify };
+
+      const res = await fetch(new URL("/verify", BASE_URL), {
         method: "POST",
         headers,
         body: stringify({
@@ -186,14 +178,11 @@ export function facilitator(
       paymentRequirements: RequestedPaymentRequirements,
       waitUntil?: WaitUntil,
     ): Promise<FacilitatorSettleResponse> {
-      const url = config.baseUrl ?? DEFAULT_BASE_URL;
-
       let headers = { "Content-Type": "application/json" };
-      const authHeaders = await facilitator.createAuthHeaders();
-      headers = { ...headers, ...authHeaders.settle };
+      headers = { ...headers, ...AUTH_HEADERS.settle };
       const waitUntilParam = waitUntil || config.waitUntil;
 
-      const res = await fetch(`${url}/settle`, {
+      const res = await fetch(new URL("/settle", BASE_URL), {
         method: "POST",
         headers,
         body: JSON.stringify({
@@ -222,22 +211,18 @@ export function facilitator(
       chainId: number;
       tokenAddress?: string;
     }): Promise<FacilitatorSupportedResponse> {
-      const url = config.baseUrl ?? DEFAULT_BASE_URL;
-
-      // TODO: re-add caching? (see thirdweb/x402/facilitator.ts)
-      const authHeaders = await facilitator.createAuthHeaders();
       const headers = {
         "Content-Type": "application/json",
-        ...authHeaders.supported,
+        ...AUTH_HEADERS.supported,
       };
-      const supportedUrl = new URL(`${url}/supported`);
+      const supportedUrl = new URL("/supported", BASE_URL);
       if (filters?.chainId) {
         supportedUrl.searchParams.set("chainId", filters.chainId.toString());
       }
       if (filters?.tokenAddress) {
         supportedUrl.searchParams.set("tokenAddress", filters.tokenAddress);
       }
-      const res = await fetch(supportedUrl.toString(), { headers });
+      const res = await fetch(supportedUrl, { headers });
 
       if (res.status !== 200) {
         throw new Error(
@@ -248,7 +233,5 @@ export function facilitator(
       const data = await res.json();
       return data as FacilitatorSupportedResponse;
     },
-  };
-
-  return facilitator;
+  } as const satisfies ThirdwebX402Facilitator;
 }
diff --git a/packages/nexus/src/fetchWithPayment.ts b/packages/nexus/src/fetchWithPayment.ts
@@ -26,11 +26,11 @@ import { createPaymentHeader } from "./sign.js";
  *
  * @example
  * ```typescript
- * import { wrapFetchWithPayment } from "thirdweb/x402";
+ * import { wrapFetchWithPayment } from "@thirdweb-dev/nexus";
  * import { createThirdwebClient } from "thirdweb";
  * import { createWallet } from "thirdweb/wallets";
  *
- * const client = createThirdwebClient({ clientId: "your-client-id" });
+ * const client = createThirdwebClient({ clientId: "your-thirdweb-client-id" });
  * const wallet = createWallet("io.metamask");
  * await wallet.connect({ client })
  *
@@ -44,7 +44,6 @@ import { createPaymentHeader } from "./sign.js";
  * @throws {Error} If a payment has already been attempted for this request
  * @throws {Error} If there's an error creating the payment header
  *
- * @bridge x402
  */
 export function wrapFetchWithPayment(
   fetch: typeof globalThis.fetch,
diff --git a/packages/nexus/src/settle-payment.ts b/packages/nexus/src/settle-payment.ts
@@ -23,17 +23,12 @@ import {
  *
  * ```ts
  * // Usage in a Next.js API route
- * import { settlePayment, facilitator } from "thirdweb/x402";
- * import { createThirdwebClient } from "thirdweb";
+ * import { settlePayment, createFacilitator } from "@thirdweb-dev/nexus";
  * import { arbitrumSepolia } from "thirdweb/chains";
  *
- * const client = createThirdwebClient({
- *   secretKey: process.env.THIRDWEB_SECRET_KEY,
- * });
- *
- * const thirdwebFacilitator = facilitator({
- *   client,
- *   serverWalletAddress: "0x1234567890123456789012345678901234567890",
+ * const facilitator = createFacilitator({
+ *   walletSecret: <your-wallet-secret>,
+ *   walletAddress: <your-wallet-address>,
  * });
  *
  * export async function GET(request: Request) {
@@ -44,10 +39,9 @@ import {
  *     resourceUrl: "https://api.example.com/premium-content",
  *     method: "GET",
  *     paymentData,
- *     payTo: "0x1234567890123456789012345678901234567890",
  *     network: arbitrumSepolia, // or any other chain
  *     price: "$0.10", // or { amount: "100000", asset: { address: "0x...", decimals: 6 } }
- *     facilitator: thirdwebFacilitator,
+ *     facilitator,
  *     routeConfig: {
  *       description: "Access to premium API content",
  *       mimeType: "application/json",
@@ -73,17 +67,12 @@ import {
  * ```ts
  * // Usage in Express middleware
  * import express from "express";
- * import { settlePayment, facilitator } from "thirdweb/x402";
- * import { createThirdwebClient } from "thirdweb";
+ * import { settlePayment, createFacilitator } from "@thirdweb-dev/nexus";
  * import { arbitrumSepolia } from "thirdweb/chains";
  *
- * const client = createThirdwebClient({
- *   secretKey: process.env.THIRDWEB_SECRET_KEY,
- * });
- *
- * const thirdwebFacilitator = facilitator({
- *   client,
- *   serverWalletAddress: "0x1234567890123456789012345678901234567890",
+ * const facilitator = createFacilitator({
+ *   walletSecret: <your-wallet-secret>,
+ *   walletAddress: <your-wallet-address>,
  * });
  *
  * const app = express();
@@ -94,11 +83,10 @@ import {
  *     resourceUrl: `${req.protocol}://${req.get('host')}${req.originalUrl}`,
  *     method: req.method,
  *     paymentData: req.headers["x-payment"],
- *     payTo: "0x1234567890123456789012345678901234567890",
  *     network: arbitrumSepolia, // or any other chain
  *     price: "$0.05",
  *     waitUntil: "submitted",
- *     facilitator: thirdwebFacilitator,
+ *     facilitator,
  *   });
  *
  *   if (result.status === 200) {
@@ -122,7 +110,6 @@ import {
  *
  * @public
  * @beta
- * @bridge x402
  */
 export async function settlePayment(
   args: SettlePaymentArgs,
diff --git a/packages/nexus/src/verify-payment.ts b/packages/nexus/src/verify-payment.ts

Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,11 @@ import { createPaymentHeader } from "./sign.js";`
`26`	`26`	`*`
`27`	`27`	`* @example`
`28`	`28`	* ```typescript
`29`		`- * import { wrapFetchWithPayment } from "thirdweb/x402";`
	`29`	`+ * import { wrapFetchWithPayment } from "@thirdweb-dev/nexus";`
`30`	`30`	`* import { createThirdwebClient } from "thirdweb";`
`31`	`31`	`* import { createWallet } from "thirdweb/wallets";`
`32`	`32`	`*`
`33`		`- * const client = createThirdwebClient({ clientId: "your-client-id" });`
	`33`	`+ * const client = createThirdwebClient({ clientId: "your-thirdweb-client-id" });`
`34`	`34`	`* const wallet = createWallet("io.metamask");`
`35`	`35`	`* await wallet.connect({ client })`
`36`	`36`	`*`
`@@ -44,7 +44,6 @@ import { createPaymentHeader } from "./sign.js";`
`44`	`44`	`* @throws {Error} If a payment has already been attempted for this request`
`45`	`45`	`* @throws {Error} If there's an error creating the payment header`
`46`	`46`	`*`
`47`		`- * @bridge x402`
`48`	`47`	`*/`
`49`	`48`	`export function wrapFetchWithPayment(`
`50`	`49`	`fetch: typeof globalThis.fetch,`