@paraswap/dex-lib 3.3.1-return-amount-pos.3 → 3.3.1

package/src/dex/platypus/platypus.ts

@@ -38,7 +38,6 @@ import PoolABI from '../../abi/platypus/pool.json';
 import AvaxPoolABI from '../../abi/platypus/avax-pool.json';
 import AssetABI from '../../abi/platypus/asset.json';
 import OracleABI from '../../abi/platypus/oracle.json';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 export class Platypus extends SimpleExchange implements IDex<PlatypusData> {
   static readonly erc20Interface = new Interface(ERC20ABI);
@@ -498,34 +497,22 @@ export class Platypus extends SimpleExchange implements IDex<PlatypusData> {
     data: PlatypusData,
     side: SwapSide,
   ): DexExchangeParam {
-    const iface = isETHAddress(srcToken)
-      ? Platypus.avaxPoolInterface
-      : isETHAddress(destToken)
-      ? Platypus.avaxPoolInterface
-      : Platypus.poolInterface;
-
-    const swapFunction = isETHAddress(srcToken)
-      ? 'swapFromETH'
-      : isETHAddress(destToken)
-      ? 'swapToETH'
-      : 'swap';
-
     const swapData = isETHAddress(srcToken)
-      ? iface.encodeFunctionData(swapFunction, [
+      ? Platypus.avaxPoolInterface.encodeFunctionData('swapFromETH', [
           destToken,
           1,
           recipient,
           getLocalDeadlineAsFriendlyPlaceholder(),
         ])
       : isETHAddress(destToken)
-      ? iface.encodeFunctionData(swapFunction, [
+      ? Platypus.avaxPoolInterface.encodeFunctionData('swapToETH', [
           srcToken,
           srcAmount,
           1,
           recipient,
           getLocalDeadlineAsFriendlyPlaceholder(),
         ])
-      : iface.encodeFunctionData(swapFunction, [
+      : Platypus.poolInterface.encodeFunctionData('swap', [
           srcToken,
           destToken,
           srcAmount,
@@ -539,10 +526,6 @@ export class Platypus extends SimpleExchange implements IDex<PlatypusData> {
       dexFuncHasRecipient: true,
       exchangeData: swapData,
       targetExchange: data.pool,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(iface, swapFunction, 'actualToAmount')
-          : undefined,
     };
   }
 

package/src/dex/polygon-migrator/polygon-migrator.ts

@@ -181,7 +181,6 @@ export class PolygonMigrator
       dexFuncHasRecipient: false,
       exchangeData: swapData,
       targetExchange: this.migratorAddress,
-      returnAmountPos: undefined,
     };
   }
 

package/src/dex/quick-perps/quick-perps.ts

@@ -24,7 +24,6 @@ import { QuickPerpsConfig, Adapters } from './config';
 import { Vault } from './vault';
 import ERC20ABI from '../../abi/erc20.json';
 import { solidityPack } from 'ethers/lib/utils';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 const QuickPerpsGasCost = 300 * 1000;
 
@@ -229,9 +228,7 @@ export class QuickPerps extends SimpleExchange implements IDex<QuickPerpsData> {
     data: QuickPerpsData,
     side: SwapSide,
   ): DexExchangeParam {
-    const iface = Vault.interface;
-    const functionName = 'swap';
-    const swapData = iface.encodeFunctionData(functionName, [
+    const swapData = Vault.interface.encodeFunctionData('swap', [
       srcToken,
       destToken,
       recipient,
@@ -244,13 +241,6 @@ export class QuickPerps extends SimpleExchange implements IDex<QuickPerpsData> {
       targetExchange: this.params.vault,
       swappedAmountNotPresentInExchangeData: true,
       transferSrcTokenBeforeSwap: this.params.vault,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              iface,
-              functionName,
-            )
-          : undefined,
     };
   }
 

package/src/dex/smoothy/smoothy.ts

@@ -104,7 +104,6 @@ export class Smoothy
       dexFuncHasRecipient: false,
       exchangeData: swapData,
       targetExchange: exchange,
-      returnAmountPos: undefined,
     };
   }
 }

package/src/dex/solidly/solidly.ts

@@ -683,7 +683,6 @@ export class Solidly extends UniswapV2 {
       transferSrcTokenBeforeSwap: data.isFeeTokenInRoute
         ? undefined
         : data.pools[0].address,
-      returnAmountPos: undefined,
     };
   }
 }

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

@@ -47,6 +47,7 @@ import { assert, DeepReadonly } from 'ts-essentials';
 import { uniswapV3Math } from './contract-math/uniswap-v3-math';
 import { Contract } from 'web3-eth-contract';
 import { AbiItem } from 'web3-utils';
+import { OptimalSwapExchange } from '@paraswap/core';
 import { TickMath } from './contract-math/TickMath';
 import { OnPoolCreatedCallback, SolidlyV3Factory } from './solidly-v3-factory';
 
@@ -724,7 +725,6 @@ export class SolidlyV3
       dexFuncHasRecipient: true,
       exchangeData: swapData,
       targetExchange: data.poolAddress,
-      returnAmountPos: undefined,
     };
   }
 

package/src/dex/spark/spark.ts

@@ -24,7 +24,6 @@ import { Interface } from 'ethers/lib/utils';
 import { SparkSDaiEventPool } from './spark-sdai-pool';
 import { BI_POWS } from '../../bigint-constants';
 import { SDAI_DEPOSIT_GAS_COST, SDAI_REDEEM_GAS_COST } from './constants';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 export class Spark
   extends SimpleExchange
@@ -242,15 +241,6 @@ export class Spark
       dexFuncHasRecipient: true,
       exchangeData: swapData,
       targetExchange: exchange,
-      returnAmountPos: isSell
-        ? extractReturnAmountPosition(
-            this.sdaiInterface,
-            this.isDai(srcToken)
-              ? SparkSDaiFunctions.deposit
-              : SparkSDaiFunctions.redeem,
-            this.isDai(srcToken) ? 'shares' : 'assets',
-          )
-        : undefined,
     };
   }
 

package/src/dex/stable-pool/stable-pool.ts

@@ -12,7 +12,6 @@ import { SimpleExchange } from '../simple-exchange';
 import StablePoolABI from '../../abi/StablePool.json';
 import { IDexHelper } from '../../dex-helper';
 import { StablePoolFunctions, StablePoolData, StablePoolParam } from './types';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 export class StablePool
   extends SimpleExchange
@@ -124,13 +123,6 @@ export class StablePool
       dexFuncHasRecipient: false,
       exchangeData: swapData,
       targetExchange: exchange,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              this.exchangeRouterInterface,
-              StablePoolFunctions.swap,
-            )
-          : undefined,
     };
   }
 }

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

