@paraswap/dex-lib 2.42.19 → 2.42.20

package/src/dex/algebra/algebra.ts

@@ -4,34 +4,21 @@ import { AbiItem } from 'web3-utils';
 import { pack } from '@ethersproject/solidity';
 import _ from 'lodash';
 import {
+  Token,
+  Address,
   ExchangePrices,
   PoolPrices,
   AdapterExchangeParam,
   SimpleExchangeParam,
-  Logger,
-  TransferFeeParams,
-  Address,
   PoolLiquidity,
-  Token,
+  Logger,
 } from '../../types';
 import { SwapSide, Network, CACHE_PREFIX } from '../../constants';
 import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
-import {
-  _require,
-  getBigIntPow,
-  getDexKeysWithNetwork,
-  interpolate,
-  isDestTokenTransferFeeToBeExchanged,
-  isSrcTokenTransferFeeToBeExchanged,
-} from '../../utils';
+import { getBigIntPow, getDexKeysWithNetwork, interpolate } from '../../utils';
 import { IDex } from '../../dex/idex';
 import { IDexHelper } from '../../dex-helper/idex-helper';
-import {
-  AlgebraData,
-  AlgebraFunctions,
-  DexParams,
-  IAlgebraPoolState,
-} from './types';
+import { AlgebraData, DexParams, IAlgebraPoolState } from './types';
 import {
   SimpleExchange,
   getLocalDeadlineAsFriendlyPlaceholder,
@@ -39,16 +26,19 @@ import {
 import { AlgebraConfig, Adapters } from './config';
 import { Contract } from 'web3-eth-contract';
 import { Interface } from 'ethers/lib/utils';
-import SwapRouter from '../../abi/algebra/SwapRouter.json';
+import UniswapV3RouterABI from '../../abi/uniswap-v3/UniswapV3Router.abi.json';
 import AlgebraQuoterABI from '../../abi/algebra/AlgebraQuoter.abi.json';
 import UniswapV3MultiABI from '../../abi/uniswap-v3/UniswapMulti.abi.json';
 import AlgebraStateMulticallABI from '../../abi/algebra/AlgebraStateMulticall.abi.json';
-import { OutputResult } from '../uniswap-v3/types';
+import {
+  OutputResult,
+  UniswapV3Functions,
+  UniswapV3SimpleSwapParams,
+} from '../uniswap-v3/types';
 import { AlgebraMath } from './lib/AlgebraMath';
 import { AlgebraEventPoolV1_1 } from './algebra-pool-v1_1';
 import { AlgebraEventPoolV1_9 } from './algebra-pool-v1_9';
 import { AlgebraFactory, OnPoolCreatedCallback } from './algebra-factory';
-import { applyTransferFee } from '../../lib/token-transfer-fee';
 
 type PoolPairsInfo = {
   token0: Address;
@@ -71,7 +61,7 @@ type IAlgebraEventPool = AlgebraEventPoolV1_1 | AlgebraEventPoolV1_9;
 
 export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
   private readonly factory: AlgebraFactory;
-  readonly isFeeOnTransferSupported: boolean = true;
+  readonly isFeeOnTransferSupported: boolean = false;
   protected eventPools: Record<string, IAlgebraEventPool | null> = {};
 
   private newlyCreatedPoolKeys: Set<string> = new Set();
@@ -95,15 +85,12 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
     | typeof AlgebraEventPoolV1_1
     | typeof AlgebraEventPoolV1_9;
 
-  readonly SRC_TOKEN_DEX_TRANSFERS = 1;
-  readonly DEST_TOKEN_DEX_TRANSFERS = 1;
-
   constructor(
     protected network: Network,
     dexKey: string,
     protected dexHelper: IDexHelper,
     protected adapters = Adapters[network] || {},
-    readonly routerIface = new Interface(SwapRouter),
+    readonly routerIface = new Interface(UniswapV3RouterABI), // same abi as uniswapV3
     readonly quoterIface = new Interface(AlgebraQuoterABI),
     readonly config = AlgebraConfig[dexKey][network],
   ) {
@@ -422,12 +409,6 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
     amounts: bigint[],
     side: SwapSide,
     pool: IAlgebraEventPool,
-    transferFees: TransferFeeParams = {
-      srcFee: 0,
-      destFee: 0,
-      srcDexFee: 0,
-      destDexFee: 0,
-    },
   ): Promise<ExchangePrices<AlgebraData> | null> {
     if (!this.config.forceRPC) {
       this.logger.warn(
@@ -435,11 +416,6 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
       );
     }
 
-    const _isSrcTokenTransferFeeToBeExchanged =
-      isSrcTokenTransferFeeToBeExchanged(transferFees);
-    const _isDestTokenTransferFeeToBeExchanged =
-      isDestTokenTransferFeeToBeExchanged(transferFees);
-
     const unitVolume = getBigIntPow(
       (side === SwapSide.SELL ? from : to).decimals,
     );
@@ -454,16 +430,7 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
       ),
     );
 
-    const _amountsWithFee = _isSrcTokenTransferFeeToBeExchanged
-      ? applyTransferFee(
-          _amounts,
-          side,
-          transferFees.srcDexFee,
-          this.SRC_TOKEN_DEX_TRANSFERS,
-        )
-      : _amounts;
-
-    const calldata = _amountsWithFee.map(_amount => ({
+    const calldata = _amounts.map(_amount => ({
       target: this.config.quoter,
       gasLimit: ALGEBRA_QUOTE_GASLIMIT,
       callData:
@@ -504,22 +471,12 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
       : Math.round(totalGasCost / totalSuccessFullSwaps);
 
     let i = 0;
-    const _rates = _amountsWithFee.map(() => decode(i++));
-
-    const _ratesWithFee = _isDestTokenTransferFeeToBeExchanged
-      ? applyTransferFee(
-          _rates,
-          side,
-          transferFees.destDexFee,
-          this.DEST_TOKEN_DEX_TRANSFERS,
-        )
-      : _rates;
-
-    const unit: bigint = _ratesWithFee[0];
+    const _rates = _amounts.map(() => decode(i++));
+    const unit: bigint = _rates[0];
 
     const prices = interpolate(
-      _amountsWithFee.slice(1),
-      _ratesWithFee.slice(1),
+      _amounts.slice(1),
+      _rates.slice(1),
       amounts,
       side,
     );
@@ -529,7 +486,6 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
         prices,
         unit,
         data: {
-          feeOnTransfer: _isSrcTokenTransferFeeToBeExchanged,
           path: [
             {
               tokenIn: from.address,
@@ -552,12 +508,6 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
     side: SwapSide,
     blockNumber: number,
     limitPools?: string[],
-    transferFees: TransferFeeParams = {
-      srcFee: 0,
-      destFee: 0,
-      srcDexFee: 0,
-      destDexFee: 0,
-    },
   ): Promise<null | ExchangePrices<AlgebraData>> {
     try {
       const _srcToken = this.dexHelper.config.wrapETH(srcToken);
@@ -568,11 +518,6 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
         _destToken,
       );
 
-      const _isSrcTokenTransferFeeToBeExchanged =
-        isSrcTokenTransferFeeToBeExchanged(transferFees);
-      const _isDestTokenTransferFeeToBeExchanged =
-        isDestTokenTransferFeeToBeExchanged(transferFees);
-
       if (_srcAddress === _destAddress) return null;
 
       if (
@@ -581,14 +526,8 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
         return null;
 
       const pool = await this.getPool(_srcAddress, _destAddress, blockNumber);
-      if (!pool) return null;
 
-      if (_isSrcTokenTransferFeeToBeExchanged && side == SwapSide.BUY) {
-        this.logger.error(
-          `pool: ${pool.poolAddress} doesn't support buy for tax srcToken ${srcToken.address}`,
-        );
-        return null;
-      }
+      if (!pool) return null;
 
       if (this.config.forceRPC) {
         const rpcPrice = await this.getPricingFromRpc(
@@ -597,7 +536,6 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
           amounts,
           side,
           pool,
-          transferFees,
         );
 
         return rpcPrice;
@@ -632,7 +570,6 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
             amounts,
             side,
             pool,
-            transferFees,
           );
 
           return rpcPrice;
@@ -664,26 +601,16 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
       const balanceDestToken =
         _destAddress === pool.token0 ? state.balance0 : state.balance1;
 
-      const [unitAmountWithFee, ...amountsWithFee] =
-        _isSrcTokenTransferFeeToBeExchanged
-          ? applyTransferFee(
-              [unitAmount, ..._amounts],
-              side,
-              transferFees.srcDexFee,
-              this.SRC_TOKEN_DEX_TRANSFERS,
-            )
-          : [unitAmount, ..._amounts];
-
       const unitResult = this._getOutputs(
         state,
-        [unitAmountWithFee],
+        [unitAmount],
         zeroForOne,
         side,
         balanceDestToken,
       );
       const pricesResult = this._getOutputs(
         state,
-        amountsWithFee,
+        _amounts,
         zeroForOne,
         side,
         balanceDestToken,
@@ -694,20 +621,10 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
         return null;
       }
 
-      const [unitResultWithFee, ...pricesResultWithFee] =
-        _isDestTokenTransferFeeToBeExchanged
-          ? applyTransferFee(
-              [unitResult.outputs[0], ...pricesResult.outputs],
-              side,
-              transferFees.destDexFee,
-              this.DEST_TOKEN_DEX_TRANSFERS,
-            )
-          : [unitResult.outputs[0], ...pricesResult.outputs];
-
-      const prices = [0n, ...pricesResultWithFee];
+      const prices = [0n, ...pricesResult.outputs];
       const gasCost = [
         0,
-        ...pricesResultWithFee.map((p, index) => {
+        ...pricesResult.outputs.map((p, index) => {
           if (p == 0n) {
             return 0;
           } else {
@@ -722,10 +639,9 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
 
       return [
         {
-          unit: unitResultWithFee,
+          unit: unitResult.outputs[0],
           prices,
           data: {
-            feeOnTransfer: _isSrcTokenTransferFeeToBeExchanged,
             path: [
               {
                 tokenIn: _srcAddress,
@@ -758,20 +674,19 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
     data: AlgebraData,
     side: SwapSide,
   ): AdapterExchangeParam {
-    let path = this._encodePath(data.path, side);
+    const { path: rawPath } = data;
+    const path = this._encodePath(rawPath, side);
 
     const payload = this.abiCoder.encodeParameter(
       {
         ParentStruct: {
           path: 'bytes',
           deadline: 'uint256',
-          feeOnTransfer: 'bool',
         },
       },
       {
         path,
         deadline: getLocalDeadlineAsFriendlyPlaceholder(), // FIXME: more gas efficient to pass block.timestamp in adapter
-        feeOnTransfer: data.feeOnTransfer,
       },
     );
 
@@ -815,46 +730,30 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
     data: AlgebraData,
     side: SwapSide,
   ): Promise<SimpleExchangeParam> {
-    let swapFunction;
-    let swapParams;
-
-    if (data.feeOnTransfer) {
-      swapFunction = AlgebraFunctions.exactInputWithFeeToken;
-      swapParams = {
-        limitSqrtPrice: '0',
-        recipient: this.augustusAddress,
-        deadline: getLocalDeadlineAsFriendlyPlaceholder(),
-        amountIn: srcAmount,
-        amountOutMinimum: destAmount,
-        tokenIn: data.path[0].tokenIn,
-        tokenOut: data.path[0].tokenOut,
-      };
-    } else {
-      swapFunction =
-        side === SwapSide.SELL
-          ? AlgebraFunctions.exactInput
-          : AlgebraFunctions.exactOutput;
-      const path = this._encodePath(data.path, side);
-      swapParams =
-        side === SwapSide.SELL
-          ? {
-              recipient: this.augustusAddress,
-              deadline: getLocalDeadlineAsFriendlyPlaceholder(),
-              amountIn: srcAmount,
-              amountOutMinimum: destAmount,
-              path,
-            }
-          : {
-              recipient: this.augustusAddress,
-              deadline: getLocalDeadlineAsFriendlyPlaceholder(),
-              amountOut: destAmount,
-              amountInMaximum: srcAmount,
-              path,
-            };
-    }
-
+    const swapFunction =
+      side === SwapSide.SELL
+        ? UniswapV3Functions.exactInput
+        : UniswapV3Functions.exactOutput;
+
+    const path = this._encodePath(data.path, side);
+    const swapFunctionParams: UniswapV3SimpleSwapParams =
+      side === SwapSide.SELL
+        ? {
+            recipient: this.augustusAddress,
+            deadline: getLocalDeadlineAsFriendlyPlaceholder(),
+            amountIn: srcAmount,
+            amountOutMinimum: destAmount,
+            path,
+          }
+        : {
+            recipient: this.augustusAddress,
+            deadline: getLocalDeadlineAsFriendlyPlaceholder(),
+            amountOut: destAmount,
+            amountInMaximum: srcAmount,
+            path,
+          };
     const swapData = this.routerIface.encodeFunctionData(swapFunction, [
-      swapParams,
+      swapFunctionParams,
     ]);
 
     return this.buildSimpleParamWithoutWETHConversion(

package/src/dex/algebra/config.ts

@@ -98,7 +98,7 @@ export const Adapters: Record<number, AdapterMappings> = {
     [SwapSide.BUY]: [{ name: 'PolygonZkEvmBuyAdapter', index: 1 }],
   },
   [Network.ARBITRUM]: {
-    [SwapSide.SELL]: [{ name: 'ArbitrumAdapter02', index: 7 }],
+    [SwapSide.SELL]: [{ name: 'ArbitrumAdapter01', index: 3 }],
     [SwapSide.BUY]: [{ name: 'ArbitrumBuyAdapter', index: 2 }],
   },
   [Network.OPTIMISM]: {

package/src/dex/algebra/types.ts

@@ -58,21 +58,9 @@ export type AlgebraData = {
     tokenIn: Address;
     tokenOut: Address;
   }[];
-  feeOnTransfer: boolean;
   isApproved?: boolean;
 };
 
-export type AlgebraDataWithFee = {
-  tokenIn: Address;
-  tokenOut: Address;
-};
-
-export enum AlgebraFunctions {
-  exactInput = 'exactInput',
-  exactOutput = 'exactOutput',
-  exactInputWithFeeToken = 'exactInputSingleSupportingFeeOnTransferTokens',
-}
-
 export type DexParams = {
   router: Address;
   quoter: Address;

package/src/dex/swaap-v2/constants.ts

@@ -30,7 +30,9 @@ export const SWAAP_429_TTL_S = 60 * 60 * 1; // 1 hour
 
 export const SWAAP_POOL_RESTRICT_TTL_S = 60 * 30; // 30 minutes
 
-export const GAS_COST_ESTIMATION = 170_000;
+export const STABLE_SWAP_GAS_COST_ESTIMATION = 130_000;
+
+export const VOLATILE_SWAP_GAS_COST_ESTIMATION = 150_000;
 
 export const BATCH_SWAP_SELECTOR = '0x945bcec9';
 

package/src/dex/swaap-v2/stable-coins.ts

@@ -0,0 +1,25 @@
+import { Network } from '../../constants';
+
+// addresses must be consistant with utils.normalizeTokenAddress
+export const STABLE_COINS: {
+  [network: number]: { [symbol: string]: boolean };
+} = {
+  [Network.MAINNET]: {
+    '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48': true, // USDT
+    '0xdac17f958d2ee523a2206206994597c13d831ec7': true, // USDC
+    '0x6b175474e89094c44da98b954eedeac495271d0f': true, // DAI
+    '0x853d955acef822db058eb8505911ed77f175b99e': true, // FRAX
+  },
+  [Network.POLYGON]: {
+    '0x3c499c542cef5e3811e1192ce70d8cc03d5c3359': true, // USDC
+    '0x2791bca1f2de4661ed88a30c99a7a9449aa84174': true, // USDC.e
+    '0xc2132d05d31c914a87c6611c10748aeb04b58e8f': true, // USDT
+    '0x8f3cf7ad23cd3cadbd9735aff958023239c6a063': true, // DAI
+  },
+  [Network.ARBITRUM]: {
+    '0xaf88d065e77c8cc2239327c5edb3a432268e5831': true, // USDC
+    '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8': true, // USDC.e
+    '0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9': true, // USDT
+    '0xda10009cbd5d07dd0cecc66161fc93d7c9000da1': true, // DAI
+  },
+};

package/src/dex/swaap-v2/swaap-v2.ts

@@ -45,7 +45,8 @@ import {
   SWAAP_RFQ_QUOTE_ENDPOINT,
   SWAAP_RFQ_API_PRICES_POLLING_INTERVAL_MS,
   SWAAP_RFQ_PRICES_CACHES_TTL_S,
-  GAS_COST_ESTIMATION,
+  STABLE_SWAP_GAS_COST_ESTIMATION,
+  VOLATILE_SWAP_GAS_COST_ESTIMATION,
   BATCH_SWAP_SELECTOR,
   CALLER_SLOT,
   SWAAP_403_TTL_S,
@@ -62,7 +63,12 @@ import {
   SWAAP_BANNED_CODE,
   SWAAP_NOTIFY_ENDPOINT,
 } from './constants';
-import { getPoolIdentifier, normalizeTokenAddress, getPairName } from './utils';
+import {
+  getPoolIdentifier,
+  normalizeTokenAddress,
+  getPairName,
+  isStablePair,
+} from './utils';
 import { Method } from '../../dex-helper/irequest-wrapper';
 import {
   SlippageCheckError,
@@ -404,8 +410,16 @@ export class SwaapV2 extends SimpleExchange implements IDex<SwaapV2Data> {
           return null;
         }
 
+        const gasCost = isStablePair(
+          this.network,
+          normalizedSrcToken.address,
+          normalizedDestToken.address,
+        )
+          ? STABLE_SWAP_GAS_COST_ESTIMATION
+          : VOLATILE_SWAP_GAS_COST_ESTIMATION;
+
         return {
-          gasCost: GAS_COST_ESTIMATION,
+          gasCost: gasCost,
           exchange: this.dexKey,
           data: {},
           prices,

package/src/dex/swaap-v2/utils.ts

@@ -1,5 +1,7 @@
-import { Address } from '../../types';
+import { Address, Token } from '../../types';
 import { ETHER_ADDRESS, NULL_ADDRESS } from '../../constants';
+import { Network } from '../../constants';
+import { STABLE_COINS } from './stable-coins';
 
 export const getIdentifierPrefix = (
   dexKey: string,
@@ -27,3 +29,18 @@ export const normalizeTokenAddress = (address: string): string => {
     ? NULL_ADDRESS
     : address.toLowerCase();
 };
+
+export const isStablePair = (
+  network: Network,
+  normalizedSrcTokenAddress: string,
+  normalizedDestTokenAddress: string,
+): boolean => {
+  const networkStableCoins = STABLE_COINS[network];
+  if (networkStableCoins === undefined) {
+    return false;
+  }
+  return (
+    networkStableCoins[normalizedSrcTokenAddress] === true &&
+    networkStableCoins[normalizedDestTokenAddress] === true
+  );
+};

package/tests/constants-e2e.ts

@@ -853,10 +853,6 @@ export const Tokens: {
       address: '0x3d9907f9a368ad0a51be60f7da3b97cf940982d8',
       decimals: 18,
     },
-    RDPX: {
-      address: '0x32eb7902d4134bf98a28b963d26de779af92a212',
-      decimals: 18,
-    },
   },
   [Network.OPTIMISM]: {
     DAI: {
@@ -1149,13 +1145,12 @@ export const Holders: {
     AMPL: '0xfcaA5ea7F8eb0631BcA72C345025C0A5a6D93f0E',
   },
   [Network.ARBITRUM]: {
-    RDPX: '0x2fa6f21ecfe274f594f470c376f5bdd061e08a37',
     ARB: '0xb65edba80a3d81903ecd499c8eb9cf0e19096bd0',
     ETH: '0xF977814e90dA44bFA03b6295A0616a897441aceC',
     DAI: '0x07d7f291e731a41d3f0ea4f1ae5b6d920ffb3fe0',
     WETH: '0xc31e54c7a869b9fcbecc14363cf510d1c41fa443',
     USDCe: '0x62383739d68dd0f844103db8dfb05a7eded5bbe6',
-    USDC: '0x489ee077994b6658eafa855c308275ead8097c4a',
+    USDC: '0xa843392198862f98d17e3aa1421b08f2c2020cff',
     OHM: '0xebce5f29ff5ca9aa330ebdf7ec6b5f474bff271e',
     USDT: '0x5ff47d4ab75bcaff6807c81f1367abb53439883c',
     POPS: '0x4b78b52e7de4d8b7d367297cb8a87c1875a9d591',