@paraswap/dex-lib 2.35.7-multiple-dex-base-chain.2 → 2.35.7-worker-pool.1

package/src/dex/maverick-v1/config.ts

@@ -14,12 +14,6 @@ export const MaverickV1Config: DexConfigMap<DexParams> = {
       routerAddress: '0x4a585e0f7c18e2c414221d6402652d5e0990e5f8',
       poolInspectorAddress: '0xaA5BF61a664109e959D69C38734d4EA7dF74e456',
     },
-    [Network.BASE]: {
-      subgraphURL:
-        'https://api.studio.thegraph.com/query/42519/maverick-base/version/latest',
-      routerAddress: '0x32AED3Bce901DA12ca8489788F3A99fCe1056e14',
-      poolInspectorAddress: '0x65A3AD03Be97619284bA7AA1E3Ca05638B9d6364',
-    },
   },
 };
 
@@ -28,8 +22,4 @@ export const Adapters: Record<number, AdapterMappings> = {
     [SwapSide.SELL]: [{ name: 'Adapter04', index: 2 }],
     [SwapSide.BUY]: [{ name: 'BuyAdapter', index: 8 }],
   },
-  [Network.BASE]: {
-    [SwapSide.SELL]: [{ name: 'BaseAdapter01', index: 2 }],
-    [SwapSide.BUY]: [{ name: 'BaseBuyAdapter', index: 2 }],
-  },
 };

package/src/dex/maverick-v1/maverick-v1-e2e.test.ts

@@ -11,109 +11,10 @@ import { Network, ContractMethod, SwapSide } from '../../constants';
 import { StaticJsonRpcProvider } from '@ethersproject/providers';
 import { generateConfig } from '../../config';
 
