@paraswap/dex-lib 4.0.16 → 4.0.17

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

@@ -118,6 +118,24 @@ 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';

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

@@ -48,6 +48,11 @@ export class FluidDex extends SimpleExchange implements IDex<FluidDexData> {
 
   pools: FluidDexPool[] = [];
 
+  // temporarily limit FLUID-ETH Dex Pool.
+  restrictedIds: string[] = [
+    'FluidDex_0xc800b0e15c40a1ff0539218100c86f4c1bac8d9c',
+  ];
+
   eventPools: FluidDexEventPool[] = [];
 
   readonly factory: FluidDexFactory;
@@ -110,8 +115,9 @@ export class FluidDex extends SimpleExchange implements IDex<FluidDexData> {
   // implement this function
   async initializePricing(blockNumber: number) {
     await this.factory.initialize(blockNumber);
-    this.pools = await this.fetchFluidDexPools(blockNumber);
-
+    this.pools = (await this.fetchFluidDexPools(blockNumber)).filter(
+      pool => !this.restrictedIds.includes(pool.id),
+    );
     this.eventPools = await Promise.all(
       this.pools.map(async pool => {
         const eventPool = new FluidDexEventPool(
@@ -134,7 +140,9 @@ export class FluidDex extends SimpleExchange implements IDex<FluidDexData> {
   }
 
   protected onPoolCreatedUpdatePools(poolsFromFactory: readonly Pool[]) {
-    this.pools = this.generateFluidDexPoolsFromPoolsFactory(poolsFromFactory);
+    this.pools = this.generateFluidDexPoolsFromPoolsFactory(
+      poolsFromFactory,
+    ).filter(pool => !this.restrictedIds.includes(pool.id));
     this.logger.info(`${this.dexKey}: pools list was updated ...`);
   }
 
@@ -174,6 +182,9 @@ export class FluidDex extends SimpleExchange implements IDex<FluidDexData> {
     // A pair must have 2 different tokens.
     if (srcAddress === destAddress) return [];
 
+    this.pools = this.pools.filter(
+      pool => !this.restrictedIds.includes(pool.id),
+    );
     const pools = this.pools.filter(
       pool =>
         (srcAddress === pool.token0 && destAddress === pool.token1) ||

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

@@ -265,15 +265,15 @@ export class PancakeSwapV3EventPool extends StatefulEventSubscriber<PoolState> {
   }
 
   _setState(state: any, blockNumber: number, reason?: string): void {
-    if (this.parentName === 'PancakeswapV3') {
-      this.logger.info(
-        `PancakeV3: Setting state: ${!!state ? 'non-empty' : 'empty'} for '${
-          this.name
-        }' for bn: '${blockNumber}' due to reason: '${
-          reason ?? 'outside_of_event_subscriber'
-        }'`,
-      );
-    }
+    // if (this.parentName === 'PancakeswapV3') {
+    //   this.logger.info(
+    //     `PancakeV3: Setting state: ${!!state ? 'non-empty' : 'empty'} for '${
+    //       this.name
+    //     }' for bn: '${blockNumber}' due to reason: '${
+    //       reason ?? 'outside_of_event_subscriber'
+    //     }'`,
+    //   );
+    // }
     super._setState(state, blockNumber);
   }
 

package/src/dex/uniswap-v3/config.ts

@@ -359,32 +359,6 @@ export const UniswapV3Config: DexConfigMap<DexParams> = {
       subgraphURL: 'Dimv1udMsJu1DqirVM4G2vNRvH8CWzWTn7GffQQCGAaq',
     },
   },
-  VelodromeSlipstream: {
-    [Network.OPTIMISM]: {
-      factory: '0x548118C7E0B865C2CfA94D15EC86B666468ac758',
-      quoter: '0xA2DEcF05c16537C702779083Fe067e308463CE45',
-      router: '0x93A3b44C38A8557E935B3e2549B2809a582c28EE',
-      supportedFees: SUPPORTED_FEES,
-      tickSpacings: [1n, 50n, 100n, 200n, 2000n],
-      tickSpacingsToFees: {
-        '1': 100n,
-        '50': 500n,
-        '100': 500n,
-        '200': 3000n,
-        '2000': 10000n,
-      },
-      stateMulticall: '0xc055b23319b3a140D4De2d0001bd0A885B3d7DbB',
-      stateMultiCallAbi: VelodromeSlipstreamMulticallABi as AbiItem[],
-      eventPoolImplementation: VelodromeSlipstreamEventPool,
-      factoryImplementation: VelodromeSlipstreamFactory,
-      decodeStateMultiCallResultWithRelativeBitmaps:
-        decodeStateMultiCallResultWithRelativeBitmapsForVelodromeSlipstream,
-      uniswapMulticall: '0x1F98415757620B543A52E61c46B32eB19261F984',
-      chunksCount: 10,
-      initRetryFrequency: 10,
-      initHash: '0xE0A596c403E854FFb9C828aB4f07eEae04A05D37', // pool implementation address from factory contract is used instead of initHash here
-    },
-  },
   VelodromeSlipstreamNewFactory: {
     [Network.OPTIMISM]: {
       factory: '0xCc0bDDB707055e04e497aB22a59c2aF4391cd12F',

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

@@ -269,15 +269,15 @@ export class UniswapV3EventPool extends StatefulEventSubscriber<PoolState> {
   }
 
   _setState(state: any, blockNumber: number, reason?: string): void {
-    if (this.parentName === 'UniswapV3') {
-      this.logger.info(
-        `UniV3: Setting state: '${!!state ? 'non-empty' : 'empty'}' for '${
-          this.name
-        }' for bn: '${blockNumber}' due to reason: '${
-          reason ?? 'outside_of_event_subscriber'
-        }'`,
-      );
-    }
+    // if (this.parentName === 'UniswapV3') {
+    // this.logger.info(
+    //   `UniV3: Setting state: '${!!state ? 'non-empty' : 'empty'}' for '${
+    //     this.name
+    //   }' for bn: '${blockNumber}' due to reason: '${
+    //     reason ?? 'outside_of_event_subscriber'
+    //   }'`,
+    // );
+    // }
     super._setState(state, blockNumber);
   }
 

package/tests/constants-e2e.ts

@@ -446,6 +446,10 @@ export const Tokens: {
       decimals: 18,
       symbol: 'EURA',
     },
+    FLUID: {
+      address: '0x6f40d4A6237C257fff2dB00FA0510DeEECd303eb',
+      decimals: 18,
+    },
     EUROC: {
       address: '0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c',
       decimals: 6,
@@ -1703,6 +1707,7 @@ export const Holders: {
   [network: number]: { [tokenAddress: string]: Address };
 } = {
   [Network.MAINNET]: {
+    FLUID: '0x2d675D4C52a8aE117b935fF98c6F9f29A15827F0',
     USDS: '0xB1796E8f1eEcF23027c1E3C00fE303629A189d10',
     sUSDS: '0xd564B3aE673CAa49D054Bf185bD72a6853763eE7',
     SKY: '0x0ddda327A6614130CCb20bc0097313A282176A01',

package/.vscode/launch.json

@@ -1,53 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Current",
-      "program": "${file}",
-      "preLaunchTask": "npm: build",
-      "sourceMaps": true,
-      "smartStep": true,
-      "internalConsoleOptions": "openOnSessionStart",
-      "outFiles": ["${workspaceFolder}/build/**/*.js"]
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Debug dex integration",
-      "program": "${workspaceFolder}/node_modules/ts-node/dist/bin.js",
-      "args": [
-        "--project",
-        "tsconfig.json",
-        // "${workspaceFolder}/src/dex/algebra/scripts/validate-state.ts",
-        "${workspaceFolder}/src/dex/camelot/camelot-pool-discovery.test.ts",
-        // "${workspaceFolder}/src/dex/solidly-v3/scripts/check-event-pool-event.ts",
-        // "${workspaceFolder}/scripts/dex-integration.ts",
-        "test",
-        "wombat"
-      ],
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "runtimeArgs": ["--nolazy"],
-      "sourceMaps": true,
-      "smartStep": true,
-      "skipFiles": ["<node_internals>/**"],
-      "cwd": "${workspaceFolder}"
-    },
-    {
-      "type": "node",
-      "name": "Jest file",
-      "request": "launch",
-      "program": "${workspaceFolder}/node_modules/jest/bin/jest.js",
-      // "program": "${workspaceFolder}/src/dex/camelot/scripts/validate-state.ts",
-      // "args": ["src/dex/balancer-v1/balancer-v1-e2e.test.ts"],
-      // "args": ["${relativeFile}"],
-      "args": ["${file}"],
-      "cwd": "${workspaceRoot}",
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "sourceMaps": true
-    }
-  ]
-}

package/.vscode/settings.json

@@ -1,2 +0,0 @@
-{
-}

package/.vscode/tasks.json

@@ -1,15 +0,0 @@
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "tsc: build - tsconfig.json",
-      "type": "typescript",
-      "tsconfig": "tsconfig.json",
-      "problemMatcher": ["$tsc"],
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      }
-    }
-  ]
-}

package/build/abi/aavev3statav2/Factory.json

@@ -1,131 +0,0 @@
-[
-    {
-        "inputs": [
-            { "internalType": "contract IPool", "name": "pool", "type": "address" },
-            { "internalType": "address", "name": "proxyAdmin", "type": "address" },
-            {
-                "internalType": "contract ITransparentProxyFactory",
-                "name": "transparentProxyFactory",
-                "type": "address"
-            },
-            { "internalType": "address", "name": "stataTokenImpl", "type": "address" }
-        ],
-        "stateMutability": "nonpayable",
-        "type": "constructor"
-    },
-    {
-        "inputs": [
-            { "internalType": "address", "name": "underlying", "type": "address" }
-        ],
-        "name": "NotListedUnderlying",
-        "type": "error"
-    },
-    {
-        "anonymous": false,
-        "inputs": [
-            {
-                "indexed": false,
-                "internalType": "uint8",
-                "name": "version",
-                "type": "uint8"
-            }
-        ],
-        "name": "Initialized",
-        "type": "event"
-    },
-    {
-        "anonymous": false,
-        "inputs": [
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "stataToken",
-                "type": "address"
-            },
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "underlying",
-                "type": "address"
-            }
-        ],
-        "name": "StataTokenCreated",
-        "type": "event"
-    },
-    {
-        "inputs": [],
-        "name": "POOL",
-        "outputs": [
-            { "internalType": "contract IPool", "name": "", "type": "address" }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "PROXY_ADMIN",
-        "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "STATA_TOKEN_IMPL",
-        "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "TRANSPARENT_PROXY_FACTORY",
-        "outputs": [
-            {
-                "internalType": "contract ITransparentProxyFactory",
-                "name": "",
-                "type": "address"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "address[]",
-                "name": "underlyings",
-                "type": "address[]"
-            }
-        ],
-        "name": "createStataTokens",
-        "outputs": [
-            { "internalType": "address[]", "name": "", "type": "address[]" }
-        ],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            { "internalType": "address", "name": "underlying", "type": "address" }
-        ],
-        "name": "getStataToken",
-        "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "getStataTokens",
-        "outputs": [
-            { "internalType": "address[]", "name": "", "type": "address[]" }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "initialize",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    }
-]