@relai-fi/x402 0.6.11-rc.0 → 0.6.11-rc.2

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() : "";
+  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 per-network relayer address for ${network} in relayer-info response`);
+  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,