@paraswap/dex-lib 2.28.10-ramses-v2 → 2.28.10

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

@@ -88,18 +88,8 @@ async function checkOnChainPricing(
     return false;
   }
 
-  // const readerCallData = getReaderCalldata(
-  //   exchangeAddress,
-  //   readerIface,
-  //   _amounts.slice(1),
-  //   funcName,
-  //   tokenIn,
-  //   tokenOut,
-  //   fee,
-  // );
-
   const readerCallData = getReaderCalldata(
-    '0x61fFE014bA17989E743c5F6cB21bF9697530B21e',
+    exchangeAddress,
     readerIface,
     _amounts.slice(1),
     funcName,
@@ -148,22 +138,9 @@ describe('UniswapV3', function () {
     blockNumber = await dexHelper.web3Provider.eth.getBlockNumber();
     uniswapV3 = new UniswapV3(network, dexKey, dexHelper);
     uniswapV3Mainnet = new UniswapV3(
-      Network.ARBITRUM,
+      Network.MAINNET,
       dexKey,
-      new DummyDexHelper(Network.ARBITRUM),
-    );
-  });
-
-
-  it('fgggg', async () => {
-    const readerCallData = getReaderCalldata(
-      '',
-      readerIface,
-      _amounts.slice(1),
-      funcName,
-      tokenIn,
-      tokenOut,
-      fee,
+      new DummyDexHelper(Network.MAINNET),
     );
   });
 

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

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import { Contract } from 'web3-eth-contract';
 import { Interface } from '@ethersproject/abi';
-import { BytesLike, ethers } from 'ethers';
+import { ethers } from 'ethers';
 import { assert, DeepReadonly } from 'ts-essentials';
 import { Log, Logger, BlockHeader, Address } from '../../types';
 import {
@@ -11,12 +11,12 @@ import {
 import { IDexHelper } from '../../dex-helper/idex-helper';
 import {
   PoolState,
-  DecodedStateMultiCallResultWithRelativeBitmaps, DecodeStateMultiCallFunc,
+  DecodedStateMultiCallResultWithRelativeBitmaps,
 } from './types';
 import UniswapV3PoolABI from '../../abi/uniswap-v3/UniswapV3Pool.abi.json';
 import { bigIntify, catchParseLogError, isSampled } from '../../utils';
 import { uniswapV3Math } from './contract-math/uniswap-v3-math';
-import { MultiCallParams, MultiResult } from '../../lib/multi-wrapper';
+import { MultiCallParams } from '../../lib/multi-wrapper';
 import {
   OUT_OF_RANGE_ERROR_POSTFIX,
   TICK_BITMAP_BUFFER,
@@ -60,7 +60,6 @@ export class UniswapV3EventPool extends StatefulEventSubscriber<PoolState> {
     readonly dexHelper: IDexHelper,
     parentName: string,
     readonly stateMultiContract: Contract,
-    readonly decodeStateMultiCallResultWithRelativeBitmaps: DecodeStateMultiCallFunc | undefined,
     readonly erc20Interface: Interface,
     protected readonly factoryAddress: Address,
     public readonly feeCode: bigint,
@@ -227,13 +226,9 @@ export class UniswapV3EventPool extends StatefulEventSubscriber<PoolState> {
               this.getBitmapRangeToRequest(),
             )
             .encodeABI(),
-          decodeFunction:
-            this.decodeStateMultiCallResultWithRelativeBitmaps !== undefined
-              ? this.decodeStateMultiCallResultWithRelativeBitmaps
-              : decodeStateMultiCallResultWithRelativeBitmaps,
+          decodeFunction: decodeStateMultiCallResultWithRelativeBitmaps,
         },
       ];
-
       this._stateRequestCallData = callData;
     }
     return this._stateRequestCallData;

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

@@ -42,7 +42,7 @@ import {
 import { UniswapV3Config, Adapters, PoolsToPreload } from './config';
 import { UniswapV3EventPool } from './uniswap-v3-pool';
 import UniswapV3RouterABI from '../../abi/uniswap-v3/UniswapV3Router.abi.json';
-import UniswapV3QuoterABI from '../../abi/uniswap-v3/UniswapV3Quoter.abi.json';
+import UniswapV3QuoterV2ABI from '../../abi/uniswap-v3/UniswapV3QuoterV2.abi.json';
 import UniswapV3MultiABI from '../../abi/uniswap-v3/UniswapMulti.abi.json';
 import DirectSwapABI from '../../abi/DirectSwap.json';
 import UniswapV3StateMulticallABI from '../../abi/uniswap-v3/UniswapV3StateMulticall.abi.json';
@@ -91,7 +91,7 @@ export class UniswapV3
 
   public static dexKeysWithNetwork: { key: string; networks: Network[] }[] =
     getDexKeysWithNetwork(
-      _.pick(UniswapV3Config, ['UniswapV3', 'QuickSwapV3.1', 'RamsesV2']),
+      _.pick(UniswapV3Config, ['UniswapV3', 'QuickSwapV3.1']),
     );
 
   logger: Logger;
@@ -107,7 +107,7 @@ export class UniswapV3
     protected dexHelper: IDexHelper,
     protected adapters = Adapters[network] || {},
     readonly routerIface = new Interface(UniswapV3RouterABI),
-    readonly quoterIface = new Interface(UniswapV3QuoterABI),
+    readonly quoterIface = new Interface(UniswapV3QuoterV2ABI),
     protected config = UniswapV3Config[dexKey][network],
     protected poolsToPreload = PoolsToPreload[dexKey]?.[network] || [],
   ) {
@@ -118,9 +118,7 @@ export class UniswapV3
       this.config.uniswapMulticall,
     );
     this.stateMultiContract = new this.dexHelper.web3Provider.eth.Contract(
-      this.config.stateMultiCallAbi !== undefined
-        ? this.config.stateMultiCallAbi
-        : UniswapV3StateMulticallABI as AbiItem[],
+      UniswapV3StateMulticallABI as AbiItem[],
       this.config.stateMulticall,
     );
 
@@ -241,7 +239,6 @@ export class UniswapV3
         this.dexHelper,
         this.dexKey,
         this.stateMultiContract,
-        this.config.decodeStateMultiCallResultWithRelativeBitmaps,
         this.erc20Interface,
         this.config.factory,
         fee,
@@ -1058,8 +1055,6 @@ export class UniswapV3
       deployer: this.config.deployer?.toLowerCase(),
       initHash: this.config.initHash,
       subgraphURL: this.config.subgraphURL,
-      stateMultiCallAbi: this.config.stateMultiCallAbi,
-      decodeStateMultiCallResultWithRelativeBitmaps: this.config.decodeStateMultiCallResultWithRelativeBitmaps,
     };
     return newConfig;
   }

