@voyage_ai/v402-web-ts 0.3.0 → 1.0.2

package/dist/index.d.mts

@@ -443,6 +443,7 @@ declare function getWalletDisplayName(networkType: NetworkType): string;
  * @param networkType - Network type (from useWallet)
  * @param merchantId - @see our website to apply
  * @param additionalParams - Optional additional parameters to send with the request (default: {})
+ * @param expectedAddress - Optional expected wallet address for validation
  * @returns Response from the payment
  *
  * @example
@@ -453,16 +454,17 @@ declare function getWalletDisplayName(networkType: NetworkType): string;
  *
  * @example
  * ```tsx
- * // With additional parameters
+ * // With additional parameters and address validation
  * const response = await makePayment(
  *   '/api/endpoint',
  *   networkType,
  *   merchantId,
- *   { userId: '123', customField: 'value' }
+ *   { userId: '123', customField: 'value' },
+ *   walletAddress  // Pass the expected address for validation
  * );
  * ```
  */
-declare function makePayment(networkType: NetworkType, merchantId: string, endpoint?: string, additionalParams?: Record<string, any>): Promise<Response>;
+declare function makePayment(networkType: NetworkType, merchantId: string, endpoint?: string, additionalParams?: Record<string, any>, expectedAddress?: string): Promise<Response>;
 
 /**
  * Network utilities

package/dist/index.d.ts

@@ -443,6 +443,7 @@ declare function getWalletDisplayName(networkType: NetworkType): string;
  * @param networkType - Network type (from useWallet)
  * @param merchantId - @see our website to apply
  * @param additionalParams - Optional additional parameters to send with the request (default: {})
+ * @param expectedAddress - Optional expected wallet address for validation
  * @returns Response from the payment
  *
  * @example
@@ -453,16 +454,17 @@ declare function getWalletDisplayName(networkType: NetworkType): string;
  *
  * @example
  * ```tsx
- * // With additional parameters
+ * // With additional parameters and address validation
  * const response = await makePayment(
  *   '/api/endpoint',
  *   networkType,
  *   merchantId,
- *   { userId: '123', customField: 'value' }
+ *   { userId: '123', customField: 'value' },
+ *   walletAddress  // Pass the expected address for validation
  * );
  * ```
  */
-declare function makePayment(networkType: NetworkType, merchantId: string, endpoint?: string, additionalParams?: Record<string, any>): Promise<Response>;
+declare function makePayment(networkType: NetworkType, merchantId: string, endpoint?: string, additionalParams?: Record<string, any>, expectedAddress?: string): Promise<Response>;
 
 /**
  * Network utilities

package/dist/index.js

@@ -182,9 +182,52 @@ function getWalletDisplayName(networkType) {
       return "Unknown Wallet";
   }
 }
+function getAllWalletAddresses() {
+  if (typeof window === "undefined") {
+    return {};
+  }
+  try {
+    const cached = localStorage.getItem(WALLET_ADDRESSES_KEY);
+    return cached ? JSON.parse(cached) : {};
+  } catch (error) {
+    console.error("Failed to parse wallet addresses cache:", error);
+    return {};
+  }
+}
+function saveWalletAddress(networkType, address) {
+  if (typeof window === "undefined") {
+    return;
+  }
+  const addresses = getAllWalletAddresses();
+  addresses[networkType] = address;
+  localStorage.setItem(WALLET_ADDRESSES_KEY, JSON.stringify(addresses));
+}
+function getCachedWalletAddress(networkType) {
+  const addresses = getAllWalletAddresses();
+  return addresses[networkType] || null;
+}
+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 WALLET_ADDRESSES_KEY, CONNECTED_WALLET_IDS_KEY;
 var init_wallet = __esm({
   "src/utils/wallet.ts"() {
     "use strict";
+    WALLET_ADDRESSES_KEY = "wallet_addresses_cache";
+    CONNECTED_WALLET_IDS_KEY = "connected_wallet_ids";
   }
 });
 
@@ -232,6 +275,51 @@ var import_spl_token = require("@solana/spl-token");
 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;
@@ -246,10 +334,118 @@ function initEVMWalletDiscovery() {
   }));
   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;
+    if ((networkType === "solana" /* SOLANA */ || networkType === "svm" /* SVM */) && wallet.provider) {
+      const providerPublicKey = wallet.provider.publicKey?.toString();
+      const cachedAddress = getCachedWalletAddress(networkType);
+      if (providerPublicKey && cachedAddress && providerPublicKey !== cachedAddress) {
+        saveWalletAddress(networkType, providerPublicKey);
+      }
+    }
+    return wallet;
+  }
+  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 */:
@@ -527,7 +723,7 @@ function createEvmPaymentFetch(config) {
 // src/utils/payment-helpers.ts
 var import_ethers2 = require("ethers");
 init_common();
-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 ? {
@@ -539,11 +735,19 @@ async function makePayment(networkType, merchantId, endpoint = PROD_BACK_URL, ad
   if (networkType === "solana" /* SOLANA */ || networkType === "svm" /* SVM */) {
     const solana = getWalletProviderForPayment(networkType);
     if (!solana) {
-      throw new Error("\u8BF7\u5148\u8FDE\u63A5 Solana \u94B1\u5305");
+      throw new Error("Please connect your Solana wallet first.");
     }
     if (!solana.isConnected) {
       await solana.connect();
     }
+    const currentAddress = solana.publicKey?.toString();
+    if (expectedAddress && currentAddress) {
+      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"
@@ -552,12 +756,18 @@ async function makePayment(networkType, merchantId, endpoint = PROD_BACK_URL, ad
   } else if (networkType === "evm" /* EVM */) {
     const ethereum = getWalletProviderForPayment(networkType);
     if (!ethereum) {
-      throw new Error("\u8BF7\u5148\u8FDE\u63A5 EVM \u94B1\u5305");
+      throw new Error("Please connect the EVM wallet first");
     }
     const provider = new import_ethers2.ethers.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);
       },
@@ -580,7 +790,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;
 }