@@ -41,7 +41,6 @@ import {
 import { SwaapV1Pool } from './swaap-v1-pool';
 import PoolABI from '../../abi/swaap-v1/pool.json';
 import { PoolQuotations } from './libraries/PoolQuotations';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 export class SwaapV1 extends SimpleExchange implements IDex<SwaapV1Data> {
   static readonly poolInterface = new Interface(PoolABI);
@@ -287,14 +286,6 @@ export class SwaapV1 extends SimpleExchange implements IDex<SwaapV1Data> {
       dexFuncHasRecipient: false,
       exchangeData: swapData,
       targetExchange: data.pool,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              SwaapV1.poolInterface,
-              functionName,
-              'tokenAmountOut',
-            )
-          : undefined,
     };
   }
 

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

@@ -77,7 +77,6 @@ import {
 } from '../generic-rfq/types';
 import { BI_MAX_UINT256 } from '../../bigint-constants';
 import { SpecialDex } from '../../executor/types';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 const BLACKLISTED = 'blacklisted';
 
@@ -477,14 +476,6 @@ export class SwaapV2 extends SimpleExchange implements IDex<SwaapV2Data> {
       exchangeData: callData,
       specialDexFlag: SpecialDex.SWAP_ON_SWAAP_V2_SINGLE,
       targetExchange: router,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              this.routerInterface,
-              'swap',
-              'amountCalculated',
-            )
-          : undefined,
     };
   }
 

package/src/dex/swell/swell.ts

@@ -291,7 +291,6 @@ export class Swell
             srcAmount,
           ])
         : undefined,
-      returnAmountPos: undefined,
     };
   }
 

package/src/dex/synthetix/synthetix.ts

