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

package/build/executor/ExecutorDetector.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExecutorDetector.js","sourceRoot":"","sources":["../../src/executor/ExecutorDetector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ExecutorDetector.js","sourceRoot":"","sources":["../../src/executor/ExecutorDetector.ts"],"names":[],"mappings":"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"}

package/build/executor/constants.d.ts

@@ -14,7 +14,5 @@ export declare const EXECUTOR_01_02_FUNCTION_CALL_DATA_TYPES: string[];
 export declare const EXECUTOR_03_FUNCTION_CALL_DATA_TYPES: string[];
 export declare const APPROVE_CALLDATA_DEST_TOKEN_POS = 68;
 export declare const WRAP_UNWRAP_FROM_AMOUNT_POS = 4;
-export declare const DEFAULT_RETURN_AMOUNT_POS = 255;
-export declare const RETURN_AMOUNT_POS_0 = 0;
-export declare const RETURN_AMOUNT_POS_32 = 32;
+export declare const DEFAULT_RETURN_AMOUNT_POS = "0xff";
 export declare const DISABLED_MAX_UNIT_APPROVAL_TOKENS: Partial<Record<Network, string[]>>;

package/build/executor/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DISABLED_MAX_UNIT_APPROVAL_TOKENS = exports.RETURN_AMOUNT_POS_32 = exports.RETURN_AMOUNT_POS_0 = exports.DEFAULT_RETURN_AMOUNT_POS = exports.WRAP_UNWRAP_FROM_AMOUNT_POS = exports.APPROVE_CALLDATA_DEST_TOKEN_POS = exports.EXECUTOR_03_FUNCTION_CALL_DATA_TYPES = exports.EXECUTOR_01_02_FUNCTION_CALL_DATA_TYPES = exports.ETH_SRC_TOKEN_POS_FOR_MULTISWAP_METADATA = exports.NOT_EXISTING_EXCHANGE_PARAM_INDEX = exports.SWAP_EXCHANGE_100_PERCENTAGE = exports.ZEROS_32_BYTES = exports.ZEROS_28_BYTES = exports.ZEROS_20_BYTES = exports.ZEROS_12_BYTES = exports.ZEROS_4_BYTES = exports.BYTES_96_LENGTH = exports.BYTES_64_LENGTH = exports.BYTES_28_LENGTH = void 0;
+exports.DISABLED_MAX_UNIT_APPROVAL_TOKENS = exports.DEFAULT_RETURN_AMOUNT_POS = exports.WRAP_UNWRAP_FROM_AMOUNT_POS = exports.APPROVE_CALLDATA_DEST_TOKEN_POS = exports.EXECUTOR_03_FUNCTION_CALL_DATA_TYPES = exports.EXECUTOR_01_02_FUNCTION_CALL_DATA_TYPES = exports.ETH_SRC_TOKEN_POS_FOR_MULTISWAP_METADATA = exports.NOT_EXISTING_EXCHANGE_PARAM_INDEX = exports.SWAP_EXCHANGE_100_PERCENTAGE = exports.ZEROS_32_BYTES = exports.ZEROS_28_BYTES = exports.ZEROS_20_BYTES = exports.ZEROS_12_BYTES = exports.ZEROS_4_BYTES = exports.BYTES_96_LENGTH = exports.BYTES_64_LENGTH = exports.BYTES_28_LENGTH = void 0;
 const ethers_1 = require("ethers");
 const constants_1 = require("../constants");
 const { utils: { hexlify, hexZeroPad }, } = ethers_1.ethers;
@@ -39,9 +39,7 @@ exports.EXECUTOR_03_FUNCTION_CALL_DATA_TYPES = [
 ];
 exports.APPROVE_CALLDATA_DEST_TOKEN_POS = 68;
 exports.WRAP_UNWRAP_FROM_AMOUNT_POS = 4;
