removing limit price from swap. updating slippage warnings and updating ABIs

removing abs in decimal adjustment calculation for slippage
upgrading next.js related to this patch: https://nextjs.org/blog/CVE-2025-66478
2025-12-08 17:52:08 -04:00 · 2025-12-08 17:52:08 -04:00 · 2025-12-08 17:52:08 -04:00
6 changed files with 79 additions and 81 deletions
--- 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/src/components/swap-form.tsx
+++ b/src/components/swap-form.tsx
@@ -397,9 +397,9 @@ 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>
        )}
@@ -493,7 +493,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/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/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,
Author	SHA1	Message	Date
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