@pendle/core-v2 0.15.0-mainnet → 0.15.2-mainnet

package/contracts/router/base/ActionBaseMintRedeem.sol

@@ -5,20 +5,16 @@ 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";
 
 // solhint-disable no-empty-blocks
 abstract contract ActionBaseMintRedeem is TokenHelper, KyberSwapHelper {
-    using SafeERC20 for IERC20;
-
     bytes internal constant EMPTY_BYTES = abi.encode();
 
     /// @dev since this contract will be proxied, it must not contains non-immutable variables
-    constructor(address _kyberSwapRouter) KyberSwapHelper(_kyberSwapRouter) {}
+    constructor(address _kyberScalingLib) KyberSwapHelper(_kyberScalingLib) {}
 
-    /**
-     * @notice swap token to baseToken through Uniswap's forks & use it to mint SY
-     */
     function _mintSyFromToken(
         address receiver,
         address SY,
@@ -26,104 +22,89 @@ abstract contract ActionBaseMintRedeem is TokenHelper, KyberSwapHelper {
         TokenInput calldata input
     ) internal returns (uint256 netSyOut) {
         _transferIn(input.tokenIn, msg.sender, input.netTokenIn);
-        if (input.tokenIn != input.tokenMintSy) {
-            _kyberswap(input.tokenIn, input.netTokenIn, input.kybercall);
+
+        bool requireSwap = input.tokenIn != input.tokenMintSy;
+
+        uint256 netTokenMintSy;
+
+        if (requireSwap) {
+            _kyberswap(input.tokenIn, input.netTokenIn, input.kyberRouter, input.kybercall);
+            netTokenMintSy = _selfBalance(input.tokenMintSy);
+        } else {
+            netTokenMintSy = input.netTokenIn;
         }
 
-        _safeApproveInf(input.tokenMintSy, SY);
+        if (input.bulk != address(0)) {
+            _transferOut(input.tokenMintSy, input.bulk, netTokenMintSy);
+
+            netSyOut = IPBulkSeller(input.bulk).swapExactTokenForSy(
+                receiver,
+                netTokenMintSy,
+                minSyOut
+            );
+        } else {
+            uint256 netNative = input.tokenMintSy == NATIVE ? netTokenMintSy : 0;
 
-        uint256 tokenMintSyBal = _selfBalance(input.tokenMintSy);
-        uint256 nativeAmountToAttach = input.tokenMintSy == NATIVE ? tokenMintSyBal : 0;
+            _safeApproveInf(input.tokenMintSy, SY);
 
-        netSyOut = IStandardizedYield(SY).deposit{ value: nativeAmountToAttach }(
-            receiver,
-            input.tokenMintSy,
-            tokenMintSyBal,
-            minSyOut
-        );
+            netSyOut = IStandardizedYield(SY).deposit{ value: netNative }(
+                receiver,
+                input.tokenMintSy,
+                netTokenMintSy,
+                minSyOut
+            );
+        }
     }
 
-    /**
-     * @notice redeem SY to baseToken -> swap baseToken to token through Uniswap's forks
-     */
     function _redeemSyToToken(
         address receiver,
         address SY,
         uint256 netSyIn,
-        TokenOutput calldata output,
+        TokenOutput memory output,
         bool doPull
     ) internal returns (uint256 netTokenOut) {
         if (doPull) {
-            IERC20(SY).safeTransferFrom(msg.sender, SY, netSyIn);
+            _transferFrom(IERC20(SY), msg.sender, _syOrBulk(SY, output), netSyIn);
         }
 
-        if (output.tokenRedeemSy == output.tokenOut) {
-            netTokenOut = IStandardizedYield(SY).redeem(
-                receiver,
+        bool requireSwap = output.tokenRedeemSy != output.tokenOut;
+        address receiverRedeemSy = requireSwap ? address(this) : receiver;
+        uint256 netTokenRedeemed;
+
+        if (output.bulk != address(0)) {
+            netTokenRedeemed = IPBulkSeller(output.bulk).swapExactSyForToken(
+                receiverRedeemSy,
                 netSyIn,
-                output.tokenRedeemSy,
-                output.minTokenOut,
-                true
+                0
             );
         } else {
-            uint256 netTokenRedeemed = IStandardizedYield(SY).redeem(
-                address(this),
+            netTokenRedeemed = IStandardizedYield(SY).redeem(
+                receiverRedeemSy,
                 netSyIn,
                 output.tokenRedeemSy,
-                1,
+                0,
                 true
             );
-            _kyberswap(output.tokenRedeemSy, netTokenRedeemed, output.kybercall);
+        }
 
-            netTokenOut = _selfBalance(output.tokenOut);
+        if (requireSwap) {
+            _kyberswap(
+                output.tokenRedeemSy,
+                netTokenRedeemed,
+                output.kyberRouter,
+                output.kybercall
+            );
 
-            if (netTokenOut < output.minTokenOut)
-                revert Errors.RouterInsufficientTokenOut(netTokenOut, output.minTokenOut);
+            netTokenOut = _selfBalance(output.tokenOut);
 
             _transferOut(output.tokenOut, receiver, netTokenOut);
+        } else {
+            netTokenOut = netTokenRedeemed;
         }
-    }
 
-    /**
-     * @notice swap token to baseToken through Uniswap's forks -> convert to SY -> convert to PT + YT
-     */
-    function _mintPyFromToken(
-        address receiver,
-        address YT,
-        uint256 minPyOut,
-        TokenInput calldata input
-    ) internal returns (uint256 netPyOut) {
-        address SY = IPYieldToken(YT).SY();
-
-        _mintSyFromToken(YT, SY, 1, input);
-
-        netPyOut = IPYieldToken(YT).mintPY(receiver, receiver);
-        if (netPyOut < minPyOut) revert Errors.RouterInsufficientPYOut(netPyOut, minPyOut);
-    }
-
-    /**
-     * @notice redeem PT + YT to SY -> redeem SY to baseToken -> swap baseToken to token through Uniswap's forks.
-        If the YT hasn't expired, both PT & YT will be needed to redeem. Else, only PT is needed
-     */
-    function _redeemPyToToken(
-        address receiver,
-        address YT,
-        uint256 netPyIn,
-        TokenOutput calldata output,
-        bool doPull
-    ) internal returns (uint256 netTokenOut) {
-        address PT = IPYieldToken(YT).PT();
-        address SY = IPYieldToken(YT).SY();
-
-        if (doPull) {
-            bool needToBurnYt = (!IPYieldToken(YT).isExpired());
-            IERC20(PT).safeTransferFrom(msg.sender, YT, netPyIn);
-            if (needToBurnYt) IERC20(YT).safeTransferFrom(msg.sender, YT, netPyIn);
+        if (netTokenOut < output.minTokenOut) {
+            revert Errors.RouterInsufficientTokenOut(netTokenOut, output.minTokenOut);
         }
-
-        uint256 amountSyOut = IPYieldToken(YT).redeemPY(SY); // ignore return
-
-        netTokenOut = _redeemSyToToken(receiver, SY, amountSyOut, output, false);
     }
 
     function _mintPyFromSy(
@@ -136,7 +117,7 @@ abstract contract ActionBaseMintRedeem is TokenHelper, KyberSwapHelper {
         address SY = IPYieldToken(YT).SY();
 
         if (doPull) {
-            IERC20(SY).safeTransferFrom(msg.sender, YT, netSyIn);
+            _transferFrom(IERC20(SY), msg.sender, YT, netSyIn);
         }
 
         netPyOut = IPYieldToken(YT).mintPY(receiver, receiver);
@@ -147,18 +128,32 @@ abstract contract ActionBaseMintRedeem is TokenHelper, KyberSwapHelper {
         address receiver,
         address YT,
         uint256 netPyIn,
-        uint256 minSyOut,
-        bool doPull
+        uint256 minSyOut
     ) internal returns (uint256 netSyOut) {
         address PT = IPYieldToken(YT).PT();
 
-        if (doPull) {
-            bool needToBurnYt = (!IPYieldToken(YT).isExpired());
-            IERC20(PT).safeTransferFrom(msg.sender, YT, netPyIn);
-            if (needToBurnYt) IERC20(YT).safeTransferFrom(msg.sender, YT, netPyIn);
-        }
+        _transferFrom(IERC20(PT), msg.sender, YT, netPyIn);
+
+        bool needToBurnYt = (!IPYieldToken(YT).isExpired());
+        if (needToBurnYt) _transferFrom(IERC20(YT), msg.sender, YT, netPyIn);
 
         netSyOut = IPYieldToken(YT).redeemPY(receiver);
         if (netSyOut < minSyOut) revert Errors.RouterInsufficientSyOut(netSyOut, minSyOut);
     }
+
+    function _syOrBulk(address SY, TokenOutput memory output)
+        internal
+        pure
+        returns (address addr)
+    {
+        return output.bulk != address(0) ? output.bulk : SY;
+    }
+
+    function _wrapTokenOutput(
+        address tokenOut,
+        uint256 minTokenOut,
+        address bulk
+    ) internal pure returns (TokenOutput memory) {
+        return TokenOutput(tokenOut, minTokenOut, tokenOut, bulk, address(0), EMPTY_BYTES);
+    }
 }

package/contracts/router/base/MarketApproxLib.sol

@@ -575,7 +575,7 @@ library MarketApproxPtOutLib {
             {
                 uint256 netSyRemaining = a.totalSyIn - netSyIn;
                 uint256 newTotalPt = a.market.totalPt.Uint() - guess;
-                uint256 netTotalSy = comp.totalAsset.Uint() + netSyIn - netSyFee;
+                uint256 netTotalSy = a.market.totalSy.Uint() + netSyIn - netSyFee;
 
                 // it is desired that
                 // netPtFromSwap / newTotalPt = netSyRemaining / netTotalSy

package/contracts/router/kyberswap/AggregationRouterHelper.sol

@@ -3,8 +3,16 @@
 pragma solidity 0.8.17;
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "./IMultihopRouter.sol";
+import "./IAggregatorRouterHelper.sol";
+import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
+import "../../core/libraries/BoringOwnableUpgradeable.sol";
 
-library AggregationRouterHelper {
+contract AggregationRouterHelper is
+    IAggregationRouterHelper,
+    Initializable,
+    UUPSUpgradeable,
+    BoringOwnableUpgradeable
+{
     uint256 private constant _PARTIAL_FILL = 0x01;
     uint256 private constant _REQUIRES_EXTRA_ETH = 0x02;
     uint256 private constant _SHOULD_CLAIM = 0x04;
@@ -14,6 +22,14 @@ library AggregationRouterHelper {
 
     uint256 private constant SLIPPAGE_RANGE = 10; // over 100
 
+    constructor() initializer {}
+
+    function initialize() external initializer {
+        __BoringOwnable_init();
+    }
+
+    function _authorizeUpgrade(address newImplementation) internal override onlyOwner {}
+
     enum DexType {
         UNI,
         STABLESWAP,

package/contracts/router/kyberswap/IAggregatorRouterHelper.sol

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity 0.8.17;
+
+interface IAggregationRouterHelper {
+    function getScaledInputData(bytes calldata kybercall, uint256 newAmount)
+        external
+        pure
+        returns (bytes memory);
+}

package/contracts/router/kyberswap/KyberSwapHelper.sol

@@ -25,42 +25,55 @@ pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts/utils/Address.sol";
 import "../../core/libraries/TokenHelper.sol";
-import "./AggregationRouterHelper.sol";
+import "./IAggregatorRouterHelper.sol";
+import "../../core/libraries/Errors.sol";
 
 struct TokenInput {
+    // Token/Sy data
     address tokenIn;
     uint256 netTokenIn;
     address tokenMintSy;
+    address bulk;
+    // Kyber data
+    address kyberRouter;
     bytes kybercall;
 }
 
 struct TokenOutput {
+    // Token/Sy data
     address tokenOut;
     uint256 minTokenOut;
     address tokenRedeemSy;
+    address bulk;
+    // Kyber data
+    address kyberRouter;
     bytes kybercall;
 }
 
 abstract contract KyberSwapHelper is TokenHelper {
     using Address for address;
-    address public immutable kyberSwapRouter;
 
-    /// @dev since this contract will be proxied, it must not contains non-immutable variables
-    constructor(address _kyberSwapRouter) {
-        kyberSwapRouter = _kyberSwapRouter;
+    address public immutable kyberScalingLib;
+
+    constructor(address _kyberScalingLib) {
+        kyberScalingLib = _kyberScalingLib;
     }
 
     function _kyberswap(
         address tokenIn,
         uint256 amountIn,
+        address kyberRouter,
         bytes memory rawKybercall
     ) internal {
-        _safeApproveInf(tokenIn, kyberSwapRouter);
+        if (kyberRouter == address(0) || rawKybercall.length == 0)
+            revert Errors.RouterKyberSwapDataZero();
+
+        _safeApproveInf(tokenIn, kyberRouter);
 
-        bytes memory kybercall = AggregationRouterHelper.getScaledInputData(
+        bytes memory kybercall = IAggregationRouterHelper(kyberScalingLib).getScaledInputData(
             rawKybercall,
             amountIn
         );
-        kyberSwapRouter.functionCallWithValue(kybercall, tokenIn == NATIVE ? amountIn : 0);
+        kyberRouter.functionCallWithValue(kybercall, tokenIn == NATIVE ? amountIn : 0);
     }
 }

package/deployments/1-markets/FRAX_30_MAR_23.json

@@ -0,0 +1,8 @@
+{
+    "symbol": "SY-testFRAX-USDC",
+    "SY": "0x896f4D49916aC5cfC36d7a260a7039ba4Ea317b6",
+    "expiry": 1680134400,
+    "PT": "0xa369ba382968bE6cb95ebc666e77bA479414677C",
+    "YT": "0x16DebA598Af5c182A26eAEf0D73CB3A1d12B8372",
+    "market": "0x0e3e152673BAf2023502C7Ea38b1B792E1b12eAa"
+}

package/deployments/1-markets/LOOKS_30_MAR_23.json

@@ -0,0 +1,8 @@
+{
+    "symbol": "SY-testLOOKS",
+    "SY": "0xCE9431Ba71784819FF63BEa631E8D131a8FDBABc",
+    "expiry": 1680134400,
+    "PT": "0x84c681550Ec6C2793CE6aD2f906685F2746b5a43",
+    "YT": "0x39DE6b48ce57F2E41ddceb6977408d39a8Dc6984",
+    "market": "0xc46AE2E2b09d60A3B3F431EdCcDe63Abc5c992D2"
+}

package/deployments/1-markets/STETH_MARCH_30.json

@@ -1,6 +1,6 @@
 {
     "symbol": "SY-testETH",
-    "SCY": "0xaA7495dcbe99A8dbd0cfA8b27b95f77565a077c8",
+    "SY": "0xaA7495dcbe99A8dbd0cfA8b27b95f77565a077c8",
     "expiry": 1680134400,
     "PT": "0xc7fCFEfB2055ba61118C93722feECDD4A72E160D",
     "YT": "0xc4a38a6236B2BcF4f4B25690B4B5f770aD8B1195",

package/deployments/1-markets/USDD_MARCH_30.json

@@ -0,0 +1,8 @@
+{
+    "symbol": "SY-testUSDD-3CRV",
+    "SY": "0x38bB37BC4F871b1485aB5fdfa75c42bA09fb2694",
+    "expiry": 1680134400,
+    "PT": "0xbbfe183460119d201e8fa95935f12EF29E2FE1F1",
+    "YT": "0xee970d5f17cB9e8E67544676DCC4d41385b58c5B",
+    "market": "0x97b9ba585D1e218fC1F9057A7729D78D2Dc23ab1"
+}

package/deployments/1-offchain-helper.json

@@ -0,0 +1,3 @@
+{
+    "bulkSellerOffchain": "0xFc7A495389cD3454f5cC0Ecaa55D30E343A1Fc16"
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "0.15.0-mainnet",
+  "version": "0.15.2-mainnet",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",
@@ -44,6 +44,7 @@
   },
   "packageManager": "yarn@3.2.2",
   "dependencies": {
-    "@openzeppelin/contracts": "^4.7.3"
+    "@openzeppelin/contracts": "^4.7.3",
+    "@openzeppelin/contracts-upgradeable": "^4.7.3"
   }
 }