@@ -31,7 +31,6 @@ import { SynthetixState } from './synthetix-state';
 // There are so many ABIs, where I need only one or two functions
 // So, I decided to unite them into one combined interface
 import CombinedSynthetixABI from '../../abi/synthetix/CombinedSynthetix.abi.json';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 export class Synthetix extends SimpleExchange implements IDex<SynthetixData> {
   readonly hasConstantPriceLargeAmounts = false;
@@ -358,16 +357,6 @@ export class Synthetix extends SimpleExchange implements IDex<SynthetixData> {
       dexFuncHasRecipient: false,
       exchangeData: swapData,
       targetExchange: exchange,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              this.combinedIface,
-              this.network === Network.OPTIMISM
-                ? 'exchange'
-                : 'exchangeAtomically',
-              'amountReceived',
-            )
-          : undefined,
     };
   }
 

package/src/dex/trader-joe-v2.1/trader-joe-v2.1.ts

@@ -21,7 +21,6 @@ import {
   TraderJoeV2RouterParam,
 } from './types';
 import { TRADERJOE_V2_1_ROUTER_ADDRESS } from './config';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 export class TraderJoeV21
   extends SimpleExchange
@@ -167,14 +166,6 @@ export class TraderJoeV21
       dexFuncHasRecipient: true,
       exchangeData: swapData,
       targetExchange: this.routerAddress,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              this.exchangeRouterInterface,
-              swapFunction,
-              'amountOut',
-            )
-          : undefined,
     };
   }
 }

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

@@ -914,7 +914,6 @@ export class UniswapV2
       targetExchange,
       specialDexFlag,
       transferSrcTokenBeforeSwap,
-      returnAmountPos: undefined,
     };
   }
 

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

@@ -71,7 +71,6 @@ import {
 import { OptimalSwapExchange } from '@paraswap/core';
 import { OnPoolCreatedCallback, UniswapV3Factory } from './uniswap-v3-factory';
 import { hexConcat, hexlify, hexZeroPad, hexValue } from 'ethers/lib/utils';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 type PoolPairsInfo = {
   token0: Address;
@@ -1142,14 +1141,6 @@ export class UniswapV3
       dexFuncHasRecipient: true,
       exchangeData,
       targetExchange: this.config.router,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              this.routerIface,
-              swapFunction,
-              'amountOut',
-            )
-          : undefined,
     };
   }
 

package/src/dex/uniswap-v3.ts

@@ -15,7 +15,6 @@ import {
 import UniswapV3RouterABI from '../abi/UniswapV3Router.json';
 import { NumberAsString } from '@paraswap/core';
 import { IDexHelper } from '../dex-helper';
-import { extractReturnAmountPosition } from '../executor/utils';
 
 const UNISWAP_V3_ROUTER_ADDRESSES: { [network: number]: Address } = {
   [Network.MAINNET]: '0xE592427A0AEce92De3Edee1F18E0157C05861564',
@@ -229,14 +228,6 @@ export class UniswapV3
       dexFuncHasRecipient: true,
       exchangeData,
       targetExchange: this.routerAddress,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              this.exchangeRouterInterface,
-              swapFunction,
-              'amountOut',
-            )
-          : undefined,
     };
   }
 }

package/src/dex/weth/weth.ts

@@ -170,7 +170,6 @@ export class Weth
       dexFuncHasRecipient: false,
       exchangeData: swapData,
       targetExchange: this.address,
-      returnAmountPos: undefined,
     };
   }
 

package/src/dex/wombat/wombat.ts

@@ -32,7 +32,6 @@ import { WombatBmw } from './wombat-bmw';
 import { fromWad } from './utils';
 import { WombatPool } from './wombat-pool';
 import { StatePollingManager } from '../../lib/stateful-rpc-poller/state-polling-manager';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 export class Wombat extends SimpleExchange implements IDex<WombatData> {
   // contract interfaces
@@ -340,14 +339,6 @@ export class Wombat extends SimpleExchange implements IDex<WombatData> {
       dexFuncHasRecipient: true,
       exchangeData: swapData,
       targetExchange: exchange,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              Wombat.poolInterface,
-              'swap',
-              'actualToAmount',
-            )
-          : undefined,
     };
   }
 

package/src/dex/woo-fi-v2/woo-fi-v2.ts