-exports.DEFAULT_RETURN_AMOUNT_POS = 255;
-exports.RETURN_AMOUNT_POS_0 = 0;
-exports.RETURN_AMOUNT_POS_32 = 32;
+exports.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
 exports.DISABLED_MAX_UNIT_APPROVAL_TOKENS = {

package/build/executor/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/executor/constants.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAChC,4CAAuC;AAEvC,MAAM,EACJ,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,GAC/B,GAAG,eAAM,CAAC;AAEE,QAAA,eAAe,GAAG,EAAE,CAAC;AACrB,QAAA,eAAe,GAAG,EAAE,CAAC;AACrB,QAAA,eAAe,GAAG,EAAE,CAAC;AAErB,QAAA,aAAa,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC1C,QAAA,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC5C,QAAA,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC5C,QAAA,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC5C,QAAA,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAE5C,QAAA,4BAA4B,GAAG,GAAG,CAAC;AAEnC,QAAA,iCAAiC,GAAG,CAAC,CAAC,CAAC;AAEvC,QAAA,wCAAwC,GAAG,oBAAoB,CAAC;AAEhE,QAAA,uCAAuC,GAAa;IAC/D,SAAS;IACT,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,OAAO,EAAE,eAAe;CACzB,CAAC;AAEW,QAAA,oCAAoC,GAAa;IAC5D,SAAS;IACT,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,OAAO,EAAE,uBAAuB;CACjC,CAAC;AAEW,QAAA,+BAA+B,GAAG,EAAE,CAAC;AACrC,QAAA,2BAA2B,GAAG,CAAC,CAAC;AAChC,QAAA,yBAAyB,GAAG,GAAG,CAAC;AAEhC,QAAA,mBAAmB,GAAG,CAAC,CAAC;AACxB,QAAA,oBAAoB,GAAG,EAAE,CAAC;AAEvC,4GAA4G;AAC5G,sDAAsD;AACzC,QAAA,iCAAiC,GAE1C;IACF,qEAAqE;IACrE,CAAC,mBAAO,CAAC,OAAO,CAAC,EAAE;QACjB,4CAA4C;QAC5C,4CAA4C;QAC5C,4CAA4C;KAC7C;CACF,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/executor/constants.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAChC,4CAAuC;AAEvC,MAAM,EACJ,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,GAC/B,GAAG,eAAM,CAAC;AAEE,QAAA,eAAe,GAAG,EAAE,CAAC;AACrB,QAAA,eAAe,GAAG,EAAE,CAAC;AACrB,QAAA,eAAe,GAAG,EAAE,CAAC;AAErB,QAAA,aAAa,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC1C,QAAA,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC5C,QAAA,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC5C,QAAA,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC5C,QAAA,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAE5C,QAAA,4BAA4B,GAAG,GAAG,CAAC;AAEnC,QAAA,iCAAiC,GAAG,CAAC,CAAC,CAAC;AAEvC,QAAA,wCAAwC,GAAG,oBAAoB,CAAC;AAEhE,QAAA,uCAAuC,GAAa;IAC/D,SAAS;IACT,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,OAAO,EAAE,eAAe;CACzB,CAAC;AAEW,QAAA,oCAAoC,GAAa;IAC5D,SAAS;IACT,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,OAAO,EAAE,uBAAuB;CACjC,CAAC;AAEW,QAAA,+BAA+B,GAAG,EAAE,CAAC;AACrC,QAAA,2BAA2B,GAAG,CAAC,CAAC;AAChC,QAAA,yBAAyB,GAAG,MAAM,CAAC;AAEhD,4GAA4G;AAC5G,sDAAsD;AACzC,QAAA,iCAAiC,GAE1C;IACF,qEAAqE;IACrE,CAAC,mBAAO,CAAC,OAAO,CAAC,EAAE;QACjB,4CAA4C;QAC5C,4CAA4C;QAC5C,4CAA4C;KAC7C;CACF,CAAC"}

package/build/types.d.ts

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

package/dex-template/__DexName__-e2e.test.ts.template

@@ -70,9 +70,16 @@ function testForNetwork(
 
   // TODO: Add any direct swap contractMethod name if it exists
   const sideToContractMethods = new Map([
-    [SwapSide.SELL, [ContractMethod.swapExactAmountIn]],
+    [
+      SwapSide.SELL,
+      [
+        ContractMethod.simpleSwap,
+        ContractMethod.multiSwap,
+        ContractMethod.megaSwap,
+      ],
+    ],
     // TODO: If buy is not supported remove the buy contract methods
-    [SwapSide.BUY, [ContractMethod.swapExactAmountOut]],
+    [SwapSide.BUY, [ContractMethod.simpleBuy, ContractMethod.buy]],
   ]);
 
   describe(`${network}`, () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "3.3.1-return-amount-pos.3",
+  "version": "3.3.1",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

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

@@ -237,7 +237,6 @@ export class AaveV1
       dexFuncHasRecipient: false,
       exchangeData,
       targetExchange: swapCallee,
-      returnAmountPos: undefined,
     };
   }
 

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

@@ -386,7 +386,6 @@ export class AaveV2
       dexFuncHasRecipient: true,
       exchangeData,
       targetExchange: swapCallee,
-      returnAmountPos: undefined,
     };
   }
 

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

