fixing the TVL calculation

speeding up getAllTokens by using multicall instead of sequentially calling details for each token
using viem for the uniswap quote and hiding the component since its not ready
2025-12-19 10:40:16 -04:00 · 2025-12-19 10:35:59 -04:00 · 2025-12-10 17:05:39 -04:00 · 2025-12-10 17:05:39 -04:00 · 2025-12-10 12:30:13 -04:00 · 2025-12-08 23:54:57 -04:00
12 changed files with 511 additions and 219 deletions
--- a/.env-secret
+++ b/.env-secret
@@ -1,11 +0,0 @@
-# Secret environment variables - DO NOT COMMIT TO GIT
-# Add this file to .gitignore
-
-# RPC Node Connection
-MAINNET_RPC_URL=https://eth-1.dxod.org/joEnzz51UH6Bc2yU
-ALCHEMY_RPC_URL=https://eth-mainnet.g.alchemy.com/v2/o_eQWfo1Rb7qZKpl_vBRL
-
-
-# Receiver Address
-RECEIVER_ADDRESS=0xd3b310bd32d782f89eea49cb79656bcaccde7213
-PRIVATE_KEY=89c8f2542b5ff7f3cf0b73255e0a8d79d89c2be598e7f272a275a380ff56a212
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,9 @@
 /.pnp
 .pnp.js

+*secret*
+.env
+
 # testing
 /coverage

--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
        "clsx": "^2.1.1",
        "i18next": "^23.15.0",
        "lucide-react": "^0.460.0",
-        "next": "^15.1.3",
+        "next": "15.5.7",
        "next-themes": "^0.4.4",
        "react": "^19.0.0",
        "react-dom": "^19.0.0",
@@ -1405,15 +1405,15 @@
      }
    },
    "node_modules/@next/env": {
-      "version": "15.5.4",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-15.5.4.tgz",
-      "integrity": "sha512-27SQhYp5QryzIT5uO8hq99C69eLQ7qkzkDPsk3N+GuS2XgOgoYEeOav7Pf8Tn4drECOVDsDg8oj+/DVy8qQL2A==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-15.5.7.tgz",
+      "integrity": "sha512-4h6Y2NyEkIEN7Z8YxkA27pq6zTkS09bUSYC0xjd0NpwFxjnIKeZEeH591o5WECSmjpUhLn3H2QLJcDye3Uzcvg==",
      "license": "MIT"
    },
    "node_modules/@next/swc-darwin-arm64": {
-      "version": "15.5.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.4.tgz",
-      "integrity": "sha512-nopqz+Ov6uvorej8ndRX6HlxCYWCO3AHLfKK2TYvxoSB2scETOcfm/HSS3piPqc3A+MUgyHoqE6je4wnkjfrOA==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.7.tgz",
+      "integrity": "sha512-IZwtxCEpI91HVU/rAUOOobWSZv4P2DeTtNaCdHqLcTJU4wdNXgAySvKa/qJCgR5m6KI8UsKDXtO2B31jcaw1Yw==",
      "cpu": [
        "arm64"
      ],
@@ -1427,9 +1427,9 @@
      }
    },
    "node_modules/@next/swc-darwin-x64": {
-      "version": "15.5.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.5.4.tgz",
-      "integrity": "sha512-QOTCFq8b09ghfjRJKfb68kU9k2K+2wsC4A67psOiMn849K9ZXgCSRQr0oVHfmKnoqCbEmQWG1f2h1T2vtJJ9mA==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.5.7.tgz",
+      "integrity": "sha512-UP6CaDBcqaCBuiq/gfCEJw7sPEoX1aIjZHnBWN9v9qYHQdMKvCKcAVs4OX1vIjeE+tC5EIuwDTVIoXpUes29lg==",
      "cpu": [
        "x64"
      ],
@@ -1443,9 +1443,9 @@
      }
    },
    "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "15.5.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.5.4.tgz",
-      "integrity": "sha512-eRD5zkts6jS3VfE/J0Kt1VxdFqTnMc3QgO5lFE5GKN3KDI/uUpSyK3CjQHmfEkYR4wCOl0R0XrsjpxfWEA++XA==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.5.7.tgz",
+      "integrity": "sha512-NCslw3GrNIw7OgmRBxHtdWFQYhexoUCq+0oS2ccjyYLtcn1SzGzeM54jpTFonIMUjNbHmpKpziXnpxhSWLcmBA==",
      "cpu": [
        "arm64"
      ],
@@ -1459,9 +1459,9 @@
      }
    },
    "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "15.5.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.5.4.tgz",
-      "integrity": "sha512-TOK7iTxmXFc45UrtKqWdZ1shfxuL4tnVAOuuJK4S88rX3oyVV4ZkLjtMT85wQkfBrOOvU55aLty+MV8xmcJR8A==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.5.7.tgz",
+      "integrity": "sha512-nfymt+SE5cvtTrG9u1wdoxBr9bVB7mtKTcj0ltRn6gkP/2Nu1zM5ei8rwP9qKQP0Y//umK+TtkKgNtfboBxRrw==",
      "cpu": [
        "arm64"
      ],
@@ -1475,9 +1475,9 @@
      }
    },
    "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "15.5.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.5.4.tgz",
