coinley-checkout 0.4.6 → 0.4.9

package/dist/coinley-checkout.es.js

@@ -2236,7 +2236,7 @@ const names = [
   "finney",
   "ether"
 ];
-function parseUnits$2(value, unit) {
+function parseUnits$1(value, unit) {
   assertArgument(typeof value === "string", "value must be a string", "value", value);
   let decimals = 18;
   if (typeof unit === "string") {
@@ -2248,8 +2248,8 @@ function parseUnits$2(value, unit) {
   }
   return FixedNumber.fromString(value, { decimals, width: 512 }).value;
 }
-function parseEther$1(ether) {
-  return parseUnits$2(ether, 18);
+function parseEther(ether) {
+  return parseUnits$1(ether, 18);
 }
 const WordSize = 32;
 const Padding = new Uint8Array(WordSize);
@@ -15107,7 +15107,7 @@ _name = new WeakMap();
 _chainId2 = new WeakMap();
 _plugins = new WeakMap();
 let Network = _Network;
-function parseUnits$1(_value2, decimals) {
+function parseUnits(_value2, decimals) {
   const value = String(_value2);
   if (!value.match(/^[0-9.]+$/)) {
     throw new Error(`invalid gwei value: ${_value2}`);
@@ -15144,8 +15144,8 @@ function getGasStationPlugin(url) {
       const payload = response.bodyJson.standard;
       const feeData = {
         gasPrice: _feeData.gasPrice,
-        maxFeePerGas: parseUnits$1(payload.maxFee, 9),
-        maxPriorityFeePerGas: parseUnits$1(payload.maxPriorityFee, 9)
+        maxFeePerGas: parseUnits(payload.maxFee, 9),
+        maxPriorityFeePerGas: parseUnits(payload.maxPriorityFee, 9)
       };
       return feeData;
     } catch (error) {
@@ -18491,42 +18491,6 @@ const debugWalletEnvironment = () => {
   const wallets = detectWallets();
   console.log("Detected wallets:", wallets);
 };
-const parseEther = (value) => {
-  try {
-    if (parseEther$1) {
-      return parseEther$1(value);
-    }
-    if (void 0)
-      ;
-    const amount = parseFloat(value) * Math.pow(10, 18);
-    return {
-      toString: () => amount.toLocaleString("fullwide", { useGrouping: false })
-    };
-  } catch (error) {
-    const amount = parseFloat(value) * Math.pow(10, 18);
-    return {
-      toString: () => amount.toLocaleString("fullwide", { useGrouping: false })
-    };
-  }
-};
-const parseUnits = (value, decimals) => {
-  try {
-    if (parseUnits$2) {
-      return parseUnits$2(value, decimals);
-    }
-    if (void 0)
-      ;
-    const amount = parseFloat(value) * Math.pow(10, decimals);
-    return {
-      toString: () => amount.toLocaleString("fullwide", { useGrouping: false })
-    };
-  } catch (error) {
-    const amount = parseFloat(value) * Math.pow(10, decimals);
-    return {
-      toString: () => amount.toLocaleString("fullwide", { useGrouping: false })
-    };
-  }
-};
 const connectMetamaskWallet = () => __async(void 0, null, function* () {
   console.log("Connecting to MetaMask wallet...");
   if (!window.ethereum || !window.ethereum.isMetaMask) {
@@ -18534,106 +18498,33 @@ const connectMetamaskWallet = () => __async(void 0, null, function* () {
     throw new Error("MetaMask not detected. Please install MetaMask extension.");
   }
   try {
-    let provider;
-    try {
-      provider = new BrowserProvider(window.ethereum);
-      const accounts = yield provider.send("eth_requestAccounts", []);
-      if (!accounts || accounts.length === 0) {
-        throw new Error("No accounts found");
-      }
-      const address = accounts[0];
-      const network = yield provider.getNetwork();
-      const chainId = Number(network.chainId);
-      let networkType;
-      switch (chainId) {
-        case 1:
-          networkType = NETWORK_TYPES.ETHEREUM;
-          break;
-        case 56:
-          networkType = NETWORK_TYPES.BSC;
-          break;
-        default:
-          networkType = `unknown-${chainId}`;
-      }
-      return {
-        walletType: WALLET_TYPES.METAMASK,
-        address,
-        provider,
-        network: networkType,
-        isConnected: true,
-        chainId
-      };
-    } catch (err) {
-      console.log("Trying fallback ethers provider pattern");
-      if (window.ethereum.request) {
-        const accounts = yield window.ethereum.request({ method: "eth_requestAccounts" });
-        if (!accounts || accounts.length === 0) {
-          throw new Error("No accounts found");
-        }
-        const address = accounts[0];
-        const chainIdHex = yield window.ethereum.request({ method: "eth_chainId" });
-        const chainId = parseInt(chainIdHex, 16);
-        let networkType;
-        switch (chainId) {
-          case 1:
-            networkType = NETWORK_TYPES.ETHEREUM;
-            break;
-          case 56:
-            networkType = NETWORK_TYPES.BSC;
-            break;
-          default:
-            networkType = `unknown-${chainId}`;
-        }
-        const simpleProvider = {
-          getSigner: () => ({
-            getAddress: () => __async(void 0, null, function* () {
-              return address;
-            }),
-            sendTransaction: (tx) => __async(void 0, null, function* () {
-              const txHash = yield window.ethereum.request({
-                method: "eth_sendTransaction",
-                params: [{
-                  from: address,
-                  to: tx.to,
-                  value: tx.value ? tx.value.toString() : "0x0",
-                  gasLimit: tx.gasLimit ? tx.gasLimit.toString() : void 0,
-                  data: tx.data
-                }]
-              });
-              return { hash: txHash };
-            })
-          }),
-          estimateGas: (tx) => __async(void 0, null, function* () {
-            const gasHex = yield window.ethereum.request({
-              method: "eth_estimateGas",
-              params: [{
-                from: address,
-                to: tx.to,
-                value: tx.value ? tx.value : "0x0"
-              }]
-            });
-            return {
-              toString: () => parseInt(gasHex, 16).toString(),
-              mul: (n2) => ({
-                div: (d) => ({
-                  toString: () => Math.floor(parseInt(gasHex, 16) * n2 / d).toString()
-                })
-              })
-            };
-          })
-        };
-        return {
-          walletType: WALLET_TYPES.METAMASK,
-          address,
-          provider: simpleProvider,
-          network: networkType,
-          isConnected: true,
-          chainId
-        };
-      } else {
-        throw new Error("Unsupported wallet interface");
-      }
+    const accounts = yield window.ethereum.request({ method: "eth_requestAccounts" });
+    if (!accounts || accounts.length === 0) {
+      throw new Error("No accounts found");
+    }
+    const address = accounts[0];
+    const chainIdHex = yield window.ethereum.request({ method: "eth_chainId" });
+    const chainId = parseInt(chainIdHex, 16);
+    let networkType;
+    switch (chainId) {
+      case 1:
+        networkType = NETWORK_TYPES.ETHEREUM;
+        break;
+      case 56:
+        networkType = NETWORK_TYPES.BSC;
+        break;
+      default:
+        networkType = `unknown-${chainId}`;
     }
+    const web3Provider = new BrowserProvider(window.ethereum);
+    return {
+      walletType: WALLET_TYPES.METAMASK,
+      address,
+      provider: web3Provider,
+      network: networkType,
+      isConnected: true,
+      chainId
+    };
   } catch (error) {
     console.error("Error connecting to MetaMask:", error);
     throw error;
@@ -18646,74 +18537,33 @@ const connectTrustWallet = () => __async(void 0, null, function* () {
     throw new Error("Trust Wallet not detected. Please install Trust Wallet.");
   }
   try {
-    if (window.ethereum.request) {
-      const accounts = yield window.ethereum.request({ method: "eth_requestAccounts" });
-      if (!accounts || accounts.length === 0) {
-        throw new Error("No accounts found");
-      }
-      const address = accounts[0];
-      const chainIdHex = yield window.ethereum.request({ method: "eth_chainId" });
-      const chainId = parseInt(chainIdHex, 16);
-      let networkType;
-      switch (chainId) {
-        case 1:
-          networkType = NETWORK_TYPES.ETHEREUM;
-          break;
-        case 56:
-          networkType = NETWORK_TYPES.BSC;
-          break;
-        default:
-          networkType = `unknown-${chainId}`;
-      }
-      const simpleProvider = {
-        getSigner: () => ({
-          getAddress: () => __async(void 0, null, function* () {
-            return address;
-          }),
-          sendTransaction: (tx) => __async(void 0, null, function* () {
-            const txHash = yield window.ethereum.request({
-              method: "eth_sendTransaction",
-              params: [{
-                from: address,
-                to: tx.to,
-                value: tx.value ? tx.value.toString() : "0x0",
-                gasLimit: tx.gasLimit ? tx.gasLimit.toString() : void 0,
-                data: tx.data
-              }]
-            });
-            return { hash: txHash };
-          })
-        }),
-        estimateGas: (tx) => __async(void 0, null, function* () {
-          const gasHex = yield window.ethereum.request({
-            method: "eth_estimateGas",
-            params: [{
-              from: address,
-              to: tx.to,
-              value: tx.value ? tx.value : "0x0"
-            }]
-          });
-          return {
-            toString: () => parseInt(gasHex, 16).toString(),
-            mul: (n2) => ({
-              div: (d) => ({
-                toString: () => Math.floor(parseInt(gasHex, 16) * n2 / d).toString()
-              })
-            })
-          };
-        })
-      };
-      return {
-        walletType: WALLET_TYPES.TRUST_WALLET,
-        address,
-        provider: simpleProvider,
-        network: networkType,
-        isConnected: true,
-        chainId
-      };
-    } else {
-      throw new Error("Unsupported wallet interface");
+    const accounts = yield window.ethereum.request({ method: "eth_requestAccounts" });
+    if (!accounts || accounts.length === 0) {
+      throw new Error("No accounts found");
+    }
+    const address = accounts[0];
+    const chainIdHex = yield window.ethereum.request({ method: "eth_chainId" });
+    const chainId = parseInt(chainIdHex, 16);
+    let networkType;
+    switch (chainId) {
+      case 1:
+        networkType = NETWORK_TYPES.ETHEREUM;
+        break;
+      case 56:
+        networkType = NETWORK_TYPES.BSC;
+        break;
+      default:
+        networkType = `unknown-${chainId}`;
     }
+    const web3Provider = new BrowserProvider(window.ethereum);
+    return {
+      walletType: WALLET_TYPES.TRUST_WALLET,
+      address,
+      provider: web3Provider,
+      network: networkType,
+      isConnected: true,
+      chainId
+    };
   } catch (error) {
     console.error("Error connecting to Trust Wallet:", error);
     throw error;
@@ -18818,7 +18668,7 @@ const sendNativeTransaction = (walletConnection, toAddress, amount) => __async(v
       case WALLET_TYPES.METAMASK:
       case WALLET_TYPES.TRUST_WALLET:
         const provider = walletConnection.provider;
-        const signer = provider.getSigner();
+        const signer = yield provider.getSigner();
         const amountInEther = amount.toString();
         const amountWei = parseEther(amountInEther);
         console.log("Sending ETH/BNB:", {
@@ -18827,12 +18677,11 @@ const sendNativeTransaction = (walletConnection, toAddress, amount) => __async(v
         });
         const gasEstimate = yield provider.estimateGas({
           to: toAddress,
-          value: amountWei
+          value: amountWei,
+          from: yield signer.getAddress()
         });
         console.log("Gas estimate:", gasEstimate.toString());
-        const gasLimit = typeof gasEstimate.mul === "function" ? gasEstimate.mul(110).div(100) : {
-          toString: () => Math.floor(parseInt(gasEstimate.toString()) * 1.1).toString()
-        };
+        const gasLimit = gasEstimate * BigInt(110) / BigInt(100);
         console.log("Using gas limit:", gasLimit.toString());
         transaction = yield signer.sendTransaction({
           to: toAddress,
@@ -18879,6 +18728,25 @@ const sendNativeTransaction = (walletConnection, toAddress, amount) => __async(v
     throw error;
   }
 });
+const sendTransaction = (walletConnection, transactionDetails) => __async(void 0, null, function* () {
+  var _a2;
+  console.log("Sending transaction with:", transactionDetails);
+  if (!walletConnection) {
+    throw new Error("Wallet not connected");
+  }
+  const { to, amount, tokenAddress, currency, network } = transactionDetails;
+  if (!to) {
+    throw new Error("Recipient address not provided");
+  }
+  const tokenConfig = (_a2 = TOKEN_CONFIG[currency]) == null ? void 0 : _a2[network];
+  if (tokenConfig && tokenConfig.isNative) {
+    return sendNativeTransaction(walletConnection, to, amount);
+  } else if (tokenConfig) {
+    return sendTokenTransaction(walletConnection, tokenConfig, to, amount);
+  } else {
+    return sendNativeTransaction(walletConnection, to, amount);
+  }
+});
 const sendTokenTransaction = (walletConnection, tokenConfig, toAddress, amount) => __async(void 0, null, function* () {
   console.log("Sending token transaction with:", { tokenConfig, toAddress, amount });
   if (!walletConnection || !walletConnection.provider) {
@@ -18910,11 +18778,11 @@ const sendERC20Transaction = (walletConnection, tokenConfig, toAddress, amount)
     throw new Error("Wallet not connected");
   }
   const provider = walletConnection.provider;
-  const signer = provider.getSigner();
+  const signer = yield provider.getSigner();
   const { contractAddress, decimals, symbol } = tokenConfig;
   const tokenAmount = parseFloat(amount);
   const tokenDecimals = parseInt(decimals);
-  const tokenUnits = parseUnits(tokenAmount.toString(), tokenDecimals);
+  const tokenUnits = parseUnits$1(tokenAmount.toString(), tokenDecimals);
   console.log(`Sending ${tokenAmount} ${symbol} (${tokenUnits.toString()} base units) to ${toAddress}`);
   try {
     const tokenContract = new Contract(
@@ -18923,9 +18791,10 @@ const sendERC20Transaction = (walletConnection, tokenConfig, toAddress, amount)
       signer
     );
     try {
-      const gasEstimate = yield tokenContract.estimateGas.transfer(toAddress, tokenUnits);
+      const gasEstimate = yield tokenContract.transfer.estimateGas(toAddress, tokenUnits);
       console.log("Gas estimate:", gasEstimate.toString());
-      const gasLimit = symbol === "USDC" ? typeof gasEstimate.mul === "function" ? gasEstimate.mul(120).div(100) : { toString: () => Math.floor(parseInt(gasEstimate.toString()) * 1.2).toString() } : typeof gasEstimate.mul === "function" ? gasEstimate.mul(110).div(100) : { toString: () => Math.floor(parseInt(gasEstimate.toString()) * 1.1).toString() };
+      const gasMultiplier = symbol === "USDC" ? BigInt(120) : BigInt(110);
+      const gasLimit = gasEstimate * gasMultiplier / BigInt(100);
       console.log("Using gas limit:", gasLimit.toString());
       const transaction = yield tokenContract.transfer(toAddress, tokenUnits, {
         gasLimit
@@ -18937,7 +18806,8 @@ const sendERC20Transaction = (walletConnection, tokenConfig, toAddress, amount)
       if (symbol === "USDC") {
         console.log("Trying USDC transaction with fixed gas limit");
         const transaction = yield tokenContract.transfer(toAddress, tokenUnits, {
-          gasLimit: 15e4
+          gasLimit: BigInt(15e4)
+          // Higher fixed gas limit for USDC
         });
         console.log("Transaction sent with fixed gas limit:", transaction);
         return transaction.hash;
@@ -19034,86 +18904,91 @@ const sendAlgorandAssetTransaction = (walletConnection, tokenConfig, toAddress,
     }
   }
 });
-const sendTransaction = (walletConnection, transactionParams) => __async(void 0, null, function* () {
-  console.log("sendTransaction called with:", transactionParams);
-  if (!walletConnection) {
-    throw new Error("Wallet not connected");
-  }
-  const { to, toAddress, amount, tokenAddress, tokenConfig, currency, network } = transactionParams;
-  const recipientAddress = to || toAddress;
-  if (!recipientAddress) {
-    throw new Error("Recipient address not provided");
-  }
-  if (!tokenAddress && !tokenConfig) {
-    return sendNativeTransaction(walletConnection, recipientAddress, amount);
-  }
-  let tokenConfiguration = tokenConfig;
-  if (!tokenConfiguration && tokenAddress) {
-    tokenConfiguration = {
-      contractAddress: tokenAddress,
-      decimals: 18,
-      symbol: currency || "TOKEN"
-    };
-  }
-  if (!tokenConfiguration) {
-    throw new Error("Token configuration not provided");
-  }
-  return sendTokenTransaction(walletConnection, tokenConfiguration, recipientAddress, amount);
-});
 let apiConfig = {
   apiKey: null,
   apiSecret: null,
   apiUrl: "https://coinleyserver-production.up.railway.app",
-  merchantWalletAddresses: {}
-  // This will be populated dynamically
+  merchantWalletAddresses: {},
+  authToken: null
 };
-const initializeApi = (config) => {
+const initializeApi = (config) => __async(void 0, null, function* () {
   apiConfig = __spreadValues(__spreadValues({}, apiConfig), config);
   console.log("API initialized with:", {
     apiUrl: apiConfig.apiUrl,
     apiKey: apiConfig.apiKey ? `${apiConfig.apiKey.substring(0, 6)}...` : null,
     hasWalletAddresses: Object.keys(apiConfig.merchantWalletAddresses || {}).length > 0
   });
-};
-const setMerchantWalletAddresses = (walletAddresses) => {
-  apiConfig.merchantWalletAddresses = __spreadValues({}, walletAddresses);
-  console.log("Updated merchant wallet addresses:", apiConfig.merchantWalletAddresses);
-};
+  try {
+    yield authenticateAndFetchWallets();
+  } catch (error) {
+    console.error("Failed to fetch merchant wallets during initialization:", error);
+  }
+});
+const authenticateAndFetchWallets = () => __async(void 0, null, function* () {
+  try {
+    console.log("Authenticating and fetching merchant wallets...");
+    const tempToken = btoa(`${apiConfig.apiKey}:${apiConfig.apiSecret}`);
+    const response = yield fetch(`${apiConfig.apiUrl}/api/merchants/dashboard`, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+        "Authorization": `Bearer ${tempToken}`,
+        "x-api-key": apiConfig.apiKey,
+        "x-api-secret": apiConfig.apiSecret
+      }
+    });
+    if (response.ok) {
+      const data = yield response.json();
+      console.log("Merchant dashboard data received:", data);
+      if (data.merchant) {
+        const walletAddresses = {};
+        if (data.merchant.walletAddress) {
+          walletAddresses.ethereum = data.merchant.walletAddress;
+        }
+        if (data.merchant.solWalletAddress) {
+          walletAddresses.solana = data.merchant.solWalletAddress;
+        }
+        if (data.merchant.merchantWallets) {
+          Object.assign(walletAddresses, data.merchant.merchantWallets);
+        }
+        apiConfig.merchantWalletAddresses = walletAddresses;
+        console.log("Merchant wallet addresses retrieved:", walletAddresses);
+        return walletAddresses;
+      }
+    } else {
+      console.error("Failed to fetch merchant dashboard:", response.status);
+    }
+  } catch (error) {
+    console.error("Error fetching merchant wallets:", error);
+  }
+  return {};
+});
+const getMerchantWallets = () => __async(void 0, null, function* () {
+  if (Object.keys(apiConfig.merchantWalletAddresses).length === 0) {
+    yield authenticateAndFetchWallets();
+  }
+  return apiConfig.merchantWalletAddresses;
+});
 const getHeaders = () => {
   return {
     "Content-Type": "application/json",
     "x-api-key": apiConfig.apiKey,
-    "x-api-secret": apiConfig.apiSecret
+    "x-api-secret": apiConfig.apiSecret,
+    "Authorization": apiConfig.authToken ? `Bearer ${apiConfig.authToken}` : void 0
   };
 };
 const createPayment = (paymentData) => __async(void 0, null, function* () {
-  var _a2;
   try {
     console.log("Creating payment with data:", paymentData);
-    console.log("API URL:", `${apiConfig.apiUrl}/api/payments/create`);
     if (!paymentData.amount) {
       throw new Error("Payment amount is required");
     }
+    const merchantWallets = yield getMerchantWallets();
+    console.log("Using merchant wallets:", merchantWallets);
     const enhancedPaymentData = __spreadProps(__spreadValues({}, paymentData), {
-      // Primary recipient address (highest priority)
-      recipientAddress: paymentData.recipientAddress || paymentData.toAddress || paymentData.walletAddress,
-      // Merchant wallet addresses (for network switching)
-      merchantWalletAddresses: __spreadValues(__spreadValues({}, apiConfig.merchantWalletAddresses), paymentData.merchantWalletAddresses),
-      // Legacy support
-      walletAddress: paymentData.walletAddress || paymentData.recipientAddress || paymentData.toAddress,
-      // Alternative naming
-      toAddress: paymentData.toAddress || paymentData.recipientAddress || paymentData.walletAddress
-    });
-    const network = enhancedPaymentData.network || "ethereum";
-    const recipientAddress = enhancedPaymentData.recipientAddress || ((_a2 = enhancedPaymentData.merchantWalletAddresses) == null ? void 0 : _a2[network]);
-    if (!recipientAddress) {
-      throw new Error(`No recipient address provided for network: ${network}. Please configure a wallet address.`);
-    }
-    console.log("Enhanced payment data:", {
-      network,
-      recipientAddress,
-      merchantWalletAddresses: enhancedPaymentData.merchantWalletAddresses
+      merchantWalletAddresses: __spreadValues(__spreadValues({}, merchantWallets), paymentData.merchantWalletAddresses)
     });
+    console.log("Enhanced payment data:", enhancedPaymentData);
     const response = yield fetch(`${apiConfig.apiUrl}/api/payments/create`, {
       method: "POST",
       headers: getHeaders(),
@@ -19131,10 +19006,7 @@ const createPayment = (paymentData) => __async(void 0, null, function* () {
       throw new Error(errorData.error || `Failed to create payment: ${response.status}`);
     }
     const data = yield response.json();
-    console.log("Create payment response data:", data);
-    if (data.merchantConfig && data.merchantConfig.walletAddresses) {
-      setMerchantWalletAddresses(data.merchantConfig.walletAddresses);
-    }
+    console.log("Payment created successfully:", data);
     return data;
   } catch (error) {
     console.error("Create payment error:", error);
@@ -19178,17 +19050,10 @@ const processPayment = (processData) => __async(void 0, null, function* () {
     if (!processData.transactionHash) {
       throw new Error("Transaction hash is required");
     }
-    const enhancedProcessData = __spreadProps(__spreadValues({}, processData), {
-      // Include timestamp
-      processedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      // Include source information
-      source: "coinley_checkout"
-    });
-    console.log("API URL:", `${apiConfig.apiUrl}/api/payments/process`);
     const response = yield fetch(`${apiConfig.apiUrl}/api/payments/process`, {
       method: "POST",
       headers: getHeaders(),
-      body: JSON.stringify(enhancedProcessData)
+      body: JSON.stringify(processData)
     });
     console.log("Process payment response status:", response.status);
     if (!response.ok) {
@@ -19209,73 +19074,51 @@ const processPayment = (processData) => __async(void 0, null, function* () {
     throw error;
   }
 });
-const getMerchantWallets = (merchantToken) => __async(void 0, null, function* () {
+const getSupportedNetworks = () => __async(void 0, null, function* () {
   try {
-    const response = yield fetch(`${apiConfig.apiUrl}/api/merchants/wallets`, {
+    const response = yield fetch(`${apiConfig.apiUrl}/api/networks`, {
       method: "GET",
-      headers: {
-        "Content-Type": "application/json",
-        "Authorization": `Bearer ${merchantToken}`
-      }
+      headers: getHeaders()
     });
     if (!response.ok) {
       let errorData;
       try {
         errorData = yield response.json();
       } catch (e) {
-        throw new Error(`Failed to get merchant wallets: ${response.status} ${response.statusText}`);
+        throw new Error(`Failed to get networks: ${response.status} ${response.statusText}`);
       }
-      throw new Error(errorData.error || `Failed to get merchant wallets: ${response.status}`);
+      throw new Error(errorData.error || `Failed to get networks: ${response.status}`);
     }
     const data = yield response.json();
-    if (data.merchantWallets) {
-      setMerchantWalletAddresses(data.merchantWallets);
-    }
     return data;
   } catch (error) {
-    console.error("Get merchant wallets error:", error);
+    console.error("Get supported networks error:", error);
     throw error;
   }
 });
-const getSupportedNetworks = () => __async(void 0, null, function* () {
+const validateWalletAddress = (address, network) => __async(void 0, null, function* () {
   try {
-    const response = yield fetch(`${apiConfig.apiUrl}/api/networks`, {
-      method: "GET",
-      headers: getHeaders()
+    const response = yield fetch(`${apiConfig.apiUrl}/api/wallets/validate`, {
+      method: "POST",
+      headers: getHeaders(),
+      body: JSON.stringify({ address, network })
     });
     if (!response.ok) {
       let errorData;
       try {
         errorData = yield response.json();
       } catch (e) {
-        throw new Error(`Failed to get networks: ${response.status} ${response.statusText}`);
+        throw new Error(`Failed to validate address: ${response.status} ${response.statusText}`);
       }
-      throw new Error(errorData.error || `Failed to get networks: ${response.status}`);
+      throw new Error(errorData.error || `Failed to validate address: ${response.status}`);
     }
     const data = yield response.json();
     return data;
   } catch (error) {
-    console.error("Get supported networks error:", error);
+    console.error("Validate wallet address error:", error);
     throw error;
   }
 });
-const validateWalletAddress = (address, network) => {
-  if (!address || typeof address !== "string")
-    return false;
-  switch (network.toLowerCase()) {
-    case "ethereum":
-    case "bsc":
-      return /^0x[a-fA-F0-9]{40}$/.test(address);
-    case "tron":
-      return /^T[a-zA-Z0-9]{33}$/.test(address);
-    case "algorand":
-      return /^[A-Z2-7]{58}$/.test(address);
-    case "solana":
-      return /^[1-9A-HJ-NP-Za-km-z]{32,44}$/.test(address);
-    default:
-      return address.length > 10;
-  }
-};
 const generateMockTransactionHash = (network = "ethereum") => {
   const prefixes = {
     ethereum: "0x",
@@ -19287,37 +19130,6 @@ const generateMockTransactionHash = (network = "ethereum") => {
   const hash2 = Array.from({ length: 64 }, () => Math.floor(Math.random() * 16).toString(16)).join("");
   return `${prefix}${hash2}`;
 };
-const getMerchantProfile = () => __async(void 0, null, function* () {
-  try {
-    const response = yield fetch(`${apiConfig.apiUrl}/api/merchants/profile`, {
-      method: "GET",
-      headers: getHeaders()
-    });
-    if (!response.ok) {
-      let errorData;
-      try {
-        errorData = yield response.json();
-      } catch (e) {
-        throw new Error(`Failed to get merchant profile: ${response.status} ${response.statusText}`);
-      }
-      throw new Error(errorData.error || `Failed to get merchant profile: ${response.status}`);
-    }
-    const data = yield response.json();
-    if (data.merchant && data.merchant.walletAddresses) {
-      apiConfig.merchantWalletAddresses = __spreadValues(__spreadValues({}, apiConfig.merchantWalletAddresses), data.merchant.walletAddresses);
-    }
-    return data;
-  } catch (error) {
-    console.error("Get merchant profile error:", error);
-    throw error;
-  }
-});
-const fetchMerchantWalletAddresses = (merchantToken) => __async(void 0, null, function* () {
-  return getMerchantWallets(merchantToken);
-});
-const getApiConfig = () => {
-  return __spreadValues({}, apiConfig);
-};
 var jsxRuntime = { exports: {} };
 var reactJsxRuntime_production_min = {};
 /**
@@ -19369,45 +19181,55 @@ const CoinleyProvider = ({
   apiSecret,
   apiUrl = "https://coinleyserver-production.up.railway.app",
   merchantWalletAddress = null,
-  // New prop for merchant wallet address
+  // Legacy prop for backward compatibility
   merchantSolWalletAddress = null,
-  // New prop for Solana wallet address
+  // Legacy prop for backward compatibility
   debug = false,
   children
 }) => {
   const [isInitialized, setIsInitialized] = useState(false);
   const [error, setError] = useState(null);
   const [paymentData, setPaymentData] = useState(null);
+  const [merchantWallets, setMerchantWallets] = useState({});
   useEffect(() => {
     if (!apiKey || !apiSecret) {
       setError("API key and secret are required");
       return;
     }
-    try {
-      initializeApi({
-        apiKey,
-        apiSecret,
-        apiUrl,
-        merchantWalletAddress,
-        // Pass wallet address to API service
-        merchantSolWalletAddress
-      });
-      setIsInitialized(true);
-      if (debug) {
-        console.log("Coinley SDK initialized with:", {
+    const initializeSDK = () => __async(void 0, null, function* () {
+      try {
+        yield initializeApi({
           apiKey,
+          apiSecret,
           apiUrl,
-          merchantWalletAddress: merchantWalletAddress ? `${merchantWalletAddress.substring(0, 6)}...${merchantWalletAddress.substring(merchantWalletAddress.length - 4)}` : "Not provided",
-          merchantSolWalletAddress: merchantSolWalletAddress ? `${merchantSolWalletAddress.substring(0, 6)}...${merchantSolWalletAddress.substring(merchantSolWalletAddress.length - 4)}` : "Not provided"
+          debug
         });
+        const wallets = yield getMerchantWallets();
+        const allWallets = __spreadValues(__spreadValues(__spreadValues({}, wallets), merchantWalletAddress && { ethereum: merchantWalletAddress }), merchantSolWalletAddress && { solana: merchantSolWalletAddress });
+        setMerchantWallets(allWallets);
+        setIsInitialized(true);
+        if (debug) {
+          console.log("Coinley SDK initialized successfully with wallets:", allWallets);
+        }
+      } catch (err) {
+        setError(err.message);
+        if (debug) {
+          console.error("Coinley SDK initialization error:", err);
+        }
       }
+    });
+    initializeSDK();
+  }, [apiKey, apiSecret, apiUrl, merchantWalletAddress, merchantSolWalletAddress, debug]);
+  const refreshMerchantWallets = () => __async(void 0, null, function* () {
+    try {
+      const wallets = yield getMerchantWallets();
+      setMerchantWallets(wallets);
+      return wallets;
     } catch (err) {
-      setError(err.message);
-      if (debug) {
-        console.error("Coinley SDK initialization error:", err);
-      }
+      console.error("Failed to refresh merchant wallets:", err);
+      return merchantWallets;
     }
-  }, [apiKey, apiSecret, apiUrl, merchantWalletAddress, merchantSolWalletAddress, debug]);
+  });
   const storePaymentData = (data) => {
     setPaymentData(data);
     return data;
@@ -19417,12 +19239,17 @@ const CoinleyProvider = ({
     apiSecret,
     apiUrl,
     merchantWalletAddress,
+    // Legacy
     merchantSolWalletAddress,
+    // Legacy
+    merchantWallets,
+    // New: All merchant wallets
     isInitialized,
     error,
     debug,
     paymentData,
-    storePaymentData
+    storePaymentData,
+    refreshMerchantWallets
   };
   return /* @__PURE__ */ jsxRuntimeExports.jsx(CoinleyContext.Provider, { value, children });
 };
@@ -21464,6 +21291,7 @@ const CoinleyCheckout = forwardRef(({
   customerEmail,
   merchantName = "Merchant",
   merchantWalletAddresses = {},
+  // This will be overridden by backend data
   onSuccess,
   onError,
   onClose,
@@ -21486,31 +21314,34 @@ const CoinleyCheckout = forwardRef(({
   const [walletConnection, setWalletConnection] = useState(null);
   const [availableWallets, setAvailableWallets] = useState({});
   const [step, setStep] = useState("select-currency");
-  const [merchantWallets, setMerchantWallets] = useState({});
-  const [isLoadingWallets, setIsLoadingWallets] = useState(false);
+  const [actualMerchantWallets, setActualMerchantWallets] = useState({});
   const effectiveApiKey = apiKey || (coinleyContext == null ? void 0 : coinleyContext.apiKey);
   const effectiveApiSecret = apiSecret || (coinleyContext == null ? void 0 : coinleyContext.apiSecret);
   apiUrl || (coinleyContext == null ? void 0 : coinleyContext.apiUrl);
   const effectiveTheme = theme || contextTheme;
   const effectiveDebug = debug || (coinleyContext == null ? void 0 : coinleyContext.debug);
   const effectiveSupportedNetworks = supportedNetworks.length > 0 ? supportedNetworks : [NETWORK_TYPES.ETHEREUM, NETWORK_TYPES.BSC, NETWORK_TYPES.TRON, NETWORK_TYPES.ALGORAND];
-  useImperativeHandle(ref, () => ({
-    open: (paymentDetails) => {
-      handleOpen(paymentDetails);
-    },
-    close: () => {
-      handleClose();
-    },
-    getPayment: () => payment,
-    getWalletConnection: () => walletConnection,
-    getMerchantWallets: () => merchantWallets,
-    debugWallets: () => debugWalletEnvironment()
-  }));
   const log = (message, data) => {
     if (effectiveDebug) {
       console.log(`[Coinley SDK] ${message}`, data);
     }
   };
+  useEffect(() => {
+    const fetchMerchantWallets = () => __async(void 0, null, function* () {
+      try {
+        log("Fetching merchant wallet addresses from backend...");
+        const wallets = yield getMerchantWallets();
+        setActualMerchantWallets(wallets);
+        log("Merchant wallets fetched successfully:", wallets);
+      } catch (error2) {
+        console.error("Failed to fetch merchant wallets:", error2);
+        setActualMerchantWallets(merchantWalletAddresses);
+      }
+    });
+    if (effectiveApiKey && effectiveApiSecret) {
+      fetchMerchantWallets();
+    }
+  }, [effectiveApiKey, effectiveApiSecret, merchantWalletAddresses]);
   useEffect(() => {
     if (typeof window !== "undefined") {
       const detectWalletsAsync = () => __async(void 0, null, function* () {
@@ -21521,44 +21352,18 @@ const CoinleyCheckout = forwardRef(({
       detectWalletsAsync();
     }
   }, [effectiveDebug]);
-  useEffect(() => {
-    const loadMerchantWallets = () => __async(void 0, null, function* () {
-      if (!effectiveApiKey || !effectiveApiSecret) {
-        log("No API credentials available for wallet address fetching");
-        return;
-      }
-      setIsLoadingWallets(true);
-      try {
-        const apiConfig2 = getApiConfig();
-        if (apiConfig2.merchantWalletAddresses && Object.keys(apiConfig2.merchantWalletAddresses).length > 0) {
-          setMerchantWallets(apiConfig2.merchantWalletAddresses);
-          log("Loaded wallet addresses from API config:", apiConfig2.merchantWalletAddresses);
-        } else {
-          const walletAddresses = yield fetchMerchantWalletAddresses();
-          if (walletAddresses && Object.keys(walletAddresses).length > 0) {
-            setMerchantWallets(walletAddresses);
-            log("Fetched wallet addresses from API:", walletAddresses);
-          } else {
-            log("No wallet addresses found in API response");
-          }
-        }
-        if (merchantWalletAddresses && Object.keys(merchantWalletAddresses).length > 0) {
-          setMerchantWallets((prev) => __spreadValues(__spreadValues({}, prev), merchantWalletAddresses));
-          log("Added manual wallet addresses:", merchantWalletAddresses);
-        }
-      } catch (error2) {
-        log("Error loading merchant wallet addresses:", error2);
-        console.warn("Could not load merchant wallet addresses:", error2.message);
-        if (merchantWalletAddresses && Object.keys(merchantWalletAddresses).length > 0) {
-          setMerchantWallets(merchantWalletAddresses);
-          log("Using fallback manual wallet addresses:", merchantWalletAddresses);
-        }
-      } finally {
-        setIsLoadingWallets(false);
-      }
-    });
-    loadMerchantWallets();
-  }, [effectiveApiKey, effectiveApiSecret, merchantWalletAddresses, effectiveDebug]);
+  useImperativeHandle(ref, () => ({
+    open: (paymentDetails) => {
+      handleOpen(paymentDetails);
+    },
+    close: () => {
+      handleClose();
+    },
+    getPayment: () => payment,
+    getWalletConnection: () => walletConnection,
+    debugWallets: () => debugWalletEnvironment(),
+    getMerchantWallets: () => actualMerchantWallets
+  }));
   const handleOpen = (paymentDetails) => __async(void 0, null, function* () {
     if (!paymentDetails || !paymentDetails.amount) {
       setError("Payment amount is required");
@@ -21571,26 +21376,13 @@ const CoinleyCheckout = forwardRef(({
     setStep("select-currency");
     try {
       log("Creating payment with details:", paymentDetails);
-      let finalWalletAddresses = __spreadValues({}, merchantWallets);
-      if (Object.keys(finalWalletAddresses).length === 0) {
-        log("No wallet addresses available, attempting to fetch...");
-        try {
-          const fetchedWallets = yield fetchMerchantWalletAddresses();
-          if (fetchedWallets) {
-            finalWalletAddresses = fetchedWallets;
-            setMerchantWallets(fetchedWallets);
-          }
-        } catch (fetchError) {
-          log("Failed to fetch wallet addresses:", fetchError);
-        }
-      }
-      if (paymentDetails.merchantWalletAddresses) {
-        finalWalletAddresses = __spreadValues(__spreadValues({}, finalWalletAddresses), paymentDetails.merchantWalletAddresses);
+      let walletAddresses = actualMerchantWallets;
+      if (Object.keys(walletAddresses).length === 0) {
+        log("No wallet addresses found, fetching from backend...");
+        walletAddresses = yield getMerchantWallets();
+        setActualMerchantWallets(walletAddresses);
       }
-      if (merchantWalletAddresses) {
-        finalWalletAddresses = __spreadValues(__spreadValues({}, finalWalletAddresses), merchantWalletAddresses);
-      }
-      log("Final wallet addresses for payment:", finalWalletAddresses);
+      log("Using wallet addresses:", walletAddresses);
       const paymentResponse = yield createPayment({
         amount: paymentDetails.amount,
         currency: paymentDetails.currency || "USDT",
@@ -21598,24 +21390,15 @@ const CoinleyCheckout = forwardRef(({
         customerEmail: paymentDetails.customerEmail || customerEmail,
         callbackUrl: paymentDetails.callbackUrl,
         metadata: __spreadProps(__spreadValues({}, paymentDetails.metadata), {
-          sdkVersion: "1.0.0",
-          merchantWallets: finalWalletAddresses
+          merchantWalletAddresses: walletAddresses
         }),
-        merchantWalletAddresses: finalWalletAddresses
+        merchantWalletAddresses: walletAddresses
       });
       log("Payment created:", paymentResponse);
-      if (paymentResponse.payment) {
-        setPayment(paymentResponse.payment);
-        if (paymentResponse.merchantConfig && paymentResponse.merchantConfig.walletAddresses) {
-          setMerchantWallets((prev) => __spreadValues(__spreadValues({}, prev), paymentResponse.merchantConfig.walletAddresses));
-          log("Updated wallet addresses from payment response:", paymentResponse.merchantConfig.walletAddresses);
-        }
-        setPaymentStatus("idle");
-        setError(null);
-      } else {
-        throw new Error("Invalid payment response structure");
-      }
-      log("Payment created and state updated successfully");
+      setPayment(paymentResponse.payment);
+      setPaymentStatus("idle");
+      setError(null);
+      log("Payment created and state updated");
     } catch (err) {
       log("Error creating payment:", err);
       setError(err.message || "Failed to create payment");
@@ -21630,67 +21413,60 @@ const CoinleyCheckout = forwardRef(({
     setWalletConnection(null);
     setSelectedPaymentMethod(null);
     setStep("select-currency");
-    setError(null);
     if (onClose)
       onClose();
   };
   const handlePaymentMethodSelect = (paymentMethod) => {
+    console.log("=== PAYMENT METHOD SELECTION DEBUG ===");
+    console.log("1. Payment method selected:", paymentMethod);
+    console.log("2. Current step before:", step);
     log("Payment method selected:", paymentMethod);
     setSelectedPaymentMethod(paymentMethod);
     setStep("confirm");
+    console.log("3. Step should now be: confirm");
+    console.log("=== END PAYMENT METHOD SELECTION DEBUG ===");
   };
   const handleBack = () => {
     if (step === "confirm") {
       setStep("select-currency");
       setWalletConnection(null);
-      setError(null);
     } else if (step === "error") {
       setStep("confirm");
-      setError(null);
     }
   };
   const handleConnectWallet = (walletType) => __async(void 0, null, function* () {
+    console.log("=== WALLET CONNECTION DEBUG ===");
+    console.log("1. Wallet type requested:", walletType);
+    console.log("2. Selected payment method:", selectedPaymentMethod);
+    console.log("3. Available wallets:", availableWallets);
+    console.log("4. Current step:", step);
     if (!selectedPaymentMethod) {
+      console.error("No payment method selected");
       setError("Please select a payment method first");
       return;
     }
     try {
+      console.log("5. Attempting to connect wallet...");
       setError(null);
       log("Connecting wallet:", { walletType, network: selectedPaymentMethod.network });
       const connection = yield connectWallet(walletType, selectedPaymentMethod.network, 2);
       setWalletConnection(connection);
       setError(null);
+      console.log("6. Connection successful:", connection);
       log("Wallet connected successfully:", connection);
     } catch (err) {
+      console.error("7. Connection failed:", err);
       log("Wallet connection error:", err);
       setError(err.message || "Failed to connect wallet");
     }
+    console.log("=== END WALLET CONNECTION DEBUG ===");
   });
-  const getRecipientAddress = () => {
-    if (!selectedPaymentMethod)
-      return null;
-    const network = selectedPaymentMethod.network;
-    if (payment && payment.recipientWallet) {
-      return payment.recipientWallet;
-    }
-    if (merchantWallets[network]) {
-      return merchantWallets[network];
-    }
-    if (merchantWalletAddresses[network]) {
-      return merchantWalletAddresses[network];
-    }
-    return null;
-  };
   const handlePayment = () => __async(void 0, null, function* () {
+    var _a2, _b;
     if (!payment || !selectedPaymentMethod) {
       setError("Missing payment information");
       return;
     }
-    const recipientAddress = getRecipientAddress();
-    if (!recipientAddress && !testMode) {
-      setError(`No recipient wallet address configured for ${selectedPaymentMethod.network} network`);
-      return;
-    }
     if (!walletConnection && !testMode) {
       setError("Please connect your wallet first");
       return;
@@ -21705,20 +21481,23 @@ const CoinleyCheckout = forwardRef(({
         log("Test mode: Generating mock transaction...");
         txHash = `test_${Date.now().toString(16)}_${Math.random().toString(16).substring(2, 10)}`;
       } else {
-        log("Sending transaction through wallet...", {
-          recipientAddress,
-          amount: payment.totalAmount || payment.amount,
-          network: selectedPaymentMethod.network
-        });
-        const tokenConfig = payment.token || selectedPaymentMethod.tokenConfig;
+        let merchantAddress;
+        if (payment.recipientWallet) {
+          merchantAddress = payment.recipientWallet;
+        } else if (actualMerchantWallets[selectedPaymentMethod.network]) {
+          merchantAddress = actualMerchantWallets[selectedPaymentMethod.network];
+        } else {
+          throw new Error(`No merchant wallet address found for ${selectedPaymentMethod.network} network`);
+        }
+        log("Using merchant address for payment:", merchantAddress);
+        log("Sending transaction through wallet...");
         txHash = yield sendTransaction(walletConnection, {
-          to: recipientAddress,
+          to: merchantAddress,
           amount: payment.totalAmount || payment.amount,
-          tokenAddress: tokenConfig == null ? void 0 : tokenConfig.contractAddress,
-          tokenDecimals: tokenConfig == null ? void 0 : tokenConfig.decimals,
+          tokenAddress: (_a2 = selectedPaymentMethod.tokenConfig) == null ? void 0 : _a2.address,
+          tokenDecimals: (_b = selectedPaymentMethod.tokenConfig) == null ? void 0 : _b.decimals,
           currency: selectedPaymentMethod.currency,
-          network: selectedPaymentMethod.network,
-          tokenConfig
+          network: selectedPaymentMethod.network
         });
       }
       log("Transaction hash:", txHash);
@@ -21739,27 +21518,16 @@ const CoinleyCheckout = forwardRef(({
         onSuccess(payment.id, txHash, {
           network: selectedPaymentMethod.network,
           currency: selectedPaymentMethod.currency,
-          amount: payment.totalAmount || payment.amount,
-          recipientAddress
+          amount: payment.totalAmount || payment.amount
         });
       }
     } catch (err) {
       log("Payment error:", err);
-      let errorMessage = err.message || "Failed to process payment";
-      if (errorMessage.includes("User rejected") || errorMessage.includes("user rejected")) {
-        errorMessage = "Transaction was rejected by user";
-      } else if (errorMessage.includes("insufficient funds")) {
-        errorMessage = "Insufficient funds in wallet";
-      } else if (errorMessage.includes("network")) {
-        errorMessage = "Network error. Please check your connection and try again";
-      } else if (errorMessage.includes("recipient") || errorMessage.includes("address")) {
-        errorMessage = "Invalid recipient address. Please contact support";
-      }
-      setError(errorMessage);
+      setError(err.message || "Failed to process payment");
       setPaymentStatus("error");
       setStep("error");
       if (onError)
-        onError(new Error(errorMessage));
+        onError(err);
     }
   });
   const getSupportedWallets = () => {
@@ -21767,12 +21535,6 @@ const CoinleyCheckout = forwardRef(({
       return [];
     return getSupportedWalletsForNetwork(selectedPaymentMethod.network);
   };
-  if (isLoadingWallets) {
-    return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "fixed inset-0 z-50 flex items-center justify-center bg-black/50", children: /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "bg-white p-6 rounded-lg shadow-xl", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center space-x-3", children: [
-      /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "animate-spin rounded-full h-6 w-6 border-2 border-blue-500 border-t-transparent" }),
-      /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-gray-700", children: "Loading payment gateway..." })
-    ] }) }) });
-  }
   return /* @__PURE__ */ jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, { children: isOpen && /* @__PURE__ */ jsxRuntimeExports.jsx(
     CoinleyModal,
     {
@@ -21795,8 +21557,7 @@ const CoinleyCheckout = forwardRef(({
       availableWallets,
       supportedWallets: getSupportedWallets(),
       step,
-      merchantWalletAddresses: merchantWallets,
-      recipientAddress: getRecipientAddress(),
+      merchantWalletAddresses: actualMerchantWallets,
       debug: effectiveDebug
     }
   ) });
@@ -21826,7 +21587,7 @@ export {
   createPayment,
   detectWallets,
   generateMockTransactionHash,
-  getMerchantProfile,
+  getMerchantWallets,
   getPayment,
   getSupportedNetworks,
   getSupportedWalletsForNetwork,