@paraswap/dex-lib 4.1.1 → 4.1.2-fluid.2

package/src/dex/balancer-v3/balancer-v3-events.test.ts

@@ -129,95 +129,168 @@ type EventData = { blockNumbers: number[]; poolAddress: string[] };
 
 describe('BalancerV3 EventPool', function () {
   const dexKey = 'BalancerV3';
-  const network = Network.SEPOLIA;
-  const dexHelper = new DummyDexHelper(network);
-  const logger = dexHelper.getLogger(dexKey);
-  let balancerV3Pool: BalancerV3EventPool;
-
-  // vault -> EventMappings
-  // TODO once we have a new test deployment add tests for: AggregateSwapFeePercentageChanged, SwapFeePercentageChanged, PoolPausedStateChanged
-  const eventsToTest: Record<Address, EventMappings> = {
-    [BalancerV3Config.BalancerV3[network].vaultAddress]: {
-      // https://eth-sepolia.blockscout.com/tx/0xc417d38ad6e21250c9ddded37680b40f0991cfd3f8ae2d8b5800507a58d48c44
-      LiquidityAdded: {
-        blockNumbers: [7170937],
-        poolAddress: ['0x2ff3b96e0057a1f25f1d62ab800554ccdb268ab8'],
-      },
-      // https://sepolia.etherscan.io/tx/0xc1596e26d51104b9236a0debc3e1946b30b82f92b8331639ad6f6aea2ff2decc
-      LiquidityRemoved: {
-        blockNumbers: [7170957],
-        poolAddress: ['0x2ff3b96e0057a1f25f1d62ab800554ccdb268ab8'],
-      },
-      // https://sepolia.etherscan.io/tx/0x78d18503c2dd4458c94ec916b10c088bb4e8b90059676d00dbcec83f763d8c0e
-      Swap: {
-        blockNumbers: [7175721],
-        poolAddress: ['0x2ff3b96e0057a1f25f1d62ab800554ccdb268ab8'],
-      },
-      // 7170034, AmpUpdateStarted, https://eth-sepolia.blockscout.com/tx/0xfbe2e53d9cede1dc900100a1d6e809a89d909746ac7b8cc011e93227af8dda8b?tab=logs
-      // 7170069, AmpUpdateStopped, https://eth-sepolia.blockscout.com/tx/0x2ee2e1d5980013fdf1cf9c3789e0321fb598c2412db8ee8057fcfaffd1c792ab?tab=logs
-      VaultAuxiliary: {
-        blockNumbers: [7170034, 7170069],
-        poolAddress: [
-          '0xD63dB0B88dca565633fB8d70a70b9b8093d34A7E',
-          '0xD63dB0B88dca565633fB8d70a70b9b8093d34A7E',
-        ],
-      },
-      // https://sepolia.etherscan.io/tx/0x71f9879485f4e4cf97aa42381988ffe277f05a872d6b507cfa007cec1239a3f8#eventlog
-      SwapFeePercentageChanged: {
-        blockNumbers: [7206571],
-        poolAddress: ['0xe69b70a86A4e1fD33dA95693A1aE12Be1c26C8ea'],
-      },
-      // https://sepolia.etherscan.io/tx/0xaf232ca2df59ba5fad38d74e9b54ec2ae1ad2e6abca8348f107cf3fd94c787c7#eventlog
-      // Should remove pool from state as its paused and no longer supports swaps
-      PoolPausedStateChanged: {
-        blockNumbers: [7206586],
-        poolAddress: ['0xe69b70a86A4e1fD33dA95693A1aE12Be1c26C8ea'],
-      },
-      // https://sepolia.etherscan.io/tx/0xa23dc10bd0fbed7ffffe867766d9b0d7670ca4a0bc352669f547bc7775644349#eventlog
-      AggregateSwapFeePercentageChanged: {
-        blockNumbers: [7206701],
-        poolAddress: ['0xe69b70a86A4e1fD33dA95693A1aE12Be1c26C8ea'],
+
+  describe('Sepolia', function () {
+    const network = Network.SEPOLIA;
+    const dexHelper = new DummyDexHelper(network);
+    const logger = dexHelper.getLogger(dexKey);
+    let balancerV3Pool: BalancerV3EventPool;
+
+    // vault -> EventMappings
+    // TODO once we have a new test deployment add tests for: AggregateSwapFeePercentageChanged, SwapFeePercentageChanged, PoolPausedStateChanged
+    const eventsToTest: Record<Address, EventMappings> = {
+      [BalancerV3Config.BalancerV3[network].vaultAddress]: {
+        // https://eth-sepolia.blockscout.com/tx/0xc417d38ad6e21250c9ddded37680b40f0991cfd3f8ae2d8b5800507a58d48c44
+        LiquidityAdded: {
+          blockNumbers: [7170937],
+          poolAddress: ['0x2ff3b96e0057a1f25f1d62ab800554ccdb268ab8'],
+        },
+        // https://sepolia.etherscan.io/tx/0xc1596e26d51104b9236a0debc3e1946b30b82f92b8331639ad6f6aea2ff2decc
+        LiquidityRemoved: {
+          blockNumbers: [7170957],
+          poolAddress: ['0x2ff3b96e0057a1f25f1d62ab800554ccdb268ab8'],
+        },
+        // https://sepolia.etherscan.io/tx/0x78d18503c2dd4458c94ec916b10c088bb4e8b90059676d00dbcec83f763d8c0e
+        Swap: {
+          blockNumbers: [7175721],
+          poolAddress: ['0x2ff3b96e0057a1f25f1d62ab800554ccdb268ab8'],
+        },
+        // 7170034, AmpUpdateStarted, https://eth-sepolia.blockscout.com/tx/0xfbe2e53d9cede1dc900100a1d6e809a89d909746ac7b8cc011e93227af8dda8b?tab=logs
+        // 7170069, AmpUpdateStopped, https://eth-sepolia.blockscout.com/tx/0x2ee2e1d5980013fdf1cf9c3789e0321fb598c2412db8ee8057fcfaffd1c792ab?tab=logs
+        VaultAuxiliary: {
+          blockNumbers: [7170034, 7170069],
+          poolAddress: [
+            '0xD63dB0B88dca565633fB8d70a70b9b8093d34A7E',
+            '0xD63dB0B88dca565633fB8d70a70b9b8093d34A7E',
+          ],
+        },
+        // https://sepolia.etherscan.io/tx/0x71f9879485f4e4cf97aa42381988ffe277f05a872d6b507cfa007cec1239a3f8#eventlog
+        SwapFeePercentageChanged: {
+          blockNumbers: [7206571],
+          poolAddress: ['0xe69b70a86A4e1fD33dA95693A1aE12Be1c26C8ea'],
+        },
+        // https://sepolia.etherscan.io/tx/0xaf232ca2df59ba5fad38d74e9b54ec2ae1ad2e6abca8348f107cf3fd94c787c7#eventlog
+        // Should remove pool from state as its paused and no longer supports swaps
+        PoolPausedStateChanged: {
+          blockNumbers: [7206586],
+          poolAddress: ['0xe69b70a86A4e1fD33dA95693A1aE12Be1c26C8ea'],
+        },
+        // https://sepolia.etherscan.io/tx/0xa23dc10bd0fbed7ffffe867766d9b0d7670ca4a0bc352669f547bc7775644349#eventlog
+        AggregateSwapFeePercentageChanged: {
+          blockNumbers: [7206701],
+          poolAddress: ['0xe69b70a86A4e1fD33dA95693A1aE12Be1c26C8ea'],
+        },
       },
-    },
-  };
+    };
+
+    beforeEach(async () => {
+      balancerV3Pool = new BalancerV3EventPool(
+        dexKey,
+        network,
+        dexHelper,
+        logger,
+      );
+    });
 
-  beforeEach(async () => {
-    balancerV3Pool = new BalancerV3EventPool(
-      dexKey,
-      network,
-      dexHelper,
-      logger,
+    Object.entries(eventsToTest).forEach(
+      ([vaultAddress, events]: [string, EventMappings]) => {
+        describe(`Events for Vault: ${vaultAddress}`, () => {
+          Object.entries(events).forEach(
+            ([eventName, eventData]: [string, EventData]) => {
+              describe(`${eventName}`, () => {
+                eventData.blockNumbers.forEach((blockNumber: number, i) => {
+                  it(`Pool: ${eventData.poolAddress[i]} State after ${blockNumber}`, async function () {
+                    await testEventSubscriber(
+                      balancerV3Pool,
+                      balancerV3Pool.addressesSubscribed,
+                      (_blockNumber: number) =>
+                        fetchPoolState(
+                          balancerV3Pool,
+                          _blockNumber,
+                          eventData.poolAddress[i],
+                        ),
+                      blockNumber,
+                      `${dexKey}_${vaultAddress}`,
+                      dexHelper.provider,
+                      stateCompare,
+                    );
+                  });
+                });
+              });
+            },
+          );
+        });
+      },
     );
   });
 
-  Object.entries(eventsToTest).forEach(
-    ([vaultAddress, events]: [string, EventMappings]) => {
-      describe(`Events for Vault: ${vaultAddress}`, () => {
-        Object.entries(events).forEach(
-          ([eventName, eventData]: [string, EventData]) => {
-            describe(`${eventName}`, () => {
-              eventData.blockNumbers.forEach((blockNumber: number, i) => {
-                it(`Pool: ${eventData.poolAddress[i]} State after ${blockNumber}`, async function () {
-                  await testEventSubscriber(
-                    balancerV3Pool,
-                    balancerV3Pool.addressesSubscribed,
-                    (_blockNumber: number) =>
-                      fetchPoolState(
-                        balancerV3Pool,
-                        _blockNumber,
-                        eventData.poolAddress[i],
-                      ),
-                    blockNumber,
-                    `${dexKey}_${vaultAddress}`,
-                    dexHelper.provider,
-                    stateCompare,
-                  );
+  describe('Mainnet', function () {
+    const network = Network.MAINNET;
+    const dexHelper = new DummyDexHelper(network);
+    const logger = dexHelper.getLogger(dexKey);
+    let balancerV3Pool: BalancerV3EventPool;
+
+    // vault -> EventMappings
+    // TODO once we have a new test deployment add tests for: AggregateSwapFeePercentageChanged, SwapFeePercentageChanged, PoolPausedStateChanged
+    const eventsToTest: Record<Address, EventMappings> = {
+      [BalancerV3Config.BalancerV3[network].vaultAddress]: {
+        LiquidityAdded: {
+          blockNumbers: [21774068],
+          poolAddress: ['0x8523bcadcda4bd329435940dcc49a7c4c0a14d94'],
+        },
+        LiquidityRemoved: {
+          blockNumbers: [21788910],
+          poolAddress: ['0x8523bcadcda4bd329435940dcc49a7c4c0a14d94'],
+        },
+        Swap: {
+          blockNumbers: [21788638, 21791514, 21791514],
+          poolAddress: [
+            '0x8523bcadcda4bd329435940dcc49a7c4c0a14d94',
+            '0x8523bcadcda4bd329435940dcc49a7c4c0a14d94',
+            '0x8523bcadcda4bd329435940dcc49a7c4c0a14d94',
+          ],
+        },
+      },
+    };
+
+    beforeEach(async () => {
+      balancerV3Pool = new BalancerV3EventPool(
+        dexKey,
+        network,
+        dexHelper,
+        logger,
+      );
+    });
+
+    Object.entries(eventsToTest).forEach(
+      ([vaultAddress, events]: [string, EventMappings]) => {
+        describe(`Events for Vault: ${vaultAddress}`, () => {
+          Object.entries(events).forEach(
+            ([eventName, eventData]: [string, EventData]) => {
+              describe(`${eventName}`, () => {
+                eventData.blockNumbers.forEach((blockNumber: number, i) => {
+                  it(`Pool: ${eventData.poolAddress[i]} State after ${blockNumber}`, async function () {
+                    await testEventSubscriber(
+                      balancerV3Pool,
+                      balancerV3Pool.addressesSubscribed,
+                      (_blockNumber: number) =>
+                        fetchPoolState(
+                          balancerV3Pool,
+                          _blockNumber,
+                          eventData.poolAddress[i],
+                        ),
+                      blockNumber,
+                      `${dexKey}_${vaultAddress}`,
+                      dexHelper.provider,
+                      stateCompare,
+                    );
+                  });
                 });
               });
-            });
-          },
-        );
-      });
-    },
-  );
+            },
+          );
+        });
+      },
+    );
+  });
 });

package/src/dex/balancer-v3/balancer-v3-pool.ts

@@ -218,10 +218,12 @@ export class BalancerV3EventPool extends StatefulEventSubscriber<PoolStateMap> {
       i < newState[poolAddress].balancesLiveScaled18.length;
       i++
     ) {
-      newState[poolAddress].balancesLiveScaled18[i] += this.toScaled18(
-        BigInt(event.args.amountsAddedRaw[i]),
-        newState[poolAddress].scalingFactors[i],
-      );
+      newState[poolAddress].balancesLiveScaled18[i] +=
+        this.toScaled18ApplyRateRoundDown(
+          BigInt(event.args.amountsAddedRaw[i]),
+          newState[poolAddress].scalingFactors[i],
+          newState[poolAddress].tokenRates[i] || WAD,
+        );
     }
     newState[poolAddress].totalSupply = BigInt(event.args.totalSupply);
 
@@ -244,10 +246,12 @@ export class BalancerV3EventPool extends StatefulEventSubscriber<PoolStateMap> {
       i < newState[poolAddress].balancesLiveScaled18.length;
       i++
     ) {
-      newState[poolAddress].balancesLiveScaled18[i] -= this.toScaled18(
-        BigInt(event.args.amountsRemovedRaw[i]),
-        newState[poolAddress].scalingFactors[i],
-      );
+      newState[poolAddress].balancesLiveScaled18[i] -=
+        this.toScaled18ApplyRateRoundDown(
+          BigInt(event.args.amountsRemovedRaw[i]),
+          newState[poolAddress].scalingFactors[i],
+          newState[poolAddress].tokenRates[i] || WAD,
+        );
     }
     newState[poolAddress].totalSupply = BigInt(event.args.totalSupply);
 
@@ -275,14 +279,17 @@ export class BalancerV3EventPool extends StatefulEventSubscriber<PoolStateMap> {
       this.logger.error(`swapEvent - token index not found in pool state`);
       return null;
     }
-    newState[poolAddress].balancesLiveScaled18[tokenInIndex] += this.toScaled18(
-      BigInt(event.args.amountIn),
-      newState[poolAddress].scalingFactors[tokenInIndex],
-    );
+    newState[poolAddress].balancesLiveScaled18[tokenInIndex] +=
+      this.toScaled18ApplyRateRoundDown(
+        BigInt(event.args.amountIn),
+        newState[poolAddress].scalingFactors[tokenInIndex],
+        newState[poolAddress].tokenRates[tokenInIndex] || WAD,
+      );
     newState[poolAddress].balancesLiveScaled18[tokenOutIndex] -=
-      this.toScaled18(
+      this.toScaled18ApplyRateRoundDown(
         BigInt(event.args.amountOut),
         newState[poolAddress].scalingFactors[tokenOutIndex],
+        newState[poolAddress].tokenRates[tokenOutIndex] || WAD,
       );
 
     return newState;
@@ -697,6 +704,19 @@ export class BalancerV3EventPool extends StatefulEventSubscriber<PoolStateMap> {
   }
 
   toScaled18(amount: bigint, scalingFactor: bigint): bigint {
+    // (amount * scalingFactor).mulUp(tokenRate);
     return (amount * scalingFactor * WAD) / WAD;
   }
+
+  toScaled18ApplyRateRoundDown(
+    amount: bigint,
+    scalingFactor: bigint,
+    tokenRate: bigint,
+  ): bigint {
+    return this.mulDown(amount * scalingFactor, tokenRate);
+  }
+
+  mulDown(a: bigint, b: bigint): bigint {
+    return (a * b) / WAD;
+  }
 }

package/src/dex/balancer-v3/balancer-v3.ts

@@ -30,7 +30,7 @@ import { Block } from '@ethersproject/abstract-provider';
 
 const MAX_UINT256 =
   '115792089237316195423570985008687907853269984665640564039457584007913129639935';
-const POOL_UPDATE_TTL = 5 * 60; // 5mins
+const POOL_UPDATE_TTL = 1 * 60; // 1min
 const RATE_UPDATE_TTL = 1 * 60; // 1min
 
 type DeepMutable<T> = {

package/src/dex/fluid-dex/config.ts

@@ -7,14 +7,14 @@ export const FluidDexConfig: DexConfigMap<DexParams> = {
     [Network.MAINNET]: {
       commonAddresses: {
         liquidityProxy: '0x52aa899454998be5b000ad077a46bbe360f4e497',
-        resolver: '0x45f4ad57e300da55c33dea579a40fcee000d7b94',
+        resolver: '0xb387f9C2092cF7c4943F97842887eBff7AE96EB3',
         dexFactory: '0x91716C4EDA1Fb55e84Bf8b4c7085f84285c19085',
       },
     },
     [Network.ARBITRUM]: {
       commonAddresses: {
         liquidityProxy: '0x52Aa899454998Be5b000Ad077a46Bbe360F4e497',
-        resolver: '0xb8f526718FF58758E256D9aD86bC194a9ff5986D',
+        resolver: '0xCe6F4E40152a1DF97ae95a7e4F60D944871A4060',
         dexFactory: '0x91716C4EDA1Fb55e84Bf8b4c7085f84285c19085',
       },
     },

package/src/dex/fluid-dex/constants.ts

@@ -1 +1,2 @@
-export const MIN_SWAP_LIQUIDITY = 10n ** 4n;
+// on-chain we use 1e4 but use extra buffer to avoid reverts
+export const MIN_SWAP_LIQUIDITY = 8500n;

package/src/dex/fluid-dex/fluid-dex-e2e.test.ts

@@ -4,46 +4,13 @@ dotenv.config();
 
 import { StaticJsonRpcProvider } from '@ethersproject/providers';
 import { testE2E } from '../../../tests/utils-e2e';
-import {
-  Tokens,
-  Holders,
-  NativeTokenSymbols,
-} from '../../../tests/constants-e2e';
+import { Tokens, Holders } from '../../../tests/constants-e2e';
 import { Network, ContractMethod, SwapSide } from '../../constants';
 import { generateConfig } from '../../config';
 import { CollateralReserves, DebtReserves, DexLimits } from './types';
 import { DummyDexHelper } from '../../dex-helper/index';
 import { FluidDex } from './fluid-dex';
 
-/*
-  README
-  ======
-
-  The template already enumerates the basic structure which involves
-  testing simpleSwap, multiSwap, megaSwap contract methods for
-  ETH <> TOKEN and TOKEN <> TOKEN swaps. You should replace tokenA and
-  tokenB with any two highly liquid tokens on FluidDex for the tests
-  to work. If the tokens that you would like to use are not defined in
-  Tokens or Holders map, you can update the './tests/constants-e2e'
-
-  Other than the standard cases that are already added by the template
-  it is highly recommended to add test cases which could be specific
-  to testing FluidDex (Eg. Tests based on poolType, special tokens,
-  etc).
-
-  You can run this individual test script by running:
-  `npx jest src/dex/<dex-name>/<dex-name>-e2e.test.ts`
-
-  e2e tests use the Tenderly fork api. Please add the following to your
-  .env file:
-  TENDERLY_TOKEN=Find this under Account>Settings>Authorization.
-  TENDERLY_ACCOUNT_ID=Your Tenderly account name.
-  TENDERLY_PROJECT=Name of a Tenderly project you have created in your
-  dashboard.
-
-  (This comment should be removed from the final implementation)
-*/
-
 function testForNetwork(
   network: Network,
   dexKey: string,
@@ -56,9 +23,14 @@ function testForNetwork(
     generateConfig(network).privateHttpProvider,
     network,
   );
+
   const tokens = Tokens[network];
   const holders = Holders[network];
 
+  // Create FluidDex instance to check reserves
+  const dexHelper = new DummyDexHelper(network);
+  const fluidDex = new FluidDex(network, dexKey, dexHelper);
+
   const sideToContractMethods = new Map([
     [SwapSide.SELL, [ContractMethod.swapExactAmountIn]],
     [SwapSide.BUY, [ContractMethod.swapExactAmountOut]],
@@ -69,11 +41,11 @@ function testForNetwork(
       describe(`${side}`, () => {
         contractMethods.forEach((contractMethod: string) => {
           describe(`${contractMethod}`, () => {
-            it(`${tokenASymbol} -> ${tokenBSymbol}`, async () => {
+            it(`${tokenBSymbol} -> ${tokenASymbol}`, async () => {
               await testE2E(
-                tokens[tokenASymbol],
                 tokens[tokenBSymbol],
-                holders[tokenASymbol],
+                tokens[tokenASymbol],
+                holders[tokenBSymbol],
                 tokenBAmount,
                 side,
                 dexKey,
@@ -82,12 +54,13 @@ function testForNetwork(
                 provider,
               );
             });
-            it(`${tokenBSymbol} -> ${tokenASymbol}`, async () => {
+
+            it(`${tokenASymbol} -> ${tokenBSymbol}`, async () => {
               await testE2E(
-                tokens[tokenBSymbol],
                 tokens[tokenASymbol],
-                holders[tokenBSymbol],
-                tokenBAmount,
+                tokens[tokenBSymbol],
+                holders[tokenASymbol],
+                tokenAAmount,
                 side,
                 dexKey,
                 contractMethod as ContractMethod,
@@ -108,30 +81,11 @@ describe('FluidDex E2E', () => {
   describe('Mainnet', () => {
     const network = Network.MAINNET;
 
-    // TODO: Uncomment & test when the issue is resolved. Currently no price as expected.
-    // describe.only('FLUID -> ETH', () => {
-    //   const tokenASymbol: string = 'FLUID';
-    //   const tokenBSymbol: string = 'ETH';
-    //
-    //   const tokenAAmount: string = '160097047322810379';
-    //   const tokenBAmount: string = '79923068733005505624';
-    //
-    //   testForNetwork(
-    //     network,
-    //     dexKey,
-    //     tokenASymbol,
-    //     tokenBSymbol,
-    //     tokenAAmount,
-    //     tokenBAmount,
-    //   );
-    // });
-
-    describe('ETH -> INST', () => {
-      const tokenASymbol: string = 'ETH';
-      const tokenBSymbol: string = 'INST';
-
-      const tokenAAmount: string = '100000000000000';
-      const tokenBAmount: string = '100000000000000';
+    describe('limit:FLUID -> ETH', () => {
+      const tokenASymbol: string = 'FLUID';
+      const tokenBSymbol: string = 'ETH';
+      const tokenAAmount: string = '16009704732281037900';
+      const tokenBAmount: string = '7992306873300550562400';
 
       testForNetwork(
         network,
@@ -148,7 +102,7 @@ describe('FluidDex E2E', () => {
       const tokenBSymbol: string = 'ETH';
 
       const tokenAAmount: string = '100000000000000';
-      const tokenBAmount: string = '100000000000000';
+      const tokenBAmount: string = '3500000000000000000';
 
       testForNetwork(
         network,
@@ -237,6 +191,9 @@ function NewDebtReservesOne(): DebtReserves {
   };
 }
 
+const centerPriceTight: bigint = 3401944443797854601871360n;
+const centerPriceWide: bigint = 1190081051944310368000000000n;
+
 const limitsTight: DexLimits = {
   withdrawableToken0: {
     available: 456740438880263n,
@@ -283,10 +240,6 @@ const limitsWide: DexLimits = {
   },
 };
 
-const ErrInsufficientBorrowable = new Error('insufficient borrowable');
-const ErrInsufficientMaxPrice = new Error('insufficient max price');
-const ErrInsufficientReserve = new Error('insufficient reserve');
-
 describe('TestPoolSimulator_SwapInLimits', () => {
   const network = Network.MAINNET;
   const dexHelper = new DummyDexHelper(network);
@@ -295,21 +248,18 @@ describe('TestPoolSimulator_SwapInLimits', () => {
 
   it('when limits hit', () => {
     let outAmt;
-    try {
-      outAmt = fluidDex.swapInAdjusted(
-        true,
-        BigInt(1e15),
-        NewColReservesOne(),
-        NewDebtReservesOne(),
-        100n,
-        18,
-        limitsTight,
-        Math.floor(Date.now() / 1000) - 10,
-      );
-      expect(outAmt).toEqual(0n);
-    } catch (err: any) {
-      expect(err.message).toEqual(ErrInsufficientBorrowable.message);
-    }
+    outAmt = fluidDex.swapInAdjusted(
+      true,
+      BigInt(1e15),
+      NewColReservesOne(),
+      NewDebtReservesOne(),
+      100n,
+      18,
+      limitsTight,
+      BigInt(centerPriceTight),
+      Math.floor(Date.now() / 1000) - 10,
+    );
+    expect(outAmt).toEqual(0n);
   });
 
   it('when expanded', () => {
@@ -321,47 +271,41 @@ describe('TestPoolSimulator_SwapInLimits', () => {
       100n,
       18,
       limitsTight,
+      BigInt(centerPriceTight),
       Math.floor(Date.now() / 1000) - 6000,
     );
-    console.log('outAmt: ', outAmt);
-    expect(outAmt?.toString()).toEqual('998262697204710');
+    expect(outAmt?.toString()).toEqual('998163044346107');
   });
 
   it('when price diff hit', () => {
     let outAmt;
-    try {
-      outAmt = fluidDex.swapInAdjusted(
-        true,
-        BigInt(3e16),
-        NewColReservesOne(),
-        NewDebtReservesOne(),
-        100n,
-        18,
-        limitsWide,
-        Math.floor(Date.now() / 1000) - 10,
-      );
-      expect(outAmt).toEqual(0n);
-    } catch (err: any) {
-      expect(err.message).toEqual(ErrInsufficientMaxPrice.message);
-    }
+    outAmt = fluidDex.swapInAdjusted(
+      true,
+      BigInt(3e16),
+      NewColReservesOne(),
+      NewDebtReservesOne(),
+      100n,
+      18,
+      limitsWide,
+      BigInt(centerPriceWide),
+      Math.floor(Date.now() / 1000) - 10,
+    );
+    expect(outAmt).toEqual(0n);
   });
 
   it('when reserves limit is hit', () => {
     let outAmt;
-    try {
-      outAmt = fluidDex.swapInAdjusted(
-        true,
-        BigInt(5e16),
-        NewColReservesOne(),
-        NewDebtReservesOne(),
-        100n,
-        18,
-        limitsWide,
-        Math.floor(Date.now() / 1000) - 10,
-      );
-      expect(outAmt).toEqual(0n);
-    } catch (err: any) {
-      expect(err.message).toEqual(ErrInsufficientReserve.message);
-    }
+    outAmt = fluidDex.swapInAdjusted(
+      true,
+      BigInt(5e16),
+      NewColReservesOne(),
+      NewDebtReservesOne(),
+      100n,
+      18,
+      limitsWide,
+      BigInt(centerPriceWide),
+      Math.floor(Date.now() / 1000) - 10,
+    );
+    expect(outAmt).toEqual(0n);
   });
 });

package/src/dex/fluid-dex/fluid-dex-liquidity-proxy.ts

@@ -137,12 +137,14 @@ export class FluidDexLiquidityProxy extends StatefulEventSubscriber<FluidDexLiqu
         token0,
         token1,
         feeHex,
+        centerPriceHex,
         collateralReservesHex,
         debtReservesHex,
         dexLimitsHex,
       ] = poolReserve;
 
       const fee = Number(feeHex.toString());
+      const centerPrice = Number(centerPriceHex.toString());
 
       const collateralReserves = {
         token0RealReserves: bigIntify(collateralReservesHex[0]),
@@ -196,6 +198,7 @@ export class FluidDexLiquidityProxy extends StatefulEventSubscriber<FluidDexLiqu
         token0,
         token1,
         fee,
+        centerPrice,
         collateralReserves,
         debtReserves,
         dexLimits,