@paraswap/dex-lib 3.8.38 → 3.8.39-1701-1507

package/src/executor/Executor01BytecodeBuilder.ts

@@ -47,16 +47,22 @@ export class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder<
     swapExchangeIndex: number,
     exchangeParamIndex: number,
     maybeWethCallData?: DepositWithdrawReturn,
+    maybeWethCallDataForNeedUnwrapWeth?: DepositWithdrawReturn,
   ): { dexFlag: Flag; approveFlag: Flag } {
     const { srcToken, destToken } =
       priceRoute.bestRoute[routeIndex].swaps[swapIndex];
     const isEthSrc = isETHAddress(srcToken);
     const isEthDest = isETHAddress(destToken);
+    const wethAddr =
+      this.dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase();
+    const isWethSrc = srcToken.toLowerCase() === wethAddr;
+    const isWethDest = destToken.toLowerCase() === wethAddr;
 
     const exchangeParam = exchangeParams[exchangeParamIndex];
     const {
       dexFuncHasRecipient,
       needWrapNative,
+      needUnwrapWeth,
       specialDexFlag,
       specialDexSupportsInsertFromAmount,
       swappedAmountNotPresentInExchangeData,
@@ -66,6 +72,17 @@ export class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder<
     const needWrap = needWrapNative && isEthSrc && maybeWethCallData?.deposit;
     const needUnwrap =
       needWrapNative && isEthDest && maybeWethCallData?.withdraw;
+
+    const needUnwrapForWethSrc =
+      needUnwrapWeth &&
+      isWethSrc &&
+      maybeWethCallDataForNeedUnwrapWeth?.withdraw;
+
+    const needWrapForWethDest =
+      needUnwrapWeth &&
+      isWethDest &&
+      maybeWethCallDataForNeedUnwrapWeth?.deposit;
+
     const isSpecialDex =
       specialDexFlag !== undefined && specialDexFlag !== SpecialDex.DEFAULT;
 
@@ -82,7 +99,13 @@ export class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder<
     if (isEthSrc && !needWrap) {
       dexFlag =
         Flag.SEND_ETH_EQUAL_TO_FROM_AMOUNT_CHECK_SRC_TOKEN_BALANCE_AFTER_SWAP; // 5
-    } else if (isEthDest && !needUnwrap) {
+    } else if (isWethSrc && needUnwrapForWethSrc) {
+      dexFlag =
+        Flag.SEND_ETH_EQUAL_TO_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP; // 9
+    } else if (
+      (isEthDest && !needUnwrap) ||
+      (isWethDest && needWrapForWethDest)
+    ) {
       dexFlag = forcePreventInsertFromAmount
         ? Flag.DONT_INSERT_FROM_AMOUNT_CHECK_ETH_BALANCE_AFTER_SWAP
         : Flag.INSERT_FROM_AMOUNT_CHECK_ETH_BALANCE_AFTER_SWAP; // 4 or 7
@@ -127,6 +150,7 @@ export class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder<
     swapExchangeIndex: number,
     exchangeParamIndex: number,
     maybeWethCallData?: DepositWithdrawReturn,
+    maybeWethCallDataForNeedUnwrapWeth?: DepositWithdrawReturn,
   ): { dexFlag: Flag; approveFlag: Flag } {
     // same as for Executor02 multi flags, except forceBalanceOfCheck
     const swap = priceRoute.bestRoute[routeIndex].swaps[swapIndex];
@@ -135,6 +159,7 @@ export class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder<
     const {
       dexFuncHasRecipient,
       needWrapNative,
+      needUnwrapWeth,
       specialDexFlag,
       specialDexSupportsInsertFromAmount,
       swappedAmountNotPresentInExchangeData,
@@ -146,6 +171,10 @@ export class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder<
       swapIndex === priceRoute.bestRoute[routeIndex].swaps.length - 1;
     const isEthSrc = isETHAddress(srcToken);
     const isEthDest = isETHAddress(destToken);
+    const wethAddr =
+      this.dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase();
+    const isWethSrc = srcToken.toLowerCase() === wethAddr;
+    const isWethDest = destToken.toLowerCase() === wethAddr;
 
     const isSpecialDex =
       specialDexFlag !== undefined && specialDexFlag !== SpecialDex.DEFAULT;
@@ -157,14 +186,27 @@ export class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder<
     const needUnwrap =
       needWrapNative && isEthDest && maybeWethCallData?.withdraw;
 
+    const needUnwrapForWethSrc =
+      needUnwrapWeth &&
+      isWethSrc &&
+      maybeWethCallDataForNeedUnwrapWeth?.withdraw;
+
+    const needWrapForWethDest =
+      needUnwrapWeth &&
+      isWethDest &&
+      maybeWethCallDataForNeedUnwrapWeth?.deposit;
+
     const forceBalanceOfCheck = isLastSwap
-      ? !dexFuncHasRecipient || needUnwrap
+      ? !dexFuncHasRecipient || needUnwrap || needUnwrapForWethSrc
       : true;
 
-    const needSendEth = isEthSrc && !needWrapNative;
-    const needCheckEthBalance = isEthDest && !needWrapNative;
+    const needSendEth =
+      (isEthSrc && !needWrapNative) || (isWethSrc && needUnwrapForWethSrc);
+    const needCheckEthBalance =
+      (isEthDest && !needWrapNative) || (isWethDest && needWrapForWethDest);
 
-    const needCheckSrcTokenBalanceOf = needUnwrap && !isLastSwap;
+    const needCheckSrcTokenBalanceOf =
+      (needUnwrap && !isLastSwap) || needWrapForWethDest;
 
     let dexFlag: Flag;
     let approveFlag =
@@ -208,7 +250,7 @@ export class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder<
     // Need to check balance, some dexes don't have 1:1 ETH -> custom_ETH rate
     if (preSwapUnwrapCalldata) {
       dexFlag =
-        Flag.SEND_ETH_EQUAL_TO_FROM_AMOUNT_CHECK_SRC_TOKEN_BALANCE_AFTER_SWAP;
+        Flag.SEND_ETH_EQUAL_TO_FROM_AMOUNT_CHECK_SRC_TOKEN_BALANCE_AFTER_SWAP; // 5
     }
 
     return {
@@ -220,8 +262,14 @@ export class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder<
   protected buildSingleSwapCallData(
     params: SingleSwapCallDataParams<Executor01SingleSwapCallDataParams>,
   ): string {
-    const { priceRoute, index, exchangeParams, flags, maybeWethCallData } =
-      params;
+    const {
+      priceRoute,
+      index,
+      exchangeParams,
+      flags,
+      maybeWethCallData,
+      maybeWethCallDataForNeedUnwrapWeth,
+    } = params;
 
     let swapCallData = '';
     const swap = priceRoute.bestRoute[0].swaps[index];
@@ -279,7 +327,47 @@ export class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder<
       swapCallData = hexConcat([approveCallData, swapCallData]);
     }
 
-    if (curExchangeParam.needWrapNative && maybeWethCallData) {
+    if (curExchangeParam.needUnwrapWeth && maybeWethCallDataForNeedUnwrapWeth) {
+      if (
+        maybeWethCallDataForNeedUnwrapWeth.withdraw &&
+        swap.srcToken.toLowerCase() ===
+          this.dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase()
+      ) {
+        const prevExchangeParam = exchangeParams[index - 1];
+
+        if (
+          !prevExchangeParam ||
+          (prevExchangeParam && !prevExchangeParam.needUnwrapWeth)
+        ) {
+          const withdrawCallData = this.buildUnwrapEthCallData(
+            this.getWETHAddress(curExchangeParam),
+            maybeWethCallDataForNeedUnwrapWeth.withdraw.calldata,
+          );
+
+          swapCallData = hexConcat([withdrawCallData, swapCallData]);
+        }
+      }
+
+      if (
+        maybeWethCallDataForNeedUnwrapWeth.deposit &&
+        swap.destToken.toLowerCase() ===
+          this.dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase()
+      ) {
+        const nextExchangeParam = exchangeParams[index + 1];
+
+        if (
+          !nextExchangeParam ||
+          (nextExchangeParam && !nextExchangeParam.needUnwrapWeth)
+        ) {
+          const depositCallData = this.buildWrapEthCallData(
+            this.getWETHAddress(curExchangeParam),
+            maybeWethCallDataForNeedUnwrapWeth.deposit.calldata,
+            Flag.SEND_ETH_EQUAL_TO_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP,
+          );
+          swapCallData = hexConcat([swapCallData, depositCallData]);
+        }
+      }
+    } else if (curExchangeParam.needWrapNative && maybeWethCallData) {
       if (maybeWethCallData.deposit && isETHAddress(swap.srcToken)) {
         const prevExchangeParam = exchangeParams[index - 1];
 
@@ -410,11 +498,13 @@ export class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder<
     exchangeParams: DexExchangeBuildParam[],
     sender: string,
     maybeWethCallData?: DepositWithdrawReturn,
+    maybeWethCallDataForNeedUnwrapWeth?: DepositWithdrawReturn,
   ): string {
     const flags = this.buildFlags(
       priceRoute,
       exchangeParams,
       maybeWethCallData,
+      maybeWethCallDataForNeedUnwrapWeth,
     );
 
     let swapsCalldata = exchangeParams.reduce<string>(
@@ -428,14 +518,18 @@ export class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder<
             flags,
             sender,
             maybeWethCallData,
+            maybeWethCallDataForNeedUnwrapWeth,
           }),
         ]),
       '0x',
     );
 
     if (
-      !exchangeParams[exchangeParams.length - 1].dexFuncHasRecipient &&
-      !isETHAddress(priceRoute.destToken)
+      (!exchangeParams[exchangeParams.length - 1].dexFuncHasRecipient &&
+        !isETHAddress(priceRoute.destToken)) ||
+      (maybeWethCallDataForNeedUnwrapWeth?.deposit &&
+        priceRoute.destToken.toLowerCase() ===
+          this.dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase())
     ) {
       const transferCallData = this.buildTransferCallData(
         this.erc20Interface.encodeFunctionData('transfer', [

package/src/executor/Executor02BytecodeBuilder.ts

@@ -70,16 +70,22 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
     swapExchangeIndex: number,
     exchangeParamIndex: number,
     maybeWethCallData?: DepositWithdrawReturn,
+    maybeWethCallDataForNeedUnwrapWeth?: DepositWithdrawReturn,
   ): { dexFlag: Flag; approveFlag: Flag } {
     const { srcToken, destToken } =
       priceRoute.bestRoute[routeIndex].swaps[swapIndex];
     const isEthSrc = isETHAddress(srcToken);
     const isEthDest = isETHAddress(destToken);
+    const wethAddr =
+      this.dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase();
+    const isWethSrc = srcToken.toLowerCase() === wethAddr;
+    const isWethDest = destToken.toLowerCase() === wethAddr;
 
     const exchangeParam = exchangeParams[exchangeParamIndex];
     const {
       dexFuncHasRecipient,
       needWrapNative,
+      needUnwrapWeth,
       specialDexFlag,
       specialDexSupportsInsertFromAmount,
       swappedAmountNotPresentInExchangeData,
@@ -92,6 +98,16 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
     const isSpecialDex =
       specialDexFlag !== undefined && specialDexFlag !== SpecialDex.DEFAULT;
 
+    const needUnwrapForWethSrc =
+      needUnwrapWeth &&
+      isWethSrc &&
+      maybeWethCallDataForNeedUnwrapWeth?.withdraw;
+
+    const needWrapForWethDest =
+      needUnwrapWeth &&
+      isWethDest &&
+      maybeWethCallDataForNeedUnwrapWeth?.deposit;
+
     const forcePreventInsertFromAmount =
       swappedAmountNotPresentInExchangeData ||
       (isSpecialDex && !specialDexSupportsInsertFromAmount);
@@ -105,7 +121,13 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
     if (isEthSrc && !needWrap) {
       dexFlag =
         Flag.SEND_ETH_EQUAL_TO_FROM_AMOUNT_CHECK_SRC_TOKEN_BALANCE_AFTER_SWAP; // 5
-    } else if (isEthDest && !needUnwrap) {
+    } else if (isWethSrc && needUnwrapForWethSrc) {
+      dexFlag =
+        Flag.SEND_ETH_EQUAL_TO_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP; // 9
+    } else if (
+      (isEthDest && !needUnwrap) ||
+      (isWethDest && needWrapForWethDest)
+    ) {
       dexFlag = forcePreventInsertFromAmount
         ? Flag.DONT_INSERT_FROM_AMOUNT_CHECK_ETH_BALANCE_AFTER_SWAP
         : Flag.INSERT_FROM_AMOUNT_CHECK_ETH_BALANCE_AFTER_SWAP; // 4 or 7
@@ -149,6 +171,7 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
     swapExchangeIndex: number,
     exchangeParamIndex: number,
     maybeWethCallData?: DepositWithdrawReturn,
+    maybeWethCallDataForNeedUnwrapWeth?: DepositWithdrawReturn,
   ): { dexFlag: Flag; approveFlag: Flag } {
     const route = priceRoute.bestRoute[routeIndex];
     const swap = route.swaps[swapIndex];
@@ -169,6 +192,7 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
     const {
       dexFuncHasRecipient,
       needWrapNative,
+      needUnwrapWeth,
       specialDexFlag,
       specialDexSupportsInsertFromAmount,
       swappedAmountNotPresentInExchangeData,
@@ -179,9 +203,20 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
 
     const isEthSrc = isETHAddress(srcToken);
     const isEthDest = isETHAddress(destToken);
-    const isWethDest =
-      (wethAddress && destToken.toLowerCase() === wethAddress.toLowerCase()) ||
-      this.dexHelper.config.isWETH(destToken);
+    const wethAddr =
+      this.dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase();
+    const isWethSrc = srcToken.toLowerCase() === wethAddr;
+    const isWethDest = destToken.toLowerCase() === wethAddr;
+
+    const needUnwrapForWethSrc =
+      needUnwrapWeth &&
+      isWethSrc &&
+      maybeWethCallDataForNeedUnwrapWeth?.withdraw;
+
+    const needWrapForWethDest =
+      needUnwrapWeth &&
+      isWethDest &&
+      maybeWethCallDataForNeedUnwrapWeth?.deposit;
 
     const isSpecialDex =
       specialDexFlag !== undefined && specialDexFlag !== SpecialDex.DEFAULT;
@@ -195,13 +230,16 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
         isHorizontalSequence &&
         !applyVerticalBranching &&
         !isLastSwap) ||
-      !dexFuncHasRecipient;
+      !dexFuncHasRecipient ||
+      (isWethDest && needWrapForWethDest);
 
     const needUnwrap =
       needWrapNative && isEthDest && maybeWethCallData?.withdraw;
 
-    const needSendEth = isEthSrc && !needWrapNative;
-    const needCheckEthBalance = isEthDest && !needWrapNative;
+    const needSendEth =
+      (isEthSrc && !needWrapNative) || (isWethSrc && needUnwrapForWethSrc);
+    const needCheckEthBalance =
+      (isEthDest && !needWrapNative) || (isWethDest && needWrapForWethDest);
 
     const needCheckSrcTokenBalanceOf =
       (needUnwrap && !applyVerticalBranching) ||
@@ -529,6 +567,7 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
     allowToAddWrap = true,
     prevBranchWasWrapped = false,
     maybeWethCallData?: DepositWithdrawReturn,
+    maybeWethCallDataForNeedUnwrapWeth?: DepositWithdrawReturn,
     addMultiSwapMetadata?: boolean,
     applyVerticalBranching?: boolean,
   ): string {
@@ -542,6 +581,11 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
     let exchangeParamIndex = 0;
     let tempExchangeParamIndex = 0;
 
+    const wethAddr =
+      this.dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase();
+    const isWethSrc = swap.srcToken.toLowerCase() === wethAddr;
+    const isWethDest = swap.destToken.toLowerCase() === wethAddr;
+
     priceRoute.bestRoute.map(route =>
       route.swaps.map(curSwap => {
         curSwap.swapExchanges.map(async se => {
@@ -613,6 +657,42 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
       swapExchangeCallData = hexConcat([approveCallData, swapExchangeCallData]);
     }
 
+    if (curExchangeParam.needUnwrapWeth) {
+      if (isWethSrc && maybeWethCallDataForNeedUnwrapWeth?.withdraw) {
+        const withdrawCallData = this.buildUnwrapEthCallData(
+          this.getWETHAddress(curExchangeParam),
+          maybeWethCallDataForNeedUnwrapWeth.withdraw.calldata,
+        );
+
+        swapExchangeCallData = hexConcat([
+          withdrawCallData,
+          swapExchangeCallData,
+        ]);
+      }
+
+      if (isWethDest && maybeWethCallDataForNeedUnwrapWeth?.deposit) {
+        const depositCallData = this.buildWrapEthCallData(
+          this.getWETHAddress(curExchangeParam),
+          maybeWethCallDataForNeedUnwrapWeth.deposit.calldata,
+          Flag.SEND_ETH_EQUAL_TO_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP,
+        );
+
+        const transferCallData = this.buildTransferCallData(
+          this.erc20Interface.encodeFunctionData('transfer', [
+            this.dexHelper.config.data.augustusV6Address,
+            priceRoute.destAmount,
+          ]),
+          priceRoute.destToken,
+        );
+
+        swapExchangeCallData = hexConcat([
+          swapExchangeCallData,
+          depositCallData,
+          transferCallData,
+        ]);
+      }
+    }
+
     if (curExchangeParam.needWrapNative) {
       if (isETHAddress(swap.srcToken)) {
         let approveWethCalldata = '0x';
@@ -1046,6 +1126,7 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
       swapIndex,
       flags,
       maybeWethCallData,
+      maybeWethCallDataForNeedUnwrapWeth,
       wrapToSwapMap,
       wrapToSwapExchangeMap,
       swap,
@@ -1088,6 +1169,7 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
             !wrapToSwapMap[swapIndex - 1],
             wrapToSwapMap[swapIndex - 1],
             maybeWethCallData,
+            maybeWethCallDataForNeedUnwrapWeth,
             swap.swapExchanges.length > 1,
             applyVerticalBranching,
           ),
@@ -1144,6 +1226,7 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
     flags: { approves: Flag[]; dexes: Flag[]; wrap: Flag },
     sender: string,
     maybeWethCallData?: DepositWithdrawReturn,
+    maybeWethCallDataForNeedUnwrapWeth?: DepositWithdrawReturn,
   ): string {
     const isMegaSwap = priceRoute.bestRoute.length > 1;
 
@@ -1165,6 +1248,7 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
             wrapToSwapExchangeMap: appendedWrapToSwapExchangeMap,
             wrapToSwapMap: addedWrapToSwapMap,
             maybeWethCallData,
+            maybeWethCallDataForNeedUnwrapWeth,
             swap,
             index: 0,
           }),
@@ -1204,7 +1288,7 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
       return false;
     }
 
-    const res = priceRoute.bestRoute.every((route, routeIndex) => {
+    const res = priceRoute.bestRoute.every(route => {
       const firstSwap = route.swaps[0];
       const eachDexOnSwapNeedsWrapNative = this.eachDexOnSwapNeedsWrapNative(
         priceRoute,
@@ -1249,6 +1333,7 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
     exchangeParams: DexExchangeBuildParam[],
     sender: string,
     maybeWethCallData?: DepositWithdrawReturn,
+    maybeWethCallDataForNeedUnwrapWeth?: DepositWithdrawReturn,
   ): string {
     const isMegaSwap = priceRoute.bestRoute.length > 1;
     const isMultiSwap = !isMegaSwap && priceRoute.bestRoute[0].swaps.length > 1;
@@ -1271,6 +1356,7 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
       priceRoute,
       exchangeParams,
       maybeWethCallData,
+      maybeWethCallDataForNeedUnwrapWeth,
     );
 
     let swapsCalldata = priceRoute.bestRoute.reduce<string>(
@@ -1285,6 +1371,7 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder<
             flags,
             sender,
             maybeWethCallData,
+            maybeWethCallDataForNeedUnwrapWeth,
           ),
         ]),
       '0x',

package/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 },
@@ -59,6 +58,7 @@ export class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder<
     swapExchangeIndex: number,
     exchangeParamIndex: number,
     maybeWethCallData?: DepositWithdrawReturn,
+    maybeWethCallDataForNeedUnwrapWeth?: DepositWithdrawReturn,
   ): { dexFlag: Flag; approveFlag: Flag } {
     const { srcToken, destToken } = priceRoute.bestRoute[0].swaps[0];
     const isEthSrc = isETHAddress(srcToken);
@@ -68,8 +68,8 @@ export class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder<
     const swap = priceRoute.bestRoute[0].swaps[0];
 
     const {
-      dexFuncHasRecipient,
       needWrapNative,
+      needUnwrapWeth,
       swappedAmountNotPresentInExchangeData,
       specialDexFlag,
       specialDexSupportsInsertFromAmount,
@@ -77,6 +77,11 @@ export class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder<
     const isSpecialDex =
       specialDexFlag !== undefined && specialDexFlag !== SpecialDex.DEFAULT;
 
+    const wethAddr =
+      this.dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase();
+    const isWethSrc = srcToken.toLowerCase() === wethAddr;
+    const isWethDest = destToken.toLowerCase() === wethAddr;
+
     const forcePreventInsertFromAmount =
       swappedAmountNotPresentInExchangeData ||
       (isSpecialDex && !specialDexSupportsInsertFromAmount);
@@ -85,6 +90,16 @@ export class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder<
     const needUnwrap =
       needWrapNative && isEthDest && maybeWethCallData?.withdraw;
 
+    const needUnwrapForWethSrc =
+      needUnwrapWeth &&
+      isWethSrc &&
+      maybeWethCallDataForNeedUnwrapWeth?.withdraw;
+
+    const needWrapForWethDest =
+      needUnwrapWeth &&
+      isWethDest &&
+      maybeWethCallDataForNeedUnwrapWeth?.deposit;
+
     let dexFlag = forcePreventInsertFromAmount
       ? Flag.DONT_INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP
       : Flag.INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP; // 0 or 3
@@ -95,7 +110,12 @@ export class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder<
     if (isEthSrc && !needWrap) {
       dexFlag =
         Flag.SEND_ETH_EQUAL_TO_FROM_AMOUNT_CHECK_SRC_TOKEN_BALANCE_AFTER_SWAP; // 5
-    } else if (isEthDest && !needUnwrap) {
+    } else if (isWethSrc && needUnwrapForWethSrc) {
+      dexFlag = Flag.SEND_ETH_EQUAL_TO_FROM_AMOUNT_CHECK_ETH_BALANCE_AFTER_SWAP; // 13
+    } else if (
+      (isEthDest && !needUnwrap) ||
+      (isWethDest && needWrapForWethDest)
+    ) {
       dexFlag = forcePreventInsertFromAmount
         ? Flag.DONT_INSERT_FROM_AMOUNT_CHECK_ETH_BALANCE_AFTER_SWAP // 4
         : Flag.INSERT_FROM_AMOUNT_CHECK_ETH_BALANCE_AFTER_SWAP; // 7
@@ -103,7 +123,6 @@ export class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder<
       dexFlag = forcePreventInsertFromAmount
         ? Flag.DONT_INSERT_FROM_AMOUNT_CHECK_SRC_TOKEN_BALANCE_AFTER_SWAP // 8
         : Flag.INSERT_FROM_AMOUNT_CHECK_SRC_TOKEN_BALANCE_AFTER_SWAP; // 11
-      // dexFlag = Flag.ZERO;
     } else if (
       !isETHAddress(swap.destToken) &&
       exchangeParams.some(param => !param.dexFuncHasRecipient)
@@ -143,6 +162,7 @@ export class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder<
       index,
       flags,
       maybeWethCallData,
+      maybeWethCallDataForNeedUnwrapWeth,
       swap,
     } = params;
     if (!swap) throw new Error('Swap is not provided for single swap calldata');
@@ -212,8 +232,32 @@ export class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder<
       ]);
     }
 
-    // after the last path
+    if (
+      maybeWethCallDataForNeedUnwrapWeth?.withdraw &&
+      swap.srcToken.toLowerCase() ===
+        this.dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase() &&
+      curExchangeParam.needUnwrapWeth
+    ) {
+      const withdrawCallData = this.buildUnwrapEthCallData(
+        this.getWETHAddress(curExchangeParam),
+        maybeWethCallDataForNeedUnwrapWeth.withdraw.calldata,
+      );
+
+      swapCallData = hexConcat([withdrawCallData, swapCallData]);
+
+      if (maybeWethCallDataForNeedUnwrapWeth.deposit) {
+        const depositCallData = this.buildWrapEthCallData(
+          this.getWETHAddress(curExchangeParam),
+          maybeWethCallDataForNeedUnwrapWeth.deposit?.calldata,
+          Flag.SEND_ETH_EQUAL_TO_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP, // 9
+        );
+
+        swapCallData = hexConcat([swapCallData, depositCallData]);
+      }
+    }
+
     if (index === exchangeParams.length - 1) {
+      // after the last path
       // if some of dexes doesn't have recipient add one transfer in the end
       if (
         exchangeParams.some(param => !param.dexFuncHasRecipient) &&
@@ -240,6 +284,43 @@ export class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder<
         swapCallData = hexConcat([swapCallData, withdrawCallData]);
       }
 
+      if (
+        maybeWethCallDataForNeedUnwrapWeth?.deposit &&
+        swap.destToken.toLowerCase() ===
+          this.dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase()
+      ) {
+        let approveWethCalldata = '0x';
+        if (curExchangeParam.approveData) {
+          approveWethCalldata = this.buildApproveCallData(
+            curExchangeParam.approveData.target,
+            curExchangeParam.approveData.token,
+            flags.approves[index],
+          );
+        }
+
+        const depositCallData = this.buildWrapEthCallData(
+          this.getWETHAddress(curExchangeParam),
+          maybeWethCallDataForNeedUnwrapWeth.deposit.calldata,
+          Flag.SEND_ETH_EQUAL_TO_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP, // 9
+        );
+
+        const transferCallData = this.buildTransferCallData(
+          this.erc20Interface.encodeFunctionData('transfer', [
+            this.dexHelper.config.data.augustusV6Address,
+            // insert 0 because it's still gonna be replaced with balance check result
+            '0',
+          ]),
+          swap.destToken,
+        );
+
+        swapCallData = hexConcat([
+          swapCallData,
+          approveWethCalldata,
+          depositCallData,
+          transferCallData,
+        ]);
+      }
+
       // send ETH to augustus
       if (
         isETHAddress(swap.destToken) &&
@@ -362,6 +443,7 @@ export class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder<
     exchangeParams: DexExchangeBuildParam[],
     sender: string,
     maybeWethCallData?: DepositWithdrawReturn,
+    maybeWethCallDataForNeedUnwrapWeth?: DepositWithdrawReturn,
   ): string {
     const swap = priceRoute.bestRoute[0].swaps[0];
 
@@ -384,6 +466,7 @@ export class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder<
       priceRoute,
       orderedExchangeParams.map(e => e.exchangeParam),
       maybeWethCallData,
+      maybeWethCallDataForNeedUnwrapWeth,
     );
 
     let swapsCalldata = orderedExchangeParams.reduce<string>(
@@ -397,6 +480,7 @@ export class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder<
             flags,
             sender,
             maybeWethCallData,
+            maybeWethCallDataForNeedUnwrapWeth,
             swap: swapWithOrderedExchanges,
           }),
         ]),

package/src/executor/ExecutorBytecodeBuilder.ts

@@ -38,6 +38,7 @@ export type SingleSwapCallDataParams<T> = {
   flags: { approves: Flag[]; dexes: Flag[]; wrap: Flag };
   sender: string;
   maybeWethCallData?: DepositWithdrawReturn;
+  maybeWethCallDataForNeedUnwrapWeth?: DepositWithdrawReturn;
 } & T;
 
 export type DexCallDataParams<T> = {
@@ -67,6 +68,7 @@ export abstract class ExecutorBytecodeBuilder<S = {}, D = {}> {
     swapExchangeIndex: number,
     exchangeParamIndex: number,
     maybeWethCallData?: DepositWithdrawReturn,
+    maybeWethCallDataForNeedUnwrapWeth?: DepositWithdrawReturn,
   ): {
     dexFlag: Flag;
     approveFlag: Flag;
@@ -86,6 +88,7 @@ export abstract class ExecutorBytecodeBuilder<S = {}, D = {}> {
     swapExchangeIndex: number,
     exchangeParamIndex: number,
     maybeWethCallData?: DepositWithdrawReturn,
+    maybeWethCallDataForNeedUnwrapWeth?: DepositWithdrawReturn,
   ): {
     dexFlag: Flag;
     approveFlag: Flag;
@@ -102,6 +105,7 @@ export abstract class ExecutorBytecodeBuilder<S = {}, D = {}> {
     exchangeParams: DexExchangeBuildParam[],
     sender: string,
     maybeWethCallData?: DepositWithdrawReturn,
+    maybeWethCallDataForNeedUnwrapWeth?: DepositWithdrawReturn,
   ): string;
 
   public abstract getAddress(): string;
@@ -297,6 +301,7 @@ export abstract class ExecutorBytecodeBuilder<S = {}, D = {}> {
     priceRoute: OptimalRate,
     exchangeParams: DexExchangeBuildParam[],
     maybeWethCallData?: DepositWithdrawReturn,
+    maybeWethCallDataForNeedUnwrapWeth?: DepositWithdrawReturn,
   ): { approves: Flag[]; dexes: Flag[]; wrap: Flag } {
     const isMegaSwap = priceRoute.bestRoute.length > 1;
     const isMultiSwap = !isMegaSwap && priceRoute.bestRoute[0].swaps.length > 1;
@@ -323,6 +328,7 @@ export abstract class ExecutorBytecodeBuilder<S = {}, D = {}> {
             swapExchangeIndex,
             exchangeParamIndex,
             maybeWethCallData,
+            maybeWethCallDataForNeedUnwrapWeth,
           );
 
           flags.dexes.push(dexFlag);