@paraswap/dex-lib 2.20.3 → 2.21.1-chronos

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

@@ -1,24 +1,17 @@
 import { Interface, AbiCoder, JsonFragment } from '@ethersproject/abi';
-import _ from 'lodash';
-import { NumberAsString, OptimalSwapExchange } from '@paraswap/core';
-import { assert } from 'ts-essentials';
 import BigNumber from 'bignumber.js';
 import CurveABI from '../../abi/Curve.json';
-import DirectSwapABI from '../../abi/DirectSwap.json';
 import { Adapters, CurveV1Config } from './config';
 
 import {
   AdapterExchangeParam,
   Address,
   ExchangePrices,
-  ExchangeTxInfo,
   PoolLiquidity,
   PoolPrices,
-  PreprocessTransactionOptions,
   SimpleExchangeParam,
   Token,
   TransferFeeParams,
-  TxInfo,
 } from '../../types';
 import {
   Network,
@@ -55,6 +48,8 @@ import { TBTCPool, address as TBTCPoolAddress } from './pools/tBTCpool';
 import { USDKPool, address as USDKPoolAddress } from './pools/usdkpool';
 import { USTPool, address as USTPoolAddress } from './pools/ustpool';
 import { SLINKPool, address as SLINKPoolAddress } from './pools/sLinkpool';
+
+import * as _ from 'lodash';
 import {
   getBigIntPow,
   getDexKeysWithNetwork,
@@ -62,13 +57,9 @@ import {
   isDestTokenTransferFeeToBeExchanged,
   isSrcTokenTransferFeeToBeExchanged,
   Utils,
-  uuidToBytes16,
 } from '../../utils';
 import { BN_0 } from '../../bignumber-constants';
-import {
-  getLocalDeadlineAsFriendlyPlaceholder,
-  SimpleExchange,
-} from '../simple-exchange';
+import { SimpleExchange } from '../simple-exchange';
 import { IDex } from '../idex';
 import { IDexHelper } from '../../dex-helper';
 import { Logger } from 'log4js';
@@ -80,12 +71,9 @@ import {
   CurveV1Data,
   TokenWithReasonableVolume,
   CurveSwapFunctions,
-  CurveV1SwapType,
-  DirectCurveV1Param,
 } from './types';
 import { erc20Iface } from '../../lib/utils-interfaces';
 import { applyTransferFee } from '../../lib/token-transfer-fee';
-import { DIRECT_METHOD_NAME } from './constants';
 
 const CURVE_DEFAULT_CHUNKS = 10;
 
@@ -94,10 +82,7 @@ const CURVE_POOL_GAS = 200 * 1000;
 
 const coder = new AbiCoder();
 
-export class CurveV1
-  extends SimpleExchange
-  implements IDex<CurveV1Data, DirectCurveV1Param>
-{
+export class CurveV1 extends SimpleExchange implements IDex<CurveV1Data> {
   exchangeRouterInterface: Interface;
   minConversionRate = '1';
 
@@ -117,8 +102,6 @@ export class CurveV1
 
   protected disableFeeOnTransferTokenAddresses: Set<string>;
 
-  readonly directSwapIface = new Interface(DirectSwapABI);
-
   readonly SRC_TOKEN_DEX_TRANSFERS = 1;
   readonly DEST_TOKEN_DEX_TRANSFERS = 1;
 
@@ -857,128 +840,6 @@ export class CurveV1
     return this.adapters[side];
   }
 
-  static getDirectFunctionName(): string[] {
-    return [DIRECT_METHOD_NAME];
-  }
-
-  getTokenFromAddress(address: Address): Token {
-    // In this Dex decimals are not used
-    return { address, decimals: 0 };
-  }
-
-  async preProcessTransaction(
-    optimalSwapExchange: OptimalSwapExchange<CurveV1Data>,
-    srcToken: Token,
-    _0: Token,
-    _1: SwapSide,
-    options: PreprocessTransactionOptions,
-  ): Promise<[OptimalSwapExchange<CurveV1Data>, 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: CurveV1Data,
-    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',
-    };
-  }
-
   async getSimpleParam(
     srcToken: string,
     destToken: string,
@@ -1082,7 +943,7 @@ export class CurveV1
       // the balances array in the pool as it was a mess to have each curve abi
       // Some have balances[uint128] some have balances[uint256]
       // One of the consequence for such a hack is below for ETH Pools
-      // TODO: below can be highly optimized
+      // TODO: below can be highly optimised
       // * we don't need to query token decimals every iteration
       // * we can use the decimals from the tokens list using the api
 

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

@@ -1,4 +1,3 @@
-import { NumberAsString } from '@paraswap/core';
 import { Address, Token } from '../../types';
 
 export type CurveV1Data = {
@@ -7,7 +6,6 @@ export type CurveV1Data = {
   j: number;
   underlyingSwap: boolean;
   deadline: number;
-  isApproved?: boolean;
 };
 
 export type PoolConfig = {
@@ -44,27 +42,3 @@ export enum CurveSwapFunctions {
   exchange = 'exchange',
   exchange_underlying = 'exchange_underlying',
 }
-
-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-v1-factory/constants.ts

@@ -34,5 +34,3 @@ export const NETWORK_ID_TO_NAME: Record<number, string> = {
 // revisited
 export const FACTORY_MAX_PLAIN_COINS = 4;
 export const FACTORY_MAX_PLAIN_IMPLEMENTATIONS_FOR_COIN = 10;
-
-export const DIRECT_METHOD_NAME = 'directCurveV1Swap';

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

@@ -29,7 +29,6 @@ function testForNetwork(
         ContractMethod.simpleSwap,
         ContractMethod.multiSwap,
         ContractMethod.megaSwap,
-        ContractMethod.directCurveV1Swap,
       ],
     ],
   ]);

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,
-];