uvd-x402-sdk 2.4.0 → 2.5.0

package/src/adapters/wagmi.ts

@@ -31,9 +31,9 @@
  */
 
 import { getChainByName } from '../chains';
-import { createX402V1Header, encodeX402Header, validateRecipient } from '../utils';
+import { createX402V1Header, createX402V2Header, encodeX402Header, validateRecipient } from '../utils';
 import { X402Error } from '../types';
-import type { PaymentResult } from '../types';
+import type { PaymentResult, X402Version } from '../types';
 
 /**
  * Viem WalletClient interface (minimal type to avoid viem dependency)
@@ -67,6 +67,12 @@ export interface WagmiPaymentOptions {
   chainName?: string;
   /** Validity window in seconds (default: 300 = 5 minutes) */
   validitySeconds?: number;
+  /**
+   * x402 protocol version (default: 1)
+   * - 1: Classic format with network as string (e.g., "base")
+   * - 2: CAIP-2 format (e.g., "eip155:8453")
+   */
+  x402Version?: X402Version;
 }
 
 /**
@@ -134,6 +140,7 @@ export async function createPaymentFromWalletClient(
     amount,
     chainName = 'base',
     validitySeconds = 300,
+    x402Version = 1,
   } = options;
 
   // Validate recipient address - prevents empty/invalid addresses
@@ -211,9 +218,9 @@ export async function createPaymentFromWalletClient(
     );
   }
 
-  // Create x402 header with correct format
+  // Build the payload data
   // IMPORTANT: validAfter, validBefore, and value must be STRINGS
-  const header = createX402V1Header(chainName, {
+  const payloadData = {
     signature,
     authorization: {
       from,
@@ -223,7 +230,12 @@ export async function createPaymentFromWalletClient(
       validBefore: validBefore.toString(),
       nonce,
     },
-  });
+  };
+
+  // Create x402 header with correct version format
+  const header = x402Version === 2
+    ? createX402V2Header(chainName, payloadData)
+    : createX402V1Header(chainName, payloadData);
 
   return encodeX402Header(header);
 }

package/src/client/X402Client.ts

@@ -25,7 +25,7 @@ import {
   getChainById,
   getEnabledChains,
 } from '../chains';
-import { validateRecipient } from '../utils';
+import { validateRecipient, chainToCAIP2 } from '../utils';
 
 /**
  * X402Client - Main SDK client for x402 payments
@@ -581,24 +581,37 @@ export class X402Client {
     // Reconstruct full signature from v, r, s
     const fullSignature = payload.r + payload.s.slice(2) + payload.v.toString(16).padStart(2, '0');
 
-    // Format in x402 standard format
-    const x402Payload = {
-      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,
-        },
+    // Determine version to use (default to v1 for backward compatibility)
+    const version = this.config.x402Version === 2 ? 2 : 1;
+
+    // Build the payload data
+    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,
       },
     };
 
+    // Format in x402 standard format (v1 or v2)
+    const x402Payload = version === 2
+      ? {
+          x402Version: 2 as const,
+          scheme: 'exact' as const,
+          network: chainToCAIP2(chain.name), // CAIP-2 format for v2
+          payload: payloadData,
+        }
+      : {
+          x402Version: 1 as const,
+          scheme: 'exact' as const,
+          network: chain.name, // Plain chain name for v1
+          payload: payloadData,
+        };
+
     // Base64 encode
     const jsonString = JSON.stringify(x402Payload);
     return btoa(jsonString);

package/src/providers/evm/index.ts

@@ -32,7 +32,8 @@ import type {
 } from '../../types';
 import { X402Error } from '../../types';
 import { getChainByName, getChainById, getTokenConfig } from '../../chains';
-import { validateRecipient } from '../../utils';
+import { validateRecipient, chainToCAIP2 } from '../../utils';
+import type { X402Version } from '../../types';
 
 /**
  * Ethereum provider interface
@@ -370,30 +371,50 @@ export class EVMProvider implements WalletAdapter {
 
   /**
    * Encode EVM payment as X-PAYMENT header
+   *
+   * @param paymentPayload - JSON-encoded payment payload from signPayment()
+   * @param chainConfig - Chain configuration
+   * @param version - x402 protocol version (1 or 2, defaults to 1)
+   * @returns Base64-encoded X-PAYMENT header value
    */
