coinley-test 0.0.21 → 0.0.22

package/dist/index.esm.js

@@ -1310,16 +1310,39 @@ class SimpleMetaMaskWallet {
     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({
         method: "eth_requestAccounts"
       });
+      if (!accounts || accounts.length === 0) {
+        throw new Error("No accounts found in MetaMask");
+      }
       const chainId = await window.ethereum.request({
         method: "eth_chainId"
       });
       this.account = accounts[0];
       this.chainId = chainId;
-      console.log("✅ MetaMask connected:", this.account);
+      console.log("✅ MetaMask connected successfully:");
+      console.log("  Account:", this.account);
+      console.log("  Chain ID:", this.chainId);
+      if (this.account.toLowerCase() !== "0xa0419a048a1469b34a5245f08c0697ba956a56ab") {
+        console.warn("⚠️ Connected to different account than expected");
+        console.warn("  Expected: 0xa0419a048A1469B34a5245f08C0697Ba956a56Ab");
+        console.warn("  Connected:", this.account);
+        throw new Error(`Please switch MetaMask to account 0xa041...56Ab. Currently connected to ${this.account.slice(0, 6)}...${this.account.slice(-4)}`);
+      }
       return { account: this.account, chainId: this.chainId };
     } catch (error) {
       console.error("MetaMask connection failed:", error);
@@ -1332,14 +1355,71 @@ class SimpleMetaMaskWallet {
     }
     try {
       console.log("🦊 Sending MetaMask transaction:", txParams);
+      if (!window.ethereum.isMetaMask) {
+        throw new Error("Not using MetaMask provider");
+      }
+      if (txParams.data && txParams.data.includes("a9059cbb")) {
+        console.log("🔍 Checking USDT balance...");
+        try {
+          const balanceHex = await window.ethereum.request({
+            method: "eth_call",
+            params: [{
+              to: txParams.to,
+              // USDT contract
+              data: `0x70a08231000000000000000000000000${this.account.slice(2)}`
+              // balanceOf(address)
+            }, "latest"]
+          });
+          const balance = parseInt(balanceHex, 16);
+          const balanceUSDT = balance / 1e6;
+          console.log("💰 USDT Balance:", balanceUSDT);
+          const amountHex = txParams.data.slice(-64);
+          const transactionAmount = parseInt(amountHex, 16);
+          const transactionAmountUSDT = transactionAmount / 1e6;
+          console.log("💸 Transaction Amount:", transactionAmountUSDT);
+          if (balance < transactionAmount) {
+            throw new Error(`Insufficient USDT balance. You have ${balanceUSDT} USDT but need ${transactionAmountUSDT} USDT`);
+          }
+        } catch (balanceError) {
+          console.warn("Could not check balance:", balanceError);
+        }
+      }
+      try {
+        const ethBalanceHex = await window.ethereum.request({
+          method: "eth_getBalance",
+          params: [this.account, "latest"]
+        });
+        const ethBalance = parseInt(ethBalanceHex, 16) / Math.pow(10, 18);
+        console.log("⛽ ETH Balance for gas:", ethBalance);
+        if (ethBalance < 1e-3) {
+          throw new Error(`Insufficient ETH for gas fees. You have ${ethBalance.toFixed(4)} ETH but need at least 0.001 ETH`);
+        }
+      } catch (gasError) {
+        console.warn("Could not check ETH balance:", gasError);
+      }
+      const fullTxParams = {
+        ...txParams,
+        from: this.account
+      };
+      try {
+        const gasEstimate = await window.ethereum.request({
+          method: "eth_estimateGas",
+          params: [fullTxParams]
+        });
+        const gasLimit = Math.floor(parseInt(gasEstimate, 16) * 1.2);
+        fullTxParams.gas = `0x${gasLimit.toString(16)}`;
+        console.log("⛽ Gas estimate:", parseInt(gasEstimate, 16));
+        console.log("⛽ Gas limit (with buffer):", gasLimit);
+      } catch (gasError) {
+        console.warn("Gas estimation failed:", gasError);
+        fullTxParams.gas = "0x15F90";
+      }
+      console.log("📤 Final transaction params:", fullTxParams);
       const txHash = await window.ethereum.request({
         method: "eth_sendTransaction",
-        params: [{
-          ...txParams,
-          from: this.account
-        }]
+        params: [fullTxParams]
       });
-      console.log("✅ Transaction sent:", txHash);
+      console.log("✅ Transaction sent successfully:", txHash);
       return txHash;
     } catch (error) {
       console.error("Transaction failed:", error);
@@ -1347,6 +1427,10 @@ class SimpleMetaMaskWallet {
         throw new Error("Transaction cancelled by user");
       } else if (error.message.includes("insufficient funds")) {
         throw new Error("Insufficient funds in wallet");
+      } else if (error.message.includes("gas")) {
+        throw new Error("Gas estimation failed. You may not have enough ETH for gas fees.");
+      } else if (error.message.includes("invalid opcode")) {
+        throw new Error("Transaction failed - invalid operation. This usually means insufficient token balance or contract interaction failed.");
       } else {
         throw new Error(error.message || "Transaction failed");
       }