@relai-fi/x402 0.5.28 → 0.5.30

package/dist/index.cjs

@@ -1260,6 +1260,88 @@ function createX402Client(config) {
     }
     return null;
   }
+  function getBridgeExtension(requirements) {
+    const ext = requirements?.extensions?.bridge;
+    if (!ext?.info?.endpoint || !Array.isArray(ext.info.supportedSourceChains)) return null;
+    return ext.info;
+  }
+  function selectBridgeSource(bridge) {
+    const sourceChains = bridge.supportedSourceChains || [];
+    const sourceAssets = bridge.supportedSourceAssets || [];
+    for (const caip2 of sourceChains) {
+      if (isSolana(caip2) && hasSolanaWallet) {
+        const asset = sourceAssets.find((a) => !a.startsWith("0x")) || "";
+        return { chain: "solana", network: caip2, asset };
+      }
+      if (isEvm(caip2) && effectiveWallets.evm) {
+        const asset = sourceAssets.find((a) => a.startsWith("0x")) || "";
+        return { chain: "evm", network: caip2, asset };
+      }
+    }
+    return null;
+  }
+  async function executeBridgePayment(bridge, accepts, requirements, url) {
+    const source = selectBridgeSource(bridge);
+    if (!source) {
+      throw new Error("[relai-x402] bridge extension found but no wallet matches supported source chains");
+    }
+    const targetAccept = accepts[0];
+    const amount = targetAccept.amount || targetAccept.maxAmountRequired;
+    log(`Bridge: ${source.network} \u2192 ${targetAccept.network}, amount=${amount}`);
+    if (maxAmountAtomic && BigInt(amount) > BigInt(maxAmountAtomic)) {
+      throw new Error(`[relai-x402] Amount ${amount} exceeds max ${maxAmountAtomic}`);
+    }
+    let sourcePaymentHeader;
+    if (source.chain === "solana") {
+      if (!bridge.payTo) {
+        throw new Error("[relai-x402] bridge.info.payTo is required for Solana source payments");
+      }
+      const sourceAccept = {
+        scheme: "exact",
+        network: source.network,
+        asset: source.asset,
+        payTo: bridge.payTo,
+        amount: targetAccept.amount || targetAccept.maxAmountRequired,
+        extra: {
+          ...bridge.feePayer ? { feePayer: bridge.feePayer } : {},
+          decimals: 6
+        }
+      };
+      sourcePaymentHeader = await buildSolanaPayment(sourceAccept, requirements, url);
+    } else {
+      const evmNetwork = normalizeNetwork(source.network);
+      const usePermit = evmNetwork && PERMIT_NETWORKS.has(evmNetwork);
+      const sourceAccept = {
+        ...targetAccept,
+        network: source.network,
+        asset: source.asset || targetAccept.asset,
+        ...bridge.payTo ? { payTo: bridge.payTo } : {}
+      };
+      sourcePaymentHeader = usePermit ? await buildEvmPermitPayment(sourceAccept, requirements, url) : await buildEvmPayment(sourceAccept, requirements, url);
+    }
+    const bridgeRes = await fetch(bridge.endpoint, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        sourcePayment: sourcePaymentHeader,
+        sourceChain: source.network,
+        targetAccept,
+        requirements,
+        resource: url,
+        paymentFacilitator: bridge.paymentFacilitator || null
+      })
+    });
+    if (!bridgeRes.ok) {
+      const err = await bridgeRes.json().catch(() => ({}));
+      throw new Error(`[relai-x402] bridge settle failed: ${err.error || bridgeRes.status}`);
+    }
+    const bridgeData = await bridgeRes.json();
+    if (!bridgeData.xPayment) {
+      throw new Error("[relai-x402] bridge endpoint did not return xPayment header");
+    }
+    log(`Bridge settled: sourceTx=${bridgeData.sourceTxId}, targetTx=${bridgeData.targetTxId}`);
+    return bridgeData.xPayment;
+  }
   async function evmRpcCall(rpcUrl, to, data) {
     const res = await fetch(rpcUrl, {
       method: "POST",
@@ -1517,19 +1599,11 @@ function createX402Client(config) {
       [],
       programId
     );
-    const createDestAtaIx = (0, import_spl_token.createAssociatedTokenAccountIdempotentInstruction)(
-      feePayerPubkey,
-      // payer (feePayer covers this)
-      destinationAta,
-      merchantPubkey,
-      mintPubkey,
-      programId
-    );
     const { blockhash } = await connection.getLatestBlockhash("confirmed");
     const message = new import_web3.TransactionMessage({
       payerKey: feePayerPubkey,
       recentBlockhash: blockhash,
-      instructions: [createDestAtaIx, transferIx]
+      instructions: [transferIx]
     }).compileToV0Message();
     const transaction = new import_web3.VersionedTransaction(message);
     const signedTx = await solWallet.signTransaction(transaction);
@@ -1712,6 +1786,16 @@ function createX402Client(config) {
     if (!accepts.length) throw new Error("[relai-x402] No payment options in 402 response");
     const selected = selectAccept(accepts);
     if (!selected) {
+      const bridge = getBridgeExtension(requirements);
+      if (bridge && selectBridgeSource(bridge)) {
+        log("No direct wallet match \u2014 attempting bridge extension flow");
+        const paymentHeader = await executeBridgePayment(bridge, accepts, requirements, url);
+        log("Retrying with X-PAYMENT header (bridge)");
+        return fetch(input, {
+          ...requestInitWithHeaders,
+          headers: { ...requestHeaders, "X-PAYMENT": paymentHeader }
+        });
+      }
       throw new Error(buildNoWalletError(accepts, false));
     }
     const { accept, chain } = selected;