@@ -245,7 +245,6 @@ export class AaveV3 extends SimpleExchange implements IDex<Data, Param> {
       dexFuncHasRecipient: true,
       exchangeData,
       targetExchange: swapCallee,
-      returnAmountPos: undefined,
     };
   }
 

package/src/dex/algebra/algebra.ts

@@ -52,7 +52,6 @@ import { AlgebraEventPoolV1_9 } from './algebra-pool-v1_9';
 import { AlgebraFactory, OnPoolCreatedCallback } from './algebra-factory';
 import { applyTransferFee } from '../../lib/token-transfer-fee';
 import { AlgebraEventPoolV1_9_bidirectional_fee } from './algebra-pool-v1_9_bidirectional_fee';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 type PoolPairsInfo = {
   token0: Address;
@@ -943,14 +942,6 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
       dexFuncHasRecipient: true,
       exchangeData,
       targetExchange: this.config.router,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              this.routerIface,
-              swapFunction,
-              'amountOut',
-            )
-          : undefined,
     };
   }
 

package/src/dex/angle-staked-stable/angle-staked-stable.ts

@@ -12,7 +12,7 @@ import type {
   NumberAsString,
   DexExchangeParam,
 } from '../../types';
-import { SwapSide, Network } from '../../constants';
+import { SwapSide, type Network } from '../../constants';
 import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
 import { getDexKeysWithNetwork } from '../../utils';
 import type { Context, IDex } from '../../dex/idex';
@@ -259,7 +259,6 @@ export class AngleStakedStable
       dexFuncHasRecipient: true,
       exchangeData: swapData,
       targetExchange: exchange,
-      returnAmountPos: undefined,
     };
   }
 

package/src/dex/bProtocol/bProtocol.ts

@@ -12,7 +12,6 @@ import { SimpleExchange } from '../simple-exchange';
 import BProtocolABI from '../../abi/BProtocol.json';
 import { IDexHelper } from '../../dex-helper';
 import { BProtocolData, BProtocolFunctions, BProtocolParam } from './types';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 export class BProtocol
   extends SimpleExchange
@@ -96,13 +95,6 @@ export class BProtocol
       dexFuncHasRecipient: true,
       exchangeData: swapData,
       targetExchange: data.exchange,
-      returnAmountPos:
-        _side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              this.exchangeRouterInterface,
-              swapFunction,
-            )
-          : undefined,
     };
   }
 }

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

@@ -43,7 +43,6 @@ import BalancerCustomMulticallABI from '../../abi/BalancerCustomMulticall.json';
 import { NumberAsString, SwapSide } from '@paraswap/core';
 import { BigNumber, ethers } from 'ethers';
 import { SpecialDex } from '../../executor/types';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 const {
   utils: { hexlify, hexZeroPad, solidityPack },
@@ -417,14 +416,6 @@ export class BalancerV1
       dexFuncHasRecipient: false,
       exchangeData: exchangeData,
       targetExchange: this.config.exchangeProxy,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              BalancerV1.proxyIface,
-              swapFunction,
-              'totalAmountOut',
-            )
-          : undefined,
     };
   }
 

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

@@ -1142,9 +1142,9 @@ export class BalancerV2
             sender = recipient = augustusV6
         else (so generic swaps)
           if sell
-            if swap.destToken = priceRoute.destToken <> ETH (need withdraw for eth currently, need fix in future)
+            if swap.destToken = priceRoute.destToken <> ETH (need withdraw for eth currently, need fix in future) 
                   sender = executor and recipient = augustusV6 (skip 1 extra transfer)
-              else
+              else 
                   sender = recipient = executor
               # note: we pass sender=null then the address of the executor is inferred contract side
           else (so buy)
