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

package/build/dex/zerox/index.js

@@ -13,13 +13,46 @@ const zrx_v4_json_1 = __importDefault(require("../../abi/zrx.v4.json"));
 const constants_1 = require("../../constants");
 const simple_exchange_1 = require("../simple-exchange");
 const order_1 = require("./order");
-const types_1 = require("./types");
-const config_1 = require("./config");
+const ZRX_EXCHANGE = {
+    1: {
+        2: '0x080bf510fcbf18b91105470639e9561022937712',
+        3: '0x61935CbDd02287B511119DDb11Aeb42F1593b7Ef',
+        4: '0xdef1c0ded9bec7f1a1670819833240f027b25eff',
+    },
+    56: {
+        2: '0x3F93C3D9304a70c9104642AB8cD37b1E2a7c203A',
+        4: '0xdef1c0ded9bec7f1a1670819833240f027b25eff',
+    },
+    137: {
+        4: '0xdef1c0ded9bec7f1a1670819833240f027b25eff',
+    },
+};
 const ZRX_ABI = {
     2: zrx_v2_json_1.default,
     3: zrx_v3_json_1.default,
     4: zrx_v4_json_1.default,
 };
+const ZRX_EXCHANGE_ERC20PROXY = {
+    1: {
+        1: '0x95E6F48254609A6ee006F7D493c8e5fB97094ceF',
+        2: '0x95E6F48254609A6ee006F7D493c8e5fB97094ceF',
+        4: '0xdef1c0ded9bec7f1a1670819833240f027b25eff',
+    },
+    56: {
+        2: '0xCF21d4b7a265FF779accBA55Ace0F56C8cE6e379',
+        4: '0xdef1c0ded9bec7f1a1670819833240f027b25eff',
+    },
+    137: {
+        4: '0xdef1c0ded9bec7f1a1670819833240f027b25eff',
+    },
+};
+var ZeroXFunctions;
+(function (ZeroXFunctions) {
+    ZeroXFunctions["swapOnZeroXv2"] = "swapOnZeroXv2";
+    ZeroXFunctions["swapOnZeroXv4"] = "swapOnZeroXv4";
+    ZeroXFunctions["swapOnZeroXv2WithPermit"] = "swapOnZeroXv2WithPermit";
+    ZeroXFunctions["swapOnZeroXv4WithPermit"] = "swapOnZeroXv4WithPermit";
+})(ZeroXFunctions || (ZeroXFunctions = {}));
 class ZeroX extends simple_exchange_1.SimpleExchange {
     constructor(dexHelper) {
         super(dexHelper, 'zerox');
@@ -27,7 +60,7 @@ class ZeroX extends simple_exchange_1.SimpleExchange {
         this.routerInterface = new abi_1.Interface(IParaswap_json_1.default);
     }
     getExchange(data) {
-        return config_1.ZRX_EXCHANGE[this.network][data.version];
+        return ZRX_EXCHANGE[this.network][data.version];
     }
     buildSimpleSwapData(data, srcAmount) {
         const zrxABI = ZRX_ABI[data.version];
@@ -134,48 +167,7 @@ class ZeroX extends simple_exchange_1.SimpleExchange {
         }
         const swapData = this.buildSimpleSwapData(data, srcAmount);
         const networkFees = '0';
-        return this.buildSimpleParamWithoutWETHConversion(src, srcAmount, dest, destAmount, swapData, this.getExchange(data), config_1.ZRX_EXCHANGE_ERC20PROXY[this.network][data.version], networkFees);
-    }
-    getDexParam(_srcToken, _destToken, srcAmount, destAmount, _recipient, data, side) {
-        if (side === constants_1.SwapSide.BUY) {
-            // Adjust the srcAmount according to the exact order price (rounding up)
-            if (data.version === 4) {
-                const order = data.order;
-                if (BigInt(destAmount) > BigInt(order.makerAmount)) {
-                    throw new Error(`ZeroX destAmount ${destAmount} > makerAmount ${order.makerAmount}`);
-                }
-                const calc = (BigInt(destAmount) * BigInt(order.takerAmount) +
-                    BigInt(order.makerAmount) -
-                    1n) /
-                    BigInt(order.makerAmount);
-                if (calc > BigInt(srcAmount)) {
-                    throw new Error(`ZeroX calc ${calc} > srcAmount ${srcAmount}`);
-                }
-                srcAmount = calc.toString();
-            }
-            else {
-                const order = data.order;
-                if (BigInt(destAmount) > BigInt(order.makerAssetAmount)) {
-                    throw new Error(`ZeroX destAmount ${destAmount} > makerAmount ${order.makerAssetAmount}`);
-                }
-                const calc = (BigInt(destAmount) * BigInt(order.takerAssetAmount) +
-                    BigInt(order.makerAssetAmount) -
-                    1n) /
-                    BigInt(order.makerAssetAmount);
-                if (calc > BigInt(srcAmount)) {
-                    throw new Error(`ZeroX calc ${calc} > srcAmount ${srcAmount}`);
-                }
-                srcAmount = calc.toString();
-            }
-        }
-        const swapData = this.buildSimpleSwapData(data, srcAmount);
-        return {
-            needWrapNative: this.needWrapNative,
-            dexFuncHasRecipient: false,
-            exchangeData: swapData,
-            targetExchange: this.getExchange(data),
-            returnAmountPos: undefined,
-        };
+        return this.buildSimpleParamWithoutWETHConversion(src, srcAmount, dest, destAmount, swapData, this.getExchange(data), ZRX_EXCHANGE_ERC20PROXY[this.network][data.version], networkFees);
     }
     getDirectParam(srcToken, destToken, srcAmount, destAmount, expectedAmount, data, side, permit, uuid, feePercent, deadline, partner, beneficiary, contractMethod) {
         const usePermit = permit !== '0x';
@@ -183,12 +175,12 @@ class ZeroX extends simple_exchange_1.SimpleExchange {
             switch (data.version) {
                 case 2:
                     return this.routerInterface.encodeFunctionData(usePermit
-                        ? types_1.ZeroXFunctions.swapOnZeroXv2WithPermit
-                        : types_1.ZeroXFunctions.swapOnZeroXv2, params);
+                        ? ZeroXFunctions.swapOnZeroXv2WithPermit
+                        : ZeroXFunctions.swapOnZeroXv2, params);
                 case 4:
                     return this.routerInterface.encodeFunctionData(usePermit
-                        ? types_1.ZeroXFunctions.swapOnZeroXv4WithPermit
-                        : types_1.ZeroXFunctions.swapOnZeroXv4, params);
+                        ? ZeroXFunctions.swapOnZeroXv4WithPermit
+                        : ZeroXFunctions.swapOnZeroXv4, params);
                 default:
                     throw new Error(`ZeroX version ${data.version} is not supported!`);
             }
@@ -217,7 +209,7 @@ class ZeroX extends simple_exchange_1.SimpleExchange {
         };
     }
     static getDirectFunctionName() {
-        return [types_1.ZeroXFunctions.swapOnZeroXv2, types_1.ZeroXFunctions.swapOnZeroXv4];
+        return [ZeroXFunctions.swapOnZeroXv2, ZeroXFunctions.swapOnZeroXv4];
     }
 }
 exports.ZeroX = ZeroX;

