@voyage_ai/v402-web-ts 0.2.1 → 1.0.0

package/dist/index.mjs

@@ -173,9 +173,27 @@ function getWalletDisplayName(networkType) {
       return "Unknown Wallet";
   }
 }
+function getAllConnectedWalletIds() {
+  if (typeof window === "undefined") {
+    return {};
+  }
+  try {
+    const cached = localStorage.getItem(CONNECTED_WALLET_IDS_KEY);
+    return cached ? JSON.parse(cached) : {};
+  } catch (error) {
+    console.error("Failed to parse connected wallet IDs:", error);
+    return {};
+  }
+}
+function getConnectedWalletId(networkType) {
+  const walletIds = getAllConnectedWalletIds();
+  return walletIds[networkType] || null;
+}
+var CONNECTED_WALLET_IDS_KEY;
 var init_wallet = __esm({
   "src/utils/wallet.ts"() {
     "use strict";
+    CONNECTED_WALLET_IDS_KEY = "connected_wallet_ids";
   }
 });
 
@@ -183,16 +201,10 @@ var init_wallet = __esm({
 init_types();
 
 // src/services/svm/payment-header.ts
-import {
-  ComputeBudgetProgram,
-  Connection,
-  PublicKey,
-  TransactionMessage,
-  VersionedTransaction
-} from "@solana/web3.js";
+import { ComputeBudgetProgram, Connection, PublicKey, TransactionMessage, VersionedTransaction } from "@solana/web3.js";
 import {
   createTransferCheckedInstruction,
-  getAssociatedTokenAddress,
+  getAssociatedTokenAddressSync,
   getMint,
   TOKEN_2022_PROGRAM_ID,
   TOKEN_PROGRAM_ID
@@ -201,6 +213,186 @@ import {
 // src/utils/index.ts
 init_wallet();
 
+// src/utils/wallet-discovery.ts
+init_wallet();
+var SOLANA_WALLETS = [
+  {
+    id: "phantom",
+    name: "Phantom",
+    // Phantom official icon
+    icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTI4IiBoZWlnaHQ9IjEyOCIgdmlld0JveD0iMCAwIDEyOCAxMjgiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxMjgiIGhlaWdodD0iMTI4IiByeD0iMjYiIGZpbGw9IiNBQjlGRjIiLz4KPHBhdGggZD0iTTExMC41IDY0QzExMC41IDg5Ljk1NjggODkuMjAxIDExMSA2My41IDExMUg0MS41QzM2LjI1MzMgMTExIDMyIDEwNi43NDcgMzIgMTAxLjVWNTQuNUMzMiAzMS4wMjggNTEuMDI4IDEyIDc0LjUgMTJDOTcuOTcyIDEyIDExNyAzMS4wMjggMTE3IDU0LjVWNTUuNUMxMTcgNTguNTM3NiAxMTQuNTM4IDYxIDExMS41IDYxSDEwOS41QzEwNi40NjIgNjEgMTA0IDYzLjQ2MjQgMTA0IDY2LjVWNjhDMTA0IDcxLjg2NiAxMDcuMTM0IDc1IDExMSA3NUgxMTEuNUMxMTQuNTM4IDc1IDExNyA3Mi41Mzc2IDExNyA2OS41VjY0SDExMC41WiIgZmlsbD0idXJsKCNwYWludDBfbGluZWFyXzEyOF8xMjgpIi8+CjxwYXRoIGQ9Ik00OC41IDY3QzUxLjUzNzYgNjcgNTQgNjQuNTM3NiA1NCA2MS41QzU0IDU4LjQ2MjQgNTEuNTM3NiA1NiA0OC41IDU2QzQ1LjQ2MjQgNTYgNDMgNTguNDYyNCA0MyA2MS41QzQzIDY0LjUzNzYgNDUuNDYyNCA2NyA0OC41IDY3WiIgZmlsbD0iIzFCMUIxQiIvPgo8cGF0aCBkPSJNNzMuNSA2N0M3Ni41Mzc2IDY3IDc5IDY0LjUzNzYgNzkgNjEuNUM3OSA1OC40NjI0IDc2LjUzNzYgNTYgNzMuNSA1NkM3MC40NjI0IDU2IDY4IDU4LjQ2MjQgNjggNjEuNUM2OCA2NC41Mzc2IDcwLjQ2MjQgNjcgNzMuNSA2N1oiIGZpbGw9IiMxQjFCMUIiLz4KPGRlZnM+CjxsaW5lYXJHcmFkaWVudCBpZD0icGFpbnQwX2xpbmVhcl8xMjhfMTI4IiB4MT0iMTE3IiB5MT0iMTIiIHgyPSIxMTciIHkyPSIxMTEiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj4KPHN0b3Agc3RvcC1jb2xvcj0iI0ZGRkZGRiIvPgo8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiNGRkZGRkYiIHN0b3Atb3BhY2l0eT0iMC44MiIvPgo8L2xpbmVhckdyYWRpZW50Pgo8L2RlZnM+Cjwvc3ZnPg==",
+    detect: () => window.phantom?.solana
+  },
+  {
+    id: "solflare",
+    name: "Solflare",
+    // Solflare icon
+    icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTI4IiBoZWlnaHQ9IjEyOCIgdmlld0JveD0iMCAwIDEyOCAxMjgiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxMjgiIGhlaWdodD0iMTI4IiByeD0iMjYiIGZpbGw9IiNGQzZEMDEiLz4KPHBhdGggZD0iTTk2IDY0TDY0IDMyTDMyIDY0TDY0IDk2TDk2IDY0WiIgZmlsbD0id2hpdGUiLz4KPC9zdmc+",
+    detect: () => window.solflare
+  },
+  {
+    id: "backpack",
+    name: "Backpack",
+    // Backpack icon (red coral color)
+    icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTI4IiBoZWlnaHQ9IjEyOCIgdmlld0JveD0iMCAwIDEyOCAxMjgiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxMjgiIGhlaWdodD0iMTI4IiByeD0iMjYiIGZpbGw9IiNFMzM0MzAiLz4KPHBhdGggZD0iTTQwIDQ4SDg4VjgwQzg4IDg4LjgzNjYgODAuODM2NiA5NiA3MiA5Nkg1NkM0Ny4xNjM0IDk2IDQwIDg4LjgzNjYgNDAgODBWNDhaIiBmaWxsPSJ3aGl0ZSIvPgo8cGF0aCBkPSJNNTIgMzJINzZWNDhINTJWMzJaIiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4=",
+    detect: () => window.backpack
+  },
+  {
+    id: "okx-solana",
+    name: "OKX Wallet",
+    // OKX icon
+    icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTI4IiBoZWlnaHQ9IjEyOCIgdmlld0JveD0iMCAwIDEyOCAxMjgiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxMjgiIGhlaWdodD0iMTI4IiByeD0iMjYiIGZpbGw9ImJsYWNrIi8+CjxyZWN0IHg9IjI0IiB5PSIyNCIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiByeD0iNCIgZmlsbD0id2hpdGUiLz4KPHJlY3QgeD0iNTIiIHk9IjI0IiB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHJ4PSI0IiBmaWxsPSJ3aGl0ZSIvPgo8cmVjdCB4PSI4MCIgeT0iMjQiIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgcng9IjQiIGZpbGw9IndoaXRlIi8+CjxyZWN0IHg9IjI0IiB5PSI1MiIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiByeD0iNCIgZmlsbD0id2hpdGUiLz4KPHJlY3QgeD0iODAiIHk9IjUyIiB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHJ4PSI0IiBmaWxsPSJ3aGl0ZSIvPgo8cmVjdCB4PSIyNCIgeT0iODAiIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgcng9IjQiIGZpbGw9IndoaXRlIi8+CjxyZWN0IHg9IjUyIiB5PSI4MCIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiByeD0iNCIgZmlsbD0id2hpdGUiLz4KPHJlY3QgeD0iODAiIHk9IjgwIiB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHJ4PSI0IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4=",
+    detect: () => window.okxwallet?.solana
+  },
+  {
+    id: "coinbase-solana",
+    name: "Coinbase Wallet",
+    // Coinbase icon (blue)
+    icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTI4IiBoZWlnaHQ9IjEyOCIgdmlld0JveD0iMCAwIDEyOCAxMjgiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxMjgiIGhlaWdodD0iMTI4IiByeD0iMjYiIGZpbGw9IiMwMDUyRkYiLz4KPGNpcmNsZSBjeD0iNjQiIGN5PSI2NCIgcj0iMzYiIGZpbGw9IndoaXRlIi8+CjxyZWN0IHg9IjQ4IiB5PSI1NiIgd2lkdGg9IjMyIiBoZWlnaHQ9IjE2IiByeD0iNCIgZmlsbD0iIzAwNTJGRiIvPgo8L3N2Zz4=",
+    detect: () => window.coinbaseSolana
+  },
+  {
+    id: "trust-solana",
+    name: "Trust Wallet",
+    // Trust Wallet icon
+    icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTI4IiBoZWlnaHQ9IjEyOCIgdmlld0JveD0iMCAwIDEyOCAxMjgiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxMjgiIGhlaWdodD0iMTI4IiByeD0iMjYiIGZpbGw9IiMwNTAwRkYiLz4KPHBhdGggZD0iTTY0IDI0QzY0IDI0IDk2IDQwIDk2IDY0Qzk2IDg4IDY0IDEwNCA2NCAxMDRDNjQgMTA0IDMyIDg4IDMyIDY0QzMyIDQwIDY0IDI0IDY0IDI0WiIgc3Ryb2tlPSJ3aGl0ZSIgc3Ryb2tlLXdpZHRoPSI2IiBmaWxsPSJub25lIi8+Cjwvc3ZnPg==",
+    detect: () => window.trustwallet?.solana
+  }
+];
+var evmWallets = /* @__PURE__ */ new Map();
+var evmDiscoveryListeners = /* @__PURE__ */ new Set();
+var evmDiscoveryInitialized = false;
+var currentConnectedWallet = null;
+function initEVMWalletDiscovery() {
+  if (typeof window === "undefined" || evmDiscoveryInitialized) return;
+  evmDiscoveryInitialized = true;
+  window.addEventListener("eip6963:announceProvider", ((event) => {
+    const { info, provider } = event.detail;
+    evmWallets.set(info.uuid, { info, provider });
+    evmDiscoveryListeners.forEach((listener) => listener());
+  }));
+  window.dispatchEvent(new Event("eip6963:requestProvider"));
+}
+function getEVMWallets() {
+  const wallets = [];
+  const detectedNames = /* @__PURE__ */ new Set();
+  evmWallets.forEach((detail, uuid) => {
+    if (!detectedNames.has(detail.info.name)) {
+      wallets.push({
+        id: uuid,
+        name: detail.info.name,
+        icon: detail.info.icon,
+        networkType: "evm" /* EVM */,
+        provider: detail.provider,
+        installed: true
+      });
+      detectedNames.add(detail.info.name);
+    }
+  });
+  if (wallets.length === 0 && typeof window !== "undefined" && window.ethereum) {
+    const ethereum = window.ethereum;
+    const walletName = ethereum.isMetaMask ? "MetaMask" : ethereum.isCoinbaseWallet ? "Coinbase Wallet" : ethereum.isOkxWallet ? "OKX Wallet" : "Browser Wallet";
+    if (!detectedNames.has(walletName)) {
+      wallets.push({
+        id: "injected",
+        name: walletName,
+        icon: "",
+        // Will use first letter as avatar
+        networkType: "evm" /* EVM */,
+        provider: ethereum,
+        installed: true
+      });
+    }
+  }
+  return wallets;
+}
+function getSolanaWallets() {
+  if (typeof window === "undefined") return [];
+  const wallets = [];
+  const detectedProviders = /* @__PURE__ */ new Set();
+  const detectedNames = /* @__PURE__ */ new Set();
+  for (const wallet of SOLANA_WALLETS) {
+    const provider = wallet.detect();
+    if (provider && !detectedNames.has(wallet.name)) {
+      wallets.push({
+        id: wallet.id,
+        name: wallet.name,
+        icon: wallet.icon,
+        networkType: "solana" /* SOLANA */,
+        provider,
+        installed: true
+      });
+      detectedProviders.add(provider);
+      detectedNames.add(wallet.name);
+    }
+  }
+  const windowSolana = window.solana;
+  if (windowSolana && !detectedProviders.has(windowSolana)) {
+    const walletName = windowSolana.isPhantom ? "Phantom" : windowSolana.isSolflare ? "Solflare" : windowSolana.isBackpack ? "Backpack" : windowSolana.walletName || "Solana Wallet";
+    if (!detectedNames.has(walletName)) {
+      wallets.push({
+        id: "solana-unknown",
+        name: walletName,
+        icon: "",
+        // Will use first letter as avatar
+        networkType: "solana" /* SOLANA */,
+        provider: windowSolana,
+        installed: true
+      });
+    }
+  }
+  return wallets;
+}
+function getWalletsForNetwork(networkType) {
+  switch (networkType) {
+    case "evm" /* EVM */:
+      return getEVMWallets();
+    case "solana" /* SOLANA */:
+    case "svm" /* SVM */:
+      return getSolanaWallets();
+    default:
+      return [];
+  }
+}
+function getWalletByName(name, networkType) {
+  const wallets = getWalletsForNetwork(networkType);
+  return wallets.find((w) => w.name === name) || null;
+}
+function restoreConnectedWallet(networkType) {
+  const savedWalletName = getConnectedWalletId(networkType);
+  if (!savedWalletName) return null;
+  const wallet = getWalletByName(savedWalletName, networkType);
+  if (wallet) {
+    currentConnectedWallet = wallet;
+    console.log(`\u2705 Restored wallet provider: ${wallet.name}`);
+    return wallet;
+  }
+  console.warn(`\u26A0\uFE0F Could not find wallet with name: ${savedWalletName}`);
+  return null;
+}
+function getWalletProviderForPayment(networkType) {
+  if (currentConnectedWallet && currentConnectedWallet.networkType === networkType) {
+    return currentConnectedWallet.provider;
+  }
+  const restoredWallet = restoreConnectedWallet(networkType);
+  if (restoredWallet) {
+    return restoredWallet.provider;
+  }
+  if (typeof window === "undefined") return null;
+  switch (networkType) {
+    case "evm" /* EVM */:
+      return window.ethereum;
+    case "solana" /* SOLANA */:
+    case "svm" /* SVM */:
+      return window.phantom?.solana || window.solana;
+    default:
+      return null;
+  }
+}
+if (typeof window !== "undefined") {
+  initEVMWalletDiscovery();
+}
+
 // src/services/evm/payment-header.ts
 import { ethers } from "ethers";
 async function createEvmPaymentHeader(params) {
@@ -316,6 +508,15 @@ function getChainIdFromNetwork(network) {
 
 // src/services/evm/payment-handler.ts
 init_types();
+var NETWORK_NAMES = {
+  1: "Ethereum Mainnet",
+  11155111: "Sepolia Testnet",
+  8453: "Base Mainnet",
+  84532: "Base Sepolia Testnet",
+  137: "Polygon Mainnet",
+  42161: "Arbitrum One",
+  10: "Optimism Mainnet"
+};
 async function handleEvmPayment(endpoint, config, requestInit) {
   const { wallet, network, maxPaymentAmount } = config;
   const initialResponse = await fetch(endpoint, {
@@ -326,25 +527,10 @@ async function handleEvmPayment(endpoint, config, requestInit) {
     return initialResponse;
   }
   const rawResponse = await initialResponse.json();
-  const IGNORED_ERRORS = [
-    "X-PAYMENT header is required",
-    "missing X-PAYMENT header",
-    "payment_required"
-  ];
-  if (rawResponse.error && !IGNORED_ERRORS.includes(rawResponse.error)) {
+  if (rawResponse.error && !IGNORED_402_ERRORS.includes(rawResponse.error)) {
     console.error(`\u274C Payment verification failed: ${rawResponse.error}`);
-    const ERROR_MESSAGES = {
-      "insufficient_funds": "Insufficient balance to complete this payment",
-      "invalid_signature": "Invalid payment signature",
-      "expired": "Payment authorization has expired",
-      "already_used": "This payment has already been used",
-      "network_mismatch": "Payment network does not match",
-      "invalid_payment": "Invalid payment data",
-      "verification_failed": "Payment verification failed"
-    };
-    const errorMessage = ERROR_MESSAGES[rawResponse.error] || `Payment failed: ${rawResponse.error}`;
-    const error = new Error(errorMessage);
-    throw wrapPaymentError(error);
+    const errorMessage = PAYMENT_ERROR_MESSAGES[rawResponse.error] || `Payment failed: ${rawResponse.error}`;
+    throw wrapPaymentError(new Error(errorMessage));
   }
   const x402Version = rawResponse.x402Version;
   const parsedPaymentRequirements = rawResponse.accepts || [];
@@ -376,19 +562,10 @@ async function handleEvmPayment(endpoint, config, requestInit) {
       console.warn("\u26A0\uFE0F Failed to get current chainId:", error);
     }
   }
-  const networkNames = {
-    1: "Ethereum Mainnet",
-    11155111: "Sepolia Testnet",
-    8453: "Base Mainnet",
-    84532: "Base Sepolia Testnet",
-    137: "Polygon Mainnet",
-    42161: "Arbitrum One",
-    10: "Optimism Mainnet"
-  };
   if (currentChainId && currentChainId !== targetChainId) {
     if (!wallet.switchChain) {
-      const currentNetworkName = networkNames[currentChainId] || `Chain ${currentChainId}`;
-      const targetNetworkName = networkNames[targetChainId] || selectedRequirements.network;
+      const currentNetworkName = NETWORK_NAMES[currentChainId] || `Chain ${currentChainId}`;
+      const targetNetworkName = NETWORK_NAMES[targetChainId] || selectedRequirements.network;
       const error = new Error(
         `Network mismatch: Your wallet is connected to ${currentNetworkName}, but payment requires ${targetNetworkName}. Please switch to ${targetNetworkName} manually in your wallet.`
       );
@@ -400,7 +577,7 @@ async function handleEvmPayment(endpoint, config, requestInit) {
       console.log(`\u2705 Successfully switched to chain ${targetChainId}`);
     } catch (error) {
       console.error("\u274C Failed to switch chain:", error);
-      const targetNetworkName = networkNames[targetChainId] || selectedRequirements.network;
+      const targetNetworkName = NETWORK_NAMES[targetChainId] || selectedRequirements.network;
       const wrappedError = wrapPaymentError(error);
       let finalError;
       if (wrappedError.code === "USER_REJECTED" /* USER_REJECTED */) {
@@ -454,25 +631,10 @@ async function handleEvmPayment(endpoint, config, requestInit) {
   if (retryResponse.status === 402) {
     try {
       const retryData = await retryResponse.json();
-      const IGNORED_ERRORS2 = [
-        "X-PAYMENT header is required",
-        "missing X-PAYMENT header",
-        "payment_required"
-      ];
-      if (retryData.error && !IGNORED_ERRORS2.includes(retryData.error)) {
+      if (retryData.error && !IGNORED_402_ERRORS.includes(retryData.error)) {
         console.error(`\u274C Payment verification failed: ${retryData.error}`);
-        const ERROR_MESSAGES = {
-          "insufficient_funds": "Insufficient balance to complete this payment",
-          "invalid_signature": "Invalid payment signature",
-          "expired": "Payment authorization has expired",
-          "already_used": "This payment has already been used",
-          "network_mismatch": "Payment network does not match",
-          "invalid_payment": "Invalid payment data",
-          "verification_failed": "Payment verification failed"
-        };
-        const errorMessage = ERROR_MESSAGES[retryData.error] || `Payment failed: ${retryData.error}`;
-        const error = new Error(errorMessage);
-        throw wrapPaymentError(error);
+        const errorMessage = PAYMENT_ERROR_MESSAGES[retryData.error] || `Payment failed: ${retryData.error}`;
+        throw wrapPaymentError(new Error(errorMessage));
       }
     } catch (error) {
       if (error instanceof PaymentOperationError) {
@@ -493,7 +655,7 @@ function createEvmPaymentFetch(config) {
 // src/utils/payment-helpers.ts
 init_common();
 import { ethers as ethers2 } from "ethers";
-async function makePayment(networkType, merchantId, endpoint = PROD_BACK_URL, additionalParams) {
+async function makePayment(networkType, merchantId, endpoint = PROD_BACK_URL, additionalParams, expectedAddress) {
   const fullEndpoint = `${endpoint}/${merchantId}`;
   let response;
   const requestInit = additionalParams && Object.keys(additionalParams).length > 0 ? {
@@ -503,26 +665,41 @@ async function makePayment(networkType, merchantId, endpoint = PROD_BACK_URL, ad
     }
   } : {};
   if (networkType === "solana" /* SOLANA */ || networkType === "svm" /* SVM */) {
-    const solana = window.solana;
+    const solana = getWalletProviderForPayment(networkType);
     if (!solana) {
-      throw new Error("\u8BF7\u5B89\u88C5 Phantom \u94B1\u5305");
+      throw new Error("Please connect your Solana wallet first.");
     }
     if (!solana.isConnected) {
       await solana.connect();
     }
+    if (expectedAddress && solana.publicKey) {
+      const currentAddress = solana.publicKey.toString();
+      if (currentAddress !== expectedAddress) {
+        throw new Error(
+          `Wallet account mismatch: the current wallet account is ${currentAddress.slice(0, 8)}...\uFF0CBut the desired account is ${expectedAddress.slice(0, 8)}.... Please switch to the correct account in your wallet.`
+        );
+      }
+    }
     response = await handleSvmPayment(fullEndpoint, {
       wallet: solana,
       network: "solana"
       // Will use backend's network configuration
     }, requestInit);
   } else if (networkType === "evm" /* EVM */) {
-    if (!window.ethereum) {
-      throw new Error("\u8BF7\u5B89\u88C5 MetaMask \u94B1\u5305");
+    const ethereum = getWalletProviderForPayment(networkType);
+    if (!ethereum) {
+      throw new Error("Please connect the EVM wallet first");
     }
-    const provider = new ethers2.BrowserProvider(window.ethereum);
+    const provider = new ethers2.BrowserProvider(ethereum);
     const signer = await provider.getSigner();
+    const currentAddress = await signer.getAddress();
+    if (expectedAddress && currentAddress.toLowerCase() !== expectedAddress.toLowerCase()) {
+      throw new Error(
+        `Wallet account mismatch: the current wallet account is ${currentAddress.slice(0, 8)}...\uFF0CBut the desired account is ${expectedAddress.slice(0, 8)}.... Please switch to the correct account in your wallet.`
+      );
+    }
     const wallet = {
-      address: await signer.getAddress(),
+      address: currentAddress,
       signTypedData: async (domain, types, message) => {
         return await signer.signTypedData(domain, types, message);
       },
@@ -533,7 +710,7 @@ async function makePayment(networkType, merchantId, endpoint = PROD_BACK_URL, ad
       },
       // Switch to a different chain
       switchChain: async (chainId) => {
-        await window.ethereum.request({
+        await ethereum.request({
           method: "wallet_switchEthereumChain",
           params: [{ chainId }]
         });
@@ -545,7 +722,7 @@ async function makePayment(networkType, merchantId, endpoint = PROD_BACK_URL, ad
       // Will use backend's network configuration
     }, requestInit);
   } else {
-    throw new Error(`\u4E0D\u652F\u6301\u7684\u7F51\u7EDC\u7C7B\u578B: ${networkType}`);
+    throw new Error(`Unsupported network types: ${networkType}`);
   }
   return response;
 }
@@ -620,6 +797,21 @@ function is402Response(response) {
 }
 
 // src/utils/payment-error-handler.ts
+var IGNORED_402_ERRORS = [
+  "X-PAYMENT header is required",
+  "missing X-PAYMENT header",
+  "payment_required"
+];
+var PAYMENT_ERROR_MESSAGES = {
+  "insufficient_funds": "Insufficient balance to complete this payment",
+  "invalid_signature": "Invalid payment signature",
+  "expired": "Payment authorization has expired",
+  "already_used": "This payment has already been used",
+  "network_mismatch": "Payment network does not match",
+  "invalid_payment": "Invalid payment data",
+  "verification_failed": "Payment verification failed",
+  "invalid_exact_svm_payload_transaction_simulation_failed": "Transaction simulation failed due to insufficient balance. Please check your wallet balance carefully and ensure you have enough funds to cover the payment and transaction fees."
+};
 function parsePaymentError(error) {
   if (!error) {
     return {
@@ -754,7 +946,7 @@ function wrapPaymentError(error) {
 // src/services/svm/payment-header.ts
 async function createSvmPaymentHeader(params) {
   const { wallet, paymentRequirements, x402Version, rpcUrl } = params;
-  const connection = new Connection(rpcUrl, "confirmed");
+  const connection = new Connection(rpcUrl);
   const feePayer = paymentRequirements?.extra?.feePayer;
   if (typeof feePayer !== "string" || !feePayer) {
     throw new Error("Missing facilitator feePayer in payment requirements (extra.feePayer).");
@@ -768,83 +960,85 @@ async function createSvmPaymentHeader(params) {
   if (!paymentRequirements?.payTo) {
     throw new Error("Missing payTo in payment requirements");
   }
-  const destination = new PublicKey(paymentRequirements.payTo);
-  const instructions = [];
-  instructions.push(
-    ComputeBudgetProgram.setComputeUnitLimit({
-      units: 7e3
-      // Sufficient for SPL token transfer
-    })
-  );
-  instructions.push(
-    ComputeBudgetProgram.setComputeUnitPrice({
-      microLamports: 1
-      // Minimal price
-    })
-  );
+  const destinationPubkey = new PublicKey(paymentRequirements.payTo);
   if (!paymentRequirements.asset) {
     throw new Error("Missing token mint for SPL transfer");
   }
   const mintPubkey = new PublicKey(paymentRequirements.asset);
-  const mintInfo = await connection.getAccountInfo(mintPubkey, "confirmed");
-  const programId = mintInfo?.owner?.toBase58() === TOKEN_2022_PROGRAM_ID.toBase58() ? TOKEN_2022_PROGRAM_ID : TOKEN_PROGRAM_ID;
-  const mint = await getMint(connection, mintPubkey, void 0, programId);
-  const sourceAta = await getAssociatedTokenAddress(
+  const mintAccountInfo = await connection.getAccountInfo(mintPubkey);
+  if (!mintAccountInfo) {
+    throw new Error(`Mint account ${mintPubkey.toBase58()} not found`);
+  }
+  const tokenProgramId = mintAccountInfo.owner.equals(TOKEN_2022_PROGRAM_ID) ? TOKEN_2022_PROGRAM_ID : TOKEN_PROGRAM_ID;
+  const mint = await getMint(connection, mintPubkey, void 0, tokenProgramId);
+  const sourceAta = getAssociatedTokenAddressSync(
     mintPubkey,
     userPubkey,
     false,
-    programId
+    tokenProgramId
   );
-  const destinationAta = await getAssociatedTokenAddress(
+  const destinationAta = getAssociatedTokenAddressSync(
     mintPubkey,
-    destination,
+    destinationPubkey,
     false,
-    programId
+    tokenProgramId
   );
-  const sourceAtaInfo = await connection.getAccountInfo(sourceAta, "confirmed");
+  const sourceAtaInfo = await connection.getAccountInfo(sourceAta);
   if (!sourceAtaInfo) {
     throw new Error(
       `User does not have an Associated Token Account for ${paymentRequirements.asset}. Please create one first or ensure you have the required token.`
     );
   }
-  const destAtaInfo = await connection.getAccountInfo(destinationAta, "confirmed");
+  const destAtaInfo = await connection.getAccountInfo(destinationAta);
   if (!destAtaInfo) {
     throw new Error(
       `Destination does not have an Associated Token Account for ${paymentRequirements.asset}. The receiver must create their token account before receiving payments.`
     );
   }
-  const amount = BigInt(paymentRequirements.maxAmountRequired);
-  instructions.push(
+  const instructions = [
+    ComputeBudgetProgram.setComputeUnitLimit({
+      units: 7e3
+      // Sufficient for SPL token transfer
+    }),
+    ComputeBudgetProgram.setComputeUnitPrice({
+      microLamports: 1
+      // Minimal price
+    }),
     createTransferCheckedInstruction(
       sourceAta,
       mintPubkey,
       destinationAta,
       userPubkey,
-      amount,
+      BigInt(paymentRequirements.maxAmountRequired),
       mint.decimals,
       [],
-      programId
+      tokenProgramId
     )
-  );
-  const { blockhash } = await connection.getLatestBlockhash("confirmed");
-  const message = new TransactionMessage({
+  ];
+  const { blockhash } = await connection.getLatestBlockhash();
+  const messageV0 = new TransactionMessage({
     payerKey: feePayerPubkey,
     recentBlockhash: blockhash,
     instructions
   }).compileToV0Message();
-  const transaction = new VersionedTransaction(message);
+  const transaction = new VersionedTransaction(messageV0);
   if (typeof wallet?.signTransaction !== "function") {
     throw new Error("Connected wallet does not support signTransaction");
   }
-  let userSignedTx;
+  let signedTransaction;
   try {
-    userSignedTx = await wallet.signTransaction(transaction);
+    signedTransaction = await wallet.signTransaction(transaction);
     console.log("\u2705 Transaction signed successfully");
   } catch (error) {
     console.error("\u274C Failed to sign transaction:", error);
     throw wrapPaymentError(error);
   }
-  const serializedTransaction = Buffer.from(userSignedTx.serialize()).toString("base64");
+  const serializedBytes = signedTransaction.serialize();
+  let binary = "";
+  for (let i = 0; i < serializedBytes.length; i++) {
+    binary += String.fromCharCode(serializedBytes[i]);
+  }
+  const serializedTransaction = btoa(binary);
   const paymentPayload = {
     x402Version,
     scheme: paymentRequirements.scheme,
@@ -853,7 +1047,7 @@ async function createSvmPaymentHeader(params) {
       transaction: serializedTransaction
     }
   };
-  const paymentHeader = Buffer.from(JSON.stringify(paymentPayload)).toString("base64");
+  const paymentHeader = btoa(JSON.stringify(paymentPayload));
   return paymentHeader;
 }
 function getDefaultSolanaRpcUrl(network) {
@@ -869,7 +1063,7 @@ function getDefaultSolanaRpcUrl(network) {
 // src/services/svm/payment-handler.ts
 init_types();
 async function handleSvmPayment(endpoint, config, requestInit) {
-  const { wallet, network, rpcUrl, maxPaymentAmount } = config;
+  const { wallet, rpcUrl, maxPaymentAmount } = config;
   const initialResponse = await fetch(endpoint, {
     ...requestInit,
     method: requestInit?.method || "POST"
@@ -878,26 +1072,10 @@ async function handleSvmPayment(endpoint, config, requestInit) {
     return initialResponse;
   }
   const rawResponse = await initialResponse.json();
-  const IGNORED_ERRORS = [
-    "X-PAYMENT header is required",
-    "missing X-PAYMENT header",
-    "payment_required"
-  ];
-  if (rawResponse.error && !IGNORED_ERRORS.includes(rawResponse.error)) {
+  if (rawResponse.error && !IGNORED_402_ERRORS.includes(rawResponse.error)) {
     console.error(`\u274C Payment verification failed: ${rawResponse.error}`);
-    const ERROR_MESSAGES = {
-      "insufficient_funds": "Insufficient balance to complete this payment",
-      "invalid_signature": "Invalid payment signature",
-      "expired": "Payment authorization has expired",
-      "already_used": "This payment has already been used",
-      "network_mismatch": "Payment network does not match",
-      "invalid_payment": "Invalid payment data",
-      "verification_failed": "Payment verification failed",
-      "invalid_exact_svm_payload_transaction_simulation_failed": "Transaction simulation failed due to insufficient balance. Please check your wallet balance carefully and ensure you have enough funds to cover the payment and transaction fees."
-    };
-    const errorMessage = ERROR_MESSAGES[rawResponse.error] || `Payment failed: ${rawResponse.error}`;
-    const error = new Error(errorMessage);
-    throw wrapPaymentError(error);
+    const errorMessage = PAYMENT_ERROR_MESSAGES[rawResponse.error] || `Payment failed: ${rawResponse.error}`;
+    throw wrapPaymentError(new Error(errorMessage));
   }
   const x402Version = rawResponse.x402Version;
   const parsedPaymentRequirements = rawResponse.accepts || [];
@@ -947,26 +1125,10 @@ async function handleSvmPayment(endpoint, config, requestInit) {
   if (retryResponse.status === 402) {
     try {
       const retryData = await retryResponse.json();
-      const IGNORED_ERRORS2 = [
-        "X-PAYMENT header is required",
-        "missing X-PAYMENT header",
-        "payment_required"
-      ];
-      if (retryData.error && !IGNORED_ERRORS2.includes(retryData.error)) {
+      if (retryData.error && !IGNORED_402_ERRORS.includes(retryData.error)) {
         console.error(`\u274C Payment verification failed: ${retryData.error}`);
-        const ERROR_MESSAGES = {
-          "insufficient_funds": "Insufficient balance to complete this payment",
-          "invalid_signature": "Invalid payment signature",
-          "expired": "Payment authorization has expired",
-          "already_used": "This payment has already been used",
-          "network_mismatch": "Payment network does not match",
-          "invalid_payment": "Invalid payment data",
-          "verification_failed": "Payment verification failed",
-          "invalid_exact_svm_payload_transaction_simulation_failed": "Transaction simulation failed due to insufficient balance. Please check your wallet balance carefully and ensure you have enough funds to cover the payment and transaction fees."
-        };
-        const errorMessage = ERROR_MESSAGES[retryData.error] || `Payment failed: ${retryData.error}`;
-        const error = new Error(errorMessage);
-        throw wrapPaymentError(error);
+        const errorMessage = PAYMENT_ERROR_MESSAGES[retryData.error] || `Payment failed: ${retryData.error}`;
+        throw wrapPaymentError(new Error(errorMessage));
       }
     } catch (error) {
       if (error instanceof PaymentOperationError) {