@@ -1585,7 +1585,6 @@ export class BalancerV2
       exchangeData,
       specialDexFlag,
       targetExchange: this.vaultAddress,
-      returnAmountPos: undefined,
     };
   }
 

package/src/dex/bancor/bancor.ts

@@ -13,7 +13,6 @@ import BancorABI from '../../abi/Bancor.json';
 import { IDexHelper } from '../../dex-helper';
 import { BancorData, BancorFunctions, BancorParam } from './types';
 import { BANCOR_NETWORK, BancorRegistry } from './config';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 export class Bancor
   extends SimpleExchange
@@ -116,13 +115,6 @@ export class Bancor
       dexFuncHasRecipient: false,
       exchangeData: swapData,
       targetExchange: data.bancorNetwork || BANCOR_NETWORK[this.network],
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              this.exchangeRouterInterface,
-              swapMethod,
-            )
-          : undefined,
     };
   }
 }

package/src/dex/camelot/camelot.ts

@@ -867,7 +867,6 @@ export class Camelot
       transferSrcTokenBeforeSwap: data.isFeeTokenInRoute
         ? undefined
         : data.pools[0].address,
-      returnAmountPos: undefined,
     };
   }
 }

package/src/dex/compound/compound.ts

@@ -101,7 +101,6 @@ export class Compound
       dexFuncHasRecipient: false,
       exchangeData: swapData,
       targetExchange: cToken,
-      returnAmountPos: undefined,
     };
   }
 }

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

@@ -1075,7 +1075,6 @@ export class CurveV1
       sendEthButSupportsInsertFromAmount: true,
       dexFuncHasRecipient: false,
       targetExchange: exchange,
-      returnAmountPos: undefined,
     };
   }
 

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

@@ -1176,7 +1176,6 @@ export class CurveV1Factory
       sendEthButSupportsInsertFromAmount: true,
       dexFuncHasRecipient: false,
       targetExchange: exchange,
-      returnAmountPos: undefined,
     };
   }
 

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

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

package/src/dex/dexalot/dexalot.ts

@@ -1021,7 +1021,6 @@ export class Dexalot extends SimpleExchange implements IDex<DexalotData> {
       needWrapNative: this.needWrapNative,
       dexFuncHasRecipient: false,
       targetExchange: this.mainnetRFQAddress,
-      returnAmountPos: undefined,
     };
   }
 

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

@@ -13,7 +13,6 @@ import { NumberAsString } from '@paraswap/core';
 import { IDexHelper } from '../../dex-helper';
 import { DodoV1Data, DodoV1Functions, DodoV1Param } from './types';
 import { DODOAproveAddress, DODOV2ProxyAddress } from './config';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 export class DodoV1
   extends SimpleExchange
@@ -119,14 +118,6 @@ export class DodoV1
       exchangeData: swapData,
       targetExchange: DODOV2ProxyAddress[this.network],
       spender: DODOAproveAddress[this.network],
-      returnAmountPos:
-        _side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              this.dodoV2Proxy,
-              swapFunction,
-              'returnAmount',
-            )
-          : undefined,
     };
   }
 }

package/src/dex/dodo-v2.ts

@@ -13,7 +13,6 @@ import { NumberAsString } from '@paraswap/core';
 import { isETHAddress } from '../utils';
 import Web3 from 'web3';
 import { IDexHelper } from '../dex-helper';
-import { extractReturnAmountPosition } from '../executor/utils';
 
 const DODOAproveAddress: { [network: number]: Address } = {
   [Network.MAINNET]: '0xCB859eA579b28e02B87A1FDE08d087ab9dbE5149',
@@ -253,14 +252,6 @@ export class DodoV2
       exchangeData: swapData,
       targetExchange: data.dodoProxy,
       spender: maybeSpender,
-      returnAmountPos:
-        _side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              this.exchangeRouterInterface,
-              swapFunction,
-              'returnAmount',
-            )
-          : undefined,
     };
   }
 }

package/src/dex/etherfi.ts

@@ -15,7 +15,6 @@ import { IDexHelper } from '../dex-helper';
 import { isETHAddress } from '../utils';
 import { assert } from 'ts-essentials';
 import { WethFunctions } from './weth/types';
-import { extractReturnAmountPosition } from '../executor/utils';
 
 type EtherFiData = void;
 
