@pendle/core-v2 0.20.2-testnet → 1.0.0-mainnet

package/contracts/offchain-helpers/RouterStatic.sol

@@ -14,10 +14,9 @@ import "../LiquidityMining/libraries/VeBalanceLib.sol";
 
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
-import "@openzeppelin/contracts/proxy/Proxy.sol";
 
 /// EXCLUDED FROM ALL AUDITS, TO BE CALLED ONLY BY PENDLE's SDK
-contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpgradeable {
+contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeable {
     using Math for uint256;
     using VeBalanceLib for VeBalance;
     using VeBalanceLib for LockedPosition;
@@ -63,31 +62,34 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
     IPMarketFactory internal immutable marketFactory;
     IPVotingEscrowMainchain internal immutable vePENDLE;
     IPBulkSellerFactory internal immutable bulkFactory;
-    address internal immutable marketMathStaticLib;
 
     constructor(
         IPYieldContractFactory _yieldContractFactory,
         IPMarketFactory _marketFactory,
         IPVotingEscrowMainchain _vePENDLE,
-        IPBulkSellerFactory _bulkFactory,
-        address _marketMathStaticLib
+        IPBulkSellerFactory _bulkFactory
     ) initializer {
         yieldContractFactory = _yieldContractFactory;
         marketFactory = _marketFactory;
         vePENDLE = _vePENDLE;
         bulkFactory = _bulkFactory;
-        marketMathStaticLib = _marketMathStaticLib;
-    }
-
-    // all Market-related functions will go to MarketMathStaticLib
-    function _implementation() internal view override returns (address) {
-        return marketMathStaticLib;
     }
 
     function initialize() external initializer {
         __BoringOwnable_init();
     }
 
+    function getDefaultApproxParams() public pure returns (ApproxParams memory) {
+        return
+            ApproxParams({
+                guessMin: 0,
+                guessMax: type(uint256).max,
+                guessOffchain: 0,
+                maxIteration: 256,
+                eps: 1e14
+            });
+    }
+
     function _authorizeUpgrade(address newImplementation) internal override onlyOwner {}
 
     // ============= SYSTEM INFO =============
@@ -156,7 +158,7 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
         sy = address(SY);
         state = _market.readState(address(this));
         impliedYield = getPtImpliedYield(market);
-        exchangeRate = MarketMathStatic.getTradeExchangeRateExcludeFee(market);
+        exchangeRate = MarketMathStatic.getExchangeRate(market);
     }
 
     // ============= USER INFO =============
@@ -323,11 +325,11 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
             uint256 netLpOut,
             uint256 netPtToSwap,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
-        return MarketMathStatic.addLiquiditySinglePtStatic(market, netPtIn);
+        return
+            MarketMathStatic.addLiquiditySinglePtStatic(market, netPtIn, getDefaultApproxParams());
     }
 
     function addLiquiditySingleSyStatic(address market, uint256 netSyIn)
@@ -336,11 +338,11 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
             uint256 netLpOut,
             uint256 netPtFromSwap,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
-        return MarketMathStatic.addLiquiditySingleSyStatic(market, netSyIn);
+        return
+            MarketMathStatic.addLiquiditySingleSyStatic(market, netSyIn, getDefaultApproxParams());
     }
 
     function addLiquiditySingleBaseTokenStatic(
@@ -354,8 +356,7 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
             uint256 netLpOut,
             uint256 netPtFromSwap,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
         uint256 netSyIn = previewDepositStatic(
@@ -365,7 +366,8 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
             bulk
         );
 
-        return MarketMathStatic.addLiquiditySingleSyStatic(market, netSyIn);
+        return
+            MarketMathStatic.addLiquiditySingleSyStatic(market, netSyIn, getDefaultApproxParams());
     }
 
     function removeLiquidityDualSyAndPtStatic(address market, uint256 netLpToRemove)
@@ -398,11 +400,15 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
             uint256 netPtOut,
             uint256 netPtFromSwap,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
