@pendle/core-v2 0.15.3-mainnet → 0.16.0-testnet-daily

package/contracts/offchain-helpers/RouterStatic.sol

@@ -4,15 +4,13 @@ pragma solidity 0.8.17;
 import "../interfaces/IPYieldContractFactory.sol";
 import "../interfaces/IPMarketFactory.sol";
 import "../interfaces/IPVotingEscrowMainchain.sol";
-import "../interfaces/IPBulkSellerFactory.sol";
-import "../interfaces/IPBulkSeller.sol";
 
 import "./MarketMathStatic.sol";
 
 import "../core/libraries/BoringOwnableUpgradeable.sol";
 import "../LiquidityMining/libraries/VeBalanceLib.sol";
 
-import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
 
 /// EXCLUDED FROM ALL AUDITS, TO BE CALLED ONLY BY PENDLE's SDK
@@ -22,7 +20,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
     using VeBalanceLib for LockedPosition;
 
     uint128 public constant MAX_LOCK_TIME = 104 weeks;
-    uint128 public constant MIN_LOCK_TIME = 1 weeks;
+    uint128 public constant MIN_LOCK_TIME = 1 days;
 
     struct TokenAmount {
         address token;
@@ -60,18 +58,15 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
     IPYieldContractFactory internal immutable yieldContractFactory;
     IPMarketFactory internal immutable marketFactory;
     IPVotingEscrowMainchain internal immutable vePENDLE;
-    IPBulkSellerFactory internal immutable bulkFactory;
 
     constructor(
         IPYieldContractFactory _yieldContractFactory,
         IPMarketFactory _marketFactory,
-        IPVotingEscrowMainchain _vePENDLE,
-        IPBulkSellerFactory _bulkFactory
+        IPVotingEscrowMainchain _vePENDLE
     ) initializer {
         yieldContractFactory = _yieldContractFactory;
         marketFactory = _marketFactory;
         vePENDLE = _vePENDLE;
-        bulkFactory = _bulkFactory;
     }
 
     function initialize() external initializer {
@@ -288,7 +283,6 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
         address market,
         address tokenIn,
         uint256 netTokenDesired,
-        address bulk,
         uint256 netPtDesired
     )
         external
@@ -299,23 +293,13 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             uint256 netPtUsed
         )
     {
-        uint256 netSyDesired = previewDepositStatic(
-            getSyMarket(market),
-            tokenIn,
-            netTokenDesired,
-            bulk
-        );
-
-        uint256 netSyUsed;
-        (netLpOut, netSyUsed, netPtUsed) = MarketMathStatic.addLiquidityDualSyAndPtStatic(
-            market,
-            netSyDesired,
-            netPtDesired
-        );
-
-        if (netSyUsed != netSyDesired) revert Errors.RouterNotAllSyUsed(netSyDesired, netSyUsed);
-
-        netTokenUsed = netTokenDesired;
+        return
+            MarketMathStatic.addLiquidityDualTokenAndPtStatic(
+                market,
+                tokenIn,
+                netTokenDesired,
+                netPtDesired
+            );
     }
 
     function addLiquiditySinglePtStatic(address market, uint256 netPtIn)
@@ -347,8 +331,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
     function addLiquiditySingleBaseTokenStatic(
         address market,
         address baseToken,
-        uint256 netBaseTokenIn,
-        address bulk
+        uint256 netBaseTokenIn
     )
         external
         returns (
@@ -358,15 +341,13 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             uint256 priceImpact
         )
     {
-        uint256 netSyIn = previewDepositStatic(
-            getSyMarket(market),
-            baseToken,
-            netBaseTokenIn,
-            bulk
-        );
-
         return
-            MarketMathStatic.addLiquiditySingleSyStatic(market, netSyIn, getDefaultApproxParams());
+            MarketMathStatic.addLiquiditySingleBaseTokenStatic(
+                market,
+                baseToken,
+                netBaseTokenIn,
+                getDefaultApproxParams()
+            );
     }
 
     function removeLiquidityDualSyAndPtStatic(address market, uint256 netLpToRemove)