package/build/dex/zerox/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/dex/zerox/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/dex/zerox/index.ts"],"names":[],"mappings":"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"}

package/build/dex/zerox/types.d.ts

@@ -1,4 +1,3 @@
-import { Address } from '@paraswap/sdk';
 import { NumberAsString } from '../../types';
 export declare enum OrderStatus {
     INVALID = 0,
@@ -42,32 +41,4 @@ export interface ZeroXSignedOrderV4 {
     signature: any;
 }
 export declare type ZeroXSignedOrder = ZeroXSignedOrderV2 | ZeroXSignedOrderV4;
-export declare enum ZeroXFunctions {
-    swapOnZeroXv2 = "swapOnZeroXv2",
-    swapOnZeroXv4 = "swapOnZeroXv4",
-    swapOnZeroXv2WithPermit = "swapOnZeroXv2WithPermit",
-    swapOnZeroXv4WithPermit = "swapOnZeroXv4WithPermit"
-}
-export declare type ZeroXData = {
-    version: number;
-    order: ZeroXSignedOrder;
-};
-export declare type SwapOnZeroXParam = [
-    srcToken: Address,
-    destToken: Address,
-    srcAmount: NumberAsString,
-    destAmount: NumberAsString,
-    exchange: Address,
-    payload: string
-];
-export declare type SwapOnZeroXWithPermitParam = [
-    srcToken: Address,
-    destToken: Address,
-    srcAmount: NumberAsString,
-    destAmount: NumberAsString,
-    exchange: Address,
-    payload: string,
-    permit: string
-];
-export declare type ZeroXParam = SwapOnZeroXParam | SwapOnZeroXWithPermitParam;
 export {};

package/build/dex/zerox/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ZeroXFunctions = exports.OrderStatus = void 0;
+exports.OrderStatus = void 0;
 var OrderStatus;
 (function (OrderStatus) {
     OrderStatus[OrderStatus["INVALID"] = 0] = "INVALID";
@@ -11,11 +11,4 @@ var OrderStatus;
     OrderStatus[OrderStatus["FULLY_FILLED"] = 5] = "FULLY_FILLED";
     OrderStatus[OrderStatus["CANCELLED"] = 6] = "CANCELLED";
 })(OrderStatus = exports.OrderStatus || (exports.OrderStatus = {}));
-var ZeroXFunctions;
-(function (ZeroXFunctions) {
-    ZeroXFunctions["swapOnZeroXv2"] = "swapOnZeroXv2";
-    ZeroXFunctions["swapOnZeroXv4"] = "swapOnZeroXv4";
-    ZeroXFunctions["swapOnZeroXv2WithPermit"] = "swapOnZeroXv2WithPermit";
-    ZeroXFunctions["swapOnZeroXv4WithPermit"] = "swapOnZeroXv4WithPermit";
-})(ZeroXFunctions = exports.ZeroXFunctions || (exports.ZeroXFunctions = {}));
 //# sourceMappingURL=types.js.map

package/build/dex/zerox/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/dex/zerox/types.ts"],"names":[],"mappings":";;;AAGA,IAAY,WAQX;AARD,WAAY,WAAW;IACrB,mDAAO,CAAA;IACP,yFAA0B,CAAA;IAC1B,yFAA0B,CAAA;IAC1B,qDAAQ,CAAA;IACR,mDAAO,CAAA;IACP,6DAAY,CAAA;IACZ,uDAAS,CAAA;AACX,CAAC,EARW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAQtB;AAuCD,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,iDAA+B,CAAA;IAC/B,iDAA+B,CAAA;IAC/B,qEAAmD,CAAA;IACnD,qEAAmD,CAAA;AACrD,CAAC,EALW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAKzB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/dex/zerox/types.ts"],"names":[],"mappings":";;;AAEA,IAAY,WAQX;AARD,WAAY,WAAW;IACrB,mDAAO,CAAA;IACP,yFAA0B,CAAA;IAC1B,yFAA0B,CAAA;IAC1B,qDAAQ,CAAA;IACR,mDAAO,CAAA;IACP,6DAAY,CAAA;IACZ,uDAAS,CAAA;AACX,CAAC,EARW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAQtB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "4.1.2-fluid.2",
+  "version": "4.1.2",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

package/src/abi/fluid-dex/resolver.abi.json

@@ -201,11 +201,6 @@
             "name": "fee",
             "type": "uint256"
           },