@@ -28,7 +28,6 @@ import { addressDecode } from '../../lib/decoders';
 import { ifaces } from './utils';
 import { StatePollingManager } from '../../lib/stateful-rpc-poller/state-polling-manager';
 import { solidityPack } from 'ethers/lib/utils';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 export class WooFiV2 extends SimpleExchange implements IDex<WooFiV2Data> {
   readonly math: WooFiV2Math;
@@ -358,10 +357,6 @@ export class WooFiV2 extends SimpleExchange implements IDex<WooFiV2Data> {
       exchangeData: swapData,
       targetExchange: this.config.wooPPV2Address,
       transferSrcTokenBeforeSwap: this.config.wooPPV2Address,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(ifaces.PPV2, 'swap', 'realToAmount')
-          : undefined,
     };
   }
 

package/src/dex/wsteth/wsteth.ts

@@ -23,7 +23,6 @@ import { uint256ToBigInt } from '../../lib/decoders';
 import { Utils } from '../../utils';
 import WSTETH_ABI from '../../abi/wstETH.json';
 import STETH_ABI from '../../abi/stETH.json';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 export class WstETH extends SimpleExchange implements IDex<WstETHData> {
   static readonly wstETHIface = new Interface(WSTETH_ABI);
@@ -253,24 +252,16 @@ export class WstETH extends SimpleExchange implements IDex<WstETHData> {
     data: WstETHData,
     side: SwapSide,
   ): Promise<DexExchangeParam> {
-    const swapFunction =
-      srcToken.toLowerCase() === this.config.stETHAddress ? 'wrap' : 'unwrap';
-    const exchangeData = WstETH.wstETHIface.encodeFunctionData(swapFunction, [
-      srcAmount,
-    ]);
+    const exchangeData = WstETH.wstETHIface.encodeFunctionData(
+      srcToken.toLowerCase() === this.config.stETHAddress ? 'wrap' : 'unwrap',
+      [srcAmount],
+    );
 
     return {
       needWrapNative: this.needWrapNative,
       dexFuncHasRecipient: false,
       exchangeData,
       targetExchange: this.config.wstETHAddress,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              WstETH.wstETHIface,
-              swapFunction,
-            )
-          : undefined,
     };
   }
 

package/src/dex/zerox/index.ts

@@ -257,7 +257,6 @@ export class ZeroX
       dexFuncHasRecipient: false,
       exchangeData: swapData,
       targetExchange: this.getExchange(data),
-      returnAmountPos: undefined,
     };
   }
 

package/src/executor/Executor01BytecodeBuilder.ts

@@ -4,7 +4,7 @@ import { OptimalRate } from '@paraswap/core';
 import { isETHAddress } from '../utils';
 import { DepositWithdrawReturn } from '../dex/weth/types';
 import { Executors, Flag, SpecialDex } from './types';
-import { BYTES_64_LENGTH, DEFAULT_RETURN_AMOUNT_POS } from './constants';
+import { BYTES_64_LENGTH } from './constants';
 import {
   DexCallDataParams,
   ExecutorBytecodeBuilder,
@@ -351,11 +351,6 @@ export class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder<
     const swap = priceRoute.bestRoute[routeIndex].swaps[swapIndex];
     let { exchangeData, specialDexFlag } = exchangeParam;
 
-    const returnAmountPos =
-      exchangeParam.returnAmountPos !== undefined
-        ? exchangeParam.returnAmountPos
-        : DEFAULT_RETURN_AMOUNT_POS;
-
     let destTokenPos = 0;
     if (checkDestTokenBalanceAfterSwap && !dontCheckBalanceAfterSwap) {
       const destTokenAddr = isETHAddress(swap.destToken)
@@ -398,8 +393,6 @@ export class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder<
       destTokenPos,
       specialDexFlag || SpecialDex.DEFAULT,
       flag,
-      undefined,
-      returnAmountPos,
     );
   }
 

package/src/executor/Executor02BytecodeBuilder.ts

@@ -22,7 +22,6 @@ import {
   ZEROS_20_BYTES,
   ZEROS_28_BYTES,
   ZEROS_4_BYTES,
-  DEFAULT_RETURN_AMOUNT_POS,
 } from './constants';
 import { assert } from 'ts-essentials';
 
@@ -277,16 +276,6 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
     let { exchangeData, specialDexFlag, targetExchange, needWrapNative } =
       exchangeParam;
 
