@paraswap/dex-lib 2.17.0 → 2.17.1-pancakeswapv3.1

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

@@ -0,0 +1,68 @@
+import { BytesLike, ethers } from 'ethers';
+import { assert } from 'ts-essentials';
+import { extractSuccessAndValue } from '../../lib/decoders';
+import { MultiResult } from '../../lib/multi-wrapper';
+import {
+  DecodedStateMultiCallResultWithRelativeBitmaps,
+} from '../uniswap-v3/types';
+
+
+export function decodeStateMultiCallResultWithRelativeBitmaps(
+  result: MultiResult<BytesLike> | BytesLike,
+): DecodedStateMultiCallResultWithRelativeBitmaps {
+  const [isSuccess, toDecode] = extractSuccessAndValue(result);
+
+  assert(
+    isSuccess && toDecode !== '0x',
+    `decodeStateMultiCallResultWithRelativeBitmaps failed to get decodable result: ${result}`,
+  );
+
+  const decoded = ethers.utils.defaultAbiCoder.decode(
+    [
+      // I don't want to pass here any interface, so I just use it in ethers format
+      `
+      tuple(
+        address pool,
+        uint256 blockTimestamp,
+        tuple(
+          uint160 sqrtPriceX96,
+          int24 tick,
+          uint16 observationIndex,
+          uint16 observationCardinality,
+          uint16 observationCardinalityNext,
+          uint32 feeProtocol,
+          bool unlocked,
+        ) slot0,
+        uint128 liquidity,
+        int24 tickSpacing,
+        uint128 maxLiquidityPerTick,
+        tuple(
+          uint32 blockTimestamp,
+          int56 tickCumulative,
+          uint160 secondsPerLiquidityCumulativeX128,
+          bool initialized,
+        ) observation,
+        tuple(
+          int16 index,
+          uint256 value,
+        )[] tickBitmap,
+        tuple(
+          int24 index,
+          tuple(
+            uint128 liquidityGross,
+            int128 liquidityNet,
+            int56 tickCumulativeOutside,
+            uint160 secondsPerLiquidityOutsideX128,
+            uint32 secondsOutside,
+            bool initialized,
+          ) value,
+        )[] ticks
+      )
+    `,
+    ],
+    toDecode,
+  )[0];
+  // This conversion is not precise, because when we decode, we have more values
+  // But I typed only the ones that are used later
+  return decoded as DecodedStateMultiCallResultWithRelativeBitmaps;
+}

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

@@ -4,7 +4,6 @@ import { Network, SwapSide } from '../../constants';
 import { Address } from '../../types';
 
 const SUPPORTED_FEES = [10000n, 3000n, 500n, 100n];
-const PANCAKE_SUPPORTED_FEES = [10000n, 2500n, 500n, 100n];
 
 // Pools that will be initialized on app startup
 // They are added for testing
@@ -23,14 +22,13 @@ export const PoolsToPreload: DexConfigMap<
       },
     ],
   },
