@paraswap/dex-lib 3.0.0-fix-for-rc → 3.0.1

package/build/dex/stable-pool.js.map

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

package/build/dex/trader-joe-v2.1.js

@@ -77,26 +77,26 @@ class TraderJoeV21 extends simple_exchange_1.SimpleExchange {
         const swapFunction = side === constants_1.SwapSide.SELL
             ? TraderJoeV2RouterFunctions.swapExactTokensForTokens
             : TraderJoeV2RouterFunctions.swapTokensForExactTokens;
+        const placeholder = (0, simple_exchange_1.getLocalDeadlineAsFriendlyPlaceholder)();
         const swapFunctionParams = side === constants_1.SwapSide.SELL
             ? [
                 srcAmount,
                 destAmount,
                 [[data.binStep], ['2'], [srcToken, destToken]],
                 recipient,
-                (0, simple_exchange_1.getLocalDeadlineAsFriendlyPlaceholder)(),
+                placeholder,
             ]
             : [
                 destAmount,
                 srcAmount,
                 [[data.binStep], ['2'], [srcToken, destToken]],
                 recipient,
-                (0, simple_exchange_1.getLocalDeadlineAsFriendlyPlaceholder)(),
+                placeholder,
             ];
         const swapData = this.exchangeRouterInterface.encodeFunctionData(swapFunction, swapFunctionParams);
         return {
             needWrapNative: this.needWrapNative,
             dexFuncHasRecipient: true,
-            dexFuncHasDestToken: true,
             exchangeData: swapData,
             targetExchange: this.routerAddress,
         };

package/build/dex/trader-joe-v2.1.js.map

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

package/build/dex/uniswap-v2/uniswap-v2-optimizer.d.ts

@@ -0,0 +1,2 @@
+import { UnoptimizedRate } from '../../types';
+export declare function uniswapOptimizer(rate: UnoptimizedRate): UnoptimizedRate;

package/build/dex/uniswap-v2/uniswap-v2-optimizer.js

@@ -0,0 +1,75 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uniswapOptimizer = void 0;
+const utils_1 = require("../../utils");
+const constants_1 = require("./constants");
+const lodash_1 = __importDefault(require("lodash"));
+// Refactor the optimization of swap rates for better clarity and efficiency
+function uniswapOptimizer(rate) {
+    const optimizeSwapRoute = (swaps) => {
+        let lastOptimizedSwap = null;
+        const optimizedSwaps = swaps.reduce((accumulatedSwaps, currentSwap) => {
+            const isUniswapSwap = currentSwap.swapExchanges.length === 1 &&
+                isSwapExchangeAUniswapFork(currentSwap.swapExchanges[0].exchange);
+            if (!isUniswapSwap) {
+                lastOptimizedSwap = null;
+                accumulatedSwaps.push(currentSwap);
+                return accumulatedSwaps;
+            }
+            if (canBeMergedWithLastSwap(lastOptimizedSwap, currentSwap)) {
+                lastOptimizedSwap = mergeSwaps(lastOptimizedSwap, currentSwap);
+            }
+            else {
+                lastOptimizedSwap = lodash_1.default.cloneDeep(currentSwap);
+                accumulatedSwaps.push(lastOptimizedSwap);
+            }
+            return accumulatedSwaps;
+        }, []);
+        return optimizedSwaps;
+    };
+    rate.bestRoute = rate.bestRoute.map(route => ({
+        ...route,
+        swaps: optimizeSwapRoute(route.swaps),
+    }));
+    return rate;
+}
+exports.uniswapOptimizer = uniswapOptimizer;
+function isSwapExchangeAUniswapFork(exchangeName) {
+    return constants_1.AllUniswapForks.some(fork => fork.toLowerCase() === exchangeName.toLowerCase());
+}
+function canBeMergedWithLastSwap(lastSwap, currentSwap) {
+    return (!!lastSwap &&
+        lodash_1.default.last(lastSwap.swapExchanges[0].data.path).toLowerCase() ===
+            currentSwap.swapExchanges[0].data.path[0].toLowerCase());
+}
+function mergeSwaps(lastSwap, currentSwap) {
+    lastSwap.swapExchanges[0].data.path.push(currentSwap.swapExchanges[0].data.path[1]);
+    lastSwap.swapExchanges[0].exchange = deriveExchangeName(lastSwap, currentSwap);
+    lastSwap.swapExchanges[0].data.pools.push(currentSwap.swapExchanges[0].data.pools[0]);
+    lastSwap.swapExchanges[0].poolAddresses.push(currentSwap.swapExchanges[0].poolAddresses[0]);
+    lastSwap.swapExchanges[0].data.gasUSD = calculateCombinedGasUSD(lastSwap, currentSwap);
+    if ((0, utils_1.isETHAddress)(currentSwap.destToken)) {
+        lastSwap.swapExchanges[0].data.weth =
+            currentSwap.swapExchanges[0].data.weth;
+    }
+    lastSwap.destToken = currentSwap.destToken;
+    lastSwap.destDecimals = currentSwap.destDecimals;
+    lastSwap.swapExchanges[0].destAmount =
+        currentSwap.swapExchanges[0].destAmount;
+    return lastSwap;
+}
+function deriveExchangeName(lastSwap, currentSwap) {
+    return lastSwap.swapExchanges[0].exchange ===
+        currentSwap.swapExchanges[0].exchange
+        ? lastSwap.swapExchanges[0].exchange
+        : 'UniswapForkOptimized';
+}
+function calculateCombinedGasUSD(lastSwap, currentSwap) {
+    const lastGasUSD = parseFloat(lastSwap.swapExchanges[0].data.gasUSD);
+    const currentGasUSD = parseFloat(currentSwap.swapExchanges[0].data.gasUSD);
+    return (lastGasUSD + currentGasUSD).toFixed(6);
+}
+//# sourceMappingURL=uniswap-v2-optimizer.js.map

package/build/dex/uniswap-v2/uniswap-v2-optimizer.js.map

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

package/build/executor/IExecutorBytecodeBuilder.d.ts

@@ -0,0 +1,6 @@
+import { OptimalRate } from '@paraswap/core';
+import { DexExchangeParam } from '../types';
+import { DepositWithdrawReturn } from '../dex/weth/types';
+export interface IExecutorBytecodeBuilder {
+    buildByteCode(priceRoute: OptimalRate, exchangeDataList: DexExchangeParam[], maybeWethCallData?: DepositWithdrawReturn): string;
+}

package/build/executor/IExecutorBytecodeBuilder.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=IExecutorBytecodeBuilder.js.map

package/build/executor/IExecutorBytecodeBuilder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IExecutorBytecodeBuilder.js","sourceRoot":"","sources":["../../src/executor/IExecutorBytecodeBuilder.ts"],"names":[],"mappings":""}

package/build/executor/tests/utils-e2e-v6.d.ts

@@ -0,0 +1,8 @@
+import { OptimalRate } from '../../types';
+export declare type ContractsAugustusV6 = {
+    AugustusV6: string;
+    Executor01: string;
+    Executor02: string;
+    Executor03: string;
+};
+export declare function runE2ETest(priceRoute: OptimalRate, senderAddress: string, forkId: string, lastTransactionId: string, contracts: ContractsAugustusV6): Promise<void>;

package/build/executor/tests/utils-e2e-v6.js

@@ -0,0 +1,175 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runE2ETest = void 0;
+/* eslint-disable no-console */
+const abi_1 = require("@ethersproject/abi");
+const local_paraswap_sdk_1 = require("../../implementations/local-paraswap-sdk");
+const tenderly_simulation_1 = require("../../../tests/tenderly-simulation");
+const constants_1 = require("../../constants");
+const erc20_json_1 = __importDefault(require("../../abi/erc20.json"));
+const config_1 = require("../../config");
+const constants_e2e_1 = require("../../../tests/constants-e2e");
+const util = __importStar(require("util"));
+const utils_1 = require("../../../tests/utils");
+const erc20Interface = new abi_1.Interface(erc20_json_1.default);
+function send1WeiTo(token, to, network) {
+    const tokens = constants_e2e_1.Tokens[network];
+    const tokenSymbol = Object.keys(tokens).find(tokenSymbol => {
+        const curToken = tokens[tokenSymbol];
+        return curToken.address === token;
+    });
+    const holders = constants_e2e_1.Holders[network];
+    const holder = holders[tokenSymbol];
+    return {
+        from: holder,
+        to: token,
+        data: erc20Interface.encodeFunctionData('transfer', [to, '1']),
+        value: '0',
+    };
+}
+function checkBalanceOf(token, holder) {
+    return {
+        from: constants_1.NULL_ADDRESS,
+        to: token,
+        data: erc20Interface.encodeFunctionData('balanceOf', [holder]),
+        value: '0',
+    };
+}
+function allowAugustusV6(tokenAddress, holderAddress, network) {
+    const augustusV6Address = (0, config_1.generateConfig)(network).augustusV6Address;
+    return {
+        from: holderAddress,
+        to: tokenAddress,
+        data: erc20Interface.encodeFunctionData('approve', [
+            augustusV6Address,
+            constants_1.MAX_UINT,
+        ]),
+        value: '0',
+    };
+}
+const getAllExchanges = (data) => {
+    const exchanges = new Set();
+    data.bestRoute.forEach(route => {
+        route.swaps.forEach(swap => {
+            swap.swapExchanges.forEach(swapExchange => {
+                exchanges.add(swapExchange.exchange);
+            });
+        });
+    });
+    return Array.from(exchanges);
+};
+async function runE2ETest(priceRoute, senderAddress, forkId, lastTransactionId, contracts) {
+    const { network, srcToken, destToken, side, contractMethod } = priceRoute;
+    const ts = new tenderly_simulation_1.TenderlySimulation(network, forkId, lastTransactionId);
+    await ts.setup();
+    if (srcToken.toLowerCase() !== constants_1.ETHER_ADDRESS.toLowerCase()) {
+        const augustusV6Allowance = await ts.simulate(allowAugustusV6(srcToken, senderAddress, network));
+        if (!augustusV6Allowance.success)
+            console.log(augustusV6Allowance.url);
+        expect(augustusV6Allowance.success).toEqual(true);
+    }
+    // The API currently doesn't allow for specifying poolIdentifiers
+    const paraswap = new local_paraswap_sdk_1.LocalParaswapSDK(network, getAllExchanges(priceRoute), '');
+    paraswap.dexHelper.config.data.augustusV6Address = contracts.AugustusV6;
+    paraswap.dexHelper.config.data.executorsAddresses = { ...contracts };
+    if (paraswap.initializePricing)
+        await paraswap.initializePricing();
+    await (0, utils_1.sleep)(2000);
+    if (paraswap.dexHelper?.replaceProviderWithRPC) {
+        paraswap.dexHelper?.replaceProviderWithRPC(`https://rpc.tenderly.co/fork/${ts.forkId}`);
+    }
+    try {
+        console.log('PRICE ROUTE: ', util.inspect(priceRoute, false, null, true));
+        expect(parseFloat(priceRoute.destAmount)).toBeGreaterThan(0);
+        const config = (0, config_1.generateConfig)(network);
+        const augustusV6Address = config.augustusV6Address;
+        const executorsAddresses = Object.values(config.executorsAddresses);
+        const addresses = [...executorsAddresses, augustusV6Address];
+        //  for await (const a of addresses) {
+        //    const src =
+        //      srcToken.address.toLowerCase() === ETHER_ADDRESS
+        //        ? config.wrappedNativeTokenAddress
+        //        : srcToken.address.toLowerCase();
+        //    const dest =
+        //      destToken.address.toLowerCase() === ETHER_ADDRESS
+        //        ? config.wrappedNativeTokenAddress
+        //        : destToken.address.toLowerCase();
+        //    if (priceRoute.bestRoute[0].swaps.length > 0) {
+        //      const intermediateToken =
+        //        priceRoute.bestRoute[0].swaps[0].destToken.toLowerCase() ===
+        //        ETHER_ADDRESS
+        //          ? config.wrappedNativeTokenAddress
+        //          : priceRoute.bestRoute[0].swaps[0].destToken.toLowerCase();
+        //      await ts.simulate(send1WeiTo(intermediateToken, a, network));
+        //    }
+        //    await ts.simulate(send1WeiTo(src, a, network));
+        //    await ts.simulate(send1WeiTo(dest, a, network));
+        //  }
+        //  //
+        //  // for await (const a of addresses) {
+        //  //   const src =
+        //  //     srcToken.address.toLowerCase() === ETHER_ADDRESS
+        //  //       ? config.wrappedNativeTokenAddress
+        //  //       : srcToken.address.toLowerCase();
+        //  //   const dest =
+        //  //     destToken.address.toLowerCase() === ETHER_ADDRESS
+        //  //       ? config.wrappedNativeTokenAddress
+        //  //       : destToken.address.toLowerCase();
+        //  //
+        //  //   if (priceRoute.bestRoute[0].swaps.length > 0) {
+        //  //     const intermediateToken =
+        //  //       priceRoute.bestRoute[0].swaps[0].destToken.toLowerCase() ===
+        //  //       ETHER_ADDRESS
+        //  //         ? config.wrappedNativeTokenAddress
+        //  //         : priceRoute.bestRoute[0].swaps[0].destToken.toLowerCase();
+        //  //
+        //  //     await ts.simulate(checkBalanceOf(intermediateToken, a));
+        //  //   }
+        //  //
+        //  //   await ts.simulate(checkBalanceOf(src, a));
+        //  //   await ts.simulate(checkBalanceOf(dest, a));
+        //  // }
+        // Calculate slippage. Default is 1%
+        const _slippage = 100;
+        const minMaxAmount = (side === constants_1.SwapSide.SELL
+            ? BigInt(priceRoute.destAmount) * (10000n - BigInt(_slippage))
+            : BigInt(priceRoute.srcAmount) * (10000n + BigInt(_slippage))) / 10000n;
+        const swapParams = await paraswap.buildTransaction(priceRoute, minMaxAmount, senderAddress);
+        const swapTx = await ts.simulate(swapParams);
+        console.log(`Tenderly URL: ${swapTx.url}`);
+        expect(swapTx.success).toEqual(true);
+    }
+    finally {
+        if (paraswap.releaseResources) {
+            await paraswap.releaseResources();
+        }
+    }
+}
+exports.runE2ETest = runE2ETest;
+//# sourceMappingURL=utils-e2e-v6.js.map

package/build/executor/tests/utils-e2e-v6.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "3.0.0-fix-for-rc",
+  "version": "3.0.1",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

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

@@ -36,3 +36,4 @@ export const FACTORY_MAX_PLAIN_COINS = 4;
 export const FACTORY_MAX_PLAIN_IMPLEMENTATIONS_FOR_COIN = 10;
 
 export const DIRECT_METHOD_NAME = 'directCurveV1Swap';
+export const DIRECT_METHOD_NAME_V6 = 'swapExactAmountInOnCurveV1';

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

@@ -28,6 +28,7 @@ import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
 import {
   getBigIntPow,
   getDexKeysWithNetwork,
+  isETHAddress,
   isSrcTokenTransferFeeToBeExchanged,
   uuidToBytes16,
 } from '../../utils';
@@ -42,6 +43,8 @@ import {
   ImplementationNames,
   PoolConstants,
   DirectCurveV1Param,
+  CurveV1FactoryDirectSwap,
+  DirectCurveV1FactoryParamV6,
 } from './types';
 import {
   getLocalDeadlineAsFriendlyPlaceholder,
@@ -75,6 +78,11 @@ import { CustomBasePoolForFactory } from './state-polling-pools/custom-pool-poll
 import ImplementationConstants from './price-handlers/functions/constants';
 import { applyTransferFee } from '../../lib/token-transfer-fee';
 import { PriceHandler } from './price-handlers/price-handler';
+import { hexConcat, hexZeroPad, hexlify } from 'ethers/lib/utils';
+import { packCurveData } from '../../lib/curve/encoder';
+import { encodeCurveAssets } from '../curve-v1/packer';
+
+import { DIRECT_METHOD_NAME_V6 } from './constants';
 
 const DefaultCoinsABI: AbiItem = {
   type: 'function',
@@ -95,7 +103,8 @@ const DefaultCoinsABI: AbiItem = {
 
 export class CurveV1Factory
   extends SimpleExchange
-  implements IDex<CurveV1FactoryData, DirectCurveV1Param>
+  implements
+    IDex<CurveV1FactoryData, DirectCurveV1Param | CurveV1FactoryDirectSwap>
 {
   readonly hasConstantPriceLargeAmounts = false;
   readonly needWrapNative = false;
@@ -954,7 +963,6 @@ export class CurveV1Factory
     ];
   }
 
-  // FIXME: need v6 function
   getDirectParam(
     srcToken: Address,
     destToken: Address,
@@ -1016,6 +1024,70 @@ export class CurveV1Factory
     };
   }
 
+  getDirectParamV6(
+    srcToken: Address,
+    destToken: Address,
+    fromAmount: NumberAsString,
+    toAmount: NumberAsString,
+    quotedAmount: NumberAsString,
+    data: CurveV1FactoryData,
+    side: SwapSide,
+    permit: string,
+    uuid: string,
+    partnerAndFee: string,
+    beneficiary: string,
+    blockNumber: number,
+    contractMethod?: string,
+  ) {
+    if (contractMethod !== DIRECT_METHOD_NAME_V6) {
+      throw new Error(`Invalid contract method ${contractMethod}`);
+    }
+    assert(side === SwapSide.SELL, 'Buy not supported');
+
+    const metadata = hexConcat([
+      hexZeroPad(uuidToBytes16(uuid), 16),
+      hexZeroPad(hexlify(blockNumber), 16),
+    ]);
+
+    const swapParams: DirectCurveV1FactoryParamV6 = [
+      packCurveData(
+        data.exchange,
+        !data.isApproved, // approve flag, if not approved then set to true
+        isETHAddress(destToken) ? 0 : isETHAddress(srcToken) ? 3 : 0,
+        data.underlyingSwap
+          ? CurveV1SwapType.EXCHANGE_UNDERLYING
+          : CurveV1SwapType.EXCHANGE,
+      ).toString(),
+      encodeCurveAssets(data.i, data.j).toString(),
+      srcToken,
+      destToken,
+      fromAmount,
+      toAmount,
+      quotedAmount,
+      metadata,
+      beneficiary,
+    ];
+
+    const encodeParams: CurveV1FactoryDirectSwap = [
+      swapParams,
+      partnerAndFee,
+      permit,
+    ];
+
+    const encoder = (...params: CurveV1FactoryDirectSwap) => {
+      return this.augustusV6Interface.encodeFunctionData(
+        DIRECT_METHOD_NAME_V6,
+        [...params],
+      );
+    };
+
+    return {
+      encoder,
+      params: encodeParams,
+      networkFee: '0',
+    };
+  }
+
   static getDirectFunctionName(): string[] {
     return [DIRECT_METHOD_NAME];
   }
@@ -1051,6 +1123,10 @@ export class CurveV1Factory
     );
   }
 