-  encodePaymentHeader(paymentPayload: string, chainConfig: ChainConfig): string {
+  encodePaymentHeader(
+    paymentPayload: string,
+    chainConfig: ChainConfig,
+    version: X402Version = 1
+  ): string {
     const payload = JSON.parse(paymentPayload) as EVMPaymentPayload;
 
     // Reconstruct full signature
     const fullSignature = payload.r + payload.s.slice(2) + payload.v.toString(16).padStart(2, '0');
 
-    const x402Payload = {
-      x402Version: 1,
-      scheme: 'exact',
-      network: chainConfig.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,
-        },
+    // Build the payload data
+    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,
       },
     };
 
+    // Format in x402 standard format (v1 or v2)
+    const x402Payload = version === 2
+      ? {
+          x402Version: 2 as const,
+          scheme: 'exact' as const,
+          network: chainToCAIP2(chainConfig.name), // CAIP-2 format for v2
+          payload: payloadData,
+        }
+      : {
+          x402Version: 1 as const,
+          scheme: 'exact' as const,
+          network: chainConfig.name, // Plain chain name for v1
+          payload: payloadData,
+        };
+
     return btoa(JSON.stringify(x402Payload));
   }
 

package/src/providers/near/index.ts

@@ -32,8 +32,10 @@ import type {
   PaymentInfo,
   NEARPaymentPayload,
   WalletAdapter,
+  X402Version,
 } from '../../types';
 import { X402Error } from '../../types';