@@ -218,7 +217,6 @@ export class EtherFi
             srcAmount,
           ])
         : undefined,
-      returnAmountPos: extractReturnAmountPosition(Interface, swapFunction)
     };
   }
 

package/src/dex/generic-rfq/generic-rfq.ts

@@ -302,7 +302,6 @@ export class GenericRFQ extends ParaSwapLimitOrders {
       specialDexFlag: SpecialDex.SWAP_ON_AUGUSTUS_RFQ,
       targetExchange: this.augustusRFQAddress,
       specialDexSupportsInsertFromAmount: true,
-      returnAmountPos: undefined,
     };
   }
 

package/src/dex/gmx/gmx.ts

@@ -22,7 +22,6 @@ import { SimpleExchange } from '../simple-exchange';
 import { GMXConfig, Adapters } from './config';
 import { Vault } from './vault';
 import ERC20ABI from '../../abi/erc20.json';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 const GMXGasCost = 300 * 1000;
 
@@ -232,13 +231,6 @@ export class GMX extends SimpleExchange implements IDex<GMXData> {
       swappedAmountNotPresentInExchangeData: true,
       exchangeData,
       targetExchange: this.params.vault,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              Vault.interface,
-              'swap',
-            )
-          : undefined,
     };
   }
 

package/src/dex/hashflow/hashflow.ts

@@ -1039,7 +1039,6 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
       dexFuncHasRecipient: true,
       exchangeData,
       targetExchange: this.routerAddress,
-      returnAmountPos: undefined,
     };
   }
 

package/src/dex/jarvis-v6/jarvis-v6.ts

@@ -483,7 +483,6 @@ export class JarvisV6
       dexFuncHasRecipient: true,
       exchangeData,
       targetExchange: data.poolAddress.toLowerCase(),
-      returnAmountPos: undefined,
     };
   }
 

package/src/dex/jarvis.ts

@@ -12,7 +12,6 @@ import { SimpleExchange } from './simple-exchange';
 import JarvisABI from '../abi/Jarvis.json';
 import Web3 from 'web3';
 import { IDexHelper } from '../dex-helper';
-import { extractReturnAmountPosition } from '../executor/utils';
 
 const THIRTY_MINUTES = 60 * 30;
 
@@ -198,8 +197,6 @@ export class Jarvis
     const swapFunction = data.method;
     const timestamp = (Date.now() / 1000 + THIRTY_MINUTES).toFixed(0);
     let swapFunctionParams: JarvisParam;
-    let outputName: string;
-
     switch (swapFunction) {
       case JarvisFunctions.mint:
         swapFunctionParams = [
@@ -210,7 +207,6 @@ export class Jarvis
           timestamp,
           recipient,
         ];
-        outputName = 'syntheticTokensMinted';
         break;
       case JarvisFunctions.redeem:
         swapFunctionParams = [
@@ -221,7 +217,6 @@ export class Jarvis
           timestamp,
           recipient,
         ];
-        outputName = 'collateralRedeemed';
         break;
       case JarvisFunctions.exchange:
         swapFunctionParams = [
@@ -234,7 +229,6 @@ export class Jarvis
           timestamp,
           recipient,
         ];
-        outputName = 'destNumTokensMinted';
         break;
       default:
         throw new Error(`Unknown function ${swapFunction}`);
@@ -249,14 +243,6 @@ export class Jarvis
       dexFuncHasRecipient: true,
       exchangeData: swapData,
       targetExchange: data.pools[0],
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              this.poolInterface,
-              swapFunction,
-              outputName,
-            )
-          : undefined,
     };
   }
 }

package/src/dex/kyberdmm/kyberdmm.ts

@@ -38,7 +38,6 @@ import kyberDmmFactoryABI from '../../abi/kyberdmm/kyber-dmm-factory.abi.json';
 import kyberDmmPoolABI from '../../abi/kyberdmm/kyber-dmm-pool.abi.json';
 import KyberDmmExchangeRouterABI from '../../abi/kyberdmm/kyber-dmm-exchange-router.abi.json';
 import { getBigIntPow, getDexKeysWithNetwork } from '../../utils';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 const MAX_TRACKED_PAIR_POOLS = 3;
 
@@ -263,15 +262,6 @@ export class KyberDmm
       dexFuncHasRecipient: true,
       exchangeData,
       targetExchange: data.router,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              this.exchangeRouterInterface,