+  static getDirectFunctionNameV6(): string[] {
+    return [DIRECT_METHOD_NAME_V6];
+  }
+
   getDexParam(
     srcToken: Address,
     destToken: Address,

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

@@ -223,3 +223,21 @@ export type DirectCurveV1Param = [
   permit: string,
   uuid: string,
 ];
+
+export type DirectCurveV1FactoryParamV6 = [
+  curveData: NumberAsString,
+  curveAssets: NumberAsString,
+  srcToken: Address,
+  destToken: Address,
+  fromAmount: NumberAsString,
+  toAmount: NumberAsString,
+  quotedAmount: NumberAsString,
+  metadata: string,
+  beneficiary: Address,
+];
+
+export type CurveV1FactoryDirectSwap = [
+  params: DirectCurveV1FactoryParamV6,
+  partnerAndFee: string,
+  permit: string,
+];

package/src/dex/uniswap-v2/uniswap-v2-optimizer.ts

@@ -0,0 +1,114 @@
+import { UnoptimizedRate, OptimalSwap, Address } from '../../types';
+import { isETHAddress } from '../../utils';
+import { AllUniswapForks } from './constants';
+import _ from 'lodash';
+
+// Refactor the optimization of swap rates for better clarity and efficiency
+export function uniswapOptimizer(rate: UnoptimizedRate): UnoptimizedRate {
+  const optimizeSwapRoute = (swaps: OptimalSwap[]): OptimalSwap[] => {
+    let lastOptimizedSwap: OptimalSwap | null = null;
+    const optimizedSwaps = swaps.reduce<OptimalSwap[]>(
+      (accumulatedSwaps, currentSwap) => {
+        const isUniswapSwap =
+          currentSwap.swapExchanges.length === 1 &&
+          isSwapExchangeAUniswapFork(currentSwap.swapExchanges[0].exchange);
+
+        if (!isUniswapSwap) {
+          lastOptimizedSwap = null;
+          accumulatedSwaps.push(currentSwap);
+          return accumulatedSwaps;
+        }
+
+        if (canBeMergedWithLastSwap(lastOptimizedSwap, currentSwap)) {
+          lastOptimizedSwap = mergeSwaps(lastOptimizedSwap!, currentSwap);
+        } else {
+          lastOptimizedSwap = _.cloneDeep(currentSwap);
+          accumulatedSwaps.push(lastOptimizedSwap);
+        }
+
+        return accumulatedSwaps;
+      },
+      [],
+    );
+
+    return optimizedSwaps;
+  };
+
+  rate.bestRoute = rate.bestRoute.map(route => ({
+    ...route,
+    swaps: optimizeSwapRoute(route.swaps),
+  }));
+
+  return rate;
+}
+
+function isSwapExchangeAUniswapFork(exchangeName: string): boolean {
+  return AllUniswapForks.some(
+    fork => fork.toLowerCase() === exchangeName.toLowerCase(),
+  );
+}
+
+function canBeMergedWithLastSwap(
+  lastSwap: OptimalSwap | null,
+  currentSwap: OptimalSwap,
+): boolean {
+  return (
+    !!lastSwap &&
+    _.last(<Address[]>lastSwap.swapExchanges[0].data.path)!.toLowerCase() ===
+      currentSwap.swapExchanges[0].data.path[0].toLowerCase()
+  );
+}
+
+function mergeSwaps(
+  lastSwap: OptimalSwap,
+  currentSwap: OptimalSwap,
+): OptimalSwap {
+  lastSwap.swapExchanges[0].data.path.push(
+    currentSwap.swapExchanges[0].data.path[1],
+  );
+  lastSwap.swapExchanges[0].exchange = deriveExchangeName(
+    lastSwap,
+    currentSwap,
+  );
+  lastSwap.swapExchanges[0].data.pools.push(
+    currentSwap.swapExchanges[0].data.pools[0],
+  );
+  lastSwap.swapExchanges[0].poolAddresses!.push(
+    currentSwap.swapExchanges[0].poolAddresses![0],
+  );
+  lastSwap.swapExchanges[0].data.gasUSD = calculateCombinedGasUSD(
+    lastSwap,
+    currentSwap,
+  );
+
+  if (isETHAddress(currentSwap.destToken)) {
+    lastSwap.swapExchanges[0].data.weth =
+      currentSwap.swapExchanges[0].data.weth;
+  }
+
+  lastSwap.destToken = currentSwap.destToken;
+  lastSwap.destDecimals = currentSwap.destDecimals;
+  lastSwap.swapExchanges[0].destAmount =
+    currentSwap.swapExchanges[0].destAmount;
+
+  return lastSwap;
+}
+
+function deriveExchangeName(
+  lastSwap: OptimalSwap,
+  currentSwap: OptimalSwap,
+): string {
+  return lastSwap.swapExchanges[0].exchange ===
+    currentSwap.swapExchanges[0].exchange
+    ? lastSwap.swapExchanges[0].exchange
+    : 'UniswapForkOptimized';
+}
+
+function calculateCombinedGasUSD(
+  lastSwap: OptimalSwap,
+  currentSwap: OptimalSwap,
+): string {
+  const lastGasUSD = parseFloat(lastSwap.swapExchanges[0].data.gasUSD);
+  const currentGasUSD = parseFloat(currentSwap.swapExchanges[0].data.gasUSD);
+  return (lastGasUSD + currentGasUSD).toFixed(6);
+}