@dexterai/x402 1.9.2 → 1.9.4

package/dist/client/index.d.ts

@@ -1,10 +1,10 @@
-export { P as PaymentReceipt, a as X402Client, X as X402ClientConfig, c as createX402Client, f as fireImpressionBeacon, g as getPaymentReceipt, d as getSponsoredAccessInfo, b as getSponsoredRecommendations } from '../sponsored-access-H1EX6zpi.js';
-import { A as AccessPassClientConfig } from '../types-BQvaF8lB.js';
-export { b as AccessPassInfo, a as AccessPassTier, D as DEXTER_FACILITATOR_URL, U as USDC_MINT, X as X402Error } from '../types-BQvaF8lB.js';
+export { P as PaymentReceipt, a as X402Client, X as X402ClientConfig, c as createX402Client, f as fireImpressionBeacon, g as getPaymentReceipt, d as getSponsoredAccessInfo, b as getSponsoredRecommendations } from '../sponsored-access-D1_mINs4.js';
+import { A as AccessPassClientConfig } from '../types-CjLMR7qs.js';
+export { b as AccessPassInfo, a as AccessPassTier, D as DEXTER_FACILITATOR_URL, U as USDC_MINT, X as X402Error } from '../types-CjLMR7qs.js';
 import { Transaction, VersionedTransaction, Keypair } from '@solana/web3.js';
-import { E as EvmWallet } from '../solana-kZcwbUK9.js';
-export { B as BASE_MAINNET, S as SOLANA_MAINNET, a as createEvmAdapter, c as createSolanaAdapter } from '../solana-kZcwbUK9.js';
-export { C as ChainAdapter, W as WalletSet } from '../types-ENcnkof8.js';
+import { E as EvmWallet } from '../solana-Cxr5byPa.js';
+export { B as BASE_MAINNET, S as SOLANA_MAINNET, a as createEvmAdapter, c as createSolanaAdapter } from '../solana-Cxr5byPa.js';
+export { C as ChainAdapter, W as WalletSet } from '../types-BIHhO2-I.js';
 export { SponsoredAccessSettlementInfo, SponsoredRecommendation } from '@dexterai/x402-ads-types';
 
 /**
@@ -135,6 +135,8 @@ declare function wrapFetch(fetchImpl: typeof globalThis.fetch, options: WrapFetc
  * ```
  */
 
+/** Symbol key for the underlying Keypair — prevents accidental exposure via console.log or JSON.stringify */
+declare const KEYPAIR_SYMBOL: unique symbol;
 /**
  * Keypair wallet interface (compatible with SDK's SolanaWallet)
  */
@@ -145,9 +147,21 @@ interface KeypairWallet {
     };
     /** Sign a transaction */
     signTransaction<T extends Transaction | VersionedTransaction>(tx: T): Promise<T>;
-    /** Get the underlying keypair (for advanced use) */
+    /**
+     * Get the underlying Keypair. Accessed via Symbol to prevent accidental
+     * exposure through console.log, JSON.stringify, or Object.keys.
+     *
+     * @example
+     * ```typescript
+     * import { KEYPAIR_SYMBOL } from '@dexterai/x402/client';
+     * const kp = wallet[KEYPAIR_SYMBOL];
+     * ```
+     */
+    [KEYPAIR_SYMBOL]: Keypair;
+    /** @deprecated Use wallet[KEYPAIR_SYMBOL] instead — this will be removed in a future major version */
     keypair: Keypair;
 }
+
 /**
  * Create a wallet from a Solana private key
  *
@@ -245,4 +259,4 @@ declare function createEvmKeypairWallet(privateKey: string): Promise<EvmWallet>;
  */
 declare function isEvmKeypairWallet(wallet: unknown): wallet is EvmWallet;
 
-export { AccessPassClientConfig, type KeypairWallet, type WrapFetchOptions, createEvmKeypairWallet, createKeypairWallet, isEvmKeypairWallet, isKeypairWallet, wrapFetch };
+export { AccessPassClientConfig, KEYPAIR_SYMBOL, type KeypairWallet, type WrapFetchOptions, createEvmKeypairWallet, createKeypairWallet, isEvmKeypairWallet, isKeypairWallet, wrapFetch };

package/dist/client/index.js

@@ -266,8 +266,11 @@ var SolanaAdapter = class {
       const account = await getAccount(connection, ata, void 0, programId);
       const decimals = accept.extra?.decimals ?? 6;
       return Number(account.amount) / Math.pow(10, decimals);
-    } catch {
-      return 0;
+    } catch (err) {
+      if (err && typeof err === "object" && "name" in err && (err.name === "TokenAccountNotFoundError" || err.name === "TokenInvalidAccountOwnerError")) {
+        return 0;
+      }
+      throw err;
     }
   }
   async buildTransaction(accept, wallet, rpcUrl) {
@@ -495,15 +498,21 @@ var EvmAdapter = class {
           ]
         })
       });
+      if (!response.ok) {
+        throw new Error(`RPC request failed: ${response.status}`);
+      }
       const result = await response.json();