-              KyberDMMFunctions.swapExactTokensForTokens,
-              'amounts',
-              data.path.length - 1, // last element is amount out
-            )
-          : undefined,
     };
   }
 

package/src/dex/lido/lido.ts

@@ -14,7 +14,6 @@ import { LidoData, stETHFunctions } from './types';
 import { stETH } from './config';
 import { WethFunctions } from '../weth/types';
 import ERC20ABI from '../../abi/erc20.json';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 export class Lido implements IDexTxBuilder<LidoData, any> {
   static dexKeys = ['lido'];
@@ -98,13 +97,6 @@ export class Lido implements IDexTxBuilder<LidoData, any> {
             srcAmount,
           ])
         : undefined,
-      returnAmountPos:
-        _side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              this.stETHInterface,
-              stETHFunctions.submit,
-            )
-          : undefined,
     };
   }
 }

package/src/dex/maker-psm/maker-psm.ts

@@ -541,7 +541,6 @@ export class MakerPsm extends SimpleExchange implements IDex<MakerPsmData> {
       targetExchange: data.psmAddress,
       specialDexFlag,
       spender: isGemSell ? data.gemJoinAddress : data.psmAddress,
-      returnAmountPos: undefined,
     };
   }
   // Returns list of top pools based on liquidity. Max

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

@@ -41,7 +41,6 @@ import {
 import { SUBGRAPH_TIMEOUT } from '../../constants';
 import RouterABI from '../../abi/maverick-v1/router.json';
 import { NumberAsString } from '@paraswap/core';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 const MAX_POOL_CNT = 1000;
 
@@ -403,14 +402,6 @@ export class MaverickV1
       dexFuncHasRecipient: true,
       exchangeData,
       targetExchange: this.config.routerAddress,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              this.routerIface,
-              MaverickV1Functions.exactInputSingle,
-              'amountOut',
-            )
-          : undefined,
     };
   }
 

package/src/dex/nerve/nerve.ts

@@ -33,7 +33,6 @@ import { NerveConfig, Adapters, NERVE_GAS_COST } from './config';
 import { NerveEventPool } from './nerve-pool';
 import _ from 'lodash';
 import { bigIntify } from './utils';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 export class Nerve
   extends SimpleExchange
@@ -383,13 +382,6 @@ export class Nerve
       dexFuncHasRecipient: false,
       exchangeData: swapData,
       targetExchange: exchange,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              this.nervePoolIface,
-              NervePoolFunctions.swap,
-            )
-          : undefined,
     };
   }
 

package/src/dex/onebit/onebit.ts

@@ -13,7 +13,6 @@ import { SimpleExchange } from '../simple-exchange';
 import OnebitABI from '../../abi/Onebit.json';
 import { IDexHelper } from '../../dex-helper';
 import { OnebitData, OnebitFunctions, OnebitParam } from './types';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 export class Onebit
   extends SimpleExchange
@@ -101,13 +100,6 @@ export class Onebit
       dexFuncHasRecipient: true,
       exchangeData: swapData,
       targetExchange: data.router,
-      returnAmountPos:
-        _side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              this.exchangeRouterInterface,
-              swapFunction,
-            )
-          : undefined,
     };
   }
 }

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

@@ -61,7 +61,6 @@ import {
   OnPoolCreatedCallback,
   PancakeswapV3Factory,
 } from './pancakeswap-v3-factory';
-import { extractReturnAmountPosition } from '../../executor/utils';
 
 type PoolPairsInfo = {
   token0: Address;
@@ -895,14 +894,6 @@ export class PancakeswapV3
       dexFuncHasRecipient: true,
       exchangeData,
       targetExchange: this.config.router,
-      returnAmountPos:
-        side === SwapSide.SELL
-          ? extractReturnAmountPosition(
-              this.routerIface,
-              swapFunction,
-              'amountOut',
-            )
-          : undefined,
     };
   }
 

package/src/dex/paraswap-limit-orders/paraswap-limit-orders.ts

@@ -398,7 +398,6 @@ export class ParaSwapLimitOrders
       dexFuncHasRecipient: true,
       exchangeData: swapData,
       targetExchange: this.augustusRFQAddress,
-      returnAmountPos: undefined,
     };
   }