-function testForNetwork(
-  network: Network,
-  dexKey: string,
-  tokenASymbol: string,
-  tokenBSymbol: string,
-  tokenAAmount: string,
-  tokenBAmount: string,
-  nativeTokenAmount: string,
-  slippage?: number | undefined,
-) {
-  const provider = new StaticJsonRpcProvider(
-    generateConfig(network).privateHttpProvider,
-    network,
-  );
-  const tokens = Tokens[network];
-  const holders = Holders[network];
-  const nativeTokenSymbol = NativeTokenSymbols[network];
-
-  const sideToContractMethods = new Map([
-    [
-      SwapSide.SELL,
-      [
-        ContractMethod.simpleSwap,
-        ContractMethod.multiSwap,
-        ContractMethod.megaSwap,
-      ],
-    ],
-    [
-      SwapSide.BUY,
-      [
-        ContractMethod.simpleBuy,
-        ContractMethod.buy,
-      ],
-    ],
-  ]);
-
-  describe(`${network}`, () => {
-    sideToContractMethods.forEach((contractMethods, side) =>
-      describe(`${side}`, () => {
-        contractMethods.forEach((contractMethod: ContractMethod) => {
-          describe(`${contractMethod}`, () => {
-            it(`${nativeTokenSymbol} -> ${tokenASymbol}`, async () => {
-              await testE2E(
-                tokens[nativeTokenSymbol],
-                tokens[tokenASymbol],
-                holders[nativeTokenSymbol],
-                side === SwapSide.SELL ? nativeTokenAmount : tokenAAmount,
-                side,
-                dexKey,
-                contractMethod,
-                network,
-                provider,
-                undefined,
-                undefined,
-                undefined,
-                slippage,
-              );
-            });
-            it(`${tokenASymbol} -> ${nativeTokenSymbol}`, async () => {
-              await testE2E(
-                tokens[tokenASymbol],
-                tokens[nativeTokenSymbol],
-                holders[tokenASymbol],
-                side === SwapSide.SELL ? tokenAAmount : nativeTokenAmount,
-                side,
-                dexKey,
-                contractMethod,
-                network,
-                provider,
-                undefined,
-                undefined,
-                undefined,
-                slippage,
-              );
-            });
-            it(`${tokenASymbol} -> ${tokenBSymbol}`, async () => {
-              await testE2E(
-                tokens[tokenASymbol],
-                tokens[tokenBSymbol],
-                holders[tokenASymbol],
-                side === SwapSide.SELL ? tokenAAmount : tokenBAmount,
-                side,
-                dexKey,
-                contractMethod,
-                network,
-                provider,
-                undefined,
-                undefined,
-                undefined,
-                slippage,
-              );
-            });
-          });
-        });
-      }),
-    );
-  });
-}
-
 describe('MaverickV1 E2E', () => {
   const dexKey = 'MaverickV1';
 
-  describe('MAINNET', () => {
+  describe('MaverickV1 MAINNET', () => {
     const network = Network.MAINNET;
     const tokens = Tokens[network];
     const holders = Holders[network];
@@ -220,25 +121,4 @@ describe('MaverickV1 E2E', () => {
       );
     });
   });
-
-  describe('BASE', () => {
-    const network = Network.BASE;
-
-    const tokenASymbol: string = 'USDbC';
-    const tokenBSymbol: string = 'MAV';
-
-    const tokenAAmount: string = '1111100000';
-    const tokenBAmount: string = '1100000000000000000';
-    const nativeTokenAmount = '100000000000000000';
-
-    testForNetwork(
-      network,
-      dexKey,
-      tokenASymbol,
-      tokenBSymbol,
-      tokenAAmount,
-      tokenBAmount,
-      nativeTokenAmount,
-    );
-  });
 });

package/src/dex/maverick-v1/maverick-v1.ts

@@ -78,7 +78,6 @@ export class MaverickV1
 
   async setupEventPools(blockNumber: number) {
     const pools = await this.fetchAllSubgraphPools();
-
     await Promise.all(
       pools.map(async (pool: any) => {
         const eventPool = new MaverickV1EventPool(
@@ -182,17 +181,8 @@ export class MaverickV1
   getCalldataGasCost(
     poolPrices: PoolPrices<MaverickV1Data>,
   ): number | number[] {
-    const gasCost = CALLDATA_GAS_COST.DEX_NO_PAYLOAD;
-
-    const arr = new Array(poolPrices.prices.length);
-    poolPrices.prices.forEach((p, index) => {
-      if (p == 0n) {
-        arr[index] = 0;
-      } else {
-        arr[index] = gasCost;
-      }
-    });
-    return arr;
+    // TODO: update if there is any payload in getAdapterParam
+    return CALLDATA_GAS_COST.DEX_NO_PAYLOAD;
   }
 
   // Returns pool prices for amounts.

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

@@ -53,21 +53,6 @@ export const PancakeswapV3Config: DexConfigMap<DexParams> = {
       subgraphURL:
         'https://api.studio.thegraph.com/query/45376/exchange-v3-arbitrum/version/latest',
     },
-    [Network.BASE]: {
-      factory: '0x0BFbCF9fa4f9C56B0F40a671Ad40E0805A091865',
-      deployer: '0x41ff9AA7e16B8B1a8a8dc4f0eFacd93D02d071c9',
-      quoter: '0xB048Bbc1Ee6b733FFfCFb9e9CeF7375518e25997',
-      router: '0x1b81D678ffb9C0263b24A97847620C99d213eB14',
-      supportedFees: PANCAKE_SUPPORTED_FEES,
-      stateMulticall: '0xeBF40A40CA3D4310Bf53048F48e860656e1D7C81',
-      uniswapMulticall: '0x091e99cb1C49331a94dD62755D168E941AbD0693',
-      chunksCount: 10,
-      initRetryFrequency: 30,
-      initHash:
-        '0x6ce8eb472fa82df5469c6ab6d485f17c3ad13c8cd7af59b3d4a8026c5ce0f7e2',
-      subgraphURL:
-        'https://api.studio.thegraph.com/query/45376/exchange-v3-base/version/latest',
-    },
   },
 };
 
@@ -84,8 +69,4 @@ export const Adapters: Record<number, AdapterMappings> = {
     [SwapSide.SELL]: [{ name: 'ArbitrumAdapter01', index: 3 }],
     [SwapSide.BUY]: [{ name: 'ArbitrumBuyAdapter', index: 2 }],
   },
-  [Network.BASE]: {
-    [SwapSide.SELL]: [{ name: 'BaseAdapter01', index: 1 }],
-    [SwapSide.BUY]: [{ name: 'BaseBuyAdapter', index: 1 }],
-  },
 };

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

@@ -11,105 +11,6 @@ import { Network, ContractMethod, SwapSide } from '../../constants';
 import { StaticJsonRpcProvider } from '@ethersproject/providers';
 import { generateConfig } from '../../config';
 
-function testForNetwork(
-  network: Network,
-  dexKey: string,
-  tokenASymbol: string,
-  tokenBSymbol: string,
-  tokenAAmount: string,
-  tokenBAmount: string,
-  nativeTokenAmount: string,
-  slippage?: number | undefined,
-) {
-  const provider = new StaticJsonRpcProvider(
-    generateConfig(network).privateHttpProvider,
-    network,
-  );
-  const tokens = Tokens[network];
-  const holders = Holders[network];
-  const nativeTokenSymbol = NativeTokenSymbols[network];
-
-  const sideToContractMethods = new Map([
-    [
-      SwapSide.SELL,
-      [
-        ContractMethod.simpleSwap,
-        ContractMethod.multiSwap,
-        ContractMethod.megaSwap,
-      ],
-    ],
-    [
-      SwapSide.BUY,
-      [
-        ContractMethod.simpleBuy,
-        ContractMethod.buy,
-      ],
-    ],
-  ]);
-
-  describe(`${network}`, () => {
-    sideToContractMethods.forEach((contractMethods, side) =>
-      describe(`${side}`, () => {
-        contractMethods.forEach((contractMethod: ContractMethod) => {
-          describe(`${contractMethod}`, () => {
-            it(`${nativeTokenSymbol} -> ${tokenASymbol}`, async () => {
-              await testE2E(
-                tokens[nativeTokenSymbol],
-                tokens[tokenASymbol],
-                holders[nativeTokenSymbol],
-                side === SwapSide.SELL ? nativeTokenAmount : tokenAAmount,
-                side,
-                dexKey,
-                contractMethod,
-                network,
-                provider,
-                undefined,
-                undefined,
-                undefined,
-                slippage,
-              );
-            });
-            it(`${tokenASymbol} -> ${nativeTokenSymbol}`, async () => {
-              await testE2E(
-                tokens[tokenASymbol],
-                tokens[nativeTokenSymbol],
-                holders[tokenASymbol],
-                side === SwapSide.SELL ? tokenAAmount : nativeTokenAmount,
-                side,
-                dexKey,
-                contractMethod,
-                network,
-                provider,
-                undefined,
-                undefined,
-                undefined,
-                slippage,
-              );
-            });
-            it(`${tokenASymbol} -> ${tokenBSymbol}`, async () => {
-              await testE2E(
-                tokens[tokenASymbol],
-                tokens[tokenBSymbol],
-                holders[tokenASymbol],
-                side === SwapSide.SELL ? tokenAAmount : tokenBAmount,
-                side,
-                dexKey,
-                contractMethod,
-                network,
-                provider,
-                undefined,
-                undefined,
-                undefined,
-                slippage,
-              );
-            });
-          });
-        });
-      }),
-    );
-  });
-}
-
 describe('PancakeswapV3 E2E', () => {
   const dexKey = 'PancakeswapV3';
 
@@ -406,25 +307,4 @@ describe('PancakeswapV3 E2E', () => {
       }),
     );
   });
-
-  describe('PancakeswapV3 Base', () => {
-    const network = Network.BASE;
-
-    const tokenASymbol: string = 'USDbC';
-    const tokenBSymbol: string = 'DAI';
-
-    const tokenAAmount: string = '11111000000';
-    const tokenBAmount: string = '210000000000000000';
-    const nativeTokenAmount = '110000000000000000000';
-
-    testForNetwork(
-      network,
-      dexKey,
-      tokenASymbol,
-      tokenBSymbol,
-      tokenAAmount,
-      tokenBAmount,
-      nativeTokenAmount,
-    );
-  });
 });

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

