@paraswap/dex-lib 4.0.16-fluid-restr → 4.0.17-statav2

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

@@ -118,23 +118,23 @@ describe('FluidDex E2E', () => {
   describe('Mainnet', () => {
     const network = Network.MAINNET;
 
-    // TODO: Uncomment 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,
-      );
-    });
+    // 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';

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

@@ -115,11 +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 = this.pools.filter(
+    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(
@@ -142,10 +140,9 @@ export class FluidDex extends SimpleExchange implements IDex<FluidDexData> {
   }
 
   protected onPoolCreatedUpdatePools(poolsFromFactory: readonly Pool[]) {
-    this.pools = this.generateFluidDexPoolsFromPoolsFactory(poolsFromFactory);
-    this.pools = this.pools.filter(
-      pool => !this.restrictedIds.includes(pool.id),
-    );
+    this.pools = this.generateFluidDexPoolsFromPoolsFactory(
+      poolsFromFactory,
+    ).filter(pool => !this.restrictedIds.includes(pool.id));
     this.logger.info(`${this.dexKey}: pools list was updated ...`);
   }
 

package/src/dex/index.ts

@@ -85,6 +85,7 @@ import { EtherFi } from './etherfi';
 import { Spark } from './spark/spark';
 import { VelodromeSlipstream } from './uniswap-v3/forks/velodrome-slipstream/velodrome-slipstream';
 import { AaveV3Stata } from './aave-v3-stata/aave-v3-stata';
+import { AaveV3StataV2 } from './aave-v3-stata-v2/aave-v3-stata-v2';
 import { OSwap } from './oswap/oswap';
 import { FluidDex } from './fluid-dex/fluid-dex';
 import { ConcentratorArusd } from './concentrator-arusd/concentrator-arusd';
@@ -182,6 +183,7 @@ const Dexes = [
   PharaohV1,
   Spark,
   AaveV3Stata,
+  AaveV3StataV2,
   OSwap,
   ConcentratorArusd,
   FxProtocolRusd,

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/stkgho/config.ts

@@ -2,13 +2,13 @@ import { DexParams } from './types';
 import { DexConfigMap } from '../../types';
 import { Network } from '../../constants';
 
-import { MiscEthereum } from '@bgd-labs/aave-address-book';
+import { GhoEthereum, AaveSafetyModule } from '@bgd-labs/aave-address-book';
 
 export const StkGHOConfig: DexConfigMap<DexParams> = {
   StkGHO: {
     [Network.MAINNET]: {
-      stkGHO: '0x1a88Df1cFe15Af22B3c4c783D4e6F7F9e0C1885d',
-      GHO: MiscEthereum.GHO_TOKEN,
+      stkGHO: AaveSafetyModule.STK_GHO,
+      GHO: GhoEthereum.GHO_TOKEN,
     },
   },
 };

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

@@ -536,6 +536,10 @@ export const Tokens: {
       address: '0x862c57d48becb45583aeba3f489696d22466ca1b',
       decimals: 6,
     },
+    waEthUSDT: {
+      address: '0x7Bc3485026Ac48b6cf9BaF0A377477Fff5703Af8',
+      decimals: 6,
+    },
     aaveUSDT: {
       address: '0x23878914efe38d27c4d67ab83ed1b93a74d4086a',
       decimals: 6,
@@ -1539,6 +1543,10 @@ export const Tokens: {
       address: '0x773CDA0CADe2A3d86E6D4e30699d40bB95174ff2',
       decimals: 18,
     },
+    waGnoGNO: {
+      address: '0x7c16F0185A26Db0AE7a9377f23BC18ea7ce5d644',
+      decimals: 18,
+    },
     aGnoUSDC: {
       address: '0xc6b7aca6de8a6044e0e32d0c841a89244a10d284',
       decimals: 6,
@@ -1811,7 +1819,8 @@ export const Holders: {
     USDe: '0x74e6c48e667d698a4cf90665b6960a5bae39e603',
     eETH: '0x0f1DfeF1a40557d279d0de6E49aB306891A638b8',
     stataUSDT: '0x6803364AceD5181877abC11E865FB27cB654a426',
-    aaveUSDT: '0x32c98a981Fe7C333Bd4e8E7630E8e0CF5ce20987',
+    aaveUSDT: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c',
+    waEthUSDT: '0xbA1333333333a1BA1108E8412f11850A5C319bA9',
     weETH: '0x267ed5f71EE47D3E45Bb1569Aa37889a2d10f91e',
     rUSD: '0xEC2eda1C4F981E468ABF62424a10B69B738b498E',
     arUSD: '0xeFc24206053a452e2299BF3b8f964512b041Db4C',
@@ -2063,6 +2072,7 @@ export const Holders: {
     SWPR: '0x9467dcFD4519287e3878C018c02f5670465a9003',
     waGnoWETH: '0x854B004700885A61107B458f11eCC169A019b764',
     waGnowstETH: '0x854B004700885A61107B458f11eCC169A019b764',
+    waGnoGNO: '0x9Ec6472Fc33D9a5D17613484aDF0295A001fDF32',
   },
   [Network.BASE]: {
     WETH: '0x4bb6b2efe7036020ba6f02a05602546c9f25bf28',