@paraswap/dex-lib 2.33.1-nomiswap-v2 → 2.33.2

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

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import dotenv from 'dotenv';
 dotenv.config();
 
@@ -15,6 +16,7 @@ import { Chronos } from './forks-override/chronos';
 import { Ramses } from './forks-override/ramses';
 import * as util from 'util';
 import { VelodromeV2 } from './forks-override/velodromeV2';
+import { Equalizer } from './forks-override/equalizer';
 
 const amounts18 = [0n, BI_POWS[18], 2000000000000000000n];
 const amounts6 = [0n, BI_POWS[6], 2000000n];
@@ -46,7 +48,7 @@ function decodeReaderResult(
 const constructCheckOnChainPricing =
   (dexHelper: DummyDexHelper) =>
   async (
-    soldily: Solidly,
+    solidly: Solidly,
     funcName: string,
     blockNumber: number,
     prices: bigint[],
@@ -88,7 +90,7 @@ describe('Solidly integration tests', () => {
 
     describe('Solidly', function () {
       const dexKey = 'Solidly';
-      const soldily = new Solidly(network, dexKey, dexHelper);
+      const solidly = new Solidly(network, dexKey, dexHelper);
 
       describe('UniswapV2 like pool', function () {
         const TokenASymbol = 'WFTM';
@@ -100,7 +102,7 @@ describe('Solidly integration tests', () => {
 
         it('getPoolIdentifiers and getPricesVolume', async function () {
           const blocknumber = await dexHelper.web3Provider.eth.getBlockNumber();
-          const pools = await soldily.getPoolIdentifiers(
+          const pools = await solidly.getPoolIdentifiers(
             tokenA,
             tokenB,
             SwapSide.SELL,
@@ -113,7 +115,7 @@ describe('Solidly integration tests', () => {
 
           expect(pools.length).toBeGreaterThan(0);
 
-          const poolPrices = await soldily.getPricesVolume(
+          const poolPrices = await solidly.getPricesVolume(
             tokenA,
             tokenB,
             amounts,
@@ -131,13 +133,13 @@ describe('Solidly integration tests', () => {
 
           // Check if onchain pricing equals to calculated ones
 
-          for (const i in poolPrices || []) {
+          for (const poolPrice of poolPrices || []) {
             await checkOnChainPricing(
-              soldily,
+              solidly,
               'getAmountOut',
               blocknumber,
-              poolPrices![i].prices,
-              poolPrices![i].poolAddresses![0],
+              poolPrice.prices,
+              poolPrice.poolAddresses![0],
               tokenA.address,
               amounts,
             );
@@ -145,7 +147,7 @@ describe('Solidly integration tests', () => {
         });
 
         it('getTopPoolsForToken', async function () {
-          const poolLiquidity = await soldily.getTopPoolsForToken(
+          const poolLiquidity = await solidly.getTopPoolsForToken(
             tokenA.address,
             10,
           );
@@ -165,7 +167,7 @@ describe('Solidly integration tests', () => {
 
         it('getPoolIdentifiers and getPricesVolume', async function () {
           const blocknumber = await dexHelper.web3Provider.eth.getBlockNumber();
-          const pools = await soldily.getPoolIdentifiers(
+          const pools = await solidly.getPoolIdentifiers(
             tokenA,
             tokenB,
             SwapSide.SELL,
@@ -178,7 +180,7 @@ describe('Solidly integration tests', () => {
 
           expect(pools.length).toBeGreaterThan(0);
 
-          const poolPrices = await soldily.getPricesVolume(
+          const poolPrices = await solidly.getPricesVolume(
             tokenA,
             tokenB,
             amounts,
@@ -195,13 +197,13 @@ describe('Solidly integration tests', () => {
           checkPoolPrices(poolPrices!, amounts, SwapSide.SELL, dexKey);
 
           // Check if onchain pricing equals to calculated ones
-          for (const i in poolPrices || []) {
+          for (const poolPrice of poolPrices || []) {
             await checkOnChainPricing(
-              soldily,
+              solidly,
               'getAmountOut',
               blocknumber,
-              poolPrices![i].prices,
-              poolPrices![i].poolAddresses![0],
+              poolPrice.prices,
+              poolPrice.poolAddresses![0],
               tokenA.address,
               amounts,
             );
@@ -209,7 +211,7 @@ describe('Solidly integration tests', () => {
         });
 
         it('getTopPoolsForToken', async function () {
-          const poolLiquidity = await soldily.getTopPoolsForToken(
+          const poolLiquidity = await solidly.getTopPoolsForToken(
             tokenA.address,
             10,
           );
@@ -265,13 +267,13 @@ describe('Solidly integration tests', () => {
 
           // Check if onchain pricing equals to calculated ones
 
-          for (const i in poolPrices || []) {
+          for (const poolPrice of poolPrices || []) {
             await checkOnChainPricing(
               spiritSwapV2,
               'getAmountOut',
               blocknumber,
-              poolPrices![i].prices,
-              poolPrices![i].poolAddresses![0],
+              poolPrice.prices,
+              poolPrice.poolAddresses![0],
               tokenA.address,
               amounts,
             );
@@ -329,13 +331,13 @@ describe('Solidly integration tests', () => {
           checkPoolPrices(poolPrices!, amounts, SwapSide.SELL, dexKey);
 
           // Check if onchain pricing equals to calculated ones
-          for (const i in poolPrices || []) {
+          for (const poolPrice of poolPrices || []) {
             await checkOnChainPricing(
               spiritSwapV2,
               'getAmountOut',
               blocknumber,
-              poolPrices![i].prices,
-              poolPrices![i].poolAddresses![0],
+              poolPrice.prices,
+              poolPrice.poolAddresses![0],
               tokenA.address,
               amounts,
             );
@@ -353,6 +355,176 @@ describe('Solidly integration tests', () => {
         });
       });
     });
+
+    describe('Equalizer', () => {
+      const dexKey = 'Equalizer';
+      const equalizer = new Equalizer(network, dexKey, dexHelper);
+
+      describe('UniswapV2 like pool', function () {
+        const TokenASymbol = 'WFTM';
+        const tokenA = Tokens[network][TokenASymbol];
+        const TokenBSymbol = 'FUSDT';
+        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,
+            );
+          }
+        });
+      });
+
+      describe('Curve like stable pool', function () {
+        const TokenASymbol = 'FUSDT';
+        const tokenA = Tokens[network][TokenASymbol];
+        const TokenBSymbol = 'USDC';
+        const tokenB = Tokens[network][TokenBSymbol];
+
+        const amounts = amounts6; // amounts6;
+
+        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,
+            );
+          }
+        });
+      });
+
+      describe('FTM -> EQUAL', () => {
+        const TokenASymbol = 'WFTM';
+        const tokenA = Tokens[network][TokenASymbol];
+        const TokenBSymbol = 'EQUAL';
+        const tokenB = Tokens[network][TokenBSymbol];
+
+        const amounts = [0n, 10000000n];
+
+        console.log('AMOUNTS: ', amounts);
+        it('getPoolIdentifiers and getPricesVolume', async function () {
+          // const blocknumber = await dexHelper.web3Provider.eth.getBlockNumber();
+          const blocknumber = 67666611;
+          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,
+            );
+          }
+        });
+      });
+    });
   });
 
   describe('Polygon', () => {
@@ -405,13 +577,13 @@ describe('Solidly integration tests', () => {
 
           // Check if onchain pricing equals to calculated ones
 
-          for (const i in poolPrices || []) {
+          for (const poolPrice of poolPrices || []) {
             await checkOnChainPricing(
               dystopia,
               'getAmountOut',
               blocknumber,
-              poolPrices![i].prices,
-              poolPrices![i].poolAddresses![0],
+              poolPrice.prices,
+              poolPrice.poolAddresses![0],
               tokenA.address,
               amounts,
             );
@@ -469,13 +641,13 @@ describe('Solidly integration tests', () => {
           checkPoolPrices(poolPrices!, amounts, SwapSide.SELL, dexKey);
 
           // Check if onchain pricing equals to calculated ones
-          for (const i in poolPrices || []) {
+          for (const poolPrice of poolPrices || []) {
             await checkOnChainPricing(
               dystopia,
               'getAmountOut',
               blocknumber,
-              poolPrices![i].prices,
-              poolPrices![i].poolAddresses![0],
+              poolPrice.prices,
+              poolPrice.poolAddresses![0],
               tokenA.address,
               amounts,
             );
@@ -545,13 +717,13 @@ describe('Solidly integration tests', () => {
 
           // Check if onchain pricing equals to calculated ones
 
-          for (const i in poolPrices || []) {
+          for (const poolPrice of poolPrices || []) {
             await checkOnChainPricing(
               cone,
               'getAmountOut',
               blocknumber,
-              poolPrices![i].prices,
-              poolPrices![i].poolAddresses![0],
+              poolPrice.prices,
+              poolPrice.poolAddresses![0],
               tokenA.address,
               amounts,
             );
@@ -609,13 +781,13 @@ describe('Solidly integration tests', () => {
           checkPoolPrices(poolPrices!, amounts, SwapSide.SELL, dexKey);
 
           // Check if onchain pricing equals to calculated ones
-          for (const i in poolPrices || []) {
+          for (const poolPrice of poolPrices || []) {
             await checkOnChainPricing(
               cone,
               'getAmountOut',
               blocknumber,
-              poolPrices![i].prices,
-              poolPrices![i].poolAddresses![0],
+              poolPrice.prices,
+              poolPrice.poolAddresses![0],
               tokenA.address,
               amounts,
             );
@@ -685,13 +857,13 @@ describe('Solidly integration tests', () => {
 
           // Check if onchain pricing equals to calculated ones
 
-          for (const i in poolPrices || []) {
+          for (const poolPrice of poolPrices || []) {
             await checkOnChainPricing(
               chronos,
               'getAmountOut',
               blocknumber,
-              poolPrices![i].prices,
-              poolPrices![i].poolAddresses![0],
+              poolPrice.prices,
+              poolPrice.poolAddresses![0],
               tokenA.address,
               amounts,
             );
@@ -749,13 +921,13 @@ describe('Solidly integration tests', () => {
           checkPoolPrices(poolPrices!, amounts, SwapSide.SELL, dexKey);
 
           // Check if onchain pricing equals to calculated ones
-          for (const i in poolPrices || []) {
+          for (const poolPrice of poolPrices || []) {
             await checkOnChainPricing(
               chronos,
               'getAmountOut',
               blocknumber,
-              poolPrices![i].prices,
-              poolPrices![i].poolAddresses![0],
+              poolPrice.prices,
+              poolPrice.poolAddresses![0],
               tokenA.address,
               amounts,
             );
@@ -821,13 +993,13 @@ describe('Solidly integration tests', () => {
 
           // Check if onchain pricing equals to calculated ones
 
-          for (const i in poolPrices || []) {
+          for (const poolPrice of poolPrices || []) {
             await checkOnChainPricing(
               ramses,
               'getAmountOut',
               blocknumber,
-              poolPrices![i].prices,
-              poolPrices![i].poolAddresses![0],
+              poolPrice.prices,
+              poolPrice.poolAddresses![0],
               tokenA.address,
               amounts,
             );
@@ -885,13 +1057,13 @@ describe('Solidly integration tests', () => {
           checkPoolPrices(poolPrices!, amounts, SwapSide.SELL, dexKey);
 
           // Check if onchain pricing equals to calculated ones
-          for (const i in poolPrices || []) {
+          for (const poolPrice of poolPrices || []) {
             await checkOnChainPricing(
               ramses,
               'getAmountOut',
               blocknumber,
-              poolPrices![i].prices,
-              poolPrices![i].poolAddresses![0],
+              poolPrice.prices,
+              poolPrice.poolAddresses![0],
               tokenA.address,
               amounts,
             );
@@ -961,13 +1133,13 @@ describe('Solidly integration tests', () => {
 
           // Check if onchain pricing equals to calculated ones
 
-          for (const i in poolPrices || []) {
+          for (const poolPrice of poolPrices || []) {
             await checkOnChainPricing(
               velodromeV2,
               'getAmountOut',
               blocknumber,
-              poolPrices![i].prices,
-              poolPrices![i].poolAddresses![0],
+              poolPrice.prices,
+              poolPrice.poolAddresses![0],
               tokenA.address,
               amounts,
             );
@@ -1015,13 +1187,13 @@ describe('Solidly integration tests', () => {
           checkPoolPrices(poolPrices!, amounts, SwapSide.SELL, dexKey);
 
           // Check if onchain pricing equals to calculated ones
-          for (const i in poolPrices || []) {
+          for (const poolPrice of poolPrices || []) {
             await checkOnChainPricing(
               velodromeV2,
               'getAmountOut',
               blocknumber,
-              poolPrices![i].prices,
-              poolPrices![i].poolAddresses![0],
+              poolPrice.prices,
+              poolPrice.poolAddresses![0],
               tokenA.address,
               amounts,
             );

package/src/dex/solidly/solidly.ts

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

package/src/dex/uniswap-v2/uniswap-v2-e2e-bsc.test.ts

@@ -2,110 +2,11 @@ import dotenv from 'dotenv';
 dotenv.config();
 
 import { testE2E } from '../../../tests/utils-e2e';
-import { Tokens, Holders, NativeTokenSymbols } from '../../../tests/constants-e2e';
+import { Tokens, Holders } from '../../../tests/constants-e2e';
 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('UniswapV2 E2E BSC', () => {
   const network = Network.BSC;
   const tokens = Tokens[network];
@@ -1506,28 +1407,6 @@ describe('UniswapV2 E2E BSC', () => {
     });
   });
 
-  describe('NomiswapV2', () => {
-    const dexKey = 'NomiswapV2';
-    const network = Network.BSC;
-
-    const tokenASymbol: string = 'USDC';
-    const tokenBSymbol: string = 'USDT';
-
-    const tokenAAmount: string = '1111100000';
-    const tokenBAmount: string = '1000000000';
-    const nativeTokenAmount = '11000000000000';
-
-    testForNetwork(
-      network,
-      dexKey,
-      tokenASymbol,
-      tokenBSymbol,
-      tokenAAmount,
-      tokenBAmount,
-      nativeTokenAmount,
-    );
-  });
-
   describe(`Swapsicle`, () => {
     const dexKey = 'Swapsicle';
 

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

@@ -151,7 +151,7 @@ export const UniswapV3Config: DexConfigMap<DexParams> = {
       quoter: '0xb1E835Dc2785b52265711e17fCCb0fd018226a6e',
       router: '0x24c90C7d8fb463722e304A71255341610Fa7589b',
       supportedFees: SUPPORTED_FEES,
-      stateMulticall: '',
+      stateMulticall: '0x30F6B9b6485ff0B67E881f5ac80D3F1c70A4B23d',
       uniswapMulticall: '0x8C0F842791F03C095b6c633759224FcC9ACe68ea',
       chunksCount: 10,
       initRetryFrequency: 10,

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

@@ -112,6 +112,7 @@ function testForNetwork(
   });
 }
 
+
 describe('UniswapV3 E2E', () => {
 
   describe('UniswapV3', () => {

package/tests/constants-e2e.ts

@@ -460,6 +460,10 @@ export const Tokens: {
       address: '0x049d68029688eabf473097a2fc38ef61633a3c7a',
       decimals: 6,
     },
+    EQUAL: {
+      address: '0x3fd3a0c85b70754efc07ac9ac0cbbdce664865a6',
+      decimals: 18
+    },
     POPS: {
       address: '0x9dE4b40bDcE50Ec6a1A668bF85997BbBD324069a',
       decimals: 18,
@@ -979,6 +983,7 @@ export const Holders: {
     ETH: '0xf48883940b4056801de30f12b934dcea90133ee6',
     GUSDC: '0x894d774a293f8aa3d23d67815d4cadb5319c1094',
     GDAI: '0x0e2ed73f9c1409e2b36fe6c46e60d4557b7c2ac0',
+    EQUAL: '0x8b187ea19c93091a4d6b426b71871648182b5fac',
   },
   [Network.BSC]: {
     DAI: '0xf68a4b64162906eff0ff6ae34e2bb1cd42fef62d',