@@ -608,21 +608,17 @@ export class PancakeswapV3
           const balanceDestToken =
             _destAddress === pool.token0 ? state.balance0 : state.balance1;
 
-          const unitResult = this._getOutputs(
-            state,
-            [unitAmount],
-            zeroForOne,
-            side,
-            balanceDestToken,
-          );
-          const pricesResult = this._getOutputs(
-            state,
-            _amounts,
-            zeroForOne,
-            side,
-            balanceDestToken,
-          );
-
+          const unitResult = (await this.dexHelper.executeOnWorkerPool(
+            this.dexKey,
+            'getOutputs',
+            [state, [unitAmount], zeroForOne, side, balanceDestToken],
+          )) as ReturnType<typeof this.getOutputs>;
+
+          const pricesResult = (await this.dexHelper.executeOnWorkerPool(
+            this.dexKey,
+            'getOutputs',
+            [state, _amounts, zeroForOne, side, balanceDestToken],
+          )) as ReturnType<typeof this.getOutputs>;
           if (!pricesResult) {
             this.logger.debug('Prices or unit is not calculated');
             return null;
@@ -911,7 +907,7 @@ export class PancakeswapV3
     return newConfig;
   }
 
-  private _getOutputs(
+  getOutputs(
     state: DeepReadonly<PoolState>,
     amounts: bigint[],
     zeroForOne: boolean,

package/src/dex/solidly/config.ts

@@ -83,17 +83,6 @@ export const SolidlyConfig: DexConfigMap<DexParams> = {
       feeCode: 0,
     },
   },
-  Aerodrome: {
-    [Network.BASE]: {
-      // There is no subgraph for Aerodrome
-      factoryAddress: '0x420DD381b31aEf6683db6B902084cB0FFECe40Da',
-      router: '0xDCf4EE5B700e2a5Fec458e06B763A4a3E3004494',
-      initCode:
-        '0x1a8f01f7eab324003d9388f229ea17991eee9c9d14586f429799f3656790eba0',
-      poolGasCost: 180 * 1000,
-      feeCode: 0,
-    },
-  },
   Cone: {
     [Network.BSC]: {
       subgraphURL: 'https://api.thegraph.com/subgraphs/name/cone-exchange/cone',
@@ -168,15 +157,6 @@ export const SolidlyConfig: DexConfigMap<DexParams> = {
       feeCode: 0,
       poolGasCost: 180 * 1000,
     },
-    [Network.BASE]: {
-      factoryAddress: '0xed8db60acc29e14bc867a497d94ca6e3ceb5ec04',
-      router: '0xDCf4EE5B700e2a5Fec458e06B763A4a3E3004494',
-      initCode:
-        '0x7ba31a081e879b8e7f06d4e8bf5ee26b5c2680669c5701f4cdbdcde51727b275',
-      feeCode: 0,
-      feeFactor: 1e18,
-      poolGasCost: 180 * 1000,
-    },
   },
 };
 
@@ -185,7 +165,7 @@ export const Adapters: Record<number, AdapterMappings> = {
     [SwapSide.SELL]: [{ name: 'PolygonAdapter02', index: 3 }], // dystopia
   },
   [Network.FANTOM]: {
-    [SwapSide.SELL]: [{ name: 'FantomAdapter01', index: 10 }], // solidly, spiritSwapV2, equalizer
+    [SwapSide.SELL]: [{ name: 'FantomAdapter01', index: 10 }], // solidly + spiritSwapV2 + Equalizer
   },
   [Network.OPTIMISM]: {
     [SwapSide.SELL]: [{ name: 'OptimismAdapter01', index: 8 }], // velodrome
@@ -202,7 +182,4 @@ export const Adapters: Record<number, AdapterMappings> = {
   [Network.ARBITRUM]: {
     [SwapSide.SELL]: [{ name: 'ArbitrumAdapter02', index: 1 }], // chronos, ramses
   },
-  [Network.BASE]: {
-    [SwapSide.SELL]: [{ name: 'BaseAdapter01', index: 3 }], // aerodrome, equalizer
-  }
 };

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

@@ -1404,92 +1404,4 @@ describe('Solidly E2E', () => {
       );
     });
   });
