Add manual insertFromAmountPos and sendEthButSupportsInsertFromAmount…

… for Bebop and Cables
paraswap · Dec 26, 2024 · a4e4d2d · a4e4d2d
1 parent fb04915
commit a4e4d2d
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 29 deletions.
diff --git a/src/dex/bebop/bebop-e2e.test.ts b/src/dex/bebop/bebop-e2e.test.ts
@@ -30,7 +30,7 @@ function testForNetwork(
   const nativeTokenSymbol = NativeTokenSymbols[network];
 
   const sideToContractMethods = new Map([
-    [SwapSide.SELL, [ContractMethod.swapExactAmountIn]],
+    // [SwapSide.SELL, [ContractMethod.swapExactAmountIn]],
     [SwapSide.BUY, [ContractMethod.swapExactAmountOut]],
   ]);
 
@@ -50,34 +50,46 @@ function testForNetwork(
                 contractMethod,
                 network,
                 provider,
+                undefined,
+                undefined,
+                undefined,
+                100,
               );
             });
-            it(`${tokenASymbol} -> ${nativeTokenSymbol}`, async () => {
-              await testE2E(
-                tokens[tokenASymbol],
-                tokens[nativeTokenSymbol],
-                holders[tokenASymbol],
-                side === SwapSide.SELL ? tokenAAmount : nativeTokenAmount,
-                side,
-                dexKey,
-                contractMethod,
-                network,
-                provider,
-              );
-            });
-            it(`${tokenASymbol} -> ${tokenBSymbol}`, async () => {
-              await testE2E(
-                tokens[tokenASymbol],
-                tokens[tokenBSymbol],
-                holders[tokenASymbol],
-                side === SwapSide.SELL ? tokenAAmount : tokenBAmount,
-                side,
-                dexKey,
-                contractMethod,
-                network,
-                provider,
-              );
-            });
+            // it(`${tokenASymbol} -> ${nativeTokenSymbol}`, async () => {
+            //   await testE2E(
+            //     tokens[tokenASymbol],
+            //     tokens[nativeTokenSymbol],
+            //     holders[tokenASymbol],
+            //     side === SwapSide.SELL ? tokenAAmount : nativeTokenAmount,
+            //     side,
+            //     dexKey,
+            //     contractMethod,
+            //     network,
+            //     provider,
+            //     undefined,
+            //     undefined,
+            //     undefined,
+            //     100,
+            //   );
+            // });
+            // it(`${tokenASymbol} -> ${tokenBSymbol}`, async () => {
+            //   await testE2E(
+            //     tokens[tokenASymbol],
+            //     tokens[tokenBSymbol],
+            //     holders[tokenASymbol],
+            //     side === SwapSide.SELL ? tokenAAmount : tokenBAmount,
+            //     side,
+            //     dexKey,
+            //     contractMethod,
+            //     network,
+            //     provider,
+            //     undefined,
+            //     undefined,
+            //     undefined,
+            //     100,
+            //   );
+            // });
           });
         });
       }),

diff --git a/src/dex/bebop/bebop.ts b/src/dex/bebop/bebop.ts
@@ -55,7 +55,7 @@ import {
 } from './constants';
 import BigNumber from 'bignumber.js';
 import { getBigNumberPow } from '../../bignumber-constants';
-import { utils } from 'ethers';
+import { ethers, utils } from 'ethers';
 import qs from 'qs';
 import { isEqual } from 'lodash';
 
@@ -656,12 +656,28 @@ export class Bebop extends SimpleExchange implements IDex<BebopData> {
         srcAmount, // modify filledTakerAmount to make insertFromAmount work
       ]);
 
+      const fromAmount = ethers.utils.defaultAbiCoder.encode(
+        ['uint256'],
+        [srcAmount],
+      );
+
+      const filledTakerAmountIndex = exchangeData
+        .replace('0x', '')
+        .lastIndexOf(fromAmount.replace('0x', ''));
+
+      const filledTakerAmountPos =
+        (filledTakerAmountIndex !== -1
+          ? filledTakerAmountIndex
+          : exchangeData.length) / 2;
+
       return {
         exchangeData: exchangeData,
         needWrapNative: this.needWrapNative,
         dexFuncHasRecipient: true,
         targetExchange: this.settlementAddress,
         returnAmountPos: undefined,
+        sendEthButSupportsInsertFromAmount: true,
+        insertFromAmountPos: filledTakerAmountPos,
       };
     } else {
       throw new Error('Not supported method');

diff --git a/src/dex/cables/cables.ts b/src/dex/cables/cables.ts
@@ -323,6 +323,7 @@ export class Cables extends SimpleExchange implements IDex<any> {
       targetExchange: this.mainnetRFQAddress,
       returnAmountPos: undefined,
       insertFromAmountPos: filledAmountPos,
+      sendEthButSupportsInsertFromAmount: true,
     };
   }
 

diff --git a/src/executor/Executor03BytecodeBuilder.ts b/src/executor/Executor03BytecodeBuilder.ts
@@ -15,7 +15,6 @@ import {
   ExecutorBytecodeBuilder,
   SingleSwapCallDataParams,
 } from './ExecutorBytecodeBuilder';
-import { assert } from 'ts-essentials';
 
 const {
   utils: { hexlify, hexDataLength, hexConcat, hexZeroPad, solidityPack },
@@ -330,6 +329,7 @@ export class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder<
 
     let fromAmountPos = 0;
     let toAmountPos = 0;
+
     if (insertAmount) {
       if (exchangeParam.insertFromAmountPos) {
         fromAmountPos = exchangeParam.insertFromAmountPos;