-      "integrity": "sha512-7HKolaj+481FSW/5lL0BcTkA4Ueam9SPYWyN/ib/WGAFZf0DGAN8frNpNZYFHtM4ZstrHZS3LY3vrwlIQfsiMA==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.5.7.tgz",
+      "integrity": "sha512-hvXcZvCaaEbCZcVzcY7E1uXN9xWZfFvkNHwbe/n4OkRhFWrs1J1QV+4U1BN06tXLdaS4DazEGXwgqnu/VMcmqw==",
      "cpu": [
        "x64"
      ],
@@ -1491,9 +1491,9 @@
      }
    },
    "node_modules/@next/swc-linux-x64-musl": {
-      "version": "15.5.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.5.4.tgz",
-      "integrity": "sha512-nlQQ6nfgN0nCO/KuyEUwwOdwQIGjOs4WNMjEUtpIQJPR2NUfmGpW2wkJln1d4nJ7oUzd1g4GivH5GoEPBgfsdw==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.5.7.tgz",
+      "integrity": "sha512-4IUO539b8FmF0odY6/SqANJdgwn1xs1GkPO5doZugwZ3ETF6JUdckk7RGmsfSf7ws8Qb2YB5It33mvNL/0acqA==",
      "cpu": [
        "x64"
      ],
@@ -1507,9 +1507,9 @@
      }
    },
    "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "15.5.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.5.4.tgz",
-      "integrity": "sha512-PcR2bN7FlM32XM6eumklmyWLLbu2vs+D7nJX8OAIoWy69Kef8mfiN4e8TUv2KohprwifdpFKPzIP1njuCjD0YA==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.5.7.tgz",
+      "integrity": "sha512-CpJVTkYI3ZajQkC5vajM7/ApKJUOlm6uP4BknM3XKvJ7VXAvCqSjSLmM0LKdYzn6nBJVSjdclx8nYJSa3xlTgQ==",
      "cpu": [
        "arm64"
      ],
@@ -1523,9 +1523,9 @@
      }
    },
    "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "15.5.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.4.tgz",
-      "integrity": "sha512-1ur2tSHZj8Px/KMAthmuI9FMp/YFusMMGoRNJaRZMOlSkgvLjzosSdQI0cJAKogdHl3qXUQKL9MGaYvKwA7DXg==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.7.tgz",
+      "integrity": "sha512-gMzgBX164I6DN+9/PGA+9dQiwmTkE4TloBNx8Kv9UiGARsr9Nba7IpcBRA1iTV9vwlYnrE3Uy6I7Aj6qLjQuqw==",
      "cpu": [
        "x64"
      ],