-          {
-            "internalType": "uint256",
-            "name": "centerPrice",
-            "type": "uint256"
-          },
           {
             "components": [
               {
@@ -400,11 +395,6 @@
             "name": "fee",
             "type": "uint256"
           },
-          {
-            "internalType": "uint256",
-            "name": "centerPrice",
-            "type": "uint256"
-          },
           {
             "components": [
               {
@@ -1202,11 +1192,6 @@
             "name": "fee",
             "type": "uint256"
           },
-          {
-            "internalType": "uint256",
-            "name": "centerPrice",
-            "type": "uint256"
-          },
           {
             "components": [
               {
@@ -1407,11 +1392,6 @@
             "name": "fee",
             "type": "uint256"
           },
-          {
-            "internalType": "uint256",
-            "name": "centerPrice",
-            "type": "uint256"
-          },
           {
             "components": [
               {
@@ -1636,11 +1616,6 @@
             "name": "fee",
             "type": "uint256"
           },
-          {
-            "internalType": "uint256",
-            "name": "centerPrice",
-            "type": "uint256"
-          },
           {
             "components": [
               {
@@ -1841,11 +1816,6 @@
             "name": "fee",
             "type": "uint256"
           },
-          {
-            "internalType": "uint256",
-            "name": "centerPrice",
-            "type": "uint256"
-          },
           {
             "components": [
               {

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

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

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

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

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

@@ -4,13 +4,46 @@ dotenv.config();
 
 import { StaticJsonRpcProvider } from '@ethersproject/providers';
 import { testE2E } from '../../../tests/utils-e2e';
-import { Tokens, Holders } from '../../../tests/constants-e2e';
+import {
+  Tokens,
+  Holders,
+  NativeTokenSymbols,
+} 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,
@@ -23,14 +56,9 @@ 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]],
@@ -41,11 +69,11 @@ function testForNetwork(
       describe(`${side}`, () => {
         contractMethods.forEach((contractMethod: string) => {
           describe(`${contractMethod}`, () => {
-            it(`${tokenBSymbol} -> ${tokenASymbol}`, async () => {
+            it(`${tokenASymbol} -> ${tokenBSymbol}`, async () => {
               await testE2E(
-                tokens[tokenBSymbol],
                 tokens[tokenASymbol],
-                holders[tokenBSymbol],
+                tokens[tokenBSymbol],
+                holders[tokenASymbol],
                 tokenBAmount,
                 side,
                 dexKey,
@@ -54,13 +82,12 @@ function testForNetwork(
                 provider,
               );
             });
-
-            it(`${tokenASymbol} -> ${tokenBSymbol}`, async () => {
+            it(`${tokenBSymbol} -> ${tokenASymbol}`, async () => {
               await testE2E(
-                tokens[tokenASymbol],
                 tokens[tokenBSymbol],
-                holders[tokenASymbol],
-                tokenAAmount,
+                tokens[tokenASymbol],
+                holders[tokenBSymbol],
+                tokenBAmount,
                 side,
                 dexKey,
                 contractMethod as ContractMethod,
@@ -81,11 +108,30 @@ describe('FluidDex E2E', () => {
   describe('Mainnet', () => {
     const network = Network.MAINNET;
 
-    describe('limit:FLUID -> ETH', () => {
-      const tokenASymbol: string = 'FLUID';
-      const tokenBSymbol: string = 'ETH';
-      const tokenAAmount: string = '16009704732281037900';
-      const tokenBAmount: string = '7992306873300550562400';
+    // 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';
 
       testForNetwork(
         network,
@@ -102,7 +148,7 @@ describe('FluidDex E2E', () => {
       const tokenBSymbol: string = 'ETH';
 
       const tokenAAmount: string = '100000000000000';
-      const tokenBAmount: string = '3500000000000000000';
+      const tokenBAmount: string = '100000000000000';
 
       testForNetwork(
         network,
@@ -191,9 +237,6 @@ function NewDebtReservesOne(): DebtReserves {
   };
 }
 
-const centerPriceTight: bigint = 3401944443797854601871360n;
-const centerPriceWide: bigint = 1190081051944310368000000000n;
-
 const limitsTight: DexLimits = {
   withdrawableToken0: {
     available: 456740438880263n,
@@ -240,6 +283,10 @@ 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);
@@ -248,18 +295,21 @@ describe('TestPoolSimulator_SwapInLimits', () => {
 
   it('when limits hit', () => {
     let outAmt;
-    outAmt = fluidDex.swapInAdjusted(
-      true,
-      BigInt(1e15),
-      NewColReservesOne(),
-      NewDebtReservesOne(),
-      100n,
-      18,
-      limitsTight,
-      BigInt(centerPriceTight),
-      Math.floor(Date.now() / 1000) - 10,
-    );
-    expect(outAmt).toEqual(0n);
+    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);
+    }
   });
 
   it('when expanded', () => {
@@ -271,41 +321,47 @@ describe('TestPoolSimulator_SwapInLimits', () => {
       100n,
       18,
       limitsTight,
-      BigInt(centerPriceTight),
       Math.floor(Date.now() / 1000) - 6000,
     );
-    expect(outAmt?.toString()).toEqual('998163044346107');
+    console.log('outAmt: ', outAmt);
+    expect(outAmt?.toString()).toEqual('998262697204710');
   });
 
   it('when price diff hit', () => {
     let outAmt;
-    outAmt = fluidDex.swapInAdjusted(
-      true,
-      BigInt(3e16),
-      NewColReservesOne(),
-      NewDebtReservesOne(),
-      100n,
-      18,
-      limitsWide,
-      BigInt(centerPriceWide),
-      Math.floor(Date.now() / 1000) - 10,
-    );
-    expect(outAmt).toEqual(0n);
+    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);
+    }
   });
 
   it('when reserves limit is hit', () => {
     let outAmt;
-    outAmt = fluidDex.swapInAdjusted(
-      true,
-      BigInt(5e16),
-      NewColReservesOne(),
-      NewDebtReservesOne(),
-      100n,
-      18,
-      limitsWide,
-      BigInt(centerPriceWide),
-      Math.floor(Date.now() / 1000) - 10,
-    );
-    expect(outAmt).toEqual(0n);
+    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);
+    }
   });
 });

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

@@ -137,14 +137,12 @@ 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]),
@@ -198,7 +196,6 @@ export class FluidDexLiquidityProxy extends StatefulEventSubscriber<FluidDexLiqu
         token0,
         token1,
         fee,
-        centerPrice,
         collateralReserves,
         debtReserves,
         dexLimits,