@paraswap/dex-lib 3.0.2 → 3.0.3-balancer-direct-fn-fix.0

package/src/config.ts

@@ -47,15 +47,15 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     wrappedNativeTokenAddress: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
     hasEIP1559: true,
     augustusAddress: '0xE4e284Eb7a312d95A7949fCA8C634164358f4492',
-    augustusV6Address: '0x6d9D0F49A229d5431ffAB4631631b81712ae4E88',
+    augustusV6Address: '0x00000000FdAC7708D0D360BDDc1bc7d097F47439',
     augustusRFQAddress: '0xe92b586627ccA7a83dC919cc7127196d70f55a06',
     tokenTransferProxyAddress: '0x216b4b4ba9f3e719726886d34a177484278bfcae',
     multicallV2Address: '0x5BA1e12693Dc8F9c48aAD8770482f4739bEeD696',
     privateHttpProvider: process.env.HTTP_PROVIDER_1,
     executorsAddresses: {
-      Executor01: '0xD7758272aC1Fc6a22ea60373D77E4776E11B2295',
-      Executor02: '0x669dF6428bdaFc803667cB32cFF1f1600edc76c5',
-      Executor03: '0xAd344037918220d2fEb02487bDa63b5d9933452A',
+      Executor01: '0x000000006E85dF93Da91e65184708f020e58df2c',
+      Executor02: '0x000000C0ef6dBff0E689d393EDBb93702eEEf0d8',
+      Executor03: '0x000000856CFe8D0625D96BD87712A074d90a9F5b',
     },
     adapterAddresses: {
       Adapter01: '0x9bE264469eF954c139Da4A45Cf76CbCC5e3A6A73',
@@ -167,15 +167,15 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     wrappedNativeTokenAddress: '0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c',
     hasEIP1559: false,
     augustusAddress: '0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57',
-    augustusV6Address: '0xF0af4fB8128e762b3D4395A067d8E8b7F7675f43',
+    augustusV6Address: '0x00000000FdAC7708D0D360BDDc1bc7d097F47439',
     augustusRFQAddress: '0x8DcDfe88EF0351f27437284D0710cD65b20288bb',
     tokenTransferProxyAddress: '0x216b4b4ba9f3e719726886d34a177484278bfcae',
     multicallV2Address: '0xC50F4c1E81c873B2204D7eFf7069Ffec6Fbe136D',
     privateHttpProvider: process.env.HTTP_PROVIDER_56,
     executorsAddresses: {
-      Executor01: '0xFaFaa66A6Bdb9E6a918af945F453F52bc4D46dD0',
-      Executor02: '0xCE93fA014718fb6e7DC70a15d6810bBCc6C45bB9',
-      Executor03: '0x7d5B7A82f0047E83064332A88918d7067c00AA14',
+      Executor01: '0x000000006E85dF93Da91e65184708f020e58df2c',
+      Executor02: '0x000000C0ef6dBff0E689d393EDBb93702eEEf0d8',
+      Executor03: '0x000000856CFe8D0625D96BD87712A074d90a9F5b',
     },
     hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
     smardexSubgraphAuthToken: process.env.API_KEY_SMARDEX_SUBGRAPH || '',
@@ -202,15 +202,15 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     wrappedNativeTokenAddress: '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270',
     hasEIP1559: true,
     augustusAddress: '0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57',
-    augustusV6Address: '0x37C950F12BAD772e3099c80FE6892227BaD2d744',
+    augustusV6Address: '0x00000000FdAC7708D0D360BDDc1bc7d097F47439',
     augustusRFQAddress: '0xF3CD476C3C4D3Ac5cA2724767f269070CA09A043',
     tokenTransferProxyAddress: '0x216b4b4ba9f3e719726886d34a177484278bfcae',
     multicallV2Address: '0x275617327c958bD06b5D6b871E7f491D76113dd8',
     privateHttpProvider: process.env.HTTP_PROVIDER_137,
     executorsAddresses: {
-      Executor01: '0xF0af4fB8128e762b3D4395A067d8E8b7F7675f43',
-      Executor02: '0x44f1DEE0489704C1144faC201E5E8724fcEe54fF',
-      Executor03: '0x4f22F574A13b8ddea63441477322F268ec10b260',
+      Executor01: '0x000000006E85dF93Da91e65184708f020e58df2c',
+      Executor02: '0x000000C0ef6dBff0E689d393EDBb93702eEEf0d8',
+      Executor03: '0x000000856CFe8D0625D96BD87712A074d90a9F5b',
     },
     hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
     smardexSubgraphAuthToken: process.env.API_KEY_SMARDEX_SUBGRAPH || '',
@@ -239,7 +239,7 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     wrappedNativeTokenAddress: '0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7',
     hasEIP1559: true,
     augustusAddress: '0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57',
-    augustusV6Address: '0x198B0641335D247Fd912C8C0911357b3C809dda4',
+    augustusV6Address: '0x00000000FdAC7708D0D360BDDc1bc7d097F47439',
     augustusRFQAddress: '0x34302c4267d0dA0A8c65510282Cc22E9e39df51f',
     tokenTransferProxyAddress: '0x216b4b4ba9f3e719726886d34a177484278bfcae',
     multicallV2Address: '0xd7Fc8aD069f95B6e2835f4DEff03eF84241cF0E1',
@@ -250,9 +250,9 @@ const baseConfigs: { [network: number]: BaseConfig } = {
       process.env[`HASHFLOW_DISABLED_MMS_43114`]?.split(',') || [],
     dexalotAuthToken: process.env.API_KEY_DEXALOT_AUTH_TOKEN || '',
     executorsAddresses: {
-      Executor01: '0x7e4C0506b74EB8854bb71E5013731a71b1db89AA',
-      Executor02: '0xe7b7FdfbD7dee9cA3c282d8585FCe194afBddbd4',
-      Executor03: '0x3545deBA19352487A2DCdad38b6F274be905b675',
+      Executor01: '0x000000006E85dF93Da91e65184708f020e58df2c',
+      Executor02: '0x000000C0ef6dBff0E689d393EDBb93702eEEf0d8',
+      Executor03: '0x000000856CFe8D0625D96BD87712A074d90a9F5b',
     },
     adapterAddresses: {
       AvalancheAdapter01: '0x745Ec73855CeC7249E5fF4c9DD81cc65b4D297a9',
@@ -275,7 +275,7 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     wrappedNativeTokenAddress: '0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83',
     hasEIP1559: false,
     augustusAddress: '0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57',
-    augustusV6Address: '0x6d9D0F49A229d5431ffAB4631631b81712ae4E88',
+    augustusV6Address: '0x00000000FdAC7708D0D360BDDc1bc7d097F47439',
     augustusRFQAddress: '0x2DF17455B96Dde3618FD6B1C3a9AA06D6aB89347',
     tokenTransferProxyAddress: '0x216b4b4ba9f3e719726886d34a177484278bfcae',
     multicallV2Address: '0xdC6E2b14260F972ad4e5a31c68294Fba7E720701',
@@ -285,9 +285,9 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     hashFlowDisabledMMs:
       process.env[`HASHFLOW_DISABLED_MMS_250`]?.split(',') || [],
     executorsAddresses: {
-      Executor01: '0xD7758272aC1Fc6a22ea60373D77E4776E11B2295',
-      Executor02: '0x669dF6428bdaFc803667cB32cFF1f1600edc76c5',
-      Executor03: '0xAd344037918220d2fEb02487bDa63b5d9933452A',
+      Executor01: '0x000000006E85dF93Da91e65184708f020e58df2c',
+      Executor02: '0x000000C0ef6dBff0E689d393EDBb93702eEEf0d8',
+      Executor03: '0x000000856CFe8D0625D96BD87712A074d90a9F5b',
     },
     adapterAddresses: {
       FantomAdapter01: '0x654dE10890f8B2C5bF54E50Af169a7E93165C416',
@@ -309,7 +309,7 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     wrappedNativeTokenAddress: '0x82aF49447D8a07e3bd95BD0d56f35241523fBab1',
     hasEIP1559: false,
     augustusAddress: '0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57',
-    augustusV6Address: '0x9ecA9E8529da35B456d6EcF01626f22d65B54859',
+    augustusV6Address: '0x00000000FdAC7708D0D360BDDc1bc7d097F47439',
     augustusRFQAddress: '0x0927FD43a7a87E3E8b81Df2c44B03C4756849F6D',
     tokenTransferProxyAddress: '0x216b4b4ba9f3e719726886d34a177484278bfcae',
     multicallV2Address: '0x7eCfBaa8742fDf5756DAC92fbc8b90a19b8815bF',
@@ -320,9 +320,9 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     hashFlowDisabledMMs:
       process.env[`HASHFLOW_DISABLED_MMS_42161`]?.split(',') || [],
     executorsAddresses: {
-      Executor01: '0x91754b995F44DccA0B4A547FD87f5F3662552b43',
-      Executor02: '0x4Ba92797D3fC29d227E7efC139d0579eD02D75D3',
-      Executor03: '0x22B10A9E6c33B3d6A965Da062C46250b9bAcf73E',
+      Executor01: '0x000000006E85dF93Da91e65184708f020e58df2c',
+      Executor02: '0x000000C0ef6dBff0E689d393EDBb93702eEEf0d8',
+      Executor03: '0x000000856CFe8D0625D96BD87712A074d90a9F5b',
     },
     adapterAddresses: {
       ArbitrumAdapter01: '0x369A2FDb910d432f0a07381a5E3d27572c876713',
@@ -346,15 +346,15 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     wrappedNativeTokenAddress: '0x4200000000000000000000000000000000000006',
     hasEIP1559: false,
     augustusAddress: '0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57',
-    augustusV6Address: '0x4Ba92797D3fC29d227E7efC139d0579eD02D75D3',
+    augustusV6Address: '0x00000000FdAC7708D0D360BDDc1bc7d097F47439',
     augustusRFQAddress: '0x0927FD43a7a87E3E8b81Df2c44B03C4756849F6D',
     tokenTransferProxyAddress: '0x216b4b4ba9f3e719726886d34a177484278bfcae',
     multicallV2Address: '0x2DC0E2aa608532Da689e89e237dF582B783E552C',
     privateHttpProvider: process.env.HTTP_PROVIDER_10,
     executorsAddresses: {
-      Executor01: '0x92c4b4539eCc74e48Deb4A299Ab95C27fAd717B1',
-      Executor02: '0x22c973dFF9a96d1A258Dc83C300D2336ff2b5b1b',
-      Executor03: '0xF0af4fB8128e762b3D4395A067d8E8b7F7675f43',
+      Executor01: '0x000000006E85dF93Da91e65184708f020e58df2c',
+      Executor02: '0x000000C0ef6dBff0E689d393EDBb93702eEEf0d8',
+      Executor03: '0x000000856CFe8D0625D96BD87712A074d90a9F5b',
     },
     hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
     smardexSubgraphAuthToken: process.env.API_KEY_SMARDEX_SUBGRAPH || '',
@@ -381,10 +381,16 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     wrappedNativeTokenAddress: '0x4F9A0e7FD2Bf6067db6994CF12E4495Df938E6e9',
     hasEIP1559: true,
     augustusAddress: '0xB83B554730d29cE4Cb55BB42206c3E2c03E4A40A',
+    augustusV6Address: '0x00000000FdAC7708D0D360BDDc1bc7d097F47439',
     augustusRFQAddress: '0x7Ee1F7fa4C0b2eDB0Fdd5944c14A07167700486E',
     tokenTransferProxyAddress: '0xc8a21fcd5a100c3ecc037c97e2f9c53a8d3a02a1',
     multicallV2Address: '0x6cA478C852DfA8941FC819fDf248606eA04780B6',
     privateHttpProvider: process.env.HTTP_PROVIDER_1101,
+    executorsAddresses: {
+      Executor01: '0x000000006E85dF93Da91e65184708f020e58df2c',
+      Executor02: '0x000000C0ef6dBff0E689d393EDBb93702eEEf0d8',
+      Executor03: '0x000000856CFe8D0625D96BD87712A074d90a9F5b',
+    },
     adapterAddresses: {
       PolygonZkEvmAdapter01: '0xd63B7691dD98fa89A2ea5e1604700489c585aa7B',
       PolygonZkEvmBuyAdapter: '0xe2137168CdA486a2555E16c597905854C84F9127',
@@ -411,7 +417,7 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     wrappedNativeTokenAddress: '0x4200000000000000000000000000000000000006',
     hasEIP1559: false,
     augustusAddress: '0x59C7C832e96D2568bea6db468C1aAdcbbDa08A52',
-    augustusV6Address: '0x1B29ada231989c0BdEF578dcC2116D9F183AAF06',
+    augustusV6Address: '0x00000000FdAC7708D0D360BDDc1bc7d097F47439',
     augustusRFQAddress: '0xa003dFBA51C9e1e56C67ae445b852bdEd7aC5EEd',
     tokenTransferProxyAddress: '0x93aAAe79a53759cD164340E4C8766E4Db5331cD7',
     multicallV2Address: '0xeDF6D2a16e8081F777eB623EeB4411466556aF3d',
@@ -420,9 +426,9 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     smardexSubgraphAuthToken: process.env.API_KEY_SMARDEX_SUBGRAPH || '',
     hashFlowDisabledMMs: [],
     executorsAddresses: {
-      Executor01: '0x1e5f415140252f09A0aa6d24a7aB257c6EB22487',
-      Executor02: '0xa89E2eD6f043cB0Cea9221f532BCdc9A41580c78',
-      Executor03: '0xc2465233ae9fa2F8D68a435901129CFd23a06441',
+      Executor01: '0x000000006E85dF93Da91e65184708f020e58df2c',
+      Executor02: '0x000000C0ef6dBff0E689d393EDBb93702eEEf0d8',
+      Executor03: '0x000000856CFe8D0625D96BD87712A074d90a9F5b',
     },
     adapterAddresses: {
       BaseAdapter01: '0xA10c9a84E72d9DfF424Fe2284B6460784bed407E',

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

@@ -1010,6 +1010,8 @@ export class BalancerV2
       destAmount,
       data,
       side,
+      this.dexHelper.config.data.augustusAddress!,
+      this.dexHelper.config.data.augustusAddress!,
     );
 
     const payload = this.abiCoder.encodeParameter(
@@ -1049,6 +1051,24 @@ export class BalancerV2
     };
   }
 
+  /*
+      Algorithm to determine balancer (sender, recipient) params:
+
+      if version = 5
+          sender = recipient = augustusV5
+      else (so V6)
+        if direct swap
+            sender = recipient = augustusV6
+        else (so generic swaps)
+          if sell
+            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 
+                  sender = recipient = executor
+              # note: we pass sender=null then the address of the executor is inferred contract side
+          else (so buy)
+              sender = recipient = executor
+*/
   public getBalancerParam(
     srcToken: string,
     destToken: string,
@@ -1056,6 +1076,9 @@ export class BalancerV2
     destAmount: string,
     data: OptimizedBalancerV2Data,
     side: SwapSide,
+    recipient: string,
+    sender: string,
+    shouldApplyHardLimits?: boolean,
   ): BalancerParam {
     let swapOffset = 0;
     let swaps: BalancerSwap[] = [];
@@ -1114,117 +1137,19 @@ export class BalancerV2
       limits = limits.concat(_limits);
     }
 
-    const funds = {
-      sender: this.augustusAddress,
-      recipient: this.augustusAddress,
-      fromInternalBalance: false,
-      toInternalBalance: false,
-    };
-
-    const params: BalancerParam = [
-      side === SwapSide.SELL ? SwapTypes.SwapExactIn : SwapTypes.SwapExactOut,
-      side === SwapSide.SELL ? swaps : swaps.reverse(),
-      assets,
-      funds,
-      limits,
-      MAX_UINT,
-    ];
-
-    return params;
-  }
-
-  public getBalancerParamV6(
-    srcToken: Address,
-    destToken: Address,
-    srcAmount: string,
-    destAmount: string,
-    data: OptimizedBalancerV2Data,
-    side: SwapSide,
-    recipient: Address,
-    sender: Address,
-    isDirect?: boolean,
-  ): BalancerParam {
-    let swapOffset = 0;
-    let swaps: BalancerSwap[] = [];
-    let assets: string[] = [];
-    let limits: string[] = [];
-
-    const isDirectSwap = !!isDirect;
+    if (shouldApplyHardLimits) {
+      // re-accumulate amount to prevent leaving dust in payer contract
+      const accumulatedAmount = swaps
+        .reduce((acc, s) => acc + BigInt(s.amount), 0n)
+        .toString();
 
-    for (const swapData of data.swaps) {
-      const pool = this.poolIdMap[swapData.poolId];
-      const hasEth = [srcToken.toLowerCase(), destToken.toLowerCase()].includes(
-        ETHER_ADDRESS.toLowerCase(),
-      );
-      const _srcToken = this.dexHelper.config.wrapETH({
-        address: srcToken,
-        decimals: 18,
-      }).address;
-      const _destToken = this.dexHelper.config.wrapETH({
-        address: destToken,
-        decimals: 18,
-      }).address;
-
-      let path = poolGetPathForTokenInOut(
-        _srcToken,
-        _destToken,
-        pool,
-        this.poolAddressMap,
-        side,
-      );
-
-      if (side === SwapSide.BUY) {
-        path = path.reverse();
-      }
-
-      let _swaps = path.map((hop, index) => ({
-        poolId: hop.pool.id,
-        assetInIndex: swapOffset + index,
-        assetOutIndex: swapOffset + index + 1,
-        amount:
-          (side === SwapSide.SELL && index === 0) ||
-          (side === SwapSide.BUY && index === path.length - 1)
-            ? swapData.amount
-            : '0',
-        userData: '0x',
-      }));
-
-      swapOffset += path.length + 1;
-
-      // BalancerV2 Uses Address(0) as ETH
-      let _assets = [_srcToken, ...path.map(hop => hop.tokenOut.address)].map(
-        t => (hasEth && this.dexHelper.config.isWETH(t) ? NULL_ADDRESS : t),
-      );
-
-      if (isDirectSwap && side === SwapSide.BUY) {
-        _assets = _assets.reverse();
-        _swaps = _swaps.map(swap => ({
-          ...swap,
-          assetInIndex: _assets.length - swap.assetInIndex - 1,
-          assetOutIndex: _assets.length - swap.assetOutIndex - 1,
-        }));
-      }
-
-      let _limits: string[];
-      if (isDirectSwap) {
-        _limits = this.createSwapArray(
-          _assets.length,
-          side === SwapSide.SELL ? 0 : 1,
-          srcAmount,
-          destAmount,
-        );
-      } else {
-        _limits = _assets.map(_ => MAX_INT);
-      }
-
-      swaps = swaps.concat(_swaps);
-      assets = assets.concat(_assets);
-      limits = limits.concat(_limits);
+      [limits[0], limits[limits.length - 1]] =
+        side == SwapSide.SELL
+          ? [accumulatedAmount, (-BigInt(destAmount)).toString()]
+          : [(-BigInt(srcAmount)).toString(), accumulatedAmount];
     }
 
     const funds = {
-      // for Direct: Both sender and recipient is AugustusV6
-      // for Generic, `sender`: BUY -> pass Executor3, for SELL -> pass NULL_ADDRESS (it's gonna be determined in the contract)
       sender,
       recipient,
       fromInternalBalance: false,
@@ -1237,29 +1162,12 @@ export class BalancerV2
       assets,
       funds,
       limits,
-      MAX_UINT,
+      getLocalDeadlineAsFriendlyPlaceholder(),
     ];
 
     return params;
   }
 
-  private createSwapArray(
-    lengthOfAssets: number,
-    swapKind: 0 | 1,
-    fromAmount: string,
-    toAmount: string,
-  ): string[] {
-    let swapArray = new Array(lengthOfAssets).fill('0');
-
-    // Assign values based on swapKind
-    swapArray[0] =
-      swapKind === 0 ? fromAmount : BigNumber.from(toAmount).mul(-1).toString();
-    swapArray[lengthOfAssets - 1] =
-      swapKind === 0 ? BigNumber.from(toAmount).mul(-1).toString() : fromAmount;
-
-    return swapArray;
-  }
-
   static getDirectFunctionName(): string[] {
     return [DirectMethods.directSell, DirectMethods.directBuy];
   }
@@ -1354,6 +1262,8 @@ export class BalancerV2
       destAmount,
       data,
       side,
+      this.dexHelper.config.data.augustusAddress!,
+      this.dexHelper.config.data.augustusAddress!,
     );
 
     const swapParams: BalancerV2DirectParam = [
@@ -1416,7 +1326,7 @@ export class BalancerV2
       hexZeroPad(hexlify(blockNumber), 16),
     ]);
 
-    const balancerParams = this.getBalancerParamV6(
+    const balancerParams = this.getBalancerParam(
       srcToken,
       destToken,
       fromAmount,
@@ -1496,6 +1406,8 @@ export class BalancerV2
       destAmount,
       data,
       side,
+      this.dexHelper.config.data.augustusAddress!,
+      this.dexHelper.config.data.augustusAddress!,
     );
 
     const swapData = this.eventPools.vaultInterface.encodeFunctionData(
@@ -1523,7 +1435,7 @@ export class BalancerV2
     side: SwapSide,
     context: Context,
   ): DexExchangeParam {
-    const params = this.getBalancerParamV6(
+    const params = this.getBalancerParam(
       srcToken,
       destToken,
       srcAmount,

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

@@ -94,6 +94,7 @@ export class CurveV2
   exchangeRouterInterface: Interface;
   genericFactoryZapIface: Interface;
   minConversionRate = '1';
+  // TODO: it's wrong, cause some pools can have eth and others can have weth
   needWrapNative = true;
   logger: Logger;
 

package/src/executor/Executor02BytecodeBuilder.ts

@@ -176,7 +176,7 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder {
     const needCheckEthBalance = isEthDest && !needWrapNative;
 
     const needCheckSrcTokenBalanceOf =
-      (needUnwrap && !applyVerticalBranching && !isLastSwap) ||
+      (needUnwrap && !applyVerticalBranching) ||
       (isHorizontalSequence && !applyVerticalBranching && !isLastSwap);
 
     let dexFlag: Flag;
@@ -719,7 +719,9 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder {
     if (
       !exchangeParams[exchangeParamIndex].dexFuncHasRecipient &&
       isETHAddress(swap.destToken) &&
-      isLast
+      isLast &&
+      // don't need to send eth without unwrapping, handling unwrap and sendEth in the end of root branch
+      !this.doesRouteNeedsRootUnwrapEth(priceRoute, exchangeParams)
     ) {
       const finalSpecialFlagCalldata = this.buildFinalSpecialFlagCalldata();
       swapExchangeCallData = hexConcat([
@@ -1166,15 +1168,15 @@ export class Executor02BytecodeBuilder extends ExecutorBytecodeBuilder {
       return false;
     }
 
-    const res = priceRoute.bestRoute.every((route, routeIndex) => {
+    const res = priceRoute.bestRoute.some((route, routeIndex) => {
       const lastSwap = route.swaps[route.swaps.length - 1];
-      const eachDexOnSwapNeedsWrapNative = this.anyDexOnSwapNeedsWrapNative(
+      const anyDexOnSwapNeedsWrapNative = this.anyDexOnSwapNeedsWrapNative(
         priceRoute,
         lastSwap,
         exchangeParams,
       );
 
-      return eachDexOnSwapNeedsWrapNative;
+      return anyDexOnSwapNeedsWrapNative;
     });
 
     return res;

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

@@ -1067,12 +1067,7 @@ describe('Executor02ByteCodeBuilder e2e tests', () => {
       });
 
       describe('lzUSDC -> FTM -> SPIRIT', () => {
-        const dexKeys = [
-          'Morphex',
-          'SpiritSwap',
-          'SpiritSwapV2',
-          'BeetsFi',
-        ];
+        const dexKeys = ['Morphex', 'SpiritSwap', 'SpiritSwapV2', 'BeetsFi'];
 
         const tokenASymbol: string = 'lzUSDC';
         const tokenBSymbol: string = 'SPIRIT';
@@ -1437,7 +1432,7 @@ describe('Executor02ByteCodeBuilder e2e tests', () => {
             false,
           );
         });
-      })
+      });
     });
   });
 

package/.vscode/launch.json

@@ -1,72 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Current",
-      "program": "${file}",
-      "preLaunchTask": "npm: build",
-      "sourceMaps": true,
-      "smartStep": true,
-      "internalConsoleOptions": "openOnSessionStart",
-      "outFiles": ["${workspaceFolder}/build/**/*.js"]
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Debug Jest Tests",
-      // "program": "${workspaceFolder}/node_modules/jest/bin/jest.js",
-      "program": "${workspaceFolder}/src/dex/camelot/scripts/validate-state.ts",
-      // "args": ["src/dex/balancer-v1/balancer-v1-e2e.test.ts"],
-      // "args": ["${relativeFile}"],
-      "args": ["${file}"],
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      // "disableOptimisticBPs": true,
-      "runtimeArgs": ["--nolazy"],
-      "sourceMaps": true,
-      "smartStep": true,
-      "skipFiles": ["<node_internals>/**"],
-      "cwd": "${workspaceFolder}"
-      // "protocol": "inspector"
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Debug Camelot",
-      "program": "${workspaceFolder}/node_modules/ts-node/dist/bin.js",
-      "args": [
-        "--project",
-        "tsconfig.json",
-        // "${workspaceFolder}/src/dex/camelot/scripts/validate-state.ts",
-        "${workspaceFolder}/src/dex/algebra/scripts/validate-state.ts",
-        // "${workspaceFolder}/src/dex/solidly-v3/scripts/check-event-pool-event.ts",
-        // "${workspaceFolder}/scripts/dex-integration.ts",
-        "test",
-        "wombat"
-      ],
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "runtimeArgs": ["--nolazy"],
-      "sourceMaps": true,
-      "smartStep": true,
-      "skipFiles": ["<node_internals>/**"],
-      "cwd": "${workspaceFolder}"
-    },
-    {
-      "type": "node",
-      "name": "Jest file",
-      "request": "launch",
-      "program": "${workspaceFolder}/node_modules/jest/bin/jest.js",
-      // "program": "${workspaceFolder}/src/dex/camelot/scripts/validate-state.ts",
-      // "args": ["src/dex/balancer-v1/balancer-v1-e2e.test.ts"],
-      // "args": ["${relativeFile}"],
-      "args": ["${file}"],
-      "cwd": "${workspaceRoot}",
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "sourceMaps": true
-    }
-  ]
-}

package/.vscode/settings.json

@@ -1,2 +0,0 @@
-{
-}

package/.vscode/tasks.json

@@ -1,15 +0,0 @@
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "tsc: build - tsconfig.json",
-      "type": "typescript",
-      "tsconfig": "tsconfig.json",
-      "problemMatcher": ["$tsc"],
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      }
-    }
-  ]
-}