@paraswap/dex-lib 2.30.1 → 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',
-          },
-        ],
+      const pairs: { name: string; sellAmount: string; buyAmount: string }[][] =
         [
-          {
-            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' },
-        ],
-      ];
+          [
+            {
+              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}`, () => {

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,

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

@@ -279,7 +279,7 @@ export class UniswapV3
           e,
         );
       } else {
-        // on unkown error mark as failed and increase retryCount for retry init strategy
+        // on unknown error mark as failed and increase retryCount for retry init strategy
         // note: state would be null by default which allows to fallback
         this.logger.warn(
           `${this.dexKey}: Can not generate pool state for srcAddress=${srcAddress}, destAddress=${destAddress}, fee=${fee} pool fallback to rpc and retry every ${this.config.initRetryFrequency} times, initRetryAttemptCount=${pool.initRetryAttemptCount}`,

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',