Merge pull request #839 from 0xprinc/aburkut/back-1766-fluid-dex-changes

Updated tests
paraswap · Nov 21, 2024 · 58e7b28 · 58e7b28
2 parents aea6687 + 9a19b2d
commit 58e7b28
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 23 deletions.
diff --git a/.env.example b/.env.example
diff --git a/src/dex/fluid-dex/fluid-dex-e2e.test.ts b/src/dex/fluid-dex/fluid-dex-e2e.test.ts
@@ -140,8 +140,8 @@ describe('FluidDex E2E', () => {
       const tokenASymbol: string = 'USDC';
       const tokenBSymbol: string = 'USDT';
 
-      const tokenAAmount: string = '1000000';
-      const tokenBAmount: string = '100000000';
+      const tokenAAmount: string = '10000';
+      const tokenBAmount: string = '1000000';
 
       testForNetwork(
         network,

diff --git a/src/dex/fluid-dex/fluid-dex-events.test.ts b/src/dex/fluid-dex/fluid-dex-events.test.ts
@@ -84,7 +84,7 @@ describe('FluidDex EventPool Mainnet', function () {
 
     const eventsToTest: Record<Address, EventMappings> = {
       '0x91716C4EDA1Fb55e84Bf8b4c7085f84285c19085': {
-        LogDexDeployed: [21105298, 21105363, 21105367, 21105371],
+        LogDexDeployed: [21199929],
       },
     };
 

diff --git a/src/dex/fluid-dex/fluid-dex-integration.test.ts b/src/dex/fluid-dex/fluid-dex-integration.test.ts
@@ -116,7 +116,6 @@ async function checkOnChainPricing(
         return price === 0n;
       }
       const percentDiff = ((price - expectedPrice) * 100n) / expectedPrice;
-      console.log('this is percent diff : ', percentDiff);
       return percentDiff <= 0.01 && percentDiff >= -0.01;
     }),
   ).toBe(true);

diff --git a/src/dex/fluid-dex/fluid-dex.ts b/src/dex/fluid-dex/fluid-dex.ts
@@ -755,11 +755,15 @@ export class FluidDex extends SimpleExchange implements IDex<FluidDexData> {
       currentLimits,
       syncTime,
     );
-    return (
-      ((amountIn * BigInt(this.FEE_100_PERCENT)) /
-        (BigInt(this.FEE_100_PERCENT) - fee)) *
-      BigInt(10) ** BigInt(inDecimals - 12)
-    );
+
+    if (amountIn == 2n ** 256n - 1n) {
+      return amountIn;
+    }
+    const ans =
+      (amountIn * this.FEE_100_PERCENT * BigInt(10 ** inDecimals)) /
+      BigInt(10 ** 12) /
+      (this.FEE_100_PERCENT - fee);
+    return ans;
   }
 
   /**
@@ -892,10 +896,10 @@ export class FluidDex extends SimpleExchange implements IDex<FluidDexData> {
         debtIReserveOut,
       );
       if (amountOut > debtReserveOut) {
-        return BigInt(Number.MAX_SAFE_INTEGER);
+        return 2n ** 256n - 1n;
       }
       if (amountOut > borrowable) {
-        return BigInt(Number.MAX_SAFE_INTEGER);
+        return 2n ** 256n - 1n;
       }
     } else if (a >= amountOut) {
       // Entire trade routes through collateral pool
@@ -906,10 +910,10 @@ export class FluidDex extends SimpleExchange implements IDex<FluidDexData> {
         colIReserveOut,
       );
       if (amountOut > colReserveOut) {
-        return BigInt(Number.MAX_SAFE_INTEGER);
+        return 2n ** 256n - 1n;
       }
       if (amountOut > withdrawable) {
-        return BigInt(Number.MAX_SAFE_INTEGER);
+        return 2n ** 256n - 1n;
       }
     } else {
       // Trade routes through both pools
@@ -922,10 +926,10 @@ export class FluidDex extends SimpleExchange implements IDex<FluidDexData> {
         debtIReserveOut,
       );
       if (amountOutDebt > debtReserveOut || a > colReserveOut) {
-        return BigInt(Number.MAX_SAFE_INTEGER);
+        return 2n ** 256n - 1n;
       }
       if (amountOutDebt > borrowable || a > withdrawable) {
-        return BigInt(Number.MAX_SAFE_INTEGER);
+        return 2n ** 256n - 1n;
       }
     }
 
@@ -962,7 +966,7 @@ export class FluidDex extends SimpleExchange implements IDex<FluidDexData> {
       (oldPrice / BigInt(100)) * MAX_PRICE_DIFF
     ) {
       // if price diff is > 5% then swap would revert.
-      return BigInt(Number.MAX_SAFE_INTEGER);
+      return 2n ** 256n - 1n;
     }
 
     const totalAmountIn = amountInCollateral + amountInDebt;