@relai-fi/x402 0.6.10 → 0.6.11-rc.1

package/README.md

@@ -1751,6 +1751,8 @@ import {
   getPayRequest,
   payPayRequest,
   payPayRequestWithCode,
+  payPayRequestWithStoredCode,
+  type PaymentRequestObject,
 } from '@relai-fi/x402';
 
 const config = { facilitatorUrl: 'https://relai.fi/facilitator' };
@@ -1784,6 +1786,16 @@ console.log('Explorer:', result.explorerUrl);
 if (result.changeCode) {
   console.log(`Change $${Number(result.change) / 1e6} USDC → code: ${result.changeCode}`);
 }
+
+// ── Agent / vault flow: reuse a fetched request object directly ─────────────
+const fetchedRequest: PaymentRequestObject = await getPayRequest(config, 'MW78SGTW');
+const storedCodeResult = await payPayRequestWithStoredCode(
+  config,
+  fetchedRequest,
+  'MYVAULT78',
+  { returnChange: 'code' },
+);
+console.log('Stored code payment success:', storedCodeResult.success);
 ```
 
 ### `payPayRequestWithCode` options
@@ -1793,6 +1805,13 @@ if (result.changeCode) {
 | `returnChange` | `'code' \| 'wallet'` | `'code'` | How to return surplus when code value > invoice |
 | `allowOverpayment` | `boolean` | `true` | If `false`, throws when code value ≠ invoice amount |
 
+`payPayRequestWithStoredCode()` accepts either:
+
+- a payment request code string, or
+- a fetched `PaymentRequestObject` from `getPayRequest()`
+
+Passing the object lets agents skip the extra request lookup when they already have the decoded request in memory. For stored Solana codes, the object must include a valid `code` field because the Solana facilitator endpoint still resolves the merchant request by `requestCode`.
+
 **`returnChange` behaviour:**
 
 | Value | Mechanism | Requires buyer wallet? |

package/dist/index.cjs

@@ -4548,6 +4548,15 @@ function buildClaimUrl(facilitatorUrl, claimToken) {
   const origin = new URL(facilitatorUrl).origin;
   return new URL(`/claim/${claimToken}`, origin).toString();
 }
+function resolveSolanaRelayerConfig(relayerInfo, network) {
+  const networkInfo = relayerInfo?.networks?.[network] ?? null;
+  const relayerAddr = typeof networkInfo?.address === "string" && networkInfo.address.trim() ? networkInfo.address.trim() : typeof relayerInfo?.address === "string" ? relayerInfo.address.trim() : "";
+  const programId = typeof relayerInfo?.programId === "string" ? relayerInfo.programId.trim() : "";
+  const usdcMint = typeof networkInfo?.usdc === "string" && networkInfo.usdc.trim() ? networkInfo.usdc.trim() : network === "solana-devnet" ? "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU" : "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
+  if (!relayerAddr) throw new Error(`Missing relayer address for ${network}`);
+  if (!programId) throw new Error("Missing Solana payment-code programId");
+  return { relayerAddr, programId, usdcMint };
+}
 async function anchorDisc(name) {
   const preimage = new TextEncoder().encode(`global:${name}`);
   if (typeof globalThis !== "undefined" && globalThis.crypto?.subtle) {
@@ -4589,9 +4598,7 @@ async function generateSolanaPaymentCode(config2, wallet, params) {
   if (!infoRes.ok) throw new Error("Failed to fetch Solana relayer info");
   const relayerInfo = await infoRes.json();
   const network = params.network ?? relayerInfo.defaultNetwork ?? "solana";
-  const relayerAddr = relayerInfo.address;
-  const programId = relayerInfo.programId;
-  const usdcMint = relayerInfo.networks?.[network]?.usdc ?? (network === "solana-devnet" ? "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU" : "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v");
+  const { relayerAddr, programId, usdcMint } = resolveSolanaRelayerConfig(relayerInfo, network);
   const code = generateCode(network, claimLink);
   const codeBytes = new TextEncoder().encode(code);
   const {
@@ -4695,9 +4702,7 @@ async function generateSolanaPaymentCodesBatch(config2, wallet, params) {
   if (!infoRes.ok) throw new Error("Failed to fetch Solana relayer info");
   const relayerInfo = await infoRes.json();
   const network = params.network ?? relayerInfo.defaultNetwork ?? "solana";
-  const relayerAddr = relayerInfo.address;
-  const programId = relayerInfo.programId;
-  const usdcMint = relayerInfo.networks?.[network]?.usdc ?? (network === "solana-devnet" ? "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU" : "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v");
+  const { relayerAddr, programId, usdcMint } = resolveSolanaRelayerConfig(relayerInfo, network);
   const {
     Connection: Connection2,
     PublicKey: PublicKey2,
@@ -4829,9 +4834,7 @@ async function cancelSolanaPaymentCode(config2, code, wallet, options = {}) {
   if (!infoRes.ok) throw new Error("Failed to fetch Solana relayer info");
   const relayerInfo = await infoRes.json();
   const network = options.network ?? relayerInfo.defaultNetwork ?? "solana";
-  const relayerAddr = relayerInfo.address;
-  const programId = relayerInfo.programId;
-  const usdcMint = relayerInfo.networks?.[network]?.usdc ?? (network === "solana-devnet" ? "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU" : "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v");
+  const { relayerAddr, programId, usdcMint } = resolveSolanaRelayerConfig(relayerInfo, network);
   const {
     Connection: Connection2,
     PublicKey: PublicKey2,
@@ -5418,6 +5421,9 @@ var EIP3009_TYPES3 = {
     { name: "nonce", type: "bytes32" }
   ]
 };
+function isPaymentRequestObject(value) {
+  return typeof value !== "string";
+}
 function isEvmAddress(value) {
   return /^0x[0-9a-fA-F]{40}$/i.test(value);
 }
@@ -5876,12 +5882,16 @@ async function claimPaymentLink(config2, claimUrlOrToken, params) {
   });
   return sanitizeClaimLinkResponse(payload, facilitatorUrl, claimToken);
 }
-async function payPayRequestWithStoredCode(config2, requestCode, paymentCode, options = {}) {
+async function payPayRequestWithStoredCode(config2, request, paymentCode, options = {}) {
   const facilitatorUrl = config2.facilitatorUrl ?? DEFAULT_FACILITATOR4;
-  const normalizedRequestCode = requestCode.trim().toUpperCase();
   const normalizedPaymentCode = paymentCode.trim().toUpperCase();
+  const requestInfo = isPaymentRequestObject(request) ? request : await getPayRequest(config2, request.trim().toUpperCase());
+  const normalizedRequestCode = isPaymentRequestObject(request) ? requestInfo.code.trim().toUpperCase() : request.trim().toUpperCase();
   const codeStatusInfo = await fetchStoredCodeWithFallback(facilitatorUrl, normalizedPaymentCode);
   if (codeStatusInfo.kind === "solana") {
+    if (!normalizedRequestCode) {
+      throw new Error("A payment request object with a valid code is required when paying a request with a stored Solana code");
+    }
     return fetchOrThrow(`${facilitatorUrl}/solana-payment-codes/${normalizedPaymentCode}/pay-request`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
@@ -5891,7 +5901,6 @@ async function payPayRequestWithStoredCode(config2, requestCode, paymentCode, op
       })
     });
   }
-  const requestInfo = await getPayRequest(config2, normalizedRequestCode);
   const codeStatus = codeStatusInfo.payload;
   const allowOverpayment = options.allowOverpayment ?? true;
   const returnChange = options.returnChange ?? "code";