+import { chainToCAIP2 } from '../../utils';
 
 // NEAR configuration
 const NEAR_CONFIG = {
@@ -473,19 +475,34 @@ export class NEARProvider implements WalletAdapter {
 
   /**
    * Encode NEAR payment as X-PAYMENT header
+   *
+   * @param paymentPayload - JSON-encoded payment payload from signPayment()
+   * @param version - x402 protocol version (1 or 2, defaults to 1)
+   * @returns Base64-encoded X-PAYMENT header value
    */
-  encodePaymentHeader(paymentPayload: string): string {
+  encodePaymentHeader(paymentPayload: string, version: X402Version = 1): string {
     const payload = JSON.parse(paymentPayload) as NEARPaymentPayload;
 
-    const x402Payload = {
-      x402Version: 1,
-      scheme: 'exact',
-      network: 'near',
-      payload: {
-        signedDelegateAction: payload.signedDelegateAction,
-      },
+    // Build the payload data
+    const payloadData = {
+      signedDelegateAction: payload.signedDelegateAction,
     };
 
+    // Format in x402 standard format (v1 or v2)
+    const x402Payload = version === 2
+      ? {
+          x402Version: 2 as const,
+          scheme: 'exact' as const,
+          network: chainToCAIP2('near'), // CAIP-2 format for v2
+          payload: payloadData,
+        }
+      : {
+          x402Version: 1 as const,
+          scheme: 'exact' as const,
+          network: 'near', // Plain chain name for v1
+          payload: payloadData,
+        };
+
     return btoa(JSON.stringify(x402Payload));
   }
 

package/src/providers/solana/index.ts

@@ -43,9 +43,11 @@ import type {
   PaymentInfo,
   SolanaPaymentPayload,
   WalletAdapter,
+  X402Version,
 } from '../../types';
 import { X402Error } from '../../types';
 import { getChainByName } from '../../chains';
+import { chainToCAIP2 } from '../../utils';
 
 /**
  * Browser-compatible base64 encoding for Uint8Array
@@ -395,24 +397,41 @@ export class SVMProvider implements WalletAdapter {
   /**
    * Encode SVM payment as X-PAYMENT header
    *
-   * @param paymentPayload - The payment payload JSON string
-   * @param chainConfig - Optional chain config (defaults to 'solana' if not provided)
+   * @param paymentPayload - JSON-encoded payment payload from signPayment()
+   * @param chainConfig - Chain configuration (optional, defaults to 'solana')
+   * @param version - x402 protocol version (1 or 2, defaults to 1)
+   * @returns Base64-encoded X-PAYMENT header value
    */
-  encodePaymentHeader(paymentPayload: string, chainConfig?: ChainConfig): string {
+  encodePaymentHeader(
+    paymentPayload: string,
+    chainConfig?: ChainConfig,
+    version: X402Version = 1
+  ): string {
     const payload = JSON.parse(paymentPayload) as SolanaPaymentPayload;
 
     // Use chain name from config, or default to 'solana' for backward compatibility
     const networkName = chainConfig?.name || 'solana';
 
-    const x402Payload = {
-      x402Version: 1,
-      scheme: 'exact',
-      network: networkName,
-      payload: {
-        transaction: payload.transaction,
-      },
+    // Build the payload data
+    const payloadData = {
+      transaction: payload.transaction,
     };
 
+    // Format in x402 standard format (v1 or v2)
+    const x402Payload = version === 2
+      ? {
+          x402Version: 2 as const,
+          scheme: 'exact' as const,
+          network: chainToCAIP2(networkName), // CAIP-2 format for v2
+          payload: payloadData,
+        }
+      : {
+          x402Version: 1 as const,
+          scheme: 'exact' as const,
+          network: networkName, // Plain chain name for v1
+          payload: payloadData,
+        };
+
     return btoa(JSON.stringify(x402Payload));
   }
 

package/src/providers/stellar/index.ts

@@ -25,8 +25,10 @@ import type {
   PaymentInfo,
   StellarPaymentPayload,
   WalletAdapter,
+  X402Version,
 } from '../../types';
 import { X402Error } from '../../types';
+import { chainToCAIP2 } from '../../utils';
 
 /**
  * Browser-compatible text to Uint8Array encoding
@@ -343,25 +345,40 @@ export class StellarProvider implements WalletAdapter {
 
   /**
    * Encode Stellar payment as X-PAYMENT header
+   *
+   * @param paymentPayload - JSON-encoded payment payload from signPayment()
+   * @param version - x402 protocol version (1 or 2, defaults to 1)
+   * @returns Base64-encoded X-PAYMENT header value
    */
-  encodePaymentHeader(paymentPayload: string): string {
+  encodePaymentHeader(paymentPayload: string, version: X402Version = 1): string {
     const payload = JSON.parse(paymentPayload) as StellarPaymentPayload;
 
-    const x402Payload = {
-      x402Version: 1,
-      scheme: 'exact',
-      network: 'stellar',
-      payload: {
-        from: payload.from,
-        to: payload.to,
-        amount: payload.amount,
-        tokenContract: payload.tokenContract,
-        authorizationEntryXdr: payload.authorizationEntryXdr,
-        nonce: payload.nonce,
-        signatureExpirationLedger: payload.signatureExpirationLedger,
-      },
+    // Build the payload data
+    const payloadData = {
+      from: payload.from,
+      to: payload.to,
+      amount: payload.amount,
+      tokenContract: payload.tokenContract,
+      authorizationEntryXdr: payload.authorizationEntryXdr,
+      nonce: payload.nonce,
+      signatureExpirationLedger: payload.signatureExpirationLedger,
     };
 
+    // Format in x402 standard format (v1 or v2)
+    const x402Payload = version === 2
+      ? {
+          x402Version: 2 as const,
+          scheme: 'exact' as const,
+          network: chainToCAIP2('stellar'), // CAIP-2 format for v2
+          payload: payloadData,
+        }
+      : {
+          x402Version: 1 as const,
+          scheme: 'exact' as const,
+          network: 'stellar', // Plain chain name for v1
+          payload: payloadData,
+        };
+
     return btoa(JSON.stringify(x402Payload));
   }