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

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

@@ -183,6 +183,45 @@ 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/executor/utils.ts

@@ -0,0 +1,44 @@
+import { FunctionFragment, Interface } from '@ethersproject/abi';
+import { RETURN_AMOUNT_POS_0, RETURN_AMOUNT_POS_32 } from './constants';
+
+export const extractReturnAmountPosition = (
+  iface: Interface,
+  functionName: string | FunctionFragment,
+  outputName = '',
+): number => {
+  const func =
+    typeof functionName === 'string'
+      ? iface.getFunction(functionName)
+      : functionName;
+  const outputs = func.outputs || [];
+  const index = outputs.findIndex(
+    ({ name }) => name === outputName || (outputName === '' && name === null),
+  );
+
+  if (index < 0) {
+    throw new Error(
+      `Function ${functionName} was not found in the provided abi`,
+    );
+  }
+
+  if (index === 0) {
+    return RETURN_AMOUNT_POS_0;
+  }
+
+  let position = RETURN_AMOUNT_POS_0;
+  let curIndex = 0;
+  while (curIndex < index) {
+    const output = outputs[curIndex];
+
+    if (output.type.includes('[]') || output.type.includes('struct')) {
+      throw new Error(
+        `extractReturnAmountPosition doesn't support outputs of type array or struct. Please define returnAmountPos manually for this case.`,
+      );
+    }
+
+    position += RETURN_AMOUNT_POS_32;
+    curIndex++;
+  }
+
+  return position;
+};

package/src/router/simpleswap.ts

@@ -135,7 +135,7 @@ export abstract class SimpleRouterBase<RouterParam>
             }
           }
 
-          const simpleParams = await dex.getSimpleParam(
+          const simpleParams = await dex.getSimpleParam?.(
             _src,
             _dest,
             _srcAmount,
@@ -157,7 +157,7 @@ export abstract class SimpleRouterBase<RouterParam>
       simpleExchangeDataList,
       srcAmountWethToDeposit,
       destAmountWethToWithdraw,
-    } = await rawSimpleParams.reduce<{
+    } = rawSimpleParams.reduce<{
       simpleExchangeDataList: SimpleExchangeParam[];
       srcAmountWethToDeposit: bigint;
       destAmountWethToWithdraw: bigint;
@@ -165,7 +165,11 @@ export abstract class SimpleRouterBase<RouterParam>
       (acc, se) => {
         acc.srcAmountWethToDeposit += BigInt(se.wethDeposit);
         acc.destAmountWethToWithdraw += BigInt(se.wethWithdraw);
-        acc.simpleExchangeDataList.push(se.simpleParams);
+        // V6 doesn't have simpleParams
+        if (se.simpleParams) {
+          acc.simpleExchangeDataList.push(se.simpleParams);
+        }
+
         return acc;
       },
       {

package/src/types.ts

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

package/tests/constants-e2e.ts

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