@paraswap/dex-lib 4.1.6 → 4.1.7-mwrappedm.0

package/src/dex/aave-v3-stata-v2/aave-v3-stata-v2-e2e.test.ts

@@ -234,18 +234,29 @@ describe('AaveV3Stata E2E', () => {
   //   });
   // });
 
-  describe('Arbitrum', () => {
+  describe.skip('Arbitrum', () => {
     const network = Network.ARBITRUM;
 
     const pairs: { name: string; amount: string; skipBuy?: boolean }[][] = [
       [
         {
-          name: 'WETH',
-          amount: '100000000000000',
+          name: 'USDT',
+          amount: '100000',
+        },
+        {
+          name: 'stataUSDT',
+          amount: '100000',
+        },
+      ],
+      [
+        {
+          name: 'aaveUSDT',
+          amount: '100000',
+          skipBuy: true,
         },
         {
-          name: 'waArbWETH',
-          amount: '1744566786133980',
+          name: 'stataUSDT',
+          amount: '100000',
         },
       ],
     ];
@@ -263,7 +274,6 @@ describe('AaveV3Stata E2E', () => {
     });
   });
 
-  // no tokens yet deployed
   describe.skip('Optimism', () => {
     const network = Network.OPTIMISM;
 
@@ -304,18 +314,29 @@ describe('AaveV3Stata E2E', () => {
     });
   });
 
-  describe('Base', () => {
+  describe.skip('Base', () => {
     const network = Network.BASE;
 
     const pairs: { name: string; amount: string; skipBuy?: boolean }[][] = [
       [
         {
-          name: 'WETH',
-          amount: '100000000000',
+          name: 'USDC',
+          amount: '100000',
+        },
+        {
+          name: 'stataUSDC',
+          amount: '100000',
         },
+      ],
+      [
         {
-          name: 'waBasWETH',
-          amount: '3792954988415750',
+          name: 'aaveUSDC',
+          amount: '100000',
+          skipBuy: true,
+        },
+        {
+          name: 'stataUSDC',
+          amount: '100000',
         },
       ],
     ];

package/src/dex/aave-v3-stata-v2/config.ts

@@ -2,12 +2,9 @@ import { DexParams } from './types';
 import { DexConfigMap } from '../../types';
 import { Network } from '../../constants';
 import {
-  AaveV3Arbitrum,
-  AaveV3Base,
   AaveV3Ethereum,
   AaveV3EthereumLido,
   AaveV3Gnosis,
-  AaveV3Optimism,
 } from '@bgd-labs/aave-address-book';
 
 export const AaveV3StataConfig: DexConfigMap<DexParams> = {
@@ -23,18 +20,5 @@ export const AaveV3StataConfig: DexConfigMap<DexParams> = {
       factoryAddresses: [AaveV3Gnosis.STATA_FACTORY],
       pool: AaveV3Gnosis.POOL,
     },
-    // Waiting for BalancerV3 to get released on Optimism
-    // [Network.OPTIMISM]: {
-    //   factoryAddresses: [AaveV3Optimism.STATA_FACTORY],
-    //   pool: AaveV3Optimism.POOL,
-    // },
-    [Network.ARBITRUM]: {
-      factoryAddresses: [AaveV3Arbitrum.STATA_FACTORY],
-      pool: AaveV3Arbitrum.POOL,
-    },
-    [Network.BASE]: {
-      factoryAddresses: [AaveV3Base.STATA_FACTORY],
-      pool: AaveV3Base.POOL,
-    },
   },
 };

package/src/dex/algebra/config.ts

@@ -95,7 +95,7 @@ export const AlgebraConfig: DexConfigMap<DexParams> = {
       initRetryFrequency: 10,
       // AlgebraStateMulticall
       algebraStateMulticall: '0x49C46f7f88110ccA234ef27Cd664510f7bbF5998',
-      subgraphURL: 'YwkNWffc8UTH77wDqGWgMShMq1uXdiQsD5wrD5MzKwJ',
+      subgraphURL: 'AAA1vYjxwFHzbt6qKwLHNcDSASyr1J1xVViDH8gTMFMR',
       uniswapMulticall: '0x4dfa9a980efE4802E969AC33968E3d6E59B8a19e',
       deployer: '0xC1b576AC6Ec749d5Ace1787bF9Ec6340908ddB47',
       version: 'v1.9-bidirectional-fee',

package/src/dex/balancer-v2/balancer-v2-integration.test.ts

@@ -697,25 +697,29 @@ describe('BalancerV2', function () {
     });
 
     describe('WETH / USDC', () => {
-      const gyroEAddr = '0x1a63b425600d775a1e1bfc212f021273812c3b16';
+      const gyroEAddr = '0x4c42b5057a8663e2b1ac21685d1502c937a03817';
 
       it('SELL WETH -> USDC getPoolIdentifiers and getPricesVolume', async function () {
         const network = Network.BASE;
 
         const dexHelper = new DummyDexHelper(network);
         const blocknumber = await dexHelper.web3Provider.eth.getBlockNumber();
-        // const blocknumber = 25726105;
+        // const blocknumber = 19425305;
         const balancerV2 = new BalancerV2(network, dexKey, dexHelper);
         const tokens = Tokens[network];
 
-        console.log('BLOCK NUMBER: ', blocknumber);
-
         const amounts = [
           0n,
-          1000000000000n, // works
-          1200000000000n, // works
-          // 3900000000000n, // not working
-          // 4000000000000n, // not working
+          BI_POWS[18],
+          2n * BI_POWS[18],
+          3n * BI_POWS[18],
+          4n * BI_POWS[18],
+          5n * BI_POWS[18],
+          6n * BI_POWS[18],
+          7n * BI_POWS[18],
+          8n * BI_POWS[18],
+          9n * BI_POWS[18],
+          10n * BI_POWS[18],
         ];
 
         await balancerV2.initializePricing(blocknumber);
@@ -750,9 +754,6 @@ describe('BalancerV2', function () {
         const isPoolPrice = poolPrices!.find(price =>
           price.data.poolId.includes(gyroEAddr),
         );
-
-        console.log('isPoolPrice: ', isPoolPrice);
-
         expect(isPoolPrice).toBeDefined();
 
         const onChainPrices = await getOnChainPricingForWeightedPool(

package/src/dex/balancer-v2/pools/gyro/GyroEPool.ts

@@ -18,6 +18,7 @@ import {
   Vector2,
 } from '@balancer-labs/sor';
 import GyroEAbi from '../../../../abi/balancer-v2/gyro-e.abi.json';
+import * as util from 'util';
 
 // Swap Limit factor
 const SWAP_LIMIT_FACTOR = BigInt('999999000000000000');

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

@@ -296,134 +296,4 @@ describe('BalancerV3 E2E', () => {
       );
     });
   });
-
-  describe('Arbitrum', () => {
-    const network = Network.ARBITRUM;
-
-    describe('Stable Path', () => {
-      const tokenASymbol: string = 'wstETH';
-      const tokenBSymbol: string = 'WETH';
-
-      const tokenAAmount: string = '10000000000000';
-      const tokenBAmount: string = '10000000000000';
-      const nativeTokenAmount = '0';
-
-      testForNetwork(
-        network,
-        dexKey,
-        tokenASymbol,
-        tokenBSymbol,
-        tokenAAmount,
-        tokenBAmount,
-        nativeTokenAmount,
-        false,
-      );
-    });
-
-    // No holders for tokens
-    // describe('Boosted Path', () => {
-    //   const tokenASymbol: string = 'waArbWETH';
-    //   const tokenBSymbol: string = 'waArbwstETH';
-    //
-    //   const tokenAAmount: string = '10000000000000';
-    //   const tokenBAmount: string = '10000000000000';
-    //   const nativeTokenAmount = '0';
-    //
-    //   testForNetwork(
-    //     network,
-    //     dexKey,
-    //     tokenASymbol,
-    //     tokenBSymbol,
-    //     tokenAAmount,
-    //     tokenBAmount,
-    //     nativeTokenAmount,
-    //     false,
-    //   );
-    // });
-  });
-
-  describe('Base', () => {
-    const network = Network.BASE;
-
-    describe('Stable Path', () => {
-      const tokenASymbol: string = 'wstETH';
-      const tokenBSymbol: string = 'WETH';
-
-      const tokenAAmount: string = '100000000000000';
-      const tokenBAmount: string = '100000000000000';
-      const nativeTokenAmount = '0';
-
-      testForNetwork(
-        network,
-        dexKey,
-        tokenASymbol,
-        tokenBSymbol,
-        tokenAAmount,
-        tokenBAmount,
-        nativeTokenAmount,
-        false,
-      );
-    });
-
-    describe('Boosted Path', () => {
-      const tokenASymbol: string = 'sUSDS';
-      const tokenBSymbol: string = 'smUSDC';
-
-      const tokenAAmount: string = '10000000000000';
-      const tokenBAmount: string = '10000000000000';
-      const nativeTokenAmount = '0';
-
-      testForNetwork(
-        network,
-        dexKey,
-        tokenASymbol,
-        tokenBSymbol,
-        tokenAAmount,
-        tokenBAmount,
-        nativeTokenAmount,
-        false,
-      );
-    });
-
-    describe('StableSurge Hook', () => {
-      const tokenASymbol: string = 'waBasGHO';
-      const tokenBSymbol: string = 'waBasUSDC';
-
-      const tokenAAmount: string = '500000000000000000';
-      const tokenBAmount: string = '500000';
-      const nativeTokenAmount = '0';
-
-      testForNetwork(
-        network,
-        dexKey,
-        tokenASymbol,
-        tokenBSymbol,
-        tokenAAmount,
-        tokenBAmount,
-        nativeTokenAmount,
-        false,
-      );
-    });
-
-    // No holders for waBasWETH
-    // describe('Boosted Path', () => {
-    //   const tokenASymbol: string = 'waBaswstETH';
-    //   const tokenBSymbol: string = 'waBasWETH';
-    //
-    //   const tokenAAmount: string = '10000000000000';
-    //   const tokenBAmount: string = '10000000000000';
-    //   const nativeTokenAmount = '0';
-    //
-    //   testForNetwork(
-    //     network,
-    //     dexKey,
-    //     tokenASymbol,
-    //     tokenBSymbol,
-    //     tokenAAmount,
-    //     tokenBAmount,
-    //     nativeTokenAmount,
-    //     false,
-    //   );
-    // });
-  });
 });

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

@@ -129,168 +129,95 @@ type EventData = { blockNumbers: number[]; poolAddress: string[] };
 
 describe('BalancerV3 EventPool', function () {
   const dexKey = 'BalancerV3';
-
-  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'],
-        },
+  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'],
       },
-    };
-
-    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,
-                    );
-                  });
-                });
-              });
-            },
-          );
-        });
+      // https://sepolia.etherscan.io/tx/0xc1596e26d51104b9236a0debc3e1946b30b82f92b8331639ad6f6aea2ff2decc
+      LiquidityRemoved: {
+        blockNumbers: [7170957],
+        poolAddress: ['0x2ff3b96e0057a1f25f1d62ab800554ccdb268ab8'],
       },
-    );
-  });
-
-  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',
-          ],
-        },
+      // 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,
+                  );
                 });
               });
-            },
-          );
-        });
-      },
-    );
-  });
+            });
+          },
+        );
+      });
+    },
+  );
 });