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

package/dist/index.cjs

@@ -5516,12 +5516,22 @@ function buildRequestError(response, payload) {
 function isNotFoundResponse(response, payload) {
   return response.status === 404 || payload.errorCode === "not_found";
 }
+function inferStoredPaymentCodeKind(normalizedCode) {
+  if (normalizedCode.length === 8 && (normalizedCode.startsWith("D") || normalizedCode.startsWith("S"))) {
+    return "solana";
+  }
+  return null;
+}
 async function fetchStoredCodeWithFallback(facilitatorUrl, normalizedCode, options = {}) {
   const suffix = options.suffix ? `/${options.suffix.replace(/^\/+/, "")}` : "";
+  const inferredKind = options.preferredKind ?? inferStoredPaymentCodeKind(normalizedCode);
   const attempts = [
     { kind: "evm", url: `${facilitatorUrl}/payment-codes/${normalizedCode}${suffix}` },
     { kind: "solana", url: `${facilitatorUrl}/solana-payment-codes/${normalizedCode}${suffix}` }
   ];
+  if (inferredKind) {
+    attempts.sort((left, right) => Number(right.kind === inferredKind) - Number(left.kind === inferredKind));
+  }
   let lastError = null;
   for (const attempt of attempts) {
     const { response, payload } = await fetchWithPayload(attempt.url, options.init);
@@ -5742,6 +5752,7 @@ async function redeemStoredPaymentCode(config2, code, params) {
   const normalizedCode = code.trim().toUpperCase();
   const { payload } = await fetchStoredCodeWithFallback(facilitatorUrl, normalizedCode, {
     suffix: "redeem",
+    preferredKind: params.solanaNetwork ? "solana" : params.evmNetwork ? "evm" : void 0,
     init: {
       method: "POST",
       headers: { "Content-Type": "application/json" },
@@ -5757,7 +5768,9 @@ async function redeemStoredPaymentCode(config2, code, params) {
 async function cancelStoredPaymentCode(config2, code, params = {}) {
   const facilitatorUrl = config2.facilitatorUrl ?? DEFAULT_FACILITATOR4;
   const normalizedCode = code.trim().toUpperCase();
-  const statusInfo = await fetchStoredCodeWithFallback(facilitatorUrl, normalizedCode);
+  const statusInfo = await fetchStoredCodeWithFallback(facilitatorUrl, normalizedCode, {
+    preferredKind: params.network === "solana" || params.network === "solana-devnet" ? "solana" : params.network ? "evm" : void 0
+  });
   if (statusInfo.kind === "solana") {
     if (!params.solanaWallet) {
       throw new Error("A Solana wallet is required to cancel this payment code");
@@ -5887,7 +5900,9 @@ async function payPayRequestWithStoredCode(config2, request, paymentCode, option
   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);
+  const codeStatusInfo = await fetchStoredCodeWithFallback(facilitatorUrl, normalizedPaymentCode, {
+    preferredKind: inferStoredPaymentCodeKind(normalizedPaymentCode) ?? void 0
+  });
   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");