package/src/lib/multi-wrapper.ts

@@ -65,11 +65,11 @@ export class MultiWrapper {
     }
 
     const aggregatedResult = await Promise.all(
-      allCalls.map(batch => {
-        return this.multi.methods
+      allCalls.map(batch =>
+        this.multi.methods
           .tryAggregate(mandatory, batch)
-          .call(undefined, blockNumber);
-      })
+          .call(undefined, blockNumber),
+      ),
     );
 
     let globalInd = 0;

package/tests/constants-e2e.ts

@@ -785,6 +785,10 @@ export const Tokens: {
       address: '0x2f2a2543b76a4166549f7aab2e75bef0aefc5b0f',
       decimals: 8,
     },
+    USDCe: {
+      address: '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8',
+      decimals: 6,
+    },
     LEX: {
       address: '0x6bB7A17AcC227fd1F6781D1EEDEAE01B42047eE0',
       decimals: 18,
@@ -1016,7 +1020,7 @@ export const Holders: {
     USDCe: '0x62383739d68dd0f844103db8dfb05a7eded5bbe6',
     USDC: '0xa843392198862f98d17e3aa1421b08f2c2020cff',
     OHM: '0xebce5f29ff5ca9aa330ebdf7ec6b5f474bff271e',
-    USDT: '0x5ff47d4ab75bcaff6807c81f1367abb53439883c',
+    USDT: '0x62383739d68dd0f844103db8dfb05a7eded5bbe6',
     POPS: '0x4b78b52e7de4d8b7d367297cb8a87c1875a9d591',
     FRAX: '0x59bf0545fca0e5ad48e13da269facd2e8c886ba4',
     nUSD: '0x9dd329f5411466d9e0c488ff72519ca9fef0cb40',