@@ -380,17 +361,10 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
     function removeLiquidityDualTokenAndPtStatic(
         address market,
         uint256 netLpToRemove,
-        address tokenOut,
-        address bulk
+        address tokenOut
     ) external view returns (uint256 netTokenOut, uint256 netPtOut) {
-        uint256 netSyOut;
-
-        (netSyOut, netPtOut) = MarketMathStatic.removeLiquidityDualSyAndPtStatic(
-            market,
-            netLpToRemove
-        );
-
-        netTokenOut = previewRedeemStatic(getSyMarket(market), tokenOut, netSyOut, bulk);
+        return
+            MarketMathStatic.removeLiquidityDualTokenAndPtStatic(market, netLpToRemove, tokenOut);
     }
 
     function removeLiquiditySinglePtStatic(address market, uint256 netLpToRemove)
@@ -424,8 +398,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
     function removeLiquiditySingleBaseTokenStatic(
         address market,
         uint256 netLpToRemove,
-        address baseToken,
-        address bulk
+        address baseToken
     )
         external
         returns (
@@ -434,14 +407,12 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             uint256 priceImpact
         )
     {
-        uint256 netSyOut;
-
-        (netSyOut, netSyFee, priceImpact) = MarketMathStatic.removeLiquiditySingleSyStatic(
-            market,
-            netLpToRemove
-        );
-
-        netBaseTokenOut = previewRedeemStatic(getSyMarket(market), baseToken, netSyOut, bulk);
+        return
+            MarketMathStatic.removeLiquiditySingleBaseTokenStatic(
+                market,
+                netLpToRemove,
+                baseToken
+            );
     }
 
     function swapExactPtForSyStatic(address market, uint256 exactPtIn)
@@ -493,8 +464,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
     function swapExactBaseTokenForPtStatic(
         address market,
         address baseToken,
-        uint256 amountBaseToken,
-        address bulk
+        uint256 amountBaseToken
     )
         external
         returns (
@@ -503,20 +473,19 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             uint256 priceImpact
         )
     {
-        uint256 netSyIn = previewDepositStatic(
-            getSyMarket(market),
-            baseToken,
-            amountBaseToken,
-            bulk
-        );
-        return MarketMathStatic.swapExactSyForPtStatic(market, netSyIn, getDefaultApproxParams());
+        return
+            MarketMathStatic.swapExactBaseTokenForPtStatic(
+                market,
+                baseToken,
+                amountBaseToken,
+                getDefaultApproxParams()
+            );
     }
 
     function swapExactPtForBaseTokenStatic(
         address market,
         uint256 exactPtIn,
-        address baseToken,
-        address bulk
+        address baseToken
     )
         external
         returns (
@@ -525,13 +494,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             uint256 priceImpact
         )
     {
-        uint256 netSyOut;
-        (netSyOut, netSyFee, priceImpact) = MarketMathStatic.swapExactPtForSyStatic(
-            market,
-            exactPtIn
-        );
-
-        netBaseTokenOut = previewRedeemStatic(getSyMarket(market), baseToken, netSyOut, bulk);
+        return MarketMathStatic.swapExactPtForBaseTokenStatic(market, exactPtIn, baseToken);
     }
 
     function swapSyForExactYtStatic(address market, uint256 exactYtOut)
@@ -583,8 +546,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
     function swapExactYtForBaseTokenStatic(
         address market,
         uint256 exactYtIn,
-        address baseToken,
-        address bulk
+        address baseToken
     )
         external
         returns (
@@ -593,20 +555,13 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             uint256 priceImpact
         )
     {
-        uint256 netSyOut;
-        (netSyOut, netSyFee, priceImpact) = MarketMathStatic.swapExactYtForSyStatic(
-            market,
-            exactYtIn
-        );
-
-        netBaseTokenOut = previewRedeemStatic(getSyMarket(market), baseToken, netSyOut, bulk);
+        return MarketMathStatic.swapExactYtForBaseTokenStatic(market, exactYtIn, baseToken);
     }
 
     function swapExactBaseTokenForYtStatic(
         address market,
         address baseToken,
-        uint256 amountBaseToken,
-        address bulk
+        uint256 amountBaseToken
     )
         external
         returns (
@@ -615,14 +570,13 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             uint256 priceImpact
         )
     {
-        uint256 netSyIn = previewDepositStatic(
-            getSyMarket(market),
-            baseToken,
-            amountBaseToken,
-            bulk
-        );
-
-        return MarketMathStatic.swapExactSyForYtStatic(market, netSyIn, getDefaultApproxParams());
+        return
+            MarketMathStatic.swapExactBaseTokenForYtStatic(
+                market,
+                baseToken,
+                amountBaseToken,
+                getDefaultApproxParams()
+            );
     }
 
     function swapExactPtForYtStatic(address market, uint256 exactPtIn)
