coinley-test 0.0.52 → 0.0.53

package/dist/index.esm.js

@@ -1921,38 +1921,47 @@ class SimpleMetaMaskWallet2 {
     this.account = null;
     this.chainId = null;
     this.walletType = "metamask";
+    this.provider = null;
   }
   async connect() {
     if (!window.ethereum) {
       throw new Error("MetaMask not installed. Please install MetaMask extension.");
     }
-    if (window.ethereum.providers) {
-      console.log("🔍 Multiple wallets detected:", window.ethereum.providers.length);
-      const metamaskProvider = window.ethereum.providers.find((provider) => provider.isMetaMask);
-      if (!metamaskProvider) {
-        throw new Error("MetaMask not found among installed wallets");
-      }
-      console.log("🦊 Using MetaMask provider specifically");
-      window.ethereum = metamaskProvider;
-    } else if (!window.ethereum.isMetaMask) {
-      throw new Error("Please use MetaMask wallet");
-    }
     try {
-      console.log("🦊 Requesting MetaMask account access...");
-      const accounts = await window.ethereum.request({
+      console.log("🦊 ISOLATING MetaMask provider...");
+      let metamaskProvider = null;
+      if (window.ethereum.providers && window.ethereum.providers.length > 0) {
+        console.log("🔍 Multiple wallet providers detected:", window.ethereum.providers.length);
+        metamaskProvider = window.ethereum.providers.find((provider) => {
+          return provider.isMetaMask && !provider.isPhantom;
+        });
+        if (!metamaskProvider) {
+          throw new Error("MetaMask provider not found among installed wallets. Please ensure MetaMask is installed.");
+        }
+        console.log("🦊 MetaMask provider isolated successfully");
+      } else if (window.ethereum.isMetaMask && !window.ethereum.isPhantom) {
+        metamaskProvider = window.ethereum;
+        console.log("🦊 Single MetaMask provider detected");
+      } else {
+        throw new Error("MetaMask provider not available. Please install MetaMask or disable conflicting wallets.");
+      }
+      this.provider = metamaskProvider;
+      console.log("🦊 Requesting MetaMask account access using isolated provider...");
+      const accounts = await this.provider.request({
         method: "eth_requestAccounts"
       });
       if (!accounts || accounts.length === 0) {
         throw new Error("No accounts found in MetaMask");
       }
-      const chainId = await window.ethereum.request({
+      const chainId = await this.provider.request({
         method: "eth_chainId"
       });
       this.account = accounts[0];
       this.chainId = chainId;
-      console.log("✅ MetaMask connected successfully:");
+      console.log("✅ MetaMask connected successfully (isolated):");
       console.log("  Account:", this.account);
       console.log("  Chain ID:", this.chainId);
+      console.log("  Provider isolated:", !!this.provider);
       return { account: this.account, chainId: this.chainId };
     } catch (error) {
       console.error("MetaMask connection failed:", error);
@@ -1960,22 +1969,19 @@ class SimpleMetaMaskWallet2 {
     }
   }
   async sendTransaction(txParams) {
-    if (!this.account) {
-      throw new Error("Wallet not connected");
+    if (!this.account || !this.provider) {
+      throw new Error("MetaMask wallet not connected or provider not isolated");
     }
     try {
-      console.log("🦊 Sending REAL MetaMask transaction:", txParams);
-      console.log("💰 REAL TRANSACTION - This will deduct real money from MetaMask!");
-      if (!window.ethereum.isMetaMask) {
-        throw new Error("Not using MetaMask provider");
-      }
+      console.log("🦊 Sending REAL MetaMask transaction using ISOLATED provider:", txParams);
+      console.log("💰 REAL METAMASK TRANSACTION - This will deduct real money!");
       const fullTxParams = {
         ...txParams,
         from: this.account
       };
       try {
-        console.log("⛽ Estimating gas for real MetaMask transaction...");
-        const gasEstimate = await window.ethereum.request({
+        console.log("⛽ Estimating gas using isolated MetaMask provider...");
+        const gasEstimate = await this.provider.request({
           method: "eth_estimateGas",
           params: [fullTxParams]
         });
@@ -1987,9 +1993,9 @@ class SimpleMetaMaskWallet2 {
         console.warn("Gas estimation failed:", gasError);
         fullTxParams.gas = "0x15F90";
       }
-      console.log("📤 REAL MetaMask transaction params:", fullTxParams);
-      console.log("🚨 SENDING REAL TRANSACTION - MONEY WILL BE DEDUCTED!");
-      const txHash = await window.ethereum.request({
+      console.log("📤 REAL MetaMask transaction params (isolated):", fullTxParams);
+      console.log("🚨 SENDING REAL METAMASK TRANSACTION - MONEY WILL BE DEDUCTED!");
+      const txHash = await this.provider.request({
         method: "eth_sendTransaction",
         params: [fullTxParams]
       });
@@ -2010,7 +2016,7 @@ class SimpleMetaMaskWallet2 {
     }
   }
   isConnected() {
-    return !!this.account;
+    return !!this.account && !!this.provider;
   }
 }
 class SimplePhantomWallet {
@@ -3115,8 +3121,18 @@ const EnhancedSimpleCoinleyPayment = ({
     }
   };
   const handleWalletSelection = (walletType) => {
+    console.log(`📱 Switching to ${walletType} wallet - ISOLATING providers...`);
+    setConnectedWallet(null);
+    setSelectedWalletType(null);
+    setError("");
+    const newWallets = {
+      metamask: new SimpleMetaMaskWallet2(),
+      phantom: new SimplePhantomWallet()
+    };
+    setWallets(newWallets);
     setSelectedWalletType(walletType);
-    console.log(`📱 Selected wallet type: ${walletType}`);
+    console.log(`✅ Wallet isolation complete for ${walletType}`);
+    console.log(`🔒 All other wallets disconnected and reset`);
   };
   const connectWallet = async (walletType = selectedWalletType) => {
     if (!walletType) {
@@ -3126,18 +3142,35 @@ const EnhancedSimpleCoinleyPayment = ({
     try {
       setLoading(true);
       setError("");
+      console.log(`🔗 Connecting to ${walletType} wallet with ISOLATION...`);
       const wallet = wallets[walletType];
       if (!wallet) {
         throw new Error(`Wallet ${walletType} not found`);
       }
-      console.log(`🔗 Connecting to ${walletType} wallet...`);
+      if (walletType === "metamask") {
+        console.log("🦊 Isolating MetaMask - disconnecting Phantom...");
+        if (window.solana && window.solana.disconnect) {
+          try {
+            await window.solana.disconnect();
+            console.log("👻 Phantom disconnected for MetaMask isolation");
+          } catch (e) {
+            console.log("👻 Phantom was not connected or disconnect failed");
+          }
+        }
+      } else if (walletType === "phantom") {
+        console.log("👻 Isolating Phantom - ensuring MetaMask separation...");
+        console.log("🦊 MetaMask provider will be isolated during Phantom connection");
+      }
       const connection = await wallet.connect();
       setConnectedWallet(wallet);
       setSelectedWalletType(walletType);
-      console.log(`✅ ${walletType} wallet connected successfully:`, connection.account);
+      console.log(`✅ ${walletType} wallet connected successfully with ISOLATION:`, connection.account);
+      console.log(`🔒 Other wallets are isolated and won't interfere`);
     } catch (err) {
       console.error(`${walletType} wallet connection failed:`, err);
       setError(err.message);
+      setConnectedWallet(null);
+      setSelectedWalletType(null);
     } finally {
       setLoading(false);
     }