-      if (result.error || !result.result) {
+      if (result.error) {
+        throw new Error(`RPC error: ${JSON.stringify(result.error)}`);
+      }
+      if (!result.result || result.result === "0x") {
         return 0;
       }
       const balance = BigInt(result.result);
       const decimals = accept.extra?.decimals ?? 6;
       return Number(balance) / Math.pow(10, decimals);
-    } catch {
-      return 0;
+    } catch (err) {
+      throw err;
     }
   }
   encodeBalanceOf(address) {
@@ -619,7 +628,8 @@ function createX402Client(config) {
     maxAmountAtomic,
     fetch: customFetch = globalThis.fetch,
     verbose = false,
-    accessPass: accessPassConfig
+    accessPass: accessPassConfig,
+    onPaymentRequired
   } = config;
   const log = verbose ? console.log.bind(console, "[x402]") : () => {
   };
@@ -732,13 +742,17 @@ function createX402Client(config) {
     const paymentAmount = accept.amount ?? accept.maxAmountRequired;
     if (!paymentAmount) return null;
     const rpcUrl = getRpcUrl(accept.network, adapter);
-    const balance = await adapter.getBalance(accept, wallet, rpcUrl);
-    const requiredAmount = Number(paymentAmount) / Math.pow(10, decimals);
-    if (balance < requiredAmount) {
-      throw new X402Error(
-        "insufficient_balance",
-        `Insufficient balance for access pass. Have $${balance.toFixed(4)}, need $${requiredAmount.toFixed(4)}`
-      );
+    try {
+      const balance = await adapter.getBalance(accept, wallet, rpcUrl);
+      const requiredAmount = Number(paymentAmount) / Math.pow(10, decimals);
+      if (balance < requiredAmount) {
+        throw new X402Error(
+          "insufficient_balance",
+          `Insufficient balance for access pass. Have $${balance.toFixed(4)}, need $${requiredAmount.toFixed(4)}`
+        );
+      }
+    } catch (err) {
+      if (err instanceof X402Error) throw err;
     }
     const signedTx = await adapter.buildTransaction(accept, wallet, rpcUrl);
     let payload;
@@ -751,13 +765,19 @@ function createX402Client(config) {
     let resolvedResource = requirements.resource;
     if (typeof requirements.resource === "string") {
       try {
-        resolvedResource = new URL(requirements.resource, originalUrl).toString();
+        const resolved = new URL(requirements.resource, originalUrl);
+        if (["http:", "https:"].includes(resolved.protocol)) {
+          resolvedResource = resolved.toString();
+        }
       } catch {
       }
     } else if (requirements.resource && typeof requirements.resource === "object" && "url" in requirements.resource) {
       const rObj = requirements.resource;
       try {
-        resolvedResource = { ...rObj, url: new URL(rObj.url, originalUrl).toString() };
+        const resolved = new URL(rObj.url, originalUrl);
+        if (["http:", "https:"].includes(resolved.protocol)) {
+          resolvedResource = { ...rObj, url: resolved.toString() };
+        }
       } catch {
       }
     }
@@ -885,16 +905,27 @@ function createX402Client(config) {
     }
     const rpcUrl = getRpcUrl(accept.network, adapter);
     log("Checking balance...");
-    const balance = await adapter.getBalance(accept, wallet, rpcUrl);
-    const requiredAmount = Number(paymentAmount) / Math.pow(10, decimals);
-    if (balance < requiredAmount) {
-      const network = adapter.name === "EVM" ? "Base" : "Solana";
-      throw new X402Error(
-        "insufficient_balance",
-        `Insufficient USDC balance on ${network}. Have $${balance.toFixed(4)}, need $${requiredAmount.toFixed(4)}`
-      );
+    try {
+      const balance = await adapter.getBalance(accept, wallet, rpcUrl);
+      const requiredAmount = Number(paymentAmount) / Math.pow(10, decimals);
+      if (balance < requiredAmount) {
+        const network = adapter.name === "EVM" ? "Base" : "Solana";
+        throw new X402Error(
+          "insufficient_balance",
+          `Insufficient USDC balance on ${network}. Have $${balance.toFixed(4)}, need $${requiredAmount.toFixed(4)}`
+        );
+      }
+      log(`Balance OK: $${balance.toFixed(4)} >= $${requiredAmount.toFixed(4)}`);
+    } catch (err) {
+      if (err instanceof X402Error) throw err;
+      log("Balance check failed (RPC error), proceeding with transaction attempt");
+    }
+    if (onPaymentRequired) {
+      const approved = await onPaymentRequired(accept);
+      if (!approved) {
+        throw new X402Error("payment_rejected", "Payment rejected by onPaymentRequired callback");
+      }
     }
-    log(`Balance OK: $${balance.toFixed(4)} >= $${requiredAmount.toFixed(4)}`);
     log("Building transaction...");
     const signedTx = await adapter.buildTransaction(accept, wallet, rpcUrl);
     log("Transaction signed");
@@ -980,6 +1011,7 @@ function createX402Client(config) {
 
 // src/client/keypair-wallet.ts
 import { Keypair, VersionedTransaction as VersionedTransaction2, Transaction } from "@solana/web3.js";
+var KEYPAIR_SYMBOL = /* @__PURE__ */ Symbol.for("x402:keypair");
 async function createKeypairWallet(privateKey) {
   let keypair;
   if (typeof privateKey === "string") {
@@ -1034,7 +1066,9 @@ async function createKeypairWallet(privateKey) {
       }
       throw new Error("Unknown transaction type");
     },
+    [KEYPAIR_SYMBOL]: keypair,
     keypair
+    // deprecated — kept for backwards compat
   };
 }
 function isKeypairWallet(wallet) {
@@ -1147,6 +1181,7 @@ async function fireImpressionBeacon(response) {
 export {
   BASE_MAINNET,
   DEXTER_FACILITATOR_URL,
+  KEYPAIR_SYMBOL,
   SOLANA_MAINNET,
   USDC_MINT,
   X402Error,