@@ -707,49 +661,19 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
     function mintPYFromBaseStatic(
         address YT,
         address baseToken,
-        uint256 amountBaseToken,
-        address bulk
+        uint256 amountBaseToken
     ) external returns (uint256 amountPY) {
         IStandardizedYield SY = IStandardizedYield(IPYieldToken(YT).SY());
-        uint256 amountSy = previewDepositStatic(SY, baseToken, amountBaseToken, bulk);
-        return mintPYFromSyStatic(YT, amountSy);
+        return mintPYFromSyStatic(YT, SY.previewDeposit(baseToken, amountBaseToken));
     }
 
     function redeemPYToBaseStatic(
         address YT,
         uint256 amountPYToRedeem,
-        address baseToken,
-        address bulk
+        address baseToken
     ) external returns (uint256 amountBaseToken) {
         IStandardizedYield SY = IStandardizedYield(IPYieldToken(YT).SY());
-        uint256 amountSy = redeemPYToSyStatic(YT, amountPYToRedeem);
-        return previewRedeemStatic(SY, baseToken, amountSy, bulk);
-    }
-
-    function previewDepositStatic(
-        IStandardizedYield SY,
-        address baseToken,
-        uint256 amountToken,
-        address bulk
-    ) public view returns (uint256 amountSy) {
-        if (bulk != address(0)) {
-            return IPBulkSeller(bulk).calcSwapExactTokenForSy(amountToken);
-        } else {
-            return SY.previewDeposit(baseToken, amountToken);
-        }
-    }
-
-    function previewRedeemStatic(
-        IStandardizedYield SY,
-        address baseToken,
-        uint256 amountSy,
-        address bulk
-    ) public view returns (uint256 amountBaseToken) {
-        if (bulk != address(0)) {
-            return IPBulkSeller(bulk).calcSwapExactSyForToken(amountSy);
-        } else {
-            return SY.previewRedeem(baseToken, amountSy);
-        }
+        return SY.previewRedeem(baseToken, redeemPYToSyStatic(YT, amountPYToRedeem));
     }
 
     function getPtImpliedYield(address market) public view returns (int256) {
@@ -793,67 +717,4 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             return (SY.getTokensIn(), SY.getTokensOut());
         }
     }
-
-    function getAmountTokenToMintSy(
-        IStandardizedYield SY,
-        address tokenIn,
-        address bulk,
-        uint256 netSyOut
-    ) public view returns (uint256 netTokenIn) {
-        uint256 pivotAmount = netSyOut;
-
-        uint256 low = pivotAmount;
-        {
-            while (true) {
-                uint256 lowSyOut = previewDepositStatic(SY, tokenIn, low, bulk);
-                if (lowSyOut >= netSyOut) low /= 10;
-                else break;
-            }
-        }
-
-        uint256 high = pivotAmount;
-        {
-            while (true) {
-                uint256 highSyOut = previewDepositStatic(SY, tokenIn, high, bulk);
-                if (highSyOut < netSyOut) high *= 10;
-                else break;
-            }
-        }
-
-        while (low <= high) {
-            uint256 mid = (low + high) / 2;
-            uint256 syOut = previewDepositStatic(SY, tokenIn, mid, bulk);
-
-            if (syOut >= netSyOut) {
-                netTokenIn = mid;
-                high = mid - 1;
-            } else {
-                low = mid + 1;
-            }
-        }
-
-        assert(netTokenIn > 0);
-    }
-
-    function getSyMarket(address market) public view returns (IStandardizedYield) {
-        (IStandardizedYield SY, , ) = IPMarket(market).readTokens();
-        return SY;
-    }
-
-    function getBulkSellerInfo(address token, address SY)
-        external
-        view
-        returns (
-            address bulk,
-            uint256 totalToken,
-            uint256 totalSy
-        )
-    {
-        bulk = IPBulkSellerFactory(bulkFactory).get(token, SY);
-        if (bulk != address(0)) {
-            BulkSellerState memory state = IPBulkSeller(bulk).readState();
-            totalToken = state.totalToken;
-            totalSy = state.totalSy;
-        }
-    }
 }