@paraswap/dex-lib 2.30.2-chronos-v3 → 2.30.2

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

@@ -12,7 +12,6 @@ import { StaticJsonRpcProvider } from '@ethersproject/providers';
 import { generateConfig } from '../../config';
 
 describe('UniswapV3 E2E', () => {
-
   describe('UniswapV3', () => {
     const dexKey = 'UniswapV3';
 
@@ -324,52 +323,57 @@ describe('UniswapV3 E2E', () => {
         [SwapSide.BUY, [ContractMethod.simpleBuy, ContractMethod.buy]],
       ]);
 
-      const pairs: { name: string; sellAmount: string; buyAmount: string }[][] = [
-        [
-          {
-            name: 'AVAX',
-            sellAmount: '1000000000000000000',
-            buyAmount: '500000',
-          },
-          {
-            name: 'USDT',
-            sellAmount: '1000000',
-            buyAmount: '10000000000000000000',
-          },
-        ],
-        [
-          {
-            name: 'AVAX',
-            sellAmount: '1000000000000000000',
-            buyAmount: '500000',
-          },
-          {
-            name: 'USDC',
-            sellAmount: '1000000',
-            buyAmount: '1000000000000000000',
-          },
-        ],
-        [
-          {
-            name: 'WAVAX',
-            sellAmount: '1000000000000000000',
-            buyAmount: '500000',
-          },
-          { name: 'USDC', sellAmount: '1000000', buyAmount: '20000000000000000' },
-        ],
+      const pairs: { name: string; sellAmount: string; buyAmount: string }[][] =
         [
-          {
-            name: 'WAVAX',
-            sellAmount: '1000000000000000000',
-            buyAmount: '10000000',
-          },
-          { name: 'USDT', sellAmount: '1000000', buyAmount: '2000000000000' },
-        ],
-        [
-          { name: 'USDC', sellAmount: '1000000', buyAmount: '100000000' },
-          { name: 'USDT', sellAmount: '100000000', buyAmount: '100000000' },
-        ],
-      ];
+          [
+            {
+              name: 'AVAX',
+              sellAmount: '1000000000000000000',
+              buyAmount: '500000',
+            },
+            {
+              name: 'USDT',
+              sellAmount: '1000000',
+              buyAmount: '10000000000000000000',
+            },
+          ],
+          [
+            {
+              name: 'AVAX',
+              sellAmount: '1000000000000000000',
+              buyAmount: '500000',
+            },
+            {
+              name: 'USDC',
+              sellAmount: '1000000',
+              buyAmount: '1000000000000000000',
+            },
+          ],
+          [
+            {
+              name: 'WAVAX',
+              sellAmount: '1000000000000000000',
+              buyAmount: '500000',
+            },
+            {
+              name: 'USDC',
+              sellAmount: '1000000',
+              buyAmount: '20000000000000000',
+            },
+          ],
+          [
+            {
+              name: 'WAVAX',
+              sellAmount: '1000000000000000000',
+              buyAmount: '10000000',
+            },
+            { name: 'USDT', sellAmount: '1000000', buyAmount: '2000000000000' },
+          ],
+          [
+            { name: 'USDC', sellAmount: '1000000', buyAmount: '100000000' },
+            { name: 'USDT', sellAmount: '100000000', buyAmount: '100000000' },
+          ],
+        ];
 
       sideToContractMethods.forEach((contractMethods, side) =>
         describe(`${side}`, () => {
@@ -501,91 +505,4 @@ describe('UniswapV3 E2E', () => {
       );
     });
   });
-
-  describe('ChronosV3', () => {
-    const dexKey = 'ChronosV3';
-    describe('Arbitrum', () => {
-      const network = Network.ARBITRUM;
-      const tokens = Tokens[network];
-      const holders = Holders[network];
-      const provider = new StaticJsonRpcProvider(
-        generateConfig(network).privateHttpProvider,
-        network,
-      );
-
-      const tokenASymbol: string = 'USDCe';
-      const tokenBSymbol: string = 'USDT';
-      const nativeTokenSymbol = NativeTokenSymbols[network];
-
-      const tokenAAmount: string = '2000000';
-      const tokenBAmount: string = '2000000';
-      const nativeTokenAmount = '100000000000000000';
-
-      const sideToContractMethods = new Map([
-        [
-          SwapSide.SELL,
-          [
-            ContractMethod.simpleSwap,
-            ContractMethod.multiSwap,
-            ContractMethod.megaSwap,
-            ContractMethod.directUniV3Swap,
-          ],
-        ],
-        [
-          SwapSide.BUY,
-          [
-            ContractMethod.simpleBuy,
-            ContractMethod.buy,
-            ContractMethod.directUniV3Buy,
-          ],
-        ],
-      ]);
-
-      sideToContractMethods.forEach((contractMethods, side) =>
-        contractMethods.forEach((contractMethod: ContractMethod) => {
-          describe(`${contractMethod}`, () => {
-            it(`${network} ${side} ${contractMethod} ${nativeTokenSymbol} -> ${tokenASymbol}`, async () => {
-              await testE2E(
-                tokens[nativeTokenSymbol],
-                tokens[tokenASymbol],
-                holders[nativeTokenSymbol],
-                side === SwapSide.SELL ? nativeTokenAmount : tokenAAmount,
-                side,
-                dexKey,
-                contractMethod,
-                network,
-                provider,
-              );
-            });
-            it(`${network} ${side} ${contractMethod} ${tokenASymbol} -> ${nativeTokenSymbol}`, async () => {
-              await testE2E(
-                tokens[tokenASymbol],
-                tokens[nativeTokenSymbol],
-                holders[tokenASymbol],
-                side === SwapSide.SELL ? tokenAAmount : nativeTokenAmount,
-                side,
-                dexKey,
-                contractMethod,
-                network,
-                provider,
-              );
-            });
-            it(`${network} ${side} ${contractMethod} ${tokenASymbol} -> ${tokenBSymbol}`, async () => {
-              await testE2E(
-                tokens[tokenASymbol],
-                tokens[tokenBSymbol],
-                holders[tokenASymbol],
-                side === SwapSide.SELL ? tokenAAmount : tokenBAmount,
-                side,
-                dexKey,
-                contractMethod,
-                network,
-                provider,
-              );
-            });
-          });
-        }),
-      );
-    });
-  });
 });

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

@@ -28,7 +28,6 @@ const amounts = [
 
 const amountsBuy = [0n, 1n * BI_POWS[18], 2n * BI_POWS[18], 3n * BI_POWS[18]];
 
-
 const quoterIface = new Interface(UniswapV3QuoterV2ABI);
 
 function getReaderCalldata(
@@ -43,13 +42,7 @@ function getReaderCalldata(
   return amounts.map(amount => ({
     target: exchangeAddress,
     callData: readerIface.encodeFunctionData(funcName, [
-      [
-        tokenIn,
-        tokenOut,
-        amount.toString(),
-        fee.toString(),
-        0,
-      ]
+      [tokenIn, tokenOut, amount.toString(), fee.toString(), 0],
     ]),
   }));
 }
@@ -499,15 +492,10 @@ describe('RamsesV2', () => {
   beforeEach(async () => {
     blockNumber = await dexHelper.web3Provider.eth.getBlockNumber();
     uniswapV3 = new UniswapV3(network, dexKey, dexHelper);
-    uniswapV3Mainnet = new UniswapV3(
-      Network.ARBITRUM,
-      dexKey,
-      dexHelper,
-    );
+    uniswapV3Mainnet = new UniswapV3(Network.ARBITRUM, dexKey, dexHelper);
   });
 
   it('getPoolIdentifiers and getPricesVolume SELL', async function () {
-
     const amounts = [
       0n,
       6000000n,
@@ -566,7 +554,6 @@ describe('RamsesV2', () => {
   });
 
   it('getPoolIdentifiers and getPricesVolume BUY', async function () {
-
     const amounts = [
       0n,
       6000000n,
@@ -624,138 +611,3 @@ describe('RamsesV2', () => {
     expect(falseChecksCounter).toBeLessThan(poolPrices!.length);
   });
 });
-
-describe('ChronosV3', () => {
-  const dexKey = 'ChronosV3';
-  let blockNumber: number;
-  let uniswapV3: UniswapV3;
-  let uniswapV3Mainnet: UniswapV3;
-
-  const network = Network.ARBITRUM;
-  const dexHelper = new DummyDexHelper(network);
-  const TokenASymbol = 'USDCe';
-  const TokenA = Tokens[network][TokenASymbol];
-
-  const TokenBSymbol = 'USDT';
-  const TokenB = Tokens[network][TokenBSymbol];
-
-  beforeEach(async () => {
-    blockNumber = await dexHelper.web3Provider.eth.getBlockNumber();
-    uniswapV3 = new UniswapV3(network, dexKey, dexHelper);
-    uniswapV3Mainnet = new UniswapV3(
-      Network.ARBITRUM,
-      dexKey,
-      dexHelper,
-    );
-  });
-
-  it('getPoolIdentifiers and getPricesVolume SELL', async function () {
-
-    const amounts = [0n, BI_POWS[6], 2000000n];
-
-    const pools = await uniswapV3.getPoolIdentifiers(
-      TokenA,
-      TokenB,
-      SwapSide.SELL,
-      blockNumber,
-    );
-    console.log(`${TokenASymbol} <> ${TokenBSymbol} Pool Identifiers: `, pools);
-
-    expect(pools.length).toBeGreaterThan(0);
-
-    const poolPrices = await uniswapV3.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);
-
-    let falseChecksCounter = 0;
-    await Promise.all(
-      poolPrices!.map(async price => {
-        const fee = uniswapV3.eventPools[price.poolIdentifier!]!.feeCode;
-        const res = await checkOnChainPricing(
-          dexHelper,
-          uniswapV3,
-          'quoteExactInputSingle',
-          blockNumber,
-          '0x6E7f0Ca45171a4440c0CDdF3A46A8dC5D4c2d4A0',
-          price.prices,
-          TokenA.address,
-          TokenB.address,
-          fee,
-          amounts,
-        );
-        if (res === false) falseChecksCounter++;
-      }),
-    );
-
-    expect(falseChecksCounter).toBeLessThan(poolPrices!.length);
-  });
-
-  it('getPoolIdentifiers and getPricesVolume BUY', async function () {
-
-    const amounts = [0n, BI_POWS[6], 2000000n];
-
-    const pools = await uniswapV3.getPoolIdentifiers(
-      TokenA,
-      TokenB,
-      SwapSide.BUY,
-      blockNumber,
-    );
-    console.log(`${TokenASymbol} <> ${TokenBSymbol} Pool Identifiers: `, pools);
-
-    expect(pools.length).toBeGreaterThan(0);
-
-    const poolPrices = await uniswapV3.getPricesVolume(
-      TokenA,
-      TokenB,
-      amounts,
-      SwapSide.BUY,
-      blockNumber,
-      pools,
-    );
-    console.log(`${TokenASymbol} <> ${TokenBSymbol} Pool Prices: `, poolPrices);
-
-    expect(poolPrices).not.toBeNull();
-    checkPoolPrices(poolPrices!, amounts, SwapSide.SELL, dexKey);
-
-    let falseChecksCounter = 0;
-    await Promise.all(
-      poolPrices!.map(async price => {
-        const fee = uniswapV3.eventPools[price.poolIdentifier!]!.feeCode;
-        const res = await checkOnChainPricing(
-          dexHelper,
-          uniswapV3,
-          'quoteExactOutputSingle',
-          blockNumber,
-          '0x6E7f0Ca45171a4440c0CDdF3A46A8dC5D4c2d4A0',
-          price.prices,
-          TokenA.address,
-          TokenB.address,
-          fee,
-          amounts,
-        );
-        if (res === false) falseChecksCounter++;
-      }),
-    );
-
-    expect(falseChecksCounter).toBeLessThan(poolPrices!.length);
-  });
-
-  it.skip('getTopPoolsForToken', async function () {
-    const poolLiquidity = await uniswapV3.getTopPoolsForToken(
-      TokenB.address,
-      10,
-    );
-    console.log(`${TokenASymbol} Top Pools:`, poolLiquidity);
-
-    checkPoolsLiquidity(poolLiquidity, TokenB.address, dexKey);
-  });
-});

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

@@ -11,7 +11,8 @@ import {
 import { IDexHelper } from '../../dex-helper/idex-helper';
 import {
   PoolState,
-  DecodedStateMultiCallResultWithRelativeBitmaps, DecodeStateMultiCallFunc,
+  DecodedStateMultiCallResultWithRelativeBitmaps,
+  DecodeStateMultiCallFunc,
 } from './types';
 import UniswapV3PoolABI from '../../abi/uniswap-v3/UniswapV3Pool.abi.json';
 import { bigIntify, catchParseLogError, isSampled } from '../../utils';
@@ -60,7 +61,9 @@ export class UniswapV3EventPool extends StatefulEventSubscriber<PoolState> {
     readonly dexHelper: IDexHelper,
     parentName: string,
     readonly stateMultiContract: Contract,
-    readonly decodeStateMultiCallResultWithRelativeBitmaps: DecodeStateMultiCallFunc | undefined,
+    readonly decodeStateMultiCallResultWithRelativeBitmaps:
+      | DecodeStateMultiCallFunc
+      | undefined,
     readonly erc20Interface: Interface,
     protected readonly factoryAddress: Address,
     public readonly feeCode: bigint,

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

@@ -91,7 +91,7 @@ export class UniswapV3
 
   public static dexKeysWithNetwork: { key: string; networks: Network[] }[] =
     getDexKeysWithNetwork(
-      _.pick(UniswapV3Config, ['UniswapV3', 'QuickSwapV3.1', 'RamsesV2', 'ChronosV3']),
+      _.pick(UniswapV3Config, ['UniswapV3', 'QuickSwapV3.1', 'RamsesV2']),
     );
 
   logger: Logger;
@@ -120,7 +120,7 @@ export class UniswapV3
     this.stateMultiContract = new this.dexHelper.web3Provider.eth.Contract(
       this.config.stateMultiCallAbi !== undefined
         ? this.config.stateMultiCallAbi
-        : UniswapV3StateMulticallABI as AbiItem[],
+        : (UniswapV3StateMulticallABI as AbiItem[]),
       this.config.stateMulticall,
     );
 
@@ -1059,7 +1059,8 @@ export class UniswapV3
       initHash: this.config.initHash,
       subgraphURL: this.config.subgraphURL,
       stateMultiCallAbi: this.config.stateMultiCallAbi,
-      decodeStateMultiCallResultWithRelativeBitmaps: this.config.decodeStateMultiCallResultWithRelativeBitmaps,
+      decodeStateMultiCallResultWithRelativeBitmaps:
+        this.config.decodeStateMultiCallResultWithRelativeBitmaps,
     };
     return newConfig;
   }

package/tests/constants-e2e.ts

@@ -299,6 +299,14 @@ export const Tokens: {
       address: '0xc411db5f5eb3f7d552f9b8454b2d74097ccde6e3',
       decimals: 6,
     },
+    GHO: {
+      address: '0x40d16fc0246ad3160ccc09b8d0d3a2cd28ae6c2f',
+      decimals: 18,
+    },
+    crvUSD: {
+      address: '0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E',
+      decimals: 18,
+    },
   },
   [Network.ROPSTEN]: {
     DAI: {
@@ -908,6 +916,8 @@ export const Holders: {
     aEthWETH: '0x645C4c0c95C1Aa6EF25d12f4a25038cA9b0C6Cc7',
     dUSDC: '0x2FC2F705110A7F46Ce85F701d7217EF1018f01A3',
     PSP: '0xE5E5440a1CE69C5cf67BFFA74d185e57c31b43E5',
+    crvUSD: '0xA920De414eA4Ab66b97dA1bFE9e6EcA7d4219635',
+    GHO: '0x844Dc85EdD8492A56228D293cfEbb823EF3E10EC',
   },
   [Network.ROPSTEN]: {
     ETH: '0x43262A12d8610AA70C15DbaeAC321d51613c9071',

package/.idea/aws.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="accountSettings">
-    <option name="activeProfile" value="profile:default" />
-    <option name="activeRegion" value="us-east-1" />
-    <option name="recentlyUsedProfiles">
-      <list>
-        <option value="profile:default" />
-      </list>
-    </option>
-    <option name="recentlyUsedRegions">
-      <list>
-        <option value="us-east-1" />
-      </list>
-    </option>
-  </component>
-</project>

package/.idea/codeStyles/Project.xml

@@ -1,19 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <ScalaCodeStyleSettings>
-      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
-    </ScalaCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACKETS" value="true" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>

package/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/paraswap-dex-lib.iml" filepath="$PROJECT_DIR$/.idea/paraswap-dex-lib.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/paraswap-dex-lib.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>