-  PancakeswapV3: {},
 };
 
 export const UniswapV3Config: DexConfigMap<DexParams> = {
   UniswapV3: {
     [Network.MAINNET]: {
       factory: '0x1F98431c8aD98523631AE4a59f267346ea31F984',
-      quoter: '0xb27308f9F90D607463bb33eA1BeBb41C27CE5AB6',
+      quoter: '0x61fFE014bA17989E743c5F6cB21bF9697530B21e',
       router: '0xE592427A0AEce92De3Edee1F18E0157C05861564',
       supportedFees: SUPPORTED_FEES,
       stateMulticall: '0x9c764D2e92dA68E4CDfD784B902283A095ff8b63',
@@ -53,7 +51,7 @@ export const UniswapV3Config: DexConfigMap<DexParams> = {
     },
     [Network.POLYGON]: {
       factory: '0x1F98431c8aD98523631AE4a59f267346ea31F984',
-      quoter: '0xb27308f9F90D607463bb33eA1BeBb41C27CE5AB6',
+      quoter: '0x61fFE014bA17989E743c5F6cB21bF9697530B21e',
       router: '0xE592427A0AEce92De3Edee1F18E0157C05861564',
       supportedFees: SUPPORTED_FEES,
       stateMulticall: '0x6Dc993Fe1e945A640576B4Dca81281d8e998DF71',
@@ -65,7 +63,7 @@ export const UniswapV3Config: DexConfigMap<DexParams> = {
     },
     [Network.ARBITRUM]: {
       factory: '0x1F98431c8aD98523631AE4a59f267346ea31F984',
-      quoter: '0xb27308f9F90D607463bb33eA1BeBb41C27CE5AB6',
+      quoter: '0x61fFE014bA17989E743c5F6cB21bF9697530B21e',
       router: '0xE592427A0AEce92De3Edee1F18E0157C05861564',
       supportedFees: SUPPORTED_FEES,
       stateMulticall: '0xaBB58098A7B5172A9b0B38a1925A522dbf0b4FC3',
@@ -77,7 +75,7 @@ export const UniswapV3Config: DexConfigMap<DexParams> = {
     },
     [Network.OPTIMISM]: {
       factory: '0x1F98431c8aD98523631AE4a59f267346ea31F984',
-      quoter: '0xb27308f9F90D607463bb33eA1BeBb41C27CE5AB6',
+      quoter: '0x61fFE014bA17989E743c5F6cB21bF9697530B21e',
       router: '0xE592427A0AEce92De3Edee1F18E0157C05861564',
       supportedFees: SUPPORTED_FEES,
       stateMulticall: '0x4FF0dEC5f9a763Aa1E5C2a962aa6f4eDFeE4f9eA',
@@ -88,36 +86,6 @@ export const UniswapV3Config: DexConfigMap<DexParams> = {
         'https://api.thegraph.com/subgraphs/name/ianlapham/optimism-post-regenesis',
     },
   },
-  PancakeswapV3: {
-    [Network.MAINNET]: {
-      factory: '0x0BFbCF9fa4f9C56B0F40a671Ad40E0805A091865',
-      deployer: '0x41ff9AA7e16B8B1a8a8dc4f0eFacd93D02d071c9',
-      quoter: '0xB048Bbc1Ee6b733FFfCFb9e9CeF7375518e25997',
-      router: '0x1b81D678ffb9C0263b24A97847620C99d213eB14',
-      supportedFees: PANCAKE_SUPPORTED_FEES,
-      stateMulticall: '0x80898f80cFA3Fa3AbF410d90e69aDc432AE5D4c2',
-      uniswapMulticall: '0xac1cE734566f390A94b00eb9bf561c2625BF44ea',
-      chunksCount: 10,
-      initHash:
-        '0x6ce8eb472fa82df5469c6ab6d485f17c3ad13c8cd7af59b3d4a8026c5ce0f7e2',
-      subgraphURL:
-        'https://api.thegraph.com/subgraphs/name/pancakeswap/exchange-v3-eth',
-    },
-    [Network.BSC]: {
-      factory: '0x0BFbCF9fa4f9C56B0F40a671Ad40E0805A091865',
-      deployer: '0x41ff9AA7e16B8B1a8a8dc4f0eFacd93D02d071c9',
-      quoter: '0xB048Bbc1Ee6b733FFfCFb9e9CeF7375518e25997',
-      router: '0x1b81D678ffb9C0263b24A97847620C99d213eB14',
-      supportedFees: PANCAKE_SUPPORTED_FEES,
-      stateMulticall: '0x9DAd2ED7ADc6eaacf81589Cd043579c9684E5C81',
-      uniswapMulticall: '0xac1cE734566f390A94b00eb9bf561c2625BF44ea',
-      chunksCount: 10,
-      initHash:
-        '0x6ce8eb472fa82df5469c6ab6d485f17c3ad13c8cd7af59b3d4a8026c5ce0f7e2',
-      subgraphURL:
-        'https://api.thegraph.com/subgraphs/name/pancakeswap/exchange-v3-bsc',
-    },
-  },
 };
 
 export const Adapters: Record<number, AdapterMappings> = {

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

@@ -203,159 +203,3 @@ describe('UniswapV3 E2E', () => {
     );
   });
 });
-
-describe('PancakeswapV3 E2E', () => {
-  const dexKey = 'PancakeswapV3';
-
-  describe('PancakeswapV3 MAINNET', () => {
-    const network = Network.MAINNET;
-    const tokens = Tokens[network];
-    const holders = Holders[network];
-    const provider = new StaticJsonRpcProvider(
-      generateConfig(network).privateHttpProvider,
-      network,
-    );
-
-    const tokenASymbol: string = 'USDT';
-    const tokenBSymbol: string = 'USDC';
-    const nativeTokenSymbol = NativeTokenSymbols[network];
-
-    const tokenAAmount: string = '100000000';
-    const tokenBAmount: string = '100000000';
-    const nativeTokenAmount = '1000000000000000000';
-
-    const sideToContractMethods = new Map([
-      [
-        SwapSide.SELL,
-        [
-          ContractMethod.simpleSwap,
-          ContractMethod.multiSwap,
-          ContractMethod.megaSwap,
-        ],
-      ],
-      [SwapSide.BUY, [ContractMethod.simpleBuy, ContractMethod.buy]],
-    ]);
-
-    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,
-            );
-          });
-        });
-      }),
-    );
-  });
-
-  describe('PancakeswapV3 BSC', () => {
-    const network = Network.BSC;
-    const tokens = Tokens[network];
-    const holders = Holders[network];
-    const provider = new StaticJsonRpcProvider(
-      generateConfig(network).privateHttpProvider,
-      network,
-    );
-
-    const tokenASymbol: string = 'BUSD';
-    const tokenBSymbol: string = 'WBNB';
-    const nativeTokenSymbol = NativeTokenSymbols[network];
-
-    const tokenAAmount: string = '100000000000000000000';
-    const tokenBAmount: string = '1000000000000000000';
-    const nativeTokenAmount = '1000000000000000000';
-
-    const sideToContractMethods = new Map([
-      [
-        SwapSide.SELL,
-        [
-          ContractMethod.simpleSwap,
-          ContractMethod.multiSwap,
-          ContractMethod.megaSwap,
-        ],
-      ],
-      [SwapSide.BUY, [ContractMethod.simpleBuy, ContractMethod.buy]],
-    ]);
-
-    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-events.test.ts

@@ -106,6 +106,8 @@ describe('UniswapV3 Event', function () {
             token0,
             token1,
             logger,
+            undefined,
+            config.initHash,
           );
 
           // It is done in generateState. But here have to make it manually
@@ -159,6 +161,8 @@ describe('UniswapV3 Event', function () {
       _token0,
       _token1,
       logger,
+      undefined,
+      config.initHash,
     );
 
     // It is done in generateState. But here have to make it manually

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

@@ -69,7 +69,6 @@ export class UniswapV3EventPool extends StatefulEventSubscriber<PoolState> {
     logger: Logger,
     mapKey: string = '',
     readonly poolInitCodeHash: string,
-    readonly poolDeployer?: string,
   ) {
     super(
       parentName,
@@ -539,7 +538,7 @@ export class UniswapV3EventPool extends StatefulEventSubscriber<PoolState> {
     );
 
     return ethers.utils.getCreate2Address(
-      this.poolDeployer ? this.poolDeployer : this.factoryAddress,
+      this.factoryAddress,
       encodedKey,
       this.poolInitCodeHash,
     );

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

@@ -214,7 +214,6 @@ export class UniswapV3
         this.logger,
         this.cacheStateKey,
         this.config.initHash,
-        this.config.deployer,
       );
 
       try {
@@ -392,19 +391,23 @@ export class UniswapV3
         callData:
           side === SwapSide.SELL
             ? this.quoterIface.encodeFunctionData('quoteExactInputSingle', [
+              [
                 from.address,
                 to.address,
-                pool.feeCodeAsString,
                 _amount.toString(),
+                pool.feeCodeAsString,
                 0, //sqrtPriceLimitX96
-              ])
+              ],
+            ])
             : this.quoterIface.encodeFunctionData('quoteExactOutputSingle', [
+              [
                 from.address,
                 to.address,
-                pool.feeCodeAsString,
                 _amount.toString(),
+                pool.feeCodeAsString,
                 0, //sqrtPriceLimitX96
-              ]),
+              ],
+            ]),
       })),
     );
 

