@paraswap/dex-lib 2.21.0 → 2.21.1-chronos

package/src/dex/curve-v1-factory/curve-v1-factory.ts

@@ -1,7 +1,5 @@
 import _ from 'lodash';
-import { AbiItem } from 'web3-utils';
-import { NumberAsString, OptimalSwapExchange } from '@paraswap/core';
-import { assert, AsyncOrSync } from 'ts-essentials';
+import { AsyncOrSync } from 'ts-essentials';
 import { Interface, JsonFragment } from '@ethersproject/abi';
 import {
   Token,
@@ -13,9 +11,6 @@ import {
   PoolLiquidity,
   Logger,
   TransferFeeParams,
-  TxInfo,
-  PreprocessTransactionOptions,
-  ExchangeTxInfo,
 } from '../../types';
 import {
   SwapSide,
@@ -28,7 +23,6 @@ import {
   getBigIntPow,
   getDexKeysWithNetwork,
   isSrcTokenTransferFeeToBeExchanged,
-  uuidToBytes16,
 } from '../../utils';
 import { IDex } from '../idex';
 import { IDexHelper } from '../../dex-helper/idex-helper';
@@ -36,19 +30,13 @@ import {
   CurveSwapFunctions,
   CurveV1FactoryData,
   CurveV1FactoryIfaces,
-  CurveV1SwapType,
   CustomImplementationNames,
   ImplementationNames,
   PoolConstants,
-  DirectCurveV1Param,
 } from './types';
-import {
-  getLocalDeadlineAsFriendlyPlaceholder,
-  SimpleExchange,
-} from '../simple-exchange';
+import { SimpleExchange } from '../simple-exchange';
 import { CurveV1FactoryConfig, Adapters } from './config';
 import {
-  DIRECT_METHOD_NAME,
   FACTORY_MAX_PLAIN_COINS,
   FACTORY_MAX_PLAIN_IMPLEMENTATIONS_FOR_COIN,
   MIN_AMOUNT_TO_RECEIVE,
@@ -56,7 +44,6 @@ import {
 } from './constants';
 import { CurveV1FactoryPoolManager } from './curve-v1-pool-manager';
 import CurveABI from '../../abi/Curve.json';
-import DirectSwapABI from '../../abi/DirectSwap.json';
 import FactoryCurveV1ABI from '../../abi/curve-v1-factory/FactoryCurveV1.json';
 import ThreePoolABI from '../../abi/curve-v1-factory/ThreePool.json';
 import ERC20ABI from '../../abi/erc20.json';
@@ -74,6 +61,7 @@ import { CustomBasePoolForFactory } from './state-polling-pools/custom-pool-poll
 import ImplementationConstants from './price-handlers/functions/constants';
 import { applyTransferFee } from '../../lib/token-transfer-fee';
 import { PriceHandler } from './price-handlers/price-handler';
+import { AbiItem } from 'web3-utils';
 
 const DefaultCoinsABI: AbiItem = {
   type: 'function',
@@ -94,7 +82,7 @@ const DefaultCoinsABI: AbiItem = {
 
 export class CurveV1Factory
   extends SimpleExchange
-  implements IDex<CurveV1FactoryData, DirectCurveV1Param>
+  implements IDex<CurveV1FactoryData>
 {
   readonly hasConstantPriceLargeAmounts = false;
   readonly needWrapNative = false;
@@ -110,8 +98,6 @@ export class CurveV1Factory
   readonly SRC_TOKEN_DEX_TRANSFERS = 1;
   readonly DEST_TOKEN_DEX_TRANSFERS = 1;
 
-  readonly directSwapIface = new Interface(DirectSwapABI);
-
   public static dexKeysWithNetwork: { key: string; networks: Network[] }[] =
     getDexKeysWithNetwork(CurveV1FactoryConfig);
 
@@ -828,128 +814,6 @@ export class CurveV1Factory
     };
   }
 
-  getTokenFromAddress(address: Address): Token {
-    // In this Dex decimals are not used
-    return { address, decimals: 0 };
-  }
-
-  async preProcessTransaction(
-    optimalSwapExchange: OptimalSwapExchange<CurveV1FactoryData>,
-    srcToken: Token,
-    _0: Token,
-    _1: SwapSide,
-    options: PreprocessTransactionOptions,
-  ): Promise<[OptimalSwapExchange<CurveV1FactoryData>, ExchangeTxInfo]> {
-    if (!options.isDirectMethod) {
-      return [
-        optimalSwapExchange,
-        {
-          deadline: BigInt(getLocalDeadlineAsFriendlyPlaceholder()),
-        },
-      ];
-    }
-
-    assert(
-      optimalSwapExchange.data !== undefined,
-      `preProcessTransaction: data field is missing`,
-    );
-
-    let isApproved: boolean | undefined;
-
-    try {
-      this.erc20Contract.options.address =
-        this.dexHelper.config.wrapETH(srcToken).address;
-      const allowance = await this.erc20Contract.methods
-        .allowance(this.augustusAddress, optimalSwapExchange.data.exchange)
-        .call(undefined, 'latest');
-      isApproved =
-        BigInt(allowance.toString()) >= BigInt(optimalSwapExchange.srcAmount);
-    } catch (e) {
-      this.logger.error(
-        `preProcessTransaction failed to retrieve allowance info: `,
-        e,
-      );
-    }
-
-    return [
-      {
-        ...optimalSwapExchange,
-        data: {
-          ...optimalSwapExchange.data,
-          isApproved,
-        },
-      },
-      {
-        deadline: BigInt(getLocalDeadlineAsFriendlyPlaceholder()),
-      },
-    ];
-  }
-
-  getDirectParam(
-    srcToken: Address,
-    destToken: Address,
-    srcAmount: NumberAsString,
-    destAmount: NumberAsString,
-    expectedAmount: NumberAsString,
-    data: CurveV1FactoryData,
-    side: SwapSide,
-    permit: string,
-    uuid: string,
-    feePercent: NumberAsString,
-    deadline: NumberAsString,
-    partner: string,
-    beneficiary: string,
-    contractMethod?: string,
-  ): TxInfo<DirectCurveV1Param> {
-    if (contractMethod !== DIRECT_METHOD_NAME) {
-      throw new Error(`Invalid contract method ${contractMethod}`);
-    }
-    assert(side === SwapSide.SELL, 'Buy not supported');
-
-    let isApproved: boolean = !!data.isApproved;
-    if (data.isApproved === undefined) {
-      this.logger.warn(`isApproved is undefined, defaulting to false`);
-    }
-
-    const swapParams: DirectCurveV1Param = [
-      srcToken,
-      destToken,
-      data.exchange,
-      srcAmount,
-      destAmount,
-      expectedAmount,
-      feePercent,
-      data.i.toString(),
-      data.j.toString(),
-      partner,
-      isApproved,
-      data.underlyingSwap
-        ? CurveV1SwapType.EXCHANGE_UNDERLYING
-        : CurveV1SwapType.EXCHANGE,
-      beneficiary,
-      // For CurveV1 we work as it is, without wrapping and unwrapping
-      false,
-      permit,
-      uuidToBytes16(uuid),
-    ];
-
-    const encoder = (...params: DirectCurveV1Param) => {
-      return this.directSwapIface.encodeFunctionData(DIRECT_METHOD_NAME, [
-        params,
-      ]);
-    };
-
-    return {
-      params: swapParams,
-      encoder,
-      networkFee: '0',
-    };
-  }
-
-  static getDirectFunctionName(): string[] {
-    return [DIRECT_METHOD_NAME];
-  }
-
   async getSimpleParam(
     srcToken: string,
     destToken: string,

package/src/dex/curve-v1-factory/types.ts

@@ -1,5 +1,4 @@
 import { Interface } from '@ethersproject/abi';
-import { NumberAsString } from '@paraswap/core';
 import { Address } from '../../types';
 
 // The difference between PoolContextConstants and PoolConstants lies in the fact
@@ -70,7 +69,6 @@ export type CurveV1FactoryData = {
   i: number;
   j: number;
   underlyingSwap: boolean;
-  isApproved?: boolean;
 };
 
 export enum FactoryImplementationNames {
@@ -183,27 +181,3 @@ export type CurveV1FactoryIfaces = {
 };
 
 export type LiquidityInCache = Record<string, number>;
-
-export enum CurveV1SwapType {
-  EXCHANGE,
-  EXCHANGE_UNDERLYING,
-}
-
-export type DirectCurveV1Param = [
-  fromToken: Address,
-  toToken: Address,
-  exchange: Address,
-  fromAmount: NumberAsString,
-  toAmount: NumberAsString,
-  expectedAmount: NumberAsString,
-  feePercent: NumberAsString,
-  i: NumberAsString,
-  j: NumberAsString,
-  partner: Address,
-  isApproved: boolean,
-  swapType: CurveV1SwapType,
-  beneficiary: Address,
-  needWrapNative: boolean,
-  permit: string,
-  uuid: string,
-];

package/src/dex/curve-v2.ts

@@ -3,26 +3,15 @@ import { SwapSide } from '../constants';
 import {
   AdapterExchangeParam,
   Address,
-  ExchangeTxInfo,
   NumberAsString,
-  PreprocessTransactionOptions,
   SimpleExchangeParam,
-  Token,
-  TxInfo,
 } from '../types';
 import { IDexTxBuilder } from './idex';
-import {
-  getLocalDeadlineAsFriendlyPlaceholder,
-  SimpleExchange,
-} from './simple-exchange';
+import { SimpleExchange } from './simple-exchange';
 import GenericFactoryZapABI from '../abi/curve-v2/GenericFactoryZap.json';
-import DirectSwapABI from '../abi/DirectSwap.json';
 import CurveV2ABI from '../abi/CurveV2.json';
+import Web3 from 'web3';
 import { IDexHelper } from '../dex-helper';
-import { assert } from 'ts-essentials';
-import { Logger } from 'log4js';
-import { OptimalSwapExchange } from '@paraswap/core';
-import { uuidToBytes16 } from '../utils';
 
 export enum CurveV2SwapType {
   EXCHANGE,
@@ -30,15 +19,12 @@ export enum CurveV2SwapType {
   EXCHANGE_GENERIC_FACTORY_ZAP,
 }
 
-const DIRECT_METHOD_NAME = 'directCurveV2Swap';
-
 type CurveV2Data = {
   i: number;
   j: number;
   exchange: string;
   originalPoolAddress: Address;
   swapType: CurveV2SwapType;
-  isApproved?: boolean;
 };
 
 type CurveV2Param = [
@@ -57,26 +43,6 @@ type CurveV2ParamsForGenericFactoryZap = [
   min_dy: NumberAsString,
 ];
 
-export type DirectCurveV2Param = [
-  fromToken: Address,
-  toToken: Address,
-  exchange: Address,
-  poolAddress: Address,
-  fromAmount: NumberAsString,
-  toAmount: NumberAsString,
-  expectedAmount: NumberAsString,
-  feePercent: NumberAsString,
-  i: NumberAsString,
-  j: NumberAsString,
-  partner: Address,
-  isApproved: boolean,
-  swapType: CurveV2SwapType,
-  beneficiary: Address,
-  needWrapNative: boolean,
-  permit: string,
-  uuid: string,
-];
-
 enum CurveV2SwapFunctions {
   exchange = 'exchange(uint256 i, uint256 j, uint256 dx, uint256 minDy)',
   exchange_underlying = 'exchange_underlying(uint256 i, uint256 j, uint256 dx, uint256 minDy)',
@@ -85,31 +51,25 @@ enum CurveV2SwapFunctions {
 
 export class CurveV2
   extends SimpleExchange
-  implements IDexTxBuilder<CurveV2Data, DirectCurveV2Param>
+  implements IDexTxBuilder<CurveV2Data, CurveV2Param>
 {
   static dexKeys = ['curvev2'];
   exchangeRouterInterface: Interface;
   genericFactoryZapIface: Interface;
   minConversionRate = '1';
   needWrapNative = true;
-  logger: Logger;
-
-  readonly directSwapIface = new Interface(DirectSwapABI);
 
-  constructor(readonly dexHelper: IDexHelper) {
+  constructor(dexHelper: IDexHelper) {
     super(dexHelper, 'curvev2');
     this.exchangeRouterInterface = new Interface(CurveV2ABI as JsonFragment[]);
     this.genericFactoryZapIface = new Interface(GenericFactoryZapABI);
-    this.logger = dexHelper.getLogger(
-      `CurveV2_${dexHelper.config.data.network}`,
-    );
   }
 
   getAdapterParam(
-    _0: string,
-    _1: string,
-    _2: string,
-    _3: string,
+    srcToken: string,
+    destToken: string,
+    srcAmount: string,
+    destAmount: string,
     data: CurveV2Data,
     side: SwapSide,
   ): AdapterExchangeParam {
@@ -140,127 +100,6 @@ export class CurveV2
     };
   }
 
-  getTokenFromAddress(address: Address): Token {
-    // In this Dex decimals are not used
-    return { address, decimals: 0 };
-  }
-
-  async preProcessTransaction(
-    optimalSwapExchange: OptimalSwapExchange<CurveV2Data>,
-    srcToken: Token,
-    _0: Token,
-    _1: SwapSide,
-    options: PreprocessTransactionOptions,
-  ): Promise<[OptimalSwapExchange<CurveV2Data>, ExchangeTxInfo]> {
-    if (!options.isDirectMethod) {
-      return [
-        optimalSwapExchange,
-        {
-          deadline: BigInt(getLocalDeadlineAsFriendlyPlaceholder()),
-        },
-      ];
-    }
-
-    assert(
-      optimalSwapExchange.data !== undefined,
-      `preProcessTransaction: data field is missing`,
-    );
-
-    let isApproved: boolean | undefined;
-
-    try {
-      this.erc20Contract.options.address =
-        this.dexHelper.config.wrapETH(srcToken).address;
-      const allowance = await this.erc20Contract.methods
-        .allowance(this.augustusAddress, optimalSwapExchange.data.exchange)
-        .call(undefined, 'latest');
-      isApproved =
-        BigInt(allowance.toString()) >= BigInt(optimalSwapExchange.srcAmount);
-    } catch (e) {
-      this.logger.error(
-        `preProcessTransaction failed to retrieve allowance info: `,
-        e,
-      );
-    }
-
-    return [
-      {
-        ...optimalSwapExchange,
-        data: {
-          ...optimalSwapExchange.data,
-          isApproved,
-        },
-      },
-      {
-        deadline: BigInt(getLocalDeadlineAsFriendlyPlaceholder()),
-      },
-    ];
-  }
-
-  getDirectParam(
-    srcToken: Address,
-    destToken: Address,
-    srcAmount: NumberAsString,
-    destAmount: NumberAsString,
-    expectedAmount: NumberAsString,
-    data: CurveV2Data,
-    side: SwapSide,
-    permit: string,
-    uuid: string,
-    feePercent: NumberAsString,
-    _0: NumberAsString,
-    partner: string,
-    beneficiary: string,
-    contractMethod?: string,
-  ): TxInfo<DirectCurveV2Param> {
-    if (contractMethod !== DIRECT_METHOD_NAME) {
-      throw new Error(`Invalid contract method ${contractMethod}`);
-    }
-    assert(side === SwapSide.SELL, 'Buy not supported');
-
-    let isApproved: boolean = !!data.isApproved;
-    if (data.isApproved === undefined) {
-      this.logger.warn(`isApproved is undefined, defaulting to false`);
-    }
-
-    const swapParams: DirectCurveV2Param = [
-      srcToken,
-      destToken,
-      data.exchange,
-      data.originalPoolAddress,
-      srcAmount,
-      destAmount,
-      expectedAmount,
-      feePercent,
-      data.i.toString(),
-      data.j.toString(),
-      partner,
-      isApproved,
-      data.swapType,
-      beneficiary,
-      // For now we always wrap native. We don't support non native trade
-      true,
-      permit,
-      uuidToBytes16(uuid),
-    ];
-
-    const encoder = (...params: DirectCurveV2Param) => {
-      return this.directSwapIface.encodeFunctionData(DIRECT_METHOD_NAME, [
-        params,
-      ]);
-    };
-
-    return {
-      params: swapParams,
-      encoder,
-      networkFee: '0',
-    };
-  }
-
-  static getDirectFunctionName(): string[] {
-    return [DIRECT_METHOD_NAME];
-  }
-
   async getSimpleParam(
     srcToken: string,
     destToken: string,

package/src/dex/idex.ts

@@ -76,15 +76,9 @@ export interface IDexTxBuilder<ExchangeData, DirectParam = null> {
     destToken: Address,
     srcAmount: NumberAsString,
     destAmount: NumberAsString,
-    expectedAmount: NumberAsString,
     data: ExchangeData,
     side: SwapSide,
     permit: string,
-    uuid: string,
-    feePercent: NumberAsString,
-    deadline: NumberAsString,
-    partner: string,
-    beneficiary: string,
     contractMethod?: string,
   ): TxInfo<DirectParam>;
 }

package/src/dex/index.ts

@@ -43,6 +43,7 @@ import { ParaSwapLimitOrders } from './paraswap-limit-orders/paraswap-limit-orde
 import { AugustusRFQOrder } from './augustus-rfq';
 import { Solidly } from './solidly/solidly';
 import { Thena } from './solidly/forks-override/thena';
+import { Chronos } from './solidly/forks-override/chronos';
 import { Velodrome } from './solidly/forks-override/velodrome';
 import { SpiritSwapV2 } from './solidly/forks-override/spiritSwapV2';
 import { Synthetix } from './synthetix/synthetix';
@@ -63,9 +64,7 @@ import { SolidlyEthereum } from './solidly/solidly-ethereum';
 import { MaverickV1 } from './maverick-v1/maverick-v1';
 import { QuickSwapV3 } from './quickswap/quickswap-v3';
 import { ZyberSwapV3 } from './quickswap/zyberswap-v3';
-import { CamelotV3 } from './quickswap/camelot-v3';
 import { TraderJoeV2 } from './trader-joe-v2';
-import { SwaapV2 } from './swaap-v2/swaap-v2';
 import { SpiritSwapV3 } from './quickswap/spiritswap-v3';
 import { TraderJoeV21 } from './trader-joe-v2.1';
 import { PancakeswapV3 } from './pancakeswap-v3/pancakeswap-v3';
@@ -86,7 +85,6 @@ const LegacyDexes = [
   DodoV2,
   QuickSwapV3,
   ZyberSwapV3,
-  CamelotV3,
   SpiritSwapV3,
   TraderJoeV2,
   TraderJoeV21,
@@ -124,6 +122,7 @@ const Dexes = [
   SolidlyEthereum,
   SpiritSwapV2,
   Thena,
+  Chronos,
   Velodrome,
   Cone,
   SoliSnek,
@@ -134,7 +133,6 @@ const Dexes = [
   Hashflow,
   MaverickV1,
   Camelot,
-  SwaapV2,
 ];
 
 export type LegacyDexConstructor = new (dexHelper: IDexHelper) => IDexTxBuilder<

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

@@ -32,7 +32,10 @@ describe('PancakeswapV3 E2E', () => {
           ContractMethod.megaSwap,
         ],
       ],
-      [SwapSide.BUY, [ContractMethod.simpleBuy, ContractMethod.buy]],
+      [SwapSide.BUY, [
+        ContractMethod.simpleBuy,
+        ContractMethod.buy,
+      ]],
     ]);
 
     const pairs: { name: string; sellAmount: string; buyAmount: string }[][] = [
@@ -95,8 +98,8 @@ describe('PancakeswapV3 E2E', () => {
           sellAmount: '10000000000',
           buyAmount: '500000000000000000000',
         },
-      ],
-    ];
+      ]
+    ]
 
     sideToContractMethods.forEach((contractMethods, side) =>
       describe(`${side}`, () => {

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

@@ -76,6 +76,7 @@ const testingData: Partial<{ [key in Network]: any }> = {
 };
 
 describe('PancakeswapV3', function () {
+
   describe('BSC', () => {
     describe('WBNB -> USDT', () => {
       it('getPoolIdentifiers and getPricesVolume SELL', async function () {
@@ -87,7 +88,11 @@ describe('PancakeswapV3', function () {
         const WBNB = Tokens[network]['WBNB'];
         const USDT = Tokens[network]['USDT'];
 
-        const amounts = [0n, 1n * BI_POWS[18], 2n * BI_POWS[18]];
+        const amounts = [
+          0n,
+          1n * BI_POWS[18],
+          2n * BI_POWS[18],
+        ];
 
         const pools = await pancakeswapV3.getPoolIdentifiers(
           WBNB,
@@ -95,7 +100,10 @@ describe('PancakeswapV3', function () {
           SwapSide.SELL,
           blockNumber,
         );
-        console.log(`WBNB <> USDT Pool Identifiers: `, pools);
+        console.log(
+          `WBNB <> USDT Pool Identifiers: `,
+          pools,
+        );
 
         expect(pools.length).toBeGreaterThan(0);
 
@@ -107,7 +115,10 @@ describe('PancakeswapV3', function () {
           blockNumber,
           pools,
         );
-        console.log(`WBNB <> USDT Pool Prices: `, poolPrices);
+        console.log(
+          `WBNB <> USDT Pool Prices: `,
+          poolPrices,
+        );
 
         expect(poolPrices).not.toBeNull();
         checkPoolPrices(

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

@@ -28,7 +28,7 @@ import {
   PoolState,
   UniswapV3Data,
   UniswapV3Functions,
-  UniswapV3SimpleSwapParams,
+  UniswapV3Param,
 } from '../uniswap-v3/types';
 import {
   getLocalDeadlineAsFriendlyPlaceholder,
@@ -69,7 +69,7 @@ const PANCAKESWAPV3_QUOTE_GASLIMIT = 200_000;
 
 export class PancakeswapV3
   extends SimpleExchange
-  implements IDex<UniswapV3Data>
+  implements IDex<UniswapV3Data, UniswapV3Param>
 {
   readonly isFeeOnTransferSupported: boolean = false;
   readonly eventPools: Record<string, PancakeSwapV3EventPool | null> = {};
@@ -733,7 +733,7 @@ export class PancakeswapV3
         : UniswapV3Functions.exactOutput;
 
     const path = this._encodePath(data.path, side);
-    const swapFunctionParams: UniswapV3SimpleSwapParams =
+    const swapFunctionParams: UniswapV3Param =
       side === SwapSide.SELL
         ? {
             recipient: this.augustusAddress,

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

@@ -2,7 +2,10 @@ 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';
+import {
+  DecodedStateMultiCallResultWithRelativeBitmaps,
+} from '../uniswap-v3/types';
+
 
 export function decodeStateMultiCallResultWithRelativeBitmaps(
   result: MultiResult<BytesLike> | BytesLike,

package/src/dex/quickswap/config.ts

@@ -3,15 +3,6 @@ import { Network } from '../../constants';
 import { DexParams } from './types';
 
 export const QuickSwapConfig: DexConfigMap<DexParams> = {
-  CamelotV3: {
-    [Network.ARBITRUM]: {
-      factoryAddress: '0x1a3c9B1d2F0529D97f2afC5136Cc23e58f1FD35B',
-      router: '0x1F721E2E82F6676FCE4eA07A5958cF098D339e18',
-      quoteAddress: '0x0Fc73040b26E9bC8514fA028D998E73A254Fa76E',
-      initCode:
-        '0x6c1bebd370ba84753516bc1393c0d0a6c645856da55f5393ac8ab3d6dbc861d3',
-    },
-  },
   ZyberSwapV3: {
     [Network.ARBITRUM]: {
       factoryAddress: '0x9C2ABD632771b433E5E7507BcaA41cA3b25D8544',