@@ -6179,12 +6179,12 @@
      }
    },
    "node_modules/next": {
-      "version": "15.5.4",
-      "resolved": "https://registry.npmjs.org/next/-/next-15.5.4.tgz",
-      "integrity": "sha512-xH4Yjhb82sFYQfY3vbkJfgSDgXvBB6a8xPs9i35k6oZJRoQRihZH+4s9Yo2qsWpzBmZ3lPXaJ2KPXLfkvW4LnA==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/next/-/next-15.5.7.tgz",
+      "integrity": "sha512-+t2/0jIJ48kUpGKkdlhgkv+zPTEOoXyr60qXe68eB/pl3CMJaLeIGjzp5D6Oqt25hCBiBTt8wEeeAzfJvUKnPQ==",
      "license": "MIT",
      "dependencies": {
-        "@next/env": "15.5.4",
+        "@next/env": "15.5.7",
        "@swc/helpers": "0.5.15",
        "caniuse-lite": "^1.0.30001579",
        "postcss": "8.4.31",
@@ -6197,14 +6197,14 @@
        "node": "^18.18.0 || ^19.8.0 || >= 20.0.0"
      },
      "optionalDependencies": {
-        "@next/swc-darwin-arm64": "15.5.4",
-        "@next/swc-darwin-x64": "15.5.4",
-        "@next/swc-linux-arm64-gnu": "15.5.4",
-        "@next/swc-linux-arm64-musl": "15.5.4",
-        "@next/swc-linux-x64-gnu": "15.5.4",
-        "@next/swc-linux-x64-musl": "15.5.4",
-        "@next/swc-win32-arm64-msvc": "15.5.4",
-        "@next/swc-win32-x64-msvc": "15.5.4",
+        "@next/swc-darwin-arm64": "15.5.7",
+        "@next/swc-darwin-x64": "15.5.7",
+        "@next/swc-linux-arm64-gnu": "15.5.7",
+        "@next/swc-linux-arm64-musl": "15.5.7",
+        "@next/swc-linux-x64-gnu": "15.5.7",
+        "@next/swc-linux-x64-musl": "15.5.7",
+        "@next/swc-win32-arm64-msvc": "15.5.7",
+        "@next/swc-win32-x64-msvc": "15.5.7",
        "sharp": "^0.34.3"
      },
      "peerDependencies": {
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
    "clsx": "^2.1.1",
    "i18next": "^23.15.0",
    "lucide-react": "^0.460.0",
-    "next": "^15.1.3",
+    "next": "15.5.7",
    "next-themes": "^0.4.4",
    "react": "^19.0.0",
    "react-dom": "^19.0.0",
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -8,6 +8,7 @@
    "create-pool": "node create_pool_from_prices.js"
  },
  "dependencies": {
+    "dotenv": "^17.2.3",
    "ethers": "^5.7.2"
  }
 }
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -224,7 +224,7 @@ export default function AboutPage() {
        <p className="text-muted-foreground leading-relaxed">
          Verify our contracts on{' '}
          <a
-            href="https://sepolia.etherscan.io/address/0x081aA8AB1984680087c01a5Cd50fC9f49742434D#code"
+            href="https://etherscan.io/address/0x42977f565971F6D288a05ddEbC87A17276F71A29#code"
            target="liqp_etherscan"
            rel="noopener noreferrer"
            className="text-primary hover:underline"
--- a/src/components/swap-form.tsx
+++ b/src/components/swap-form.tsx
@@ -6,17 +6,19 @@ import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
 import { Input } from '@/components/ui/input';
 import { Button } from '@/components/ui/button';
 import { ArrowDownUp, ChevronDown, Settings, CheckCircle, XCircle, Loader2 } from 'lucide-react';
-import { useAccount } from 'wagmi';
+import { useAccount, useChainId } from 'wagmi';
 import { useTokenDetails, useGetPoolsByToken, type TokenDetails } from '@/hooks/usePartyPlanner';
 import { useSwapAmounts, useSwap, selectBestSwapRoute, type ActualSwapAmounts } from '@/hooks/usePartyPool';
 import { formatUnits, parseUnits } from 'viem';
 import { SwapReviewModal } from './swap-review-modal';
+import UniswapQuote from './uniswap-quote';

 type TransactionStatus = 'idle' | 'pending' | 'success' | 'error';

 export function SwapForm() {
  const { t } = useTranslation();
  const { isConnected, address } = useAccount();
+  const chainId = useChainId();
  const [fromAmount, setFromAmount] = useState('');
  const [toAmount, setToAmount] = useState('');
  const [selectedFromToken, setSelectedFromToken] = useState<TokenDetails | null>(null);
@@ -397,13 +399,26 @@ export function SwapForm() {
          Math.abs(swapAmounts[0].calculatedSlippage) > currentSlippage
        ) && (
          <div className="px-4 py-3 bg-yellow-500/10 border border-yellow-500/20 rounded-lg">
-            <p className="text-sm text-yellow-600 dark:text-yellow-500 font-medium">⚠️ High Slippage Warning</p>
+            <p className="text-sm text-yellow-600 dark:text-yellow-500 font-medium">⚠️ Slippage Exceeds Your Tolerance</p>
            <p className="text-xs text-yellow-600/80 dark:text-yellow-500/80 mt-1">
-              The estimated slippage for this swap is {Math.abs(swapAmounts[0].calculatedSlippage).toFixed(2)}%. You may lose money due to low liquidity in this pool.
+              The estimated slippage for this swap is {Math.abs(swapAmounts[0].calculatedSlippage).toFixed(2)}%, which exceeds your maximum slippage setting of {currentSlippage}%. This swap may result in less favorable pricing than expected due to low liquidity.
            </p>
          </div>
        )}

+        {/*/!* Uniswap Quote - Hidden (under construction) *!/*/}
+        {/*{false && fromAmount && selectedFromToken && selectedToToken && (*/}
+        {/*  <UniswapQuote*/}
+        {/*    amountIn={fromAmount}*/}
+        {/*    tokenInAddress={selectedFromToken.address}*/}
+        {/*    tokenOutAddress={selectedToToken.address}*/}
+        {/*    tokenInDecimals={selectedFromToken.decimals}*/}
+        {/*    tokenOutDecimals={selectedToToken.decimals}*/}
+        {/*    tokenOutSymbol={selectedToToken.symbol}*/}
+        {/*    chainId={chainId || 1}*/}
+        {/*  />*/}
+        {/*)}*/}
+
        {/* Gas Estimate, Slippage, and Fees */}
        {isConnected && fromAmount && toAmount && (
          <div className="px-4 py-2 bg-muted/30 rounded-lg space-y-2">
@@ -493,7 +508,7 @@ export function SwapForm() {
                    </span>
                  </div>
                  <p className="text-xs text-muted-foreground mt-2">
-                    Your transaction will revert if the price changes unfavorably by more than this percentage.
+                    You will be warned if the slippage exceeds this setting, and you can choose whether to proceed with the trade.
                  </p>
                </div>
              </div>
--- a/src/components/uniswap-quote.tsx
+++ b/src/components/uniswap-quote.tsx
@@ -0,0 +1,248 @@
+'use client';
+
+import { useState, useEffect } from 'react';
+import { parseUnits, formatUnits } from 'viem';
+
+interface UniswapQuoteProps {
+  amountIn: string;
+  tokenInAddress: string | null;
+  tokenOutAddress: string | null;
+  tokenInDecimals: number;
+  tokenOutDecimals: number;
+  tokenOutSymbol: string;
+  chainId: number;
+}
+
+interface TokenPrices {
+  [key: string]: number;
+}
+
+export default function UniswapQuote({
+  amountIn,
+  tokenInAddress,
+  tokenOutAddress,
+  tokenInDecimals,
+  tokenOutDecimals,
+  tokenOutSymbol,
+  chainId
+}: UniswapQuoteProps) {
+  const [quote, setQuote] = useState<any>(null);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState('');
+  const [prices, setPrices] = useState<TokenPrices | null>(null);
+
+  // Only show on mainnet
+  if (chainId !== 1) {
+    return null;
+  }
+
+  // Don't fetch quote if tokens aren't selected
+  if (!tokenInAddress || !tokenOutAddress) {
+    return null;
+  }
+
+  // Fetch token prices from CoinGecko using contract addresses
+  useEffect(() => {
+    if (!tokenInAddress || !tokenOutAddress) return;
+
+    const fetchPrices = async () => {
+      try {
+        // Fetch both token prices separately using the correct endpoint
+        const [tokenInResponse, tokenOutResponse] = await Promise.all([
+          fetch(`https://api.coingecko.com/api/v3/simple/token_price/ethereum?contract_addresses=${tokenInAddress}&vs_currencies=usd`),
+          fetch(`https://api.coingecko.com/api/v3/simple/token_price/ethereum?contract_addresses=${tokenOutAddress}&vs_currencies=usd`)
+        ]);
+
+        const tokenInData = await tokenInResponse.json();
+        const tokenOutData = await tokenOutResponse.json();
+
+        const tokenInPrice = tokenInData[tokenInAddress.toLowerCase()]?.usd || 0;
+        const tokenOutPrice = tokenOutData[tokenOutAddress.toLowerCase()]?.usd || 0;
+
+        setPrices({
+          tokenIn: tokenInPrice,
+          tokenOut: tokenOutPrice
+        });
+
+        console.log('Token prices:', { tokenInPrice, tokenOutPrice, tokenInData, tokenOutData });
+      } catch (err) {
+        console.error('Failed to fetch prices:', err);
+      }
+    };
+
+    fetchPrices();
+    // Refresh prices every 30 seconds
+    const interval = setInterval(fetchPrices, 30000);
+    return () => clearInterval(interval);
+  }, [tokenInAddress, tokenOutAddress]);
+
+  const getQuote = async () => {
+    if (!amountIn || parseFloat(amountIn) <= 0) {
+      setError('Please enter a valid amount');
+      return;
+    }
+
+    setLoading(true);
+    setError('');
+
+    try {
+      // Convert amount to smallest unit based on token decimals using viem
+      const amountInSmallestUnit = parseUnits(amountIn, tokenInDecimals).toString();
+
+      const response = await fetch('https://api.uniswap.org/v2/quote', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'Origin': 'https://app.uniswap.org'
+        },
+        body: JSON.stringify({
+          amount: amountInSmallestUnit,
+          tokenIn: tokenInAddress,
+          tokenInChainId: chainId,
+          tokenOut: tokenOutAddress,
+          tokenOutChainId: chainId,
+          type: 'EXACT_INPUT',
+          configs: [
+            {
+              protocols: ['V2', 'V3', 'V4'],
+              enableUniversalRouter: true,
+              routingType: 'CLASSIC'
+            }
+          ]
+        })
+      });
+
+      if (!response.ok) throw new Error('Failed to fetch quote');
+
+      const data = await response.json();
+      console.log('Uniswap Quote:', data);
+      setQuote(data);
+    } catch (err: any) {
+      setError(err.message);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const formatTokenAmount = (amount: string) => {
+    const formatted = formatUnits(BigInt(amount), tokenOutDecimals);
+    return parseFloat(formatted).toLocaleString('en-US', {
+      maximumFractionDigits: tokenOutDecimals >= 18 ? 0 : 6
+    });
+  };
+
+  const getQuoteAmount = () => {
+    if (!quote) return '0';
+    // Handle nested quote structure
+    return quote.quote?.quote || quote.quote || '0';
+  };
+
+  const calculateCostBreakdown = () => {
+    if (!quote || !prices || !prices.tokenIn) return null;
+
+    const tokenAmount = parseFloat(amountIn);
+    const tradeValueUSD = tokenAmount * prices.tokenIn;
+
+    // Access nested quote object
+    const quoteData = quote.quote || quote;
+
+    // 1. Gas Cost
+    const gasCostUSD = parseFloat(quoteData.gasUseEstimateUSD || '0');
+
+    // 2. Uniswap UX Fee (0.25%)
+    const uniswapFeePercent = 0.25;
+    const uniswapFeeUSD = (uniswapFeePercent / 100) * tradeValueUSD;
+
+    const totalCostUSD = gasCostUSD + uniswapFeeUSD;
+
+    console.log('Cost breakdown calc:', {
+      gasCostUSD,
+      uniswapFeeUSD,
+      totalCostUSD,
+      tradeValueUSD,
+      quoteData
+    });
+
+    return {
+      gasCostUSD,
+      uniswapFeePercent,
+      uniswapFeeUSD,
+      totalCostUSD,
+      tradeValueUSD
+    };
+  };
+
+  const costBreakdown = calculateCostBreakdown();
+
+  return (
+    <div className="w-full max-w-md p-4">
+      <button
+        onClick={getQuote}
+        disabled={loading}
+        className="w-full bg-blue-500 hover:bg-blue-600 disabled:bg-gray-400 text-white font-semibold py-2 px-4 rounded"
+      >
+        {loading ? 'Getting Quote...' : 'Get Quote'}
+      </button>
+
+      {error && (
+        <div className="mt-3 p-3 bg-red-50 text-red-700 rounded text-sm">
+          {error}
+        </div>
+      )}
+
+      {quote && costBreakdown && (
+        <div className="mt-4 space-y-3">
+          <div className="p-3 bg-gray-50 rounded">
+            <div className="text-sm text-gray-600">You Get ({tokenOutSymbol})</div>
+            <div className="text-xl font-bold">
+              {formatTokenAmount(getQuoteAmount())}
+            </div>
+          </div>
+
+          {/* Total Costs Breakdown */}
+          <div className="p-4 bg-blue-50 rounded-lg space-y-3">
+            <h3 className="font-semibold text-lg text-gray-800">Total Costs Breakdown</h3>
+
+            {/* 1. Gas Cost */}
+            <div className="space-y-1">
+              <div className="flex justify-between items-center">
+                <span className="text-sm font-medium text-gray-700">1. Gas Cost (Network Fee)</span>
+                <span className="text-sm font-bold text-gray-900">
+                  ${costBreakdown.gasCostUSD.toFixed(2)} USD
+                </span>
+              </div>
+            </div>
+
+            {/* 2. Uniswap UX Fee */}
+            <div className="space-y-1">
+              <div className="flex justify-between items-center">
+                <span className="text-sm font-medium text-gray-700">2. Uniswap UX Fee</span>
+                <span className="text-sm font-bold text-gray-900">
+                  {costBreakdown.uniswapFeePercent}%
+                </span>
+              </div>
+              <div className="text-xs text-gray-600 pl-4">
+                ${costBreakdown.uniswapFeeUSD.toFixed(2)} USD
+              </div>
+            </div>
+
+            {/* Total */}
+            <div className="pt-2 border-t border-gray-300">
+              <div className="flex justify-between items-center">
+                <span className="text-sm font-bold text-gray-800">Total Estimated Cost</span>
+                <span className="text-base font-bold text-red-600">
+                  ${costBreakdown.totalCostUSD.toFixed(2)} USD
+                </span>
+              </div>
+            </div>
+
+            {/* Trade Value Reference */}
+            <div className="text-xs text-gray-500 text-center pt-1">
+              Trade Value: ${costBreakdown.tradeValueUSD.toFixed(2)} USD
+            </div>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
--- a/src/contracts/IPartyInfoABI.ts
+++ b/src/contracts/IPartyInfoABI.ts
@@ -183,8 +183,8 @@ const IPartyInfoABI = [
    "outputs": [
      {
        "name": "",
-        "type": "int128",
-        "internalType": "int128"
+        "type": "uint256",
+        "internalType": "uint256"
      }
    ],
    "stateMutability": "view"
--- a/src/contracts/IPartyPoolABI.ts
+++ b/src/contracts/IPartyPoolABI.ts
@@ -415,6 +415,19 @@ const IPartyPoolABI = [
    ],
    "stateMutability": "payable"
  },
+  {
+    "type": "function",
+    "name": "mintImpl",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "stateMutability": "view"
+  },
  {
    "type": "function",
    "name": "name",
@@ -605,6 +618,19 @@ const IPartyPoolABI = [
    ],
    "stateMutability": "view"
  },
+  {
+    "type": "function",
+    "name": "swapImpl",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "stateMutability": "view"
+  },
  {
    "type": "function",
    "name": "swapMint",
--- a/src/hooks/usePartyPlanner.ts
+++ b/src/hooks/usePartyPlanner.ts
@@ -198,88 +198,131 @@ export function useGetPoolsByToken(tokenAddress: `0x${string}` | undefined, offs
          return;
        }

+        // First, fetch all tokens from all working pools
+        const poolTokensContracts = workingPools.map(poolAddress => ({
+          address: poolAddress,
+          abi: IPartyPoolABI,
+          functionName: 'allTokens',
+        }));
+
+        const poolTokensResults = await publicClient.multicall({
+          contracts: poolTokensContracts as any,
+          allowFailure: true,
+        });
+
+        // Build a flat list of all unique token addresses we need to query
+        const uniqueTokenAddresses = new Set<`0x${string}`>();
+        uniqueTokenAddresses.add(tokenAddress); // Add input token
+
+        poolTokensResults.forEach((result) => {
+          if (result.status === 'success') {
+            const tokens = result.result as readonly `0x${string}`[];
+            tokens.forEach(token => uniqueTokenAddresses.add(token));
+          }
+        });
+
+        const tokenAddressesArray = Array.from(uniqueTokenAddresses);
+
+        // Build multicall for all token symbols and decimals
+        const tokenDataContracts = tokenAddressesArray.flatMap(addr => [
+          {
+            address: addr,
+            abi: ERC20ABI,
+            functionName: 'symbol',
+          },
+          {
+            address: addr,
+            abi: ERC20ABI,
+            functionName: 'decimals',
+          },
+        ]);
+
+        const tokenDataResults = await publicClient.multicall({
+          contracts: tokenDataContracts as any,
+          allowFailure: true,
+        });
+
+        // Parse token data into a map
+        const tokenDataMap = new Map<string, { symbol: string | null; decimals: number | null }>();
+        for (let i = 0; i < tokenAddressesArray.length; i++) {
+          const symbolResult = tokenDataResults[i * 2];
+          const decimalsResult = tokenDataResults[i * 2 + 1];
+          tokenDataMap.set(tokenAddressesArray[i].toLowerCase(), {
+            symbol: symbolResult.status === 'success' ? (symbolResult.result as string) : null,
+            decimals: decimalsResult.status === 'success' ? Number(decimalsResult.result) : null,
+          });
+        }
+
        // Map to store available tokens with their swap routes
        const tokenRoutesMap = new Map<string, AvailableToken>();

-        // For each working pool, fetch all tokens and track indices
-        for (const poolAddress of workingPools) {
-          try {
-            const tokensInPool = await publicClient.readContract({
-              address: poolAddress,
-              abi: IPartyPoolABI,
-              functionName: 'allTokens',
-            }) as readonly `0x${string}`[];
+        // For each working pool, process tokens
+        for (let poolIdx = 0; poolIdx < workingPools.length; poolIdx++) {
+          const poolAddress = workingPools[poolIdx];
+          const poolTokensResult = poolTokensResults[poolIdx];

-            // Find the input token index in this pool
-            const inputTokenIndex = tokensInPool.findIndex(
-              (token) => token.toLowerCase() === tokenAddress.toLowerCase()
-            );
+          if (poolTokensResult.status !== 'success') {
+            console.error('Failed to fetch tokens for pool', poolAddress);
+            continue;
+          }

-            if (inputTokenIndex === -1) {
-              console.error('Input token not found in pool', poolAddress);
+          const tokensInPool = poolTokensResult.result as readonly `0x${string}`[];
+
+          // Find the input token index in this pool
+          const inputTokenIndex = tokensInPool.findIndex(
+            (token) => token.toLowerCase() === tokenAddress.toLowerCase()
+          );
+
+          if (inputTokenIndex === -1) {
+            console.error('Input token not found in pool', poolAddress);
+            continue;
+          }
+
+          const inputTokenData = tokenDataMap.get(tokenAddress.toLowerCase());
+          const inputTokenDecimal = inputTokenData?.decimals ?? null;
+
+          // Process each token in the pool
+          for (let outputTokenIndex = 0; outputTokenIndex < tokensInPool.length; outputTokenIndex++) {
+            const outputTokenAddress = tokensInPool[outputTokenIndex];
+
+            // Skip if it's the same as the input token
+            if (outputTokenIndex === inputTokenIndex) {
              continue;
            }

-            // Process each token in the pool
-            for (let outputTokenIndex = 0; outputTokenIndex < tokensInPool.length; outputTokenIndex++) {
-              const outputTokenAddress = tokensInPool[outputTokenIndex];
+            const outputTokenData = tokenDataMap.get(outputTokenAddress.toLowerCase());
+            const outputTokenSymbol = outputTokenData?.symbol ?? null;
+            const outputTokenDecimal = outputTokenData?.decimals ?? null;

-              // Skip if it's the same as the input token
-              if (outputTokenIndex === inputTokenIndex) {
-                continue;
-              }
+            // Skip tokens with the same symbol as the selected token
+            if (!outputTokenSymbol || outputTokenSymbol === selectedTokenSymbol) {
+              continue;
+            }

-              // Get the symbol of this token
-              const outputTokenSymbol = await publicClient.readContract({
+            // Skip tokens if decimals failed to load
+            if (inputTokenDecimal === null || outputTokenDecimal === null) {
+              console.error(`Failed to load decimals for token ${outputTokenAddress} or ${tokenAddress}`);
+              continue;
+            }
+
+            // Create or update the available token entry
+            const tokenKey = outputTokenAddress.toLowerCase();
+            if (!tokenRoutesMap.has(tokenKey)) {
+              tokenRoutesMap.set(tokenKey, {
                address: outputTokenAddress,
-                abi: ERC20ABI,
-                functionName: 'symbol',
-              }).catch(() => null);
-
-              const inputTokenDecimal = await publicClient.readContract({
-                address: tokenAddress,
-                abi: ERC20ABI,
-                functionName: 'decimals',
-              }).catch(() => null);
-
-              const outputTokenDecimal = await publicClient.readContract({
-                address: outputTokenAddress,
-                abi: ERC20ABI,
-                functionName: 'decimals',
-              }).catch(() => null);
-
-               // Skip tokens with the same symbol as the selected token
-              if (!outputTokenSymbol || outputTokenSymbol === selectedTokenSymbol) {
-                continue;
-              }
-
-              // Skip tokens if decimals failed to load
-              if (inputTokenDecimal === null || outputTokenDecimal === null) {
-                console.error(`Failed to load decimals for token ${outputTokenAddress} or ${tokenAddress}`);
-                continue;
-              }
-
-              // Create or update the available token entry
-              const tokenKey = outputTokenAddress.toLowerCase();
-              if (!tokenRoutesMap.has(tokenKey)) {
-                tokenRoutesMap.set(tokenKey, {
-                  address: outputTokenAddress,
-                  symbol: outputTokenSymbol,
-                  swapRoutes: [],
-                });
-              }
-
-              // Add this swap route
-              tokenRoutesMap.get(tokenKey)!.swapRoutes.push({
-                poolAddress,
-                inputTokenIndex,
-                outputTokenIndex,
-                inputTokenDecimal,
-                outputTokenDecimal,
+                symbol: outputTokenSymbol,
+                swapRoutes: [],
              });
            }
-          } catch (err) {
-            console.error('Error fetching tokens from pool', poolAddress, err);
+
+            // Add this swap route
+            tokenRoutesMap.get(tokenKey)!.swapRoutes.push({
+              poolAddress,
+              inputTokenIndex,
+              outputTokenIndex,
+              inputTokenDecimal,
+              outputTokenDecimal,
+            });
          }
        }

@@ -326,55 +369,54 @@ export function useTokenDetails(userAddress: `0x${string}` | undefined) {
          return;
        }

+        // Build multicall contracts array - 4 calls per token (name, symbol, decimals, balanceOf)
+        const contracts = tokens.flatMap((tokenAddress) => [
+          {
+            address: tokenAddress,
+            abi: ERC20ABI,
+            functionName: 'name',
+          },
+          {
+            address: tokenAddress,
+            abi: ERC20ABI,
+            functionName: 'symbol',
+          },
+          {
+            address: tokenAddress,
+            abi: ERC20ABI,
+            functionName: 'decimals',
+          },
+          {
+            address: tokenAddress,
+            abi: ERC20ABI,
+            functionName: 'balanceOf',
+            args: [userAddress],
+          },
+        ]);
+
+        // Execute multicall
+        const results = await publicClient.multicall({
+          contracts: contracts as any,
+          allowFailure: true,
+        });
+
+        // Parse results
        const details: TokenDetails[] = [];
-
-        // Make individual calls for each token
        for (let i = 0; i < tokens.length; i++) {
-          const tokenAddress = tokens[i];
-          try {
-            const [name, symbol, decimals, balance] = await Promise.all([
-              publicClient.readContract({
-                address: tokenAddress,
-                abi: ERC20ABI,
-                functionName: 'name',
-              }).catch(() => 'Unknown'),
-              publicClient.readContract({
-                address: tokenAddress,
-                abi: ERC20ABI,
-                functionName: 'symbol',
-              }).catch(() => '???'),
-              publicClient.readContract({
-                address: tokenAddress,
-                abi: ERC20ABI,
-                functionName: 'decimals',
-              }).catch(() => 18),
-              publicClient.readContract({
-                address: tokenAddress,
-                abi: ERC20ABI,
-                functionName: 'balanceOf',
-                args: [userAddress],
-              }).catch(() => BigInt(0)),
-            ]);
+          const baseIndex = i * 4;
+          const nameResult = results[baseIndex];
+          const symbolResult = results[baseIndex + 1];
+          const decimalsResult = results[baseIndex + 2];
+          const balanceResult = results[baseIndex + 3];

-            details.push({
-              address: tokenAddress,
-              name: name as string,
-              symbol: symbol as string,
-              decimals: Number(decimals),
-              balance: balance as bigint,
-              index: i,
-            });
-          } catch (err) {
-            // Add token with fallback values if individual call fails
-            details.push({
-              address: tokenAddress,
-              name: 'Unknown',
-              symbol: '???',
-              decimals: 18,
-              balance: BigInt(0),
-              index: i,
-            });
-          }
+          details.push({
+            address: tokens[i],
+            name: nameResult.status === 'success' ? (nameResult.result as string) : 'Unknown',
+            symbol: symbolResult.status === 'success' ? (symbolResult.result as string) : '???',
+            decimals: decimalsResult.status === 'success' ? Number(decimalsResult.result) : 18,
+            balance: balanceResult.status === 'success' ? (balanceResult.result as bigint) : BigInt(0),
+            index: i,
+          });
        }

        setTokenDetails(details);
@@ -525,11 +567,9 @@ export function useGetAllPools(offset: number = 0, limit: number = 100) {
                    priceStr = `$${finalPrice.toFixed(4)}`;
                  }

-                  // Calculate TVL (approximate by getting first token balance and multiplying by 3)
+                  // Calculate TVL (approximate by getting first token balance and multiplying by number of tokens)
                  const tokenBalance = Number(balance) / Math.pow(10, decimals);
-
-                  console.log('tokenBalance', tokenBalance);
-                  const approximateTVL = tokenBalance * 3;
+                  const approximateTVL = tokenBalance * tokens.length;
                  tvlStr = formatTVL(approximateTVL);
                }
              } catch (err) {
--- a/src/hooks/usePartyPool.ts
+++ b/src/hooks/usePartyPool.ts
@@ -120,18 +120,6 @@ export function useSwapAmounts(
                setLoading(true);

                const amountInTokenUnits = parseUnits(fromAmount, fromTokenDecimals);
-                // Calculate limit price based on slippage tolerance
-                // limitPrice in Q96 format = Q96 * (100 + slippage%) / 100
-                // This represents the maximum acceptable price ratio (1 + slippage%)
-                const slippageBasisPoints = BigInt(Math.floor(slippagePercent * 100)); // Convert to basis points (0.5% = 50)
-                const limitPrice = (Q96 * (10000n + slippageBasisPoints)) / 10000n;
-
-                console.log('Limit Price Calculation:', {
-                    slippagePercent,
-                    slippageBasisPoints: slippageBasisPoints.toString(),
-                    limitPriceQ96: limitPrice.toString(),
-                    Q96: Q96.toString(),
-                });

                const results: SwapAmountResult[] = [];
                const chainId = await publicClient.getChainId();
@@ -146,8 +134,8 @@ export function useSwapAmounts(
                    // Evaluate ALL routes for this token
                    for (const route of token.swapRoutes) {
                        try {
-                            // Get swap amounts
-                            const swapResult = await publicClient.readContract({
+                            // Get swap amounts with NO LIMIT
+                            const [swapInputAmount, swapOutputAmount, inFee] = await publicClient.readContract({
                                address: route.poolAddress,
                                abi: IPartyPoolABI,
                                functionName: 'swapAmounts',
@@ -155,12 +143,10 @@ export function useSwapAmounts(
                                    BigInt(route.inputTokenIndex),
                                    BigInt(route.outputTokenIndex),
                                    amountInTokenUnits,
-                                    limitPrice,
+                                    0n, // NO LIMIT
                                ],
                            }) as readonly [bigint, bigint, bigint];

-                            const [amountIn, amountOut, fee] = swapResult;
-
                            // Get kappa for this pool
                            const kappa = await publicClient.readContract({
                                address: route.poolAddress,
@@ -172,19 +158,6 @@ export function useSwapAmounts(
                            let calculatedSlippage: number | undefined;
                            if (partyInfoAddress) {
                                try {
-                                    // Get swap amounts with NO LIMIT (0 means no price limit)
-                                    const [swapInputAmount, swapOutputAmount, inFee] = await publicClient.readContract({
-                                        address: route.poolAddress,
-                                        abi: IPartyPoolABI,
-                                        functionName: 'swapAmounts',
-                                        args: [
-                                            BigInt(route.inputTokenIndex),
-                                            BigInt(route.outputTokenIndex),
-                                            amountInTokenUnits,
-                                            0n, // NO LIMIT
-                                        ],
-                                    }) as readonly [bigint, bigint, bigint];
-
                                    // Get the current market price from PoolInfo
                                    const priceInt128 = await publicClient.readContract({
                                        address: partyInfoAddress,
@@ -193,11 +166,10 @@ export function useSwapAmounts(
                                        args: [route.poolAddress, BigInt(route.inputTokenIndex), BigInt(route.outputTokenIndex)],
                                    }) as bigint;

-
                                    // Convert Q128 format to decimal (price = priceValue / 2^128)
                                    // Then apply decimal conversion: 10^18 / 10^outputTokenDecimals
                                    const priceQ128 = Number(priceInt128) / 2 ** 128;
-                                    const decimalAdjustment = 10 ** Math.abs(route.outputTokenDecimal - route.inputTokenDecimal);
+                                    const decimalAdjustment = 10 ** (route.outputTokenDecimal - route.inputTokenDecimal);
                                    const marketPrice = priceQ128 / decimalAdjustment;
                                    const swapOutputAmountDecimal = Number(swapOutputAmount) / 10 ** route.outputTokenDecimal;
                                    const swapInputAmountDecimal = Number(swapInputAmount) / 10 ** route.inputTokenDecimal;
@@ -214,9 +186,9 @@ export function useSwapAmounts(
                            routeResults.push({
                                tokenAddress: token.address,
                                tokenSymbol: token.symbol,
-                                amountIn,
-                                amountOut,
-                                fee,
+                                amountIn: swapInputAmount,
+                                amountOut: swapOutputAmount,
+                                fee: inFee,
                                poolAddress: route.poolAddress,
                                kappa,
                                inputTokenIndex: route.inputTokenIndex,
@@ -388,9 +360,7 @@ export function useSwap() {
            await publicClient.waitForTransactionReceipt({ hash: approvalHash });
            console.log('✅ Approval confirmed');

-            // STEP 2: Calculate limit price and deadline
-            const slippageBasisPoints = BigInt(Math.floor(slippagePercent * 100));
-            const limitPrice = (Q96 * (10000n + slippageBasisPoints)) / 10000n;
+            // STEP 2: Calculate deadline
            const deadline = BigInt(Math.floor(Date.now() / 1000) + 1200);

            console.log('🚀 Executing swap with params:', {
@@ -400,12 +370,12 @@ export function useSwap() {
                inputTokenIndex,
                outputTokenIndex,
                maxAmountIn: maxAmountIn.toString(),
-                limitPrice: limitPrice.toString(),
+                limitPrice: '0 (no limit)',
                deadline: deadline.toString(),
                unwrap: false,
            });

-            // STEP 3: Execute the swap transaction
+            // STEP 3: Execute the swap transaction with no limit price
            const hash = await walletClient.writeContract({
                address: poolAddress,
                abi: IPartyPoolABI,
@@ -417,7 +387,7 @@ export function useSwap() {
                    BigInt(inputTokenIndex),
                    BigInt(outputTokenIndex),
                    maxAmountIn,
-                    limitPrice,
+                    0n, // no limit price
                    deadline,
                    false, // unwrap
                    '0x', // cbData (empty bytes)
Author	SHA1	Message	Date
surbhi	d207ef6dca	fixing the TVL calculation	2025-12-19 10:40:16 -04:00
surbhi	0e5921255e	speeding up getAllTokens by using multicall instead of sequentially calling details for each token	2025-12-19 10:35:59 -04:00
surbhi	1ac26aeec0	using viem for the uniswap quote and hiding the component since its not ready	2025-12-10 17:05:39 -04:00
surbhi	a2a036818d	getting quotes from unsiwap	2025-12-10 17:05:39 -04:00
tim	1c2e267136	removed .env-secret; fixed .gitignore; updated package.json for deploy pool script	2025-12-10 12:30:13 -04:00
tim	b2abf2073e	updated etherscan link	2025-12-08 23:54:57 -04:00
surbhi	9835d67e54	removing limitPrice calucating from the swap execution	2025-12-08 18:17:49 -04:00
surbhi	b0b050f4be	removing limit price from swap. updating slippage warnings and updating ABIs	2025-12-08 17:52:08 -04:00
surbhi	f43db3391b	removing abs in decimal adjustment calculation for slippage	2025-12-08 17:52:08 -04:00
surbhi	334e9f4f53	upgrading next.js related to this patch: https://nextjs.org/blog/CVE-2025-66478	2025-12-08 17:52:08 -04:00