package/tests/constants-e2e.ts

@@ -1011,7 +1011,7 @@ export const Holders: {
     aArbUSDC: '0x048BF2F5908e95976CeAD0E47D805b3803E286e2',
     ZYB: '0x3ec0eddcd1e25025077327886a78133589082fb2',
     WBTC: '0xd9d611c6943585bc0e18e51034af8fa28778f7da',
-    RDNT: '0x62383739d68dd0f844103db8dfb05a7eded5bbe6'
+    RDNT: '0x62383739d68dd0f844103db8dfb05a7eded5bbe6',
   },
   [Network.OPTIMISM]: {
     ETH: '0x9ef21bE1C270AA1c3c3d750F458442397fBFFCB6',

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

@@ -1,28 +0,0 @@
-import { UniswapV3 } from '../../uniswap-v3';
-import { Network } from '../../../../constants';
-import { IDexHelper } from '../../../../dex-helper';
-import { Interface } from '@ethersproject/abi';
-import PancakeswapV3RouterABI from '../../../../abi/uniswap-v3/pancakeswap-v3/PancakeswapV3Router.abi.json';
-import PancakeswapV3QuoterV2ABI from '../../../../abi/uniswap-v3/pancakeswap-v3/PancakeswapV3QuoterV2.abi.json';
-import { getDexKeysWithNetwork } from '../../../../utils';
-import _ from 'lodash';
-import { UniswapV3Config } from '../../config';
-
-export class PancakeswapV3 extends UniswapV3 {
-  public static dexKeysWithNetwork: { key: string; networks: Network[] }[] =
-    getDexKeysWithNetwork(_.pick(UniswapV3Config, ['PancakeswapV3']));
-  constructor(
-    protected network: Network,
-    dexKey: string,
-    protected dexHelper: IDexHelper,
-  ) {
-    super(
-      network,
-      dexKey,
-      dexHelper,
-      undefined,
-      new Interface(PancakeswapV3RouterABI),
-      new Interface(PancakeswapV3QuoterV2ABI),
-    );
-  }
-}