-    const routeNeedsRootUnwrapEth = this.doesRouteNeedsRootUnwrapEth(
-      priceRoute,
-      exchangeParams,
-    );
-
-    const returnAmountPos =
-      exchangeParam.returnAmountPos !== undefined && !routeNeedsRootUnwrapEth // prevent returnAmoutPos optimisation if route needs root unwrap eth
-        ? exchangeParam.returnAmountPos
-        : DEFAULT_RETURN_AMOUNT_POS;
-
     const applyVerticalBranching = this.doesSwapNeedToApplyVerticalBranching(
       priceRoute,
       routeIndex,
@@ -354,8 +343,6 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
       destTokenPos,
       specialDexFlag || SpecialDex.DEFAULT,
       flag,
-      undefined,
-      returnAmountPos,
     );
   }
 

package/src/executor/ExecutorBytecodeBuilder.ts

@@ -25,7 +25,6 @@ import {
 import { Executors, Flag, SpecialDex } from './types';
 import { MAX_UINT, Network } from '../constants';
 import { DexExchangeBuildParam, DexExchangeParam } from '../types';
-import { ExecutorDetector } from './ExecutorDetector';
 
 const {
   utils: { hexlify, hexDataLength, hexConcat, hexZeroPad, solidityPack },
@@ -229,7 +228,6 @@ export abstract class ExecutorBytecodeBuilder<S = {}, D = {}> {
     specialDexFlag: SpecialDex,
     flag: Flag,
     toAmountPos = 0,
-    returnAmountPos = DEFAULT_RETURN_AMOUNT_POS,
   ): string {
     const builder =
       this.type !== Executors.THREE
@@ -244,7 +242,6 @@ export abstract class ExecutorBytecodeBuilder<S = {}, D = {}> {
       specialDexFlag,
       flag,
       toAmountPos,
-      returnAmountPos,
     );
   }
 
@@ -255,15 +252,13 @@ export abstract class ExecutorBytecodeBuilder<S = {}, D = {}> {
     destTokenPos: number,
     specialDexFlag: SpecialDex,
     flag: Flag,
-    toAmountPos = 0, // not used for Executor01 and Executor02, just to follow the same interface
-    returnAmountPos = DEFAULT_RETURN_AMOUNT_POS,
   ) {
     return solidityPack(EXECUTOR_01_02_FUNCTION_CALL_DATA_TYPES, [
       tokenAddress, // token address
       hexZeroPad(hexlify(hexDataLength(calldata) + BYTES_28_LENGTH), 4), // calldata length + bytes28(0)
       hexZeroPad(hexlify(fromAmountPos), 2), // fromAmountPos
       hexZeroPad(hexlify(destTokenPos), 2), // destTokenPos
-      hexZeroPad(hexlify(returnAmountPos), 1), // returnAmountPos
+      hexZeroPad(hexlify(DEFAULT_RETURN_AMOUNT_POS), 1), // TODO: Fix returnAmount Pos
       hexZeroPad(hexlify(specialDexFlag), 1), // special
       hexZeroPad(hexlify(flag), 2), // flag
       ZEROS_28_BYTES, // bytes28(0)

package/src/executor/ExecutorDetector.ts

@@ -21,7 +21,7 @@ export class ExecutorDetector {
       [RouteExecutionType.SINGLE_STEP]: Executors.ONE, // simpleSwap via Executor01
       [RouteExecutionType.HORIZONTAL_SEQUENCE]: Executors.ONE, // multiSwap via Executor01
       [RouteExecutionType.VERTICAL_BRANCH]: Executors.TWO, // simpleSwap with percentage on a path via Executor02
-      [RouteExecutionType.VERTICAL_BRANCH_HORIZONTAL_SEQUENCE]: Executors.TWO, // multiSwap with percentages on paths via Executor02
+      [RouteExecutionType.VERTICAL_BRANCH_HORIZONTAL_SEQUENCE]: Executors.TWO, // multiSwap with pecentages on paths via Executor02
       // megaSwap via Executor02
       [RouteExecutionType.NESTED_VERTICAL_BRANCH_HORIZONTAL_SEQUENCE]:
         Executors.TWO,
@@ -46,7 +46,7 @@ export class ExecutorDetector {
     this.wethBytecodeBuilder = new WETHBytecodeBuilder(this.dexHelper);
   }
 
-  public getRouteExecutionType(priceRoute: OptimalRate): RouteExecutionType {
+  protected getRouteExecutionType(priceRoute: OptimalRate): RouteExecutionType {
     if (
       priceRoute.bestRoute.length === 1 &&
       priceRoute.bestRoute[0].percent === 100 &&
@@ -85,7 +85,6 @@ export class ExecutorDetector {
 
     throw new Error('Route type is not supported yet');
   }
-
   detectSpecialExecutor(priceRoute: OptimalRate): Executors | null {
     if (isSingleWrapRoute(priceRoute)) return Executors.WETH;
     return null;

package/src/executor/constants.ts

@@ -47,10 +47,7 @@ export const EXECUTOR_03_FUNCTION_CALL_DATA_TYPES: string[] = [
 
 export const APPROVE_CALLDATA_DEST_TOKEN_POS = 68;
 export const WRAP_UNWRAP_FROM_AMOUNT_POS = 4;
-export const DEFAULT_RETURN_AMOUNT_POS = 255;
-
-export const RETURN_AMOUNT_POS_0 = 0;
-export const RETURN_AMOUNT_POS_32 = 32;
+export const DEFAULT_RETURN_AMOUNT_POS = '0xff';
 
 // TODO-v6?: can it be removed  after approval/cache task, because we are going to give approvals only once,
 // therefore for any case initial allowance would be 0

package/src/executor/executor01-bytecode-builder-e2e.test.ts

@@ -183,45 +183,6 @@ describe('Executor01ByteCodeBuilder e2e tests', () => {
             provider,
           );
         });
-
-        it('simpleSwap USDC -> ETH', async () => {
-          await testE2E(
-            tokens['USDC'],
-            tokens['ETH'],
-            holders['USDC'],
-            '100000000',
-            SwapSide.SELL,
-            dexKey,
-            ContractMethod.simpleSwap,
-            network,
-            provider,
-          );
-        });
-      });
-
-      describe('Etherfi', () => {
-        const dexKey = 'EtherFi';
-
-        const tokens = Tokens[network];
-        const holders = Holders[network];
-        const provider = new StaticJsonRpcProvider(
-          generateConfig(network).privateHttpProvider,
-          network,
-        );
-
-        it('simpleSwap eETH -> weETH', async () => {
-          await testE2E(
-            tokens['eETH'],
-            tokens['weETH'],
-            holders['eETH'],
-            '100000000000000000',
-            SwapSide.SELL,
-            dexKey,
-            ContractMethod.simpleSwap,
-            network,
-            provider,
-          );
-        });
       });
 
       describe('BalancerV2', () => {

package/src/types.ts

@@ -170,7 +170,6 @@ export type DexExchangeParam = {
   specialDexSupportsInsertFromAmount?: boolean;
   swappedAmountNotPresentInExchangeData?: boolean;
   preSwapUnwrapCalldata?: string;
-  returnAmountPos: number | undefined;
 };
 
 export type DexExchangeBuildParam = DexExchangeParam & {

package/tests/constants-e2e.ts

@@ -407,10 +407,6 @@ export const Tokens: {
       address: '0x35fa164735182de50811e8e2e824cfb9b6118ac2',
       decimals: 18,
     },
-    weETH: {
-      address: '0xcd5fe23c85820f7b72d0926fc9b05b43e359b7ee',
-      decimals: 18,
-    },
   },
   [Network.ROPSTEN]: {
     DAI: {
@@ -1379,7 +1375,6 @@ export const Holders: {
     BNT: '0xf727e20e081aAE428E7c6bE07b156bB21ab587a7',
     USDe: '0x74e6c48e667d698a4cf90665b6960a5bae39e603',
     eETH: '0x0f1DfeF1a40557d279d0de6E49aB306891A638b8',
-    weETH: '0xfB4cB868727D9622258bf2B26A8CFc95f6742669',
   },
   [Network.ROPSTEN]: {
     ETH: '0x43262A12d8610AA70C15DbaeAC321d51613c9071',
@@ -1546,7 +1541,7 @@ export const Holders: {
     LINK: '0x7f1fa204bb700853d36994da19f830b6ad18455c',
     DMT: '0x40414f138eb2ef938e6c3629897ef99d4464d4e8',
     PENDLE: '0x5bdf85216ec1e38d6458c870992a69e38e03f7ef',
-    wstETH: '0x27edc7700f1820cb38ec3bbb84c542945f21b5a1',
+    wstETH: '0x916792f7734089470de27297903bed8a4630b26d',
     EURA: '0x6dd7b830896b56812aa667bdd14b71c8b3252f8e',
     stEUR: '0xE588611e7A2392507879E3be80531654b85C16aA',
     USDA: '0xa86ff337db9107b54862d30d1a598f8be847b05e',