-
-  describe('Base', () => {
-    const network = Network.BASE;
-
-    describe('Aerodrome', () => {
-      const dexKey = 'Aerodrome';
-      const tokenASymbol: string = 'USDbC';
-      const tokenBSymbol: string = 'DAI';
-
-      const tokenAAmount: string = '1111100000';
-      const tokenBAmount: string = '100000000000000000';
-      const nativeTokenAmount = '100000000000000000';
-
-      testForNetwork(
-        network,
-        dexKey,
-        tokenASymbol,
-        tokenBSymbol,
-        tokenAAmount,
-        tokenBAmount,
-        nativeTokenAmount,
-      );
-    });
-
-    describe('Equalizer', () => {
-      const dexKey = 'Equalizer';
-      const network = Network.BASE;
-
-      const tokenASymbol: string = 'USDbC';
-      const tokenAAmount: string = '1111100000';
-      const nativeTokenAmount = '110000000000000000';
-
-      const provider = new StaticJsonRpcProvider(
-        generateConfig(network).privateHttpProvider,
-        network,
-      );
-      const tokens = Tokens[network];
-      const holders = Holders[network];
-      const nativeTokenSymbol = NativeTokenSymbols[network];
-
-      // TODO: Add any direct swap contractMethod name if it exists
-      const sideToContractMethods = new Map([
-        [
-          SwapSide.SELL,
-          [
-            ContractMethod.simpleSwap,
-            ContractMethod.multiSwap,
-            ContractMethod.megaSwap,
-          ],
-        ],
-      ]);
-
-      sideToContractMethods.forEach((contractMethods, side) =>
-        describe(`${side}`, () => {
-          contractMethods.forEach((contractMethod: ContractMethod) => {
-            describe(`${contractMethod}`, () => {
-              it(`${nativeTokenSymbol} -> ${tokenASymbol}`, async () => {
-                await testE2E(
-                  tokens[nativeTokenSymbol],
-                  tokens[tokenASymbol],
-                  holders[nativeTokenSymbol],
-                  side === SwapSide.SELL ? nativeTokenAmount : tokenAAmount,
-                  side,
-                  dexKey,
-                  contractMethod,
-                  network,
-                  provider,
-                );
-              });
-              it(`${tokenASymbol} -> ${nativeTokenSymbol}`, async () => {
-                await testE2E(
-                  tokens[tokenASymbol],
-                  tokens[nativeTokenSymbol],
-                  holders[tokenASymbol],
-                  side === SwapSide.SELL ? tokenAAmount : nativeTokenAmount,
-                  side,
-                  dexKey,
-                  contractMethod,
-                  network,
-                  provider,
-                );
-              });
-            });
-          });
-        }),
-      );
-    });
-  });
 });