-        return MarketMathStatic.removeLiquiditySinglePtStatic(market, netLpToRemove);
+        return
+            MarketMathStatic.removeLiquiditySinglePtStatic(
+                market,
+                netLpToRemove,
+                getDefaultApproxParams()
+            );
     }
 
     function removeLiquiditySingleSyStatic(address market, uint256 netLpToRemove)
@@ -410,8 +416,7 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
         returns (
             uint256 netSyOut,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
         return MarketMathStatic.removeLiquiditySingleSyStatic(market, netLpToRemove);
@@ -427,14 +432,15 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
         returns (
             uint256 netBaseTokenOut,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
         uint256 netSyOut;
 
-        (netSyOut, netSyFee, priceImpact, exchangeRateAfter) = MarketMathStatic
-            .removeLiquiditySingleSyStatic(market, netLpToRemove);
+        (netSyOut, netSyFee, priceImpact) = MarketMathStatic.removeLiquiditySingleSyStatic(
+            market,
+            netLpToRemove
+        );
 
         netBaseTokenOut = previewRedeemStatic(getSyMarket(market), baseToken, netSyOut, bulk);
     }
@@ -444,8 +450,7 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
         returns (
             uint256 netSyOut,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
         return MarketMathStatic.swapExactPtForSyStatic(market, exactPtIn);
@@ -456,8 +461,7 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
         returns (
             uint256 netSyIn,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
         return MarketMathStatic.swapSyForExactPtStatic(market, exactPtOut);
@@ -468,11 +472,11 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
         returns (
             uint256 netPtOut,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
-        return MarketMathStatic.swapExactSyForPtStatic(market, exactSyIn);
+        return
+            MarketMathStatic.swapExactSyForPtStatic(market, exactSyIn, getDefaultApproxParams());
     }
 
     function swapPtForExactSyStatic(address market, uint256 exactSyOut)
@@ -480,11 +484,11 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
         returns (
             uint256 netPtIn,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
-        return MarketMathStatic.swapPtForExactSyStatic(market, exactSyOut);
+        return
+            MarketMathStatic.swapPtForExactSyStatic(market, exactSyOut, getDefaultApproxParams());
     }
 
     function swapExactBaseTokenForPtStatic(
@@ -497,8 +501,7 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
         returns (
             uint256 netPtOut,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
         uint256 netSyIn = previewDepositStatic(
@@ -507,7 +510,7 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
             amountBaseToken,
             bulk
         );
-        return MarketMathStatic.swapExactSyForPtStatic(market, netSyIn);
+        return MarketMathStatic.swapExactSyForPtStatic(market, netSyIn, getDefaultApproxParams());
     }
 
     function swapExactPtForBaseTokenStatic(
@@ -520,13 +523,14 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
         returns (
             uint256 netBaseTokenOut,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
         uint256 netSyOut;
-        (netSyOut, netSyFee, priceImpact, exchangeRateAfter) = MarketMathStatic
-            .swapExactPtForSyStatic(market, exactPtIn);
+        (netSyOut, netSyFee, priceImpact) = MarketMathStatic.swapExactPtForSyStatic(
+            market,
+            exactPtIn
+        );
 
         netBaseTokenOut = previewRedeemStatic(getSyMarket(market), baseToken, netSyOut, bulk);
     }
@@ -536,8 +540,7 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
         returns (
             uint256 netSyIn,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
         return MarketMathStatic.swapSyForExactYtStatic(market, exactYtOut);
@@ -548,11 +551,11 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
         returns (
             uint256 netYtOut,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
-        return MarketMathStatic.swapExactSyForYtStatic(market, exactSyIn);
+        return
+            MarketMathStatic.swapExactSyForYtStatic(market, exactSyIn, getDefaultApproxParams());
     }
 
     function swapExactYtForSyStatic(address market, uint256 exactYtIn)
@@ -560,8 +563,7 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
         returns (
             uint256 netSyOut,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
         return MarketMathStatic.swapExactYtForSyStatic(market, exactYtIn);
@@ -572,11 +574,11 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
         returns (
             uint256 netYtIn,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
-        return MarketMathStatic.swapYtForExactSyStatic(market, exactSyOut);
+        return
+            MarketMathStatic.swapYtForExactSyStatic(market, exactSyOut, getDefaultApproxParams());
     }
 
     function swapExactYtForBaseTokenStatic(
@@ -589,13 +591,14 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
         returns (
             uint256 netBaseTokenOut,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
         uint256 netSyOut;
-        (netSyOut, netSyFee, priceImpact, exchangeRateAfter) = MarketMathStatic
-            .swapExactYtForSyStatic(market, exactYtIn);
+        (netSyOut, netSyFee, priceImpact) = MarketMathStatic.swapExactYtForSyStatic(
+            market,
+            exactYtIn
+        );
 
         netBaseTokenOut = previewRedeemStatic(getSyMarket(market), baseToken, netSyOut, bulk);
     }
@@ -610,8 +613,7 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
         returns (
             uint256 netYtOut,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
         uint256 netSyIn = previewDepositStatic(
@@ -621,7 +623,7 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
             bulk
         );
 
-        return MarketMathStatic.swapExactSyForYtStatic(market, netSyIn);
+        return MarketMathStatic.swapExactSyForYtStatic(market, netSyIn, getDefaultApproxParams());
     }
 
     function swapExactPtForYtStatic(address market, uint256 exactPtIn)
@@ -630,11 +632,10 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
             uint256 netYtOut,
             uint256 totalPtToSwap,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
-        return MarketMathStatic.swapExactPtForYt(market, exactPtIn);
+        return MarketMathStatic.swapExactPtForYt(market, exactPtIn, getDefaultApproxParams());
     }
 
     function swapExactYtForPtStatic(address market, uint256 exactYtIn)
@@ -643,11 +644,10 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
             uint256 netPtOut,
             uint256 totalPtSwapped,
             uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
+            uint256 priceImpact
         )
     {
-        return MarketMathStatic.swapExactYtForPt(market, exactYtIn);
+        return MarketMathStatic.swapExactYtForPt(market, exactYtIn, getDefaultApproxParams());
     }
 
     // ============= vePENDLE =============
@@ -778,7 +778,7 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
         public
         returns (uint256 priceImpact)
     {
-        return MarketMathStatic.calcPriceImpactPt(market, netPtOut);
+        return MarketMathStatic.calcPriceImpact(market, netPtOut);
     }
 
     // either but not both pyToken or market must be != 0
@@ -803,7 +803,7 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
         address bulk,
         uint256 netSyOut
     ) public view returns (uint256 netTokenIn) {
-        uint256 pivotAmount = 10**IERC20Metadata(tokenIn).decimals();
+        uint256 pivotAmount = netSyOut;
 
         uint256 low = pivotAmount;
         {

package/contracts/router/ActionAddRemoveLiq.sol

@@ -24,8 +24,8 @@ contract ActionAddRemoveLiq is IPActionAddRemoveLiq, ActionBaseMintRedeem {
     using BulkSellerMathCore for BulkSellerState;
 
     /// @dev since this contract will be proxied, it must not contains non-immutable variables
-    constructor(address _swapAggregator)
-        ActionBaseMintRedeem(_swapAggregator) //solhint-disable-next-line no-empty-blocks
+    constructor(address _kyberScalingLib)
+        ActionBaseMintRedeem(_kyberScalingLib) //solhint-disable-next-line no-empty-blocks
     {}
 
     /**

package/contracts/router/ActionMintRedeem.sol

@@ -12,8 +12,8 @@ contract ActionMintRedeem is IPActionMintRedeem, ActionBaseMintRedeem {
     using Math for int256;
 
     /// @dev since this contract will be proxied, it must not contains non-immutable variables
-    constructor(address _swapAggregator)
-        ActionBaseMintRedeem(_swapAggregator) //solhint-disable-next-line no-empty-blocks
+    constructor(address _kyberScalingLib)
+        ActionBaseMintRedeem(_kyberScalingLib) //solhint-disable-next-line no-empty-blocks
     {}
 
     /**
@@ -180,7 +180,8 @@ contract ActionMintRedeem is IPActionMintRedeem, ActionBaseMintRedeem {
         address[] calldata markets,
         RouterSwapAllStruct calldata dataSwap
     ) external returns (uint256 netTokenOut, uint256[] memory amountsSwapped) {
-        if (dataSwap.tokens.length != dataSwap.data.length) revert Errors.ArrayLengthMismatch();
+        if (dataSwap.tokens.length != dataSwap.kybercalls.length)
+            revert Errors.ArrayLengthMismatch();
 
         if (dataYT.tokenRedeemSys.length != dataYT.syAddrs.length)
             revert Errors.ArrayLengthMismatch();
@@ -225,7 +226,7 @@ contract ActionMintRedeem is IPActionMintRedeem, ActionBaseMintRedeem {
             _transferFrom(
                 IERC20(tokensOut.tokens[i]),
                 msg.sender,
-                swapAggregator,
+                address(this),
                 tokensOut.amounts[i]
             );
         }
@@ -269,7 +270,7 @@ contract ActionMintRedeem is IPActionMintRedeem, ActionBaseMintRedeem {
 
             TokenOutput memory output = _wrapTokenOutput(tokenRedeemSys[i], 1, bulks[i]);
             uint256 amountOut = _redeemSyToToken(
-                swapAggregator,
+                address(this),
                 sys.tokens[i],
                 sys.amounts[i],
                 output,
@@ -286,10 +287,11 @@ contract ActionMintRedeem is IPActionMintRedeem, ActionBaseMintRedeem {
     ) internal returns (uint256 netTokenOut) {
         for (uint256 i = 0; i < tokens.tokens.length; ++i) {
             if (tokens.amounts[i] == 0) continue;
-            ISwapAggregator(swapAggregator).swap(
+            _kyberswap(
                 tokens.tokens[i],
                 tokens.amounts[i],
-                dataSwap.data[i]
+                dataSwap.kyberRouter,
+                dataSwap.kybercalls[i]
             );
         }
         netTokenOut = _selfBalance(dataSwap.outputToken);

package/contracts/router/ActionSwapPT.sol

@@ -16,8 +16,8 @@ contract ActionSwapPT is IPActionSwapPT, ActionBaseMintRedeem {
     using PYIndexLib for IPYieldToken;
 
     /// @dev since this contract will be proxied, it must not contains non-immutable variables
-    constructor(address _swapAggregator)
-        ActionBaseMintRedeem(_swapAggregator) //solhint-disable-next-line no-empty-blocks
+    constructor(address _kyberScalingLib)
+        ActionBaseMintRedeem(_kyberScalingLib) //solhint-disable-next-line no-empty-blocks
     {}
 
     /**

package/contracts/router/ActionSwapYT.sol

@@ -17,8 +17,8 @@ contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
     using PYIndexLib for IPYieldToken;
 
     /// @dev since this contract will be proxied, it must not contains non-immutable variables
-    constructor(address _swapAggregator)
-        ActionBaseMintRedeem(_swapAggregator) //solhint-disable-next-line no-empty-blocks
+    constructor(address _kyberScalingLib)
+        ActionBaseMintRedeem(_kyberScalingLib) //solhint-disable-next-line no-empty-blocks
     {}
 
     /**

package/contracts/router/base/ActionBaseMintRedeem.sol

@@ -1,43 +1,19 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.17;
 
+import "../kyberswap/KyberSwapHelper.sol";
 import "../../core/libraries/TokenHelper.sol";
 import "../../interfaces/IStandardizedYield.sol";
 import "../../interfaces/IPYieldToken.sol";
 import "../../interfaces/IPBulkSeller.sol";
 import "../../core/libraries/Errors.sol";
-import "../swap-aggregator/ISwapAggregator.sol";
-
-struct TokenInput {
-    // Token/Sy data
-    address tokenIn;
-    uint256 netTokenIn;
-    address tokenMintSy;
-    address bulk;
-    // aggregator data
-    SwapData data;
-}
-
-struct TokenOutput {
-    // Token/Sy data
-    address tokenOut;
-    uint256 minTokenOut;
-    address tokenRedeemSy;
-    address bulk;
-    // Kyber data
-    SwapData data;
-}
 
 // solhint-disable no-empty-blocks
-abstract contract ActionBaseMintRedeem is TokenHelper {
+abstract contract ActionBaseMintRedeem is TokenHelper, KyberSwapHelper {
     bytes internal constant EMPTY_BYTES = abi.encode();
 
-    address public immutable swapAggregator;
-
     /// @dev since this contract will be proxied, it must not contains non-immutable variables
-    constructor(address _swapAggregator) {
-        swapAggregator = _swapAggregator;
-    }
+    constructor(address _kyberScalingLib) KyberSwapHelper(_kyberScalingLib) {}
 
     function _mintSyFromToken(
         address receiver,
@@ -45,23 +21,14 @@ abstract contract ActionBaseMintRedeem is TokenHelper {
         uint256 minSyOut,
         TokenInput calldata input
     ) internal returns (uint256 netSyOut) {
+        _transferIn(input.tokenIn, msg.sender, input.netTokenIn);
+
         bool requireSwap = input.tokenIn != input.tokenMintSy;
 
         uint256 netTokenMintSy;
 
-        if (input.tokenIn != NATIVE) {
-            _transferFrom(
-                IERC20(input.tokenIn),
-                msg.sender,
-                requireSwap ? swapAggregator : address(this),
-                input.netTokenIn
-            );
-        }
-
         if (requireSwap) {
-            ISwapAggregator(swapAggregator).swap{
-                value: input.tokenIn == NATIVE ? input.netTokenIn : 0
-            }(input.tokenIn, input.netTokenIn, input.data);
+            _kyberswap(input.tokenIn, input.netTokenIn, input.kyberRouter, input.kybercall);
             netTokenMintSy = _selfBalance(input.tokenMintSy);
         } else {
             netTokenMintSy = input.netTokenIn;
@@ -99,7 +66,7 @@ abstract contract ActionBaseMintRedeem is TokenHelper {
         }
 
         bool requireSwap = output.tokenRedeemSy != output.tokenOut;
-        address receiverRedeemSy = requireSwap ? swapAggregator : receiver;
+        address receiverRedeemSy = requireSwap ? address(this) : receiver;
         uint256 netTokenRedeemed;
 
         if (output.bulk != address(0)) {
@@ -120,9 +87,12 @@ abstract contract ActionBaseMintRedeem is TokenHelper {
         }
 
         if (requireSwap) {
-            ISwapAggregator(swapAggregator).swap{
-                value: output.tokenRedeemSy == NATIVE ? netTokenRedeemed : 0
-            }(output.tokenRedeemSy, netTokenRedeemed, output.data);
+            _kyberswap(
+                output.tokenRedeemSy,
+                netTokenRedeemed,
+                output.kyberRouter,
+                output.kybercall
+            );
 
             netTokenOut = _selfBalance(output.tokenOut);
 
@@ -183,13 +153,6 @@ abstract contract ActionBaseMintRedeem is TokenHelper {
         uint256 minTokenOut,
         address bulk
     ) internal pure returns (TokenOutput memory) {
-        return
-            TokenOutput(
-                tokenOut,
-                minTokenOut,
-                tokenOut,
-                bulk,
-                SwapData(AGGREGATOR.KYBERSWAP, address(0), EMPTY_BYTES)
-            );
+        return TokenOutput(tokenOut, minTokenOut, tokenOut, bulk, address(0), EMPTY_BYTES);
     }
 }