uvd-x402-sdk 2.3.0 → 2.5.0

package/dist/react/index.mjs

@@ -584,6 +584,80 @@ function getEnabledChains() {
   return Object.values(SUPPORTED_CHAINS).filter((chain) => chain.x402.enabled);
 }
 
+// src/utils/x402.ts
+function chainToCAIP2(chainName) {
+  const caip2 = CAIP2_IDENTIFIERS[chainName.toLowerCase()];
+  if (caip2) {
+    return caip2;
+  }
+  const chain = getChainByName(chainName);
+  if (chain) {
+    if (chain.networkType === "evm") {
+      return `eip155:${chain.chainId}`;
+    }
+    return `${chain.networkType}:${chainName}`;
+  }
+  return chainName;
+}
+
+// src/utils/validation.ts
+var ETH_ADDRESS_REGEX = /^0x[a-fA-F0-9]{40}$/;
+var SOLANA_ADDRESS_REGEX = /^[1-9A-HJ-NP-Za-km-z]{32,44}$/;
+var STELLAR_ADDRESS_REGEX = /^G[A-Z2-7]{55}$/;
+var NEAR_ADDRESS_REGEX = /^[a-z0-9._-]+$/;
+function validateRecipient(recipient, networkType) {
+  if (!recipient) {
+    throw new X402Error(
+      "Recipient address is required. The payTo/recipient field cannot be empty. Please provide a valid recipient address where payments should be sent.",
+      "INVALID_RECIPIENT"
+    );
+  }
+  const trimmed = recipient.trim();
+  if (trimmed === "") {
+    throw new X402Error(
+      "Recipient address cannot be empty or whitespace. Please provide a valid recipient address.",
+      "INVALID_RECIPIENT"
+    );
+  }
+  {
+    switch (networkType) {
+      case "evm":
+        if (!ETH_ADDRESS_REGEX.test(trimmed)) {
+          throw new X402Error(
+            `Invalid EVM recipient address: "${trimmed}". Expected a 40-character hexadecimal address starting with 0x.`,
+            "INVALID_RECIPIENT"
+          );
+        }
+        break;
+      case "svm":
+      case "solana":
+        if (!SOLANA_ADDRESS_REGEX.test(trimmed)) {
+          throw new X402Error(
+            `Invalid Solana recipient address: "${trimmed}". Expected a base58-encoded public key (32-44 characters).`,
+            "INVALID_RECIPIENT"
+          );
+        }
+        break;
+      case "stellar":
+        if (!STELLAR_ADDRESS_REGEX.test(trimmed)) {
+          throw new X402Error(
+            `Invalid Stellar recipient address: "${trimmed}". Expected a G-prefixed public key (56 characters).`,
+            "INVALID_RECIPIENT"
+          );
+        }
+        break;
+      case "near":
+        if (!NEAR_ADDRESS_REGEX.test(trimmed) || trimmed.length > 64) {
+          throw new X402Error(
+            `Invalid NEAR recipient address: "${trimmed}". Expected a valid NEAR account ID.`,
+            "INVALID_RECIPIENT"
+          );
+        }
+        break;
+    }
+  }
+}
+
 // src/client/X402Client.ts
 var X402Client = class {
   // Configuration
@@ -934,6 +1008,7 @@ var X402Client = class {
       throw new X402Error("Wallet not connected", "WALLET_NOT_CONNECTED");
     }
     const recipient = this.getRecipientForNetwork(paymentInfo, "evm");
+    validateRecipient(recipient, "evm");
     const nonceBytes = new Uint8Array(32);
     if (typeof window !== "undefined" && window.crypto) {
       window.crypto.getRandomValues(nonceBytes);
@@ -1015,21 +1090,30 @@ var X402Client = class {
   }
   encodeEVMPaymentHeader(payload, chain) {
     const fullSignature = payload.r + payload.s.slice(2) + payload.v.toString(16).padStart(2, "0");
-    const x402Payload = {
+    const version = this.config.x402Version === 2 ? 2 : 1;
+    const payloadData = {
+      signature: fullSignature,
+      authorization: {
+        from: payload.from,
+        to: payload.to,
+        value: payload.value,
+        validAfter: payload.validAfter.toString(),
+        validBefore: payload.validBefore.toString(),
+        nonce: payload.nonce
+      }
+    };
+    const x402Payload = version === 2 ? {
+      x402Version: 2,
+      scheme: "exact",
+      network: chainToCAIP2(chain.name),
+      // CAIP-2 format for v2
+      payload: payloadData
+    } : {
       x402Version: 1,
       scheme: "exact",
       network: chain.name,
-      payload: {
-        signature: fullSignature,
-        authorization: {
-          from: payload.from,
-          to: payload.to,
-          value: payload.value,
-          validAfter: payload.validAfter.toString(),
-          validBefore: payload.validBefore.toString(),
-          nonce: payload.nonce
-        }
-      }
+      // Plain chain name for v1
+      payload: payloadData
     };
     const jsonString = JSON.stringify(x402Payload);
     return btoa(jsonString);