package/src/dex/solidly/solidly-integration.test.ts

@@ -1202,70 +1202,4 @@ describe('Solidly integration tests', () => {
       });
     });
   });
-
-  describe('Base', () => {
-    const network = Network.BASE;
-    const dexHelper = new DummyDexHelper(network);
-    const checkOnChainPricing = constructCheckOnChainPricing(dexHelper);
-
-    describe('Equalizer', () => {
-      const dexKey = 'Equalizer';
-      const equalizer = new Equalizer(network, dexKey, dexHelper);
-
-      describe('UniswapV2 like pool', function () {
-        const TokenASymbol = 'USDbC';
-        const tokenA = Tokens[network][TokenASymbol];
-        const TokenBSymbol = 'ETH';
-        const tokenB = Tokens[network][TokenBSymbol];
-
-        const amounts = amounts18;
-
-        it('getPoolIdentifiers and getPricesVolume', async function () {
-          const blocknumber = await dexHelper.web3Provider.eth.getBlockNumber();
-          const pools = await equalizer.getPoolIdentifiers(
-            tokenA,
-            tokenB,
-            SwapSide.SELL,
-            blocknumber,
-          );
-          console.log(
-            `${TokenASymbol} <> ${TokenBSymbol} Pool Identifiers: `,
-            pools,
-          );
-
-          expect(pools.length).toBeGreaterThan(0);
-
-          const poolPrices = await equalizer.getPricesVolume(
-            tokenA,
-            tokenB,
-            amounts,
-            SwapSide.SELL,
-            blocknumber,
-            pools,
-          );
-          console.log(
-            `${TokenASymbol} <> ${TokenBSymbol} Pool Prices: `,
-            poolPrices,
-          );
-
-          expect(poolPrices).not.toBeNull();
-          checkPoolPrices(poolPrices!, amounts, SwapSide.SELL, dexKey);
-
-          // Check if onchain pricing equals to calculated ones
-
-          for (const poolPrice of poolPrices || []) {
-            await checkOnChainPricing(
-              equalizer,
-              'getAmountOut',
-              blocknumber,
-              poolPrice.prices,
-              poolPrice.poolAddresses![0],
-              tokenA.address,
-              amounts,
-            );
-          }
-        });
-      });
-    });
-  });
 });

package/src/dex/solidly/solidly.ts

@@ -75,7 +75,6 @@ export class Solidly extends UniswapV2 {
         'Chronos',
         'Ramses',
         'Equalizer',
-        'Aerodrome',
       ]),
     );
 

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

@@ -210,19 +210,6 @@ export const UniswapV3Config: DexConfigMap<DexParams> = {
       subgraphURL:
         'https://api.thegraph.com/subgraphs/name/sushi-v3/v3-optimism',
     },
-    [Network.BASE]: {
-      factory: '0xc35DADB65012eC5796536bD9864eD8773aBc74C4',
-      quoter: '0xb1E835Dc2785b52265711e17fCCb0fd018226a6e',
-      router: '0xCc0e85901f33D375FcdD9a888B05Df9616F68277',
-      supportedFees: SUPPORTED_FEES,
-      stateMulticall: '0x7160f736c52e1e78e92FD4eE4D73e21A7Cf4F950',
-      uniswapMulticall: '0x091e99cb1C49331a94dD62755D168E941AbD0693',
-      chunksCount: 10,
-      initRetryFrequency: 10,
-      initHash: `0xe34f199b19b2b4f47f68442619d555527d244f78a3297ea89325f843f87b8b54`,
-      subgraphURL:
-        'https://api.studio.thegraph.com/query/32073/v3-base/v0.0.1',
-    },
   },
   ChronosV3: {
     [Network.ARBITRUM]: {

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

@@ -424,16 +424,16 @@ describe('UniswapV3 E2E', () => {
         [
           SwapSide.SELL,
           [
-            ContractMethod.simpleSwap,
+            // ContractMethod.simpleSwap,
             ContractMethod.multiSwap,
-            ContractMethod.megaSwap,
+            // ContractMethod.megaSwap,
           ],
         ],
         [
           SwapSide.BUY,
           [
-            ContractMethod.simpleBuy,
-            ContractMethod.buy
+            // ContractMethod.simpleBuy,
+            // ContractMethod.buy
           ],
         ],
       ]);
@@ -1094,26 +1094,5 @@ describe('UniswapV3 E2E', () => {
         nativeTokenAmount,
       );
     });
-
-    describe('BASE', () => {
-      const network = Network.BASE;
-
-      const tokenASymbol: string = 'USDbC';
-      const tokenBSymbol: string = 'DAI';
-
-      const tokenAAmount: string = '111110000';
-      const tokenBAmount: string = '110000000000000000';
-      const nativeTokenAmount = '1100000000000000000';
-
-      testForNetwork(
-        network,
-        dexKey,
-        tokenASymbol,
-        tokenBSymbol,
-        tokenAAmount,
-        tokenBAmount,
-        nativeTokenAmount,
-      );
-    });
   });
 });