@alleyboss/micropay-solana-x402-paywall 3.1.4 → 3.2.1

package/dist/agent/index.cjs

@@ -1,8 +1,13 @@
 'use strict';
 
 var web3_js = require('@solana/web3.js');
+var bs58 = require('bs58');
 var jose = require('jose');
 
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
+
+var bs58__default = /*#__PURE__*/_interopDefault(bs58);
+
 // src/agent/agentPayment.ts
 var DEFAULT_COMPUTE_UNITS = 2e5;
 var DEFAULT_MICRO_LAMPORTS = 1e3;
@@ -51,8 +56,6 @@ async function buildVersionedTransaction(config) {
     lastValidBlockHeight
   };
 }
-
-// src/agent/agentPayment.ts
 var WALLET_REGEX = /^[1-9A-HJ-NP-Za-km-z]{32,44}$/;
 function isValidWalletAddress(address) {
   if (!address || typeof address !== "string") return false;
@@ -153,15 +156,19 @@ async function hasAgentSufficientBalance(connection, agentKeypair, requiredLampo
   };
 }
 function keypairFromBase58(base58Secret) {
-  const bytes = Buffer.from(base58Secret, "base64");
-  if (bytes.length !== 64) {
+  try {
+    const bytes = bs58__default.default.decode(base58Secret);
+    if (bytes.length !== 64) {
+      throw new Error("Invalid secret key length. Expected 64 bytes.");
+    }
+    return web3_js.Keypair.fromSecretKey(bytes);
+  } catch (error) {
     const parts = base58Secret.split(",").map((n) => parseInt(n.trim(), 10));
     if (parts.length === 64) {
       return web3_js.Keypair.fromSecretKey(Uint8Array.from(parts));
     }
     throw new Error("Invalid secret key format. Expected base58 string or comma-separated bytes.");
   }
-  return web3_js.Keypair.fromSecretKey(bytes);
 }
 function generateAgentKeypair() {
   const keypair = web3_js.Keypair.generate();

package/dist/agent/index.js

@@ -1,4 +1,5 @@
 import { PublicKey, SystemProgram, LAMPORTS_PER_SOL, Keypair, TransactionMessage, VersionedTransaction, ComputeBudgetProgram } from '@solana/web3.js';
+import bs58 from 'bs58';
 import { SignJWT, jwtVerify } from 'jose';
 
 // src/agent/agentPayment.ts
@@ -49,8 +50,6 @@ async function buildVersionedTransaction(config) {
     lastValidBlockHeight
   };
 }
-
-// src/agent/agentPayment.ts
 var WALLET_REGEX = /^[1-9A-HJ-NP-Za-km-z]{32,44}$/;
 function isValidWalletAddress(address) {
   if (!address || typeof address !== "string") return false;
@@ -151,15 +150,19 @@ async function hasAgentSufficientBalance(connection, agentKeypair, requiredLampo
   };
 }
 function keypairFromBase58(base58Secret) {
-  const bytes = Buffer.from(base58Secret, "base64");
-  if (bytes.length !== 64) {
+  try {
+    const bytes = bs58.decode(base58Secret);
+    if (bytes.length !== 64) {
+      throw new Error("Invalid secret key length. Expected 64 bytes.");
+    }
+    return Keypair.fromSecretKey(bytes);
+  } catch (error) {
     const parts = base58Secret.split(",").map((n) => parseInt(n.trim(), 10));
     if (parts.length === 64) {
       return Keypair.fromSecretKey(Uint8Array.from(parts));
     }
     throw new Error("Invalid secret key format. Expected base58 string or comma-separated bytes.");
   }
-  return Keypair.fromSecretKey(bytes);
 }
 function generateAgentKeypair() {
   const keypair = Keypair.generate();

package/dist/client/index.cjs

@@ -1,6 +1,8 @@
 'use strict';
 
 var http = require('@x402/core/http');
+var web3_js = require('@solana/web3.js');
+var react = require('react');
 
 // src/client/types.ts
 var TOKEN_MINTS = {
@@ -111,8 +113,137 @@ function createX402AuthorizationHeader(signature, paymentRequiredHeader) {
   const token = http.encodePaymentSignatureHeader(payload);
   return `x402 ${token}`;
 }
+async function sendSolanaPayment({
+  connection,
+  wallet,
+  recipientAddress,
+  amount,
+  // memo, // TODO: Add memo support to transaction
+  commitment = "confirmed"
+}) {
+  if (!wallet.publicKey) {
+    throw new Error("Wallet not connected");
+  }
+  if (amount <= 0n) {
+    throw new Error("Amount must be greater than 0");
+  }
+  try {
+    const recipientPubkey = new web3_js.PublicKey(recipientAddress);
+    const transaction = new web3_js.Transaction().add(
+      web3_js.SystemProgram.transfer({
+        fromPubkey: wallet.publicKey,
+        toPubkey: recipientPubkey,
+        lamports: amount
+      })
+    );
+    const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash(commitment);
+    transaction.recentBlockhash = blockhash;
+    transaction.feePayer = wallet.publicKey;
+    const signature = await wallet.sendTransaction(transaction, connection);
+    await connection.confirmTransaction({
+      signature,
+      blockhash,
+      lastValidBlockHeight
+    }, commitment);
+    return {
+      signature,
+      amountSol: Number(amount) / web3_js.LAMPORTS_PER_SOL
+    };
+  } catch (error) {
+    console.error("Payment failed:", error);
+    throw new Error(error.message || "Payment failed");
+  }
+}
+function usePaywallResource({
+  url,
+  connection,
+  wallet
+}) {
+  const [data, setData] = react.useState(null);
+  const [isLocked, setIsLocked] = react.useState(true);
+  const [isLoading, setIsLoading] = react.useState(true);
+  const [error, setError] = react.useState(null);
+  const [paymentHeader, setPaymentHeader] = react.useState(null);
+  const [price, setPrice] = react.useState();
+  const [recipient, setRecipient] = react.useState();
+  const fetchData = react.useCallback(async (authHeader) => {
+    setIsLoading(true);
+    setError(null);
+    try {
+      const headers = {
+        "Content-Type": "application/json"
+      };
+      if (authHeader) {
+        headers["Authorization"] = authHeader;
+      }
+      const res = await fetch(url, { headers });
+      if (res.status === 402) {
+        const wwwAuth = res.headers.get("WWW-Authenticate");
+        if (wwwAuth) {
+          setPaymentHeader(wwwAuth);
+          try {
+            const match = wwwAuth.match(/amount="([^"]+)",\s*payTo="([^"]+)"/);
+            if (match) {
+              setPrice(BigInt(match[1]));
+              setRecipient(match[2]);
+            }
+          } catch (e) {
+            console.warn("Failed to parse 402 details from header", e);
+          }
+        }
+        setIsLocked(true);
+        setData(null);
+      } else if (res.ok) {
+        const json = await res.json();
+        setData(json);
+        setIsLocked(false);
+      } else {
+        throw new Error(`Request failed with status ${res.status}`);
+      }
+    } catch (err) {
+      setError(err.message || "Failed to fetch resource");
+    } finally {
+      setIsLoading(false);
+    }
+  }, [url]);
+  react.useEffect(() => {
+    fetchData();
+  }, [fetchData]);
+  const unlock = react.useCallback(async () => {
+    if (!paymentHeader || !price || !recipient) {
+      setError("Missing payment requirements");
+      return;
+    }
+    setIsLoading(true);
+    try {
+      const { signature } = await sendSolanaPayment({
+        connection,
+        wallet,
+        recipientAddress: recipient,
+        amount: price
+      });
+      const authHeader = createX402AuthorizationHeader(signature, paymentHeader);
+      await fetchData(authHeader);
+    } catch (err) {
+      console.error("Unlock failed", err);
+      setError(err.message || "Payment/Unlock failed");
+      setIsLoading(false);
+    }
+  }, [connection, wallet, paymentHeader, price, recipient, fetchData]);
+  return {
+    data,
+    isLocked,
+    isLoading,
+    price,
+    recipient,
+    error,
+    unlock
+  };
+}
 
 exports.buildSolanaPayUrl = buildSolanaPayUrl;
 exports.createPaymentFlow = createPaymentFlow;
 exports.createPaymentReference = createPaymentReference;
 exports.createX402AuthorizationHeader = createX402AuthorizationHeader;
+exports.sendSolanaPayment = sendSolanaPayment;
+exports.usePaywallResource = usePaywallResource;

package/dist/client/index.d.cts

@@ -1,3 +1,5 @@
+import { PublicKey, Transaction, Connection, TransactionSignature } from '@solana/web3.js';
+
 /** SPL Token asset specification */
 interface SPLTokenAsset {
     /** Token mint address */
@@ -126,4 +128,95 @@ declare function createPaymentReference(): string;
  */
 declare function createX402AuthorizationHeader(signature: string, paymentRequiredHeader: string): string;
 
-export { type PaymentFlowConfig, type SolanaPayUrlParams, buildSolanaPayUrl, createPaymentFlow, createPaymentReference, createX402AuthorizationHeader };
+/**
+ * Minimal wallet adapter interface compatible with @solana/wallet-adapter-base
+ */
+interface WalletAdapterInterface {
+    publicKey: PublicKey | null;
+    signTransaction?: (transaction: Transaction) => Promise<Transaction>;
+    sendTransaction: (transaction: Transaction, connection: Connection, options?: any) => Promise<TransactionSignature>;
+}
+interface SendPaymentParams {
+    /** Solana Connection object */
+    connection: Connection;
+    /** Connected wallet adapter */
+    wallet: WalletAdapterInterface;
+    /** Recipient wallet address */
+    recipientAddress: string;
+    /** Amount in lamports */
+    amount: bigint;
+    /** Optional memo for the transaction */
+    memo?: string;
+    /** Commitment level (default: 'confirmed') */
+    commitment?: 'processed' | 'confirmed' | 'finalized';
+}
+interface PaymentResult {
+    signature: string;
+    amountSol: number;
+}
+/**
+ * Send a SOL payment from the client-side wallet
+ *
+ * Handles transaction creation, recent blockhash, and sending.
+ *
+ * @example
+ * ```typescript
+ * const result = await sendSolanaPayment({
+ *   connection,
+ *   wallet,
+ *   recipientAddress: '...',
+ *   amount: 10_000_000n // 0.01 SOL
+ * });
+ * ```
+ */
+declare function sendSolanaPayment({ connection, wallet, recipientAddress, amount, commitment }: SendPaymentParams): Promise<PaymentResult>;
+
+interface PaywallConfig {
+    /** URL to fetch protected content from */
+    url: string;
+    /** Solana Connection */
+    connection: Connection;
+    /** Wallet Adapter */
+    wallet: WalletAdapterInterface;
+}
+interface PaywallState<T> {
+    /** Content data if unlocked */
+    data: T | null;
+    /** Whether content is currently locked by 402 */
+    isLocked: boolean;
+    /** Whether an operation is in progress (initial load or unlocking) */
+    isLoading: boolean;
+    /** Payment amount required (in lamports) */
+    price?: bigint;
+    /** Recipient address */
+    recipient?: string;
+    /** Error message */
+    error: string | null;
+    /** Function to trigger unlock flow */
+    unlock: () => Promise<void>;
+}
+/**
+ * React Hook to manage x402 Payment Loop
+ *
+ * Handles:
+ * 1. Initial fetch
+ * 2. 402 Payment Required detection
+ * 3. Payment execution (via wallet)
+ * 4. Auth header creation
+ * 5. Re-fetch with proof
+ *
+ * @example
+ * ```tsx
+ * const { data, isLocked, unlock, price } = usePaywallResource<Article>({
+ *   url: `/api/articles/${slug}`,
+ *   connection,
+ *   wallet
+ * });
+ *
+ * if (isLocked) return <Button onClick={unlock}>Pay {price} Lamports</Button>;
+ * return <Article data={data} />;
+ * ```
+ */
+declare function usePaywallResource<T = any>({ url, connection, wallet }: PaywallConfig): PaywallState<T>;
+
+export { type PaymentFlowConfig, type PaymentResult, type PaywallConfig, type PaywallState, type SendPaymentParams, type SolanaPayUrlParams, type WalletAdapterInterface, buildSolanaPayUrl, createPaymentFlow, createPaymentReference, createX402AuthorizationHeader, sendSolanaPayment, usePaywallResource };

package/dist/client/index.d.ts

@@ -1,3 +1,5 @@
+import { PublicKey, Transaction, Connection, TransactionSignature } from '@solana/web3.js';
+
 /** SPL Token asset specification */
 interface SPLTokenAsset {
     /** Token mint address */
@@ -126,4 +128,95 @@ declare function createPaymentReference(): string;
  */
 declare function createX402AuthorizationHeader(signature: string, paymentRequiredHeader: string): string;
 
-export { type PaymentFlowConfig, type SolanaPayUrlParams, buildSolanaPayUrl, createPaymentFlow, createPaymentReference, createX402AuthorizationHeader };
+/**
+ * Minimal wallet adapter interface compatible with @solana/wallet-adapter-base
+ */
+interface WalletAdapterInterface {
+    publicKey: PublicKey | null;
+    signTransaction?: (transaction: Transaction) => Promise<Transaction>;
+    sendTransaction: (transaction: Transaction, connection: Connection, options?: any) => Promise<TransactionSignature>;
+}
+interface SendPaymentParams {
+    /** Solana Connection object */
+    connection: Connection;
+    /** Connected wallet adapter */
+    wallet: WalletAdapterInterface;
+    /** Recipient wallet address */
+    recipientAddress: string;
+    /** Amount in lamports */
+    amount: bigint;
+    /** Optional memo for the transaction */
+    memo?: string;
+    /** Commitment level (default: 'confirmed') */
+    commitment?: 'processed' | 'confirmed' | 'finalized';
+}
+interface PaymentResult {
+    signature: string;
+    amountSol: number;
+}
+/**
+ * Send a SOL payment from the client-side wallet
+ *
+ * Handles transaction creation, recent blockhash, and sending.
+ *
+ * @example
+ * ```typescript
+ * const result = await sendSolanaPayment({
+ *   connection,
+ *   wallet,
+ *   recipientAddress: '...',
+ *   amount: 10_000_000n // 0.01 SOL
+ * });
+ * ```
+ */
+declare function sendSolanaPayment({ connection, wallet, recipientAddress, amount, commitment }: SendPaymentParams): Promise<PaymentResult>;
+
+interface PaywallConfig {
+    /** URL to fetch protected content from */
+    url: string;
+    /** Solana Connection */
+    connection: Connection;
+    /** Wallet Adapter */
+    wallet: WalletAdapterInterface;
+}
+interface PaywallState<T> {
+    /** Content data if unlocked */
+    data: T | null;
+    /** Whether content is currently locked by 402 */
+    isLocked: boolean;
+    /** Whether an operation is in progress (initial load or unlocking) */
+    isLoading: boolean;
+    /** Payment amount required (in lamports) */
+    price?: bigint;
+    /** Recipient address */
+    recipient?: string;
+    /** Error message */
+    error: string | null;
+    /** Function to trigger unlock flow */
+    unlock: () => Promise<void>;
+}
+/**
+ * React Hook to manage x402 Payment Loop
+ *
+ * Handles:
+ * 1. Initial fetch
+ * 2. 402 Payment Required detection
+ * 3. Payment execution (via wallet)
+ * 4. Auth header creation
+ * 5. Re-fetch with proof
+ *
+ * @example
+ * ```tsx
+ * const { data, isLocked, unlock, price } = usePaywallResource<Article>({
+ *   url: `/api/articles/${slug}`,
+ *   connection,
+ *   wallet
+ * });
+ *
+ * if (isLocked) return <Button onClick={unlock}>Pay {price} Lamports</Button>;
+ * return <Article data={data} />;
+ * ```
+ */
+declare function usePaywallResource<T = any>({ url, connection, wallet }: PaywallConfig): PaywallState<T>;
+
+export { type PaymentFlowConfig, type PaymentResult, type PaywallConfig, type PaywallState, type SendPaymentParams, type SolanaPayUrlParams, type WalletAdapterInterface, buildSolanaPayUrl, createPaymentFlow, createPaymentReference, createX402AuthorizationHeader, sendSolanaPayment, usePaywallResource };

package/dist/client/index.js

@@ -1,4 +1,6 @@
 import { decodePaymentRequiredHeader, encodePaymentSignatureHeader } from '@x402/core/http';
+import { PublicKey, Transaction, SystemProgram, LAMPORTS_PER_SOL } from '@solana/web3.js';
+import { useState, useCallback, useEffect } from 'react';
 
 // src/client/types.ts
 var TOKEN_MINTS = {
@@ -109,5 +111,132 @@ function createX402AuthorizationHeader(signature, paymentRequiredHeader) {
   const token = encodePaymentSignatureHeader(payload);
   return `x402 ${token}`;
 }
+async function sendSolanaPayment({
+  connection,
+  wallet,
+  recipientAddress,
+  amount,
+  // memo, // TODO: Add memo support to transaction
+  commitment = "confirmed"
+}) {
+  if (!wallet.publicKey) {
+    throw new Error("Wallet not connected");
+  }
+  if (amount <= 0n) {
+    throw new Error("Amount must be greater than 0");
+  }
+  try {
+    const recipientPubkey = new PublicKey(recipientAddress);
+    const transaction = new Transaction().add(
+      SystemProgram.transfer({
+        fromPubkey: wallet.publicKey,
+        toPubkey: recipientPubkey,
+        lamports: amount
+      })
+    );
+    const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash(commitment);
+    transaction.recentBlockhash = blockhash;
+    transaction.feePayer = wallet.publicKey;
+    const signature = await wallet.sendTransaction(transaction, connection);
+    await connection.confirmTransaction({
+      signature,
+      blockhash,
+      lastValidBlockHeight
+    }, commitment);
+    return {
+      signature,
+      amountSol: Number(amount) / LAMPORTS_PER_SOL
+    };
+  } catch (error) {
+    console.error("Payment failed:", error);
+    throw new Error(error.message || "Payment failed");
+  }
+}
+function usePaywallResource({
+  url,
+  connection,
+  wallet
+}) {
+  const [data, setData] = useState(null);
+  const [isLocked, setIsLocked] = useState(true);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState(null);
+  const [paymentHeader, setPaymentHeader] = useState(null);
+  const [price, setPrice] = useState();
+  const [recipient, setRecipient] = useState();
+  const fetchData = useCallback(async (authHeader) => {
+    setIsLoading(true);
+    setError(null);
+    try {
+      const headers = {
+        "Content-Type": "application/json"
+      };
+      if (authHeader) {
+        headers["Authorization"] = authHeader;
+      }
+      const res = await fetch(url, { headers });
+      if (res.status === 402) {
+        const wwwAuth = res.headers.get("WWW-Authenticate");
+        if (wwwAuth) {
+          setPaymentHeader(wwwAuth);
+          try {
+            const match = wwwAuth.match(/amount="([^"]+)",\s*payTo="([^"]+)"/);
+            if (match) {
+              setPrice(BigInt(match[1]));
+              setRecipient(match[2]);
+            }
+          } catch (e) {
+            console.warn("Failed to parse 402 details from header", e);
+          }
+        }
+        setIsLocked(true);
+        setData(null);
+      } else if (res.ok) {
+        const json = await res.json();
+        setData(json);
+        setIsLocked(false);
+      } else {
+        throw new Error(`Request failed with status ${res.status}`);
+      }
+    } catch (err) {
+      setError(err.message || "Failed to fetch resource");
+    } finally {
+      setIsLoading(false);
+    }
+  }, [url]);
+  useEffect(() => {
+    fetchData();
+  }, [fetchData]);
+  const unlock = useCallback(async () => {
+    if (!paymentHeader || !price || !recipient) {
+      setError("Missing payment requirements");
+      return;
+    }
+    setIsLoading(true);
+    try {
+      const { signature } = await sendSolanaPayment({
+        connection,
+        wallet,
+        recipientAddress: recipient,
+        amount: price
+      });
+      const authHeader = createX402AuthorizationHeader(signature, paymentHeader);
+      await fetchData(authHeader);
+    } catch (err) {
+      console.error("Unlock failed", err);
+      setError(err.message || "Payment/Unlock failed");
+      setIsLoading(false);
+    }
+  }, [connection, wallet, paymentHeader, price, recipient, fetchData]);
+  return {
+    data,
+    isLocked,
+    isLoading,
+    price,
+    recipient,
+    error,
+    unlock
+  };
+}
 
-export { buildSolanaPayUrl, createPaymentFlow, createPaymentReference, createX402AuthorizationHeader };
+export { buildSolanaPayUrl, createPaymentFlow, createPaymentReference, createX402AuthorizationHeader, sendSolanaPayment, usePaywallResource };

package/dist/index.cjs

@@ -6,8 +6,14 @@ var client = require('@x402/core/client');
 var svm = require('@x402/svm');
 var http = require('@x402/core/http');
 var web3_js = require('@solana/web3.js');
+var react = require('react');
+var bs58 = require('bs58');
 var jose = require('jose');
 
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
+
+var bs58__default = /*#__PURE__*/_interopDefault(bs58);
+
 // src/index.ts
 
 // src/client/types.ts
@@ -119,6 +125,133 @@ function createX402AuthorizationHeader(signature, paymentRequiredHeader) {
   const token = http.encodePaymentSignatureHeader(payload);
   return `x402 ${token}`;
 }
+async function sendSolanaPayment({
+  connection,
+  wallet,
+  recipientAddress,
+  amount,
+  // memo, // TODO: Add memo support to transaction
+  commitment = "confirmed"
+}) {
+  if (!wallet.publicKey) {
+    throw new Error("Wallet not connected");
+  }
+  if (amount <= 0n) {
+    throw new Error("Amount must be greater than 0");
+  }
+  try {
+    const recipientPubkey = new web3_js.PublicKey(recipientAddress);
+    const transaction = new web3_js.Transaction().add(
+      web3_js.SystemProgram.transfer({
+        fromPubkey: wallet.publicKey,
+        toPubkey: recipientPubkey,
+        lamports: amount
+      })
+    );
+    const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash(commitment);
+    transaction.recentBlockhash = blockhash;
+    transaction.feePayer = wallet.publicKey;
+    const signature = await wallet.sendTransaction(transaction, connection);
+    await connection.confirmTransaction({
+      signature,
+      blockhash,
+      lastValidBlockHeight
+    }, commitment);
+    return {
+      signature,
+      amountSol: Number(amount) / web3_js.LAMPORTS_PER_SOL
+    };
+  } catch (error) {
+    console.error("Payment failed:", error);
+    throw new Error(error.message || "Payment failed");
+  }
+}
+function usePaywallResource({
+  url,
+  connection,
+  wallet
+}) {
+  const [data, setData] = react.useState(null);
+  const [isLocked, setIsLocked] = react.useState(true);
+  const [isLoading, setIsLoading] = react.useState(true);
+  const [error, setError] = react.useState(null);
+  const [paymentHeader, setPaymentHeader] = react.useState(null);
+  const [price, setPrice] = react.useState();
+  const [recipient, setRecipient] = react.useState();
+  const fetchData = react.useCallback(async (authHeader) => {
+    setIsLoading(true);
+    setError(null);
+    try {
+      const headers = {
+        "Content-Type": "application/json"
+      };
+      if (authHeader) {
+        headers["Authorization"] = authHeader;
+      }
+      const res = await fetch(url, { headers });
+      if (res.status === 402) {
+        const wwwAuth = res.headers.get("WWW-Authenticate");
+        if (wwwAuth) {
+          setPaymentHeader(wwwAuth);
+          try {
+            const match = wwwAuth.match(/amount="([^"]+)",\s*payTo="([^"]+)"/);
+            if (match) {
+              setPrice(BigInt(match[1]));
+              setRecipient(match[2]);
+            }
+          } catch (e) {
+            console.warn("Failed to parse 402 details from header", e);
+          }
+        }
+        setIsLocked(true);
+        setData(null);
+      } else if (res.ok) {
+        const json = await res.json();
+        setData(json);
+        setIsLocked(false);
+      } else {
+        throw new Error(`Request failed with status ${res.status}`);
+      }
+    } catch (err) {
+      setError(err.message || "Failed to fetch resource");
+    } finally {
+      setIsLoading(false);
+    }
+  }, [url]);
+  react.useEffect(() => {
+    fetchData();
+  }, [fetchData]);
+  const unlock = react.useCallback(async () => {
+    if (!paymentHeader || !price || !recipient) {
+      setError("Missing payment requirements");
+      return;
+    }
+    setIsLoading(true);
+    try {
+      const { signature } = await sendSolanaPayment({
+        connection,
+        wallet,
+        recipientAddress: recipient,
+        amount: price
+      });
+      const authHeader = createX402AuthorizationHeader(signature, paymentHeader);
+      await fetchData(authHeader);
+    } catch (err) {
+      console.error("Unlock failed", err);
+      setError(err.message || "Payment/Unlock failed");
+      setIsLoading(false);
+    }
+  }, [connection, wallet, paymentHeader, price, recipient, fetchData]);
+  return {
+    data,
+    isLocked,
+    isLoading,
+    price,
+    recipient,
+    error,
+    unlock
+  };
+}
 var DEFAULT_COMPUTE_UNITS = 2e5;
 var DEFAULT_MICRO_LAMPORTS = 1e3;
 function createPriorityFeeInstructions(config2 = {}) {
@@ -166,8 +299,6 @@ async function buildVersionedTransaction(config2) {
     lastValidBlockHeight
   };
 }
-
-// src/agent/agentPayment.ts
 var WALLET_REGEX = /^[1-9A-HJ-NP-Za-km-z]{32,44}$/;
 function isValidWalletAddress(address) {
   if (!address || typeof address !== "string") return false;
@@ -268,15 +399,19 @@ async function hasAgentSufficientBalance(connection, agentKeypair, requiredLampo
   };
 }
 function keypairFromBase58(base58Secret) {
-  const bytes = Buffer.from(base58Secret, "base64");
-  if (bytes.length !== 64) {
+  try {
+    const bytes = bs58__default.default.decode(base58Secret);
+    if (bytes.length !== 64) {
+      throw new Error("Invalid secret key length. Expected 64 bytes.");
+    }
+    return web3_js.Keypair.fromSecretKey(bytes);
+  } catch (error) {
     const parts = base58Secret.split(",").map((n) => parseInt(n.trim(), 10));
     if (parts.length === 64) {
       return web3_js.Keypair.fromSecretKey(Uint8Array.from(parts));
     }
     throw new Error("Invalid secret key format. Expected base58 string or comma-separated bytes.");
   }
-  return web3_js.Keypair.fromSecretKey(bytes);
 }
 function generateAgentKeypair() {
   const keypair = web3_js.Keypair.generate();
@@ -614,8 +749,10 @@ exports.hasAgentSufficientBalance = hasAgentSufficientBalance;
 exports.keypairFromBase58 = keypairFromBase58;
 exports.lamportsToSol = lamportsToSol;
 exports.lamportsToUsd = lamportsToUsd;
+exports.sendSolanaPayment = sendSolanaPayment;
 exports.usdToLamports = usdToLamports;
 exports.useCredit = useCredit;
+exports.usePaywallResource = usePaywallResource;
 exports.validateCreditSession = validateCreditSession;
 Object.keys(core).forEach(function (k) {
   if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {

package/dist/index.d.cts

@@ -2,7 +2,7 @@ export * from '@x402/core';
 export * from '@x402/core/types';
 export * from '@x402/core/client';
 export * from '@x402/svm';
-export { PaymentFlowConfig, SolanaPayUrlParams, buildSolanaPayUrl, createPaymentFlow, createPaymentReference, createX402AuthorizationHeader } from './client/index.cjs';
+export { PaymentFlowConfig, PaymentResult, PaywallConfig, PaywallState, SendPaymentParams, SolanaPayUrlParams, WalletAdapterInterface, buildSolanaPayUrl, createPaymentFlow, createPaymentReference, createX402AuthorizationHeader, sendSolanaPayment, usePaywallResource } from './client/index.cjs';
 export { AgentPaymentResult, CreditSessionClaims, CreditSessionConfig, CreditSessionData, CreditValidation, ExecuteAgentPaymentParams, UseCreditResult, addCredits, createCreditSession, executeAgentPayment, generateAgentKeypair, getAgentBalance, getRemainingCredits, hasAgentSufficientBalance, keypairFromBase58, useCredit, validateCreditSession } from './agent/index.cjs';
 export { CustomPriceProvider, PriceConfig, PriceData, clearPriceCache, configurePricing, formatPriceDisplay, formatPriceSync, getProviders, getSolPrice, lamportsToSol, lamportsToUsd, usdToLamports } from './pricing/index.cjs';
 import '@solana/web3.js';

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export * from '@x402/core';
 export * from '@x402/core/types';
 export * from '@x402/core/client';
 export * from '@x402/svm';
-export { PaymentFlowConfig, SolanaPayUrlParams, buildSolanaPayUrl, createPaymentFlow, createPaymentReference, createX402AuthorizationHeader } from './client/index.js';
+export { PaymentFlowConfig, PaymentResult, PaywallConfig, PaywallState, SendPaymentParams, SolanaPayUrlParams, WalletAdapterInterface, buildSolanaPayUrl, createPaymentFlow, createPaymentReference, createX402AuthorizationHeader, sendSolanaPayment, usePaywallResource } from './client/index.js';
 export { AgentPaymentResult, CreditSessionClaims, CreditSessionConfig, CreditSessionData, CreditValidation, ExecuteAgentPaymentParams, UseCreditResult, addCredits, createCreditSession, executeAgentPayment, generateAgentKeypair, getAgentBalance, getRemainingCredits, hasAgentSufficientBalance, keypairFromBase58, useCredit, validateCreditSession } from './agent/index.js';
 export { CustomPriceProvider, PriceConfig, PriceData, clearPriceCache, configurePricing, formatPriceDisplay, formatPriceSync, getProviders, getSolPrice, lamportsToSol, lamportsToUsd, usdToLamports } from './pricing/index.js';
 import '@solana/web3.js';

package/dist/index.js

@@ -3,7 +3,9 @@ export * from '@x402/core/types';
 export * from '@x402/core/client';
 export * from '@x402/svm';
 import { decodePaymentRequiredHeader, encodePaymentSignatureHeader } from '@x402/core/http';
-import { PublicKey, SystemProgram, LAMPORTS_PER_SOL, Keypair, TransactionMessage, VersionedTransaction, ComputeBudgetProgram } from '@solana/web3.js';
+import { PublicKey, Transaction, SystemProgram, LAMPORTS_PER_SOL, Keypair, TransactionMessage, VersionedTransaction, ComputeBudgetProgram } from '@solana/web3.js';
+import { useState, useCallback, useEffect } from 'react';
+import bs58 from 'bs58';
 import { SignJWT, jwtVerify } from 'jose';
 
 // src/index.ts
@@ -117,6 +119,133 @@ function createX402AuthorizationHeader(signature, paymentRequiredHeader) {
   const token = encodePaymentSignatureHeader(payload);
   return `x402 ${token}`;
 }
+async function sendSolanaPayment({
+  connection,
+  wallet,
+  recipientAddress,
+  amount,
+  // memo, // TODO: Add memo support to transaction
+  commitment = "confirmed"
+}) {
+  if (!wallet.publicKey) {
+    throw new Error("Wallet not connected");
+  }
+  if (amount <= 0n) {
+    throw new Error("Amount must be greater than 0");
+  }
+  try {
+    const recipientPubkey = new PublicKey(recipientAddress);
+    const transaction = new Transaction().add(
+      SystemProgram.transfer({
+        fromPubkey: wallet.publicKey,
+        toPubkey: recipientPubkey,
+        lamports: amount
+      })
+    );
+    const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash(commitment);
+    transaction.recentBlockhash = blockhash;
+    transaction.feePayer = wallet.publicKey;
+    const signature = await wallet.sendTransaction(transaction, connection);
+    await connection.confirmTransaction({
+      signature,
+      blockhash,
+      lastValidBlockHeight
+    }, commitment);
+    return {
+      signature,
+      amountSol: Number(amount) / LAMPORTS_PER_SOL
+    };
+  } catch (error) {
+    console.error("Payment failed:", error);
+    throw new Error(error.message || "Payment failed");
+  }
+}
+function usePaywallResource({
+  url,
+  connection,
+  wallet
+}) {
+  const [data, setData] = useState(null);
+  const [isLocked, setIsLocked] = useState(true);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState(null);
+  const [paymentHeader, setPaymentHeader] = useState(null);
+  const [price, setPrice] = useState();
+  const [recipient, setRecipient] = useState();
+  const fetchData = useCallback(async (authHeader) => {
+    setIsLoading(true);
+    setError(null);
+    try {
+      const headers = {
+        "Content-Type": "application/json"
+      };
+      if (authHeader) {
+        headers["Authorization"] = authHeader;
+      }
+      const res = await fetch(url, { headers });
+      if (res.status === 402) {
+        const wwwAuth = res.headers.get("WWW-Authenticate");
+        if (wwwAuth) {
+          setPaymentHeader(wwwAuth);
+          try {
+            const match = wwwAuth.match(/amount="([^"]+)",\s*payTo="([^"]+)"/);
+            if (match) {
+              setPrice(BigInt(match[1]));
+              setRecipient(match[2]);
+            }
+          } catch (e) {
+            console.warn("Failed to parse 402 details from header", e);
+          }
+        }
+        setIsLocked(true);
+        setData(null);
+      } else if (res.ok) {
+        const json = await res.json();
+        setData(json);
+        setIsLocked(false);
+      } else {
+        throw new Error(`Request failed with status ${res.status}`);
+      }
+    } catch (err) {
+      setError(err.message || "Failed to fetch resource");
+    } finally {
+      setIsLoading(false);
+    }
+  }, [url]);
+  useEffect(() => {
+    fetchData();
+  }, [fetchData]);
+  const unlock = useCallback(async () => {
+    if (!paymentHeader || !price || !recipient) {
+      setError("Missing payment requirements");
+      return;
+    }
+    setIsLoading(true);
+    try {
+      const { signature } = await sendSolanaPayment({
+        connection,
+        wallet,
+        recipientAddress: recipient,
+        amount: price
+      });
+      const authHeader = createX402AuthorizationHeader(signature, paymentHeader);
+      await fetchData(authHeader);
+    } catch (err) {
+      console.error("Unlock failed", err);
+      setError(err.message || "Payment/Unlock failed");
+      setIsLoading(false);
+    }
+  }, [connection, wallet, paymentHeader, price, recipient, fetchData]);
+  return {
+    data,
+    isLocked,
+    isLoading,
+    price,
+    recipient,
+    error,
+    unlock
+  };
+}
 var DEFAULT_COMPUTE_UNITS = 2e5;
 var DEFAULT_MICRO_LAMPORTS = 1e3;
 function createPriorityFeeInstructions(config2 = {}) {
@@ -164,8 +293,6 @@ async function buildVersionedTransaction(config2) {
     lastValidBlockHeight
   };
 }
-
-// src/agent/agentPayment.ts
 var WALLET_REGEX = /^[1-9A-HJ-NP-Za-km-z]{32,44}$/;
 function isValidWalletAddress(address) {
   if (!address || typeof address !== "string") return false;
@@ -266,15 +393,19 @@ async function hasAgentSufficientBalance(connection, agentKeypair, requiredLampo
   };
 }
 function keypairFromBase58(base58Secret) {
-  const bytes = Buffer.from(base58Secret, "base64");
-  if (bytes.length !== 64) {
+  try {
+    const bytes = bs58.decode(base58Secret);
+    if (bytes.length !== 64) {
+      throw new Error("Invalid secret key length. Expected 64 bytes.");
+    }
+    return Keypair.fromSecretKey(bytes);
+  } catch (error) {
     const parts = base58Secret.split(",").map((n) => parseInt(n.trim(), 10));
     if (parts.length === 64) {
       return Keypair.fromSecretKey(Uint8Array.from(parts));
     }
     throw new Error("Invalid secret key format. Expected base58 string or comma-separated bytes.");
   }
-  return Keypair.fromSecretKey(bytes);
 }
 function generateAgentKeypair() {
   const keypair = Keypair.generate();
@@ -592,4 +723,4 @@ function getProviders() {
   return PROVIDERS.map((p) => ({ name: p.name, url: p.url }));
 }
 
-export { addCredits, buildSolanaPayUrl, clearPriceCache, configurePricing, createCreditSession, createPaymentFlow, createPaymentReference, createX402AuthorizationHeader, executeAgentPayment, formatPriceDisplay, formatPriceSync, generateAgentKeypair, getAgentBalance, getProviders, getRemainingCredits, getSolPrice, hasAgentSufficientBalance, keypairFromBase58, lamportsToSol, lamportsToUsd, usdToLamports, useCredit, validateCreditSession };
+export { addCredits, buildSolanaPayUrl, clearPriceCache, configurePricing, createCreditSession, createPaymentFlow, createPaymentReference, createX402AuthorizationHeader, executeAgentPayment, formatPriceDisplay, formatPriceSync, generateAgentKeypair, getAgentBalance, getProviders, getRemainingCredits, getSolPrice, hasAgentSufficientBalance, keypairFromBase58, lamportsToSol, lamportsToUsd, sendSolanaPayment, usdToLamports, useCredit, usePaywallResource, validateCreditSession };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alleyboss/micropay-solana-x402-paywall",
-    "version": "3.1.4",
+    "version": "3.2.1",
     "description": "Production-ready Solana micropayments library wrapper for official x402 SDK",
     "author": "AlleyBoss",
     "license": "MIT",
@@ -108,20 +108,26 @@
         "prepublishOnly": "npm run test && npm run build"
     },
     "dependencies": {
+        "@types/bs58": "^4.0.4",
         "@x402/core": "^2.1.0",
         "@x402/next": "^2.1.0",
         "@x402/svm": "^2.1.0",
+        "bs58": "^6.0.0",
         "jose": "^6.1.3"
     },
     "peerDependencies": {
-        "@solana/web3.js": "^1.90.0"
+        "@solana/web3.js": "^1.90.0",
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
     },
     "devDependencies": {
         "@solana/web3.js": "^1.98.4",
         "@types/express": "^5.0.6",
         "@types/node": "^20",
+        "@types/react": "^19.2.7",
         "@types/uuid": "^10.0.0",
         "express": "^5.2.1",
+        "react": "^19.2.3",
         "tsup": "^8.0.0",
         "typescript": "^5",
         "vitest": "^3.0.0"