@pendle/core-v2 0.9.0-gamma-2 → 0.9.3-beta

package/build/artifacts/contracts/periphery/PermissionsV2Upg.sol/PermissionsV2Upg.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/12e51efac9ec486bc1239cdd2596f524.json"
+  "buildInfo": "../../../build-info/66b9e4a73d84ceb078aec43d05a41359.json"
 }

package/contracts/core/LiquidityMining/VotingController/PendleVotingControllerUpg.sol

@@ -70,7 +70,7 @@ contract PendleVotingControllerUpg is
         address user = msg.sender;
 
         require(weights.length == pools.length, "invaid array length");
-        require(vePendle.balanceOf(user) > 0 || user == _governance(), "zero vependle balance");
+        require(vePendle.balanceOf(user) > 0, "zero vependle balance");
 
         UserData storage uData = userData[user];
         LockedPosition memory userPosition = _getUserVePendlePosition(user);

package/contracts/core/PendleRouter.sol

@@ -50,11 +50,13 @@ contract PendleRouter is Proxy, Initializable, UUPSUpgradeable, PermissionsV2Upg
             sig == IPActionCore.redeemPyToToken.selector ||
             sig == IPActionCore.mintPyFromScy.selector ||
             sig == IPActionCore.redeemPyToScy.selector ||
-            sig == IPActionCore.addLiquidity.selector ||
+            sig == IPActionCore.addLiquidityDualScyAndPt.selector ||
+            sig == IPActionCore.addLiquidityDualIbTokenAndPt.selector ||
             sig == IPActionCore.addLiquiditySinglePt.selector ||
             sig == IPActionCore.addLiquiditySingleScy.selector ||
             sig == IPActionCore.addLiquiditySingleToken.selector ||
-            sig == IPActionCore.removeLiquidity.selector ||
+            sig == IPActionCore.removeLiquidityDualScyAndPt.selector ||
+            sig == IPActionCore.removeLiquidityDualIbTokenAndPt.selector ||
             sig == IPActionCore.removeLiquiditySinglePt.selector ||
             sig == IPActionCore.removeLiquiditySingleScy.selector ||
             sig == IPActionCore.removeLiquiditySingleToken.selector ||

package/contracts/core/actions/ActionCore.sol

@@ -18,7 +18,7 @@ contract ActionCore is IPActionCore, ActionSCYAndPTBase {
     {}
 
     /// @dev refer to the internal function
-    function addLiquidity(
+    function addLiquidityDualScyAndPt(
         address receiver,
         address market,
         uint256 scyDesired,
@@ -32,7 +32,7 @@ contract ActionCore is IPActionCore, ActionSCYAndPTBase {
             uint256 ptUsed
         )
     {
-        (netLpOut, scyUsed, ptUsed) = _addLiquidity(
+        (netLpOut, scyUsed, ptUsed) = _addLiquidityDualScyAndPt(
             receiver,
             market,
             scyDesired,
@@ -40,7 +40,39 @@ contract ActionCore is IPActionCore, ActionSCYAndPTBase {
             minLpOut,
             true
         );
-        emit AddLiquidity(msg.sender, market, receiver, scyUsed, ptUsed, netLpOut);
+        emit AddLiquidityDualScyAndPt(msg.sender, market, receiver, scyUsed, ptUsed, netLpOut);
+    }
+
+    /// @dev refer to the internal function
+    function addLiquidityDualIbTokenAndPt(
+        address receiver,
+        address market,
+        uint256 ibTokenDesired,
+        uint256 ptDesired,
+        uint256 minLpOut
+    )
+        external
+        returns (
+            uint256 netLpOut,
+            uint256 ibTokenUsed,
+            uint256 ptUsed
+        )
+    {
+        (netLpOut, ibTokenUsed, ptUsed) = _addLiquidityDualIbTokenAndPt(
+            receiver,
+            market,
+            ibTokenDesired,
+            ptDesired,
+            minLpOut
+        );
+        emit AddLiquidityDualIbTokenAndPt(
+            msg.sender,
+            market,
+            receiver,
+            ibTokenDesired,
+            ptUsed,
+            netLpOut
+        );
     }
 
     function addLiquiditySinglePt(
@@ -74,22 +106,53 @@ contract ActionCore is IPActionCore, ActionSCYAndPTBase {
     }
 
     /// @dev refer to the internal function
-    function removeLiquidity(
+    function removeLiquidityDualScyAndPt(
         address receiver,
         address market,
         uint256 lpToRemove,
         uint256 scyOutMin,
         uint256 ptOutMin
     ) external returns (uint256 netScyOut, uint256 netPtOut) {
-        (netScyOut, netPtOut) = _removeLiquidity(
+        (netScyOut, netPtOut) = _removeLiquidityDualScyAndPt(
             receiver,
             market,
             lpToRemove,
             scyOutMin,
-            ptOutMin,
-            true
+            ptOutMin
+        );
+        emit RemoveLiquidityDualScyAndPt(
+            msg.sender,
+            market,
+            receiver,
+            lpToRemove,
+            netPtOut,
+            netScyOut
+        );
+    }
+
+    /// @dev refer to the internal function
+    function removeLiquidityDualIbTokenAndPt(
+        address receiver,
+        address market,
+        uint256 lpToRemove,
+        uint256 ibTokenMin,
+        uint256 ptOutMin
+    ) external returns (uint256 netIbTokenOut, uint256 netPtOut) {
+        (netIbTokenOut, netPtOut) = _removeLiquidityDualIbTokenAndPt(
+            receiver,
+            market,
+            lpToRemove,
+            ibTokenMin,
+            ptOutMin
+        );
+        emit RemoveLiquidityDualIbTokenAndPt(
+            msg.sender,
+            market,
+            receiver,
+            lpToRemove,
+            netPtOut,
+            netIbTokenOut
         );
-        emit RemoveLiquidity(msg.sender, market, receiver, lpToRemove, netPtOut, netScyOut);
     }
 
     function removeLiquiditySinglePt(

package/contracts/core/actions/base/ActionSCYAndPTBase.sol

@@ -23,7 +23,7 @@ abstract contract ActionSCYAndPTBase is ActionSCYAndPYBase {
     /// @dev For doPull: if doPull is true, this function will do transferFrom as necessary from msg.sender. Else, it will
     /// assume tokens have already been transferred in.
 
-    function _addLiquidity(
+    function _addLiquidityDualScyAndPt(
         address receiver,
         address market,
         uint256 scyDesired,
@@ -63,31 +63,88 @@ abstract contract ActionSCYAndPTBase is ActionSCYAndPYBase {
         require(netLpOut >= minLpOut, "FS insufficient lp out");
     }
 
-    function _removeLiquidity(
+    function _addLiquidityDualIbTokenAndPt(
+        address receiver,
+        address market,
+        uint256 ibTokenDesired,
+        uint256 ptDesired,
+        uint256 minLpOut
+    )
+        internal
+        returns (
+            uint256 netLpOut,
+            uint256 ibTokenUsed,
+            uint256 ptUsed
+        )
+    {
+        (ISuperComposableYield SCY, IPPrincipalToken PT, IPYieldToken YT) = IPMarket(market)
+            .readTokens();
+
+        address ibToken = SCY.yieldToken();
+        uint256 scyDesired = SCY.previewDeposit(ibToken, ibTokenDesired);
+        uint256 scyUsed;
+
+        {
+            MarketState memory state = IPMarket(market).readState(false);
+            (, netLpOut, scyUsed, ptUsed) = state.addLiquidity(
+                YT.newIndex(),
+                scyDesired,
+                ptDesired,
+                block.timestamp
+            );
+        }
+
+        // early-check
+        require(netLpOut >= minLpOut, "insufficient lp out");
+
+        IERC20(PT).safeTransferFrom(msg.sender, market, ptUsed);
+
+        // convert ibToken to SCY to deposit
+        ibTokenUsed = (ibTokenDesired * scyUsed).rawDivUp(scyDesired);
+
+        IERC20(ibToken).safeTransferFrom(msg.sender, address(this), ibTokenUsed);
+
+        _safeApproveInf(ibToken, address(SCY));
+
+        SCY.deposit(market, ibToken, ibTokenUsed, scyDesired);
+
+        netLpOut = IPMarket(market).mint(receiver);
+        // fail-safe
+        require(netLpOut >= minLpOut, "FS insufficient lp out");
+    }
+
+    function _removeLiquidityDualScyAndPt(
         address receiver,
         address market,
         uint256 lpToRemove,
         uint256 scyOutMin,
-        uint256 ptOutMin,
-        bool doPull
+        uint256 ptOutMin
     ) internal returns (uint256 netScyOut, uint256 netPtOut) {
-        MarketState memory state = IPMarket(market).readState(false);
+        IERC20(market).safeTransferFrom(msg.sender, market, lpToRemove);
 
-        (netScyOut, netPtOut) = state.removeLiquidity(lpToRemove);
+        (netScyOut, netPtOut) = IPMarket(market).burn(receiver, receiver);
 
-        // early-check
         require(netScyOut >= scyOutMin, "insufficient SCY out");
         require(netPtOut >= ptOutMin, "insufficient PT out");
+    }
 
-        if (doPull) {
-            IERC20(market).safeTransferFrom(msg.sender, market, lpToRemove);
-        }
+    function _removeLiquidityDualIbTokenAndPt(
+        address receiver,
+        address market,
+        uint256 lpToRemove,
+        uint256 ibTokenOutMin,
+        uint256 ptOutMin
+    ) internal returns (uint256 netIbTokenOut, uint256 netPtOut) {
+        (ISuperComposableYield SCY, , ) = IPMarket(market).readTokens();
+        address ibToken = SCY.yieldToken();
 
-        (netScyOut, netPtOut) = IPMarket(market).burn(receiver, receiver);
+        IERC20(market).safeTransferFrom(msg.sender, market, lpToRemove);
 
-        // fail-safe
-        require(netScyOut >= scyOutMin, "FS insufficient SCY out");
-        require(netPtOut >= ptOutMin, "FS insufficient PT out");
+        (, netPtOut) = IPMarket(market).burn(address(SCY), receiver);
+
+        netIbTokenOut = SCY.redeemAfterTransfer(receiver, ibToken, ibTokenOutMin);
+
+        require(netPtOut >= ptOutMin, "insufficient PT out");
     }
 
     function _swapExactPtForScy(

package/contracts/core/actions/base/ActionSCYAndYTBase.sol

@@ -201,7 +201,7 @@ abstract contract ActionSCYAndYTBase is ActionSCYAndPYBase, CallbackHelper {
     ) internal returns (uint256 netTokenOut) {
         (ISuperComposableYield SCY, , ) = IPMarket(market).readTokens();
 
-        uint256 netScyOut = _swapExactYtForScy(receiver, market, netYtIn, 1, doPull);
+        uint256 netScyOut = _swapExactYtForScy(address(SCY), market, netYtIn, 1, doPull);
 
         netTokenOut = _redeemScyToToken(receiver, address(SCY), netScyOut, output, false);
     }

package/contracts/interfaces/IPActionCore.sol

@@ -5,7 +5,7 @@ import "../libraries/math/MarketApproxLib.sol";
 import "../libraries/kyberswap/KyberSwapHelper.sol";
 
 interface IPActionCore {
-    event AddLiquidity(
+    event AddLiquidityDualScyAndPt(
         address indexed caller,
         address indexed market,
         address indexed receiver,
@@ -14,7 +14,16 @@ interface IPActionCore {
         uint256 lpOut
     );
 
-    event RemoveLiquidity(
+    event AddLiquidityDualIbTokenAndPt(
+        address indexed caller,
+        address indexed market,
+        address indexed receiver,
+        uint256 ibTokenUsed,
+        uint256 ptUsed,
+        uint256 lpOut
+    );
+
+    event RemoveLiquidityDualScyAndPt(
         address indexed caller,
         address indexed market,
         address receiver,
@@ -23,6 +32,15 @@ interface IPActionCore {
         uint256 amountSCYOut
     );
 
+    event RemoveLiquidityDualIbTokenAndPt(
+        address indexed caller,
+        address indexed market,
+        address receiver,
+        uint256 lpIn,
+        uint256 amountPTOut,
+        uint256 amountIbTokenOut
+    );
+
     event SwapPtAndScy(
         address indexed caller,
         address indexed market,
@@ -92,7 +110,7 @@ interface IPActionCore {
         uint256 netTokenOut
     );
 
-    function addLiquidity(
+    function addLiquidityDualScyAndPt(
         address receiver,
         address market,
         uint256 scyDesired,
@@ -106,6 +124,21 @@ interface IPActionCore {
             uint256 ptUsed
         );
 
+    /// @dev refer to the internal function
+    function addLiquidityDualIbTokenAndPt(
+        address receiver,
+        address market,
+        uint256 ibTokenDesired,
+        uint256 ptDesired,
+        uint256 minLpOut
+    )
+        external
+        returns (
+            uint256 netLpOut,
+            uint256 ibTokenUsed,
+            uint256 ptUsed
+        );
+
     function addLiquiditySinglePt(
         address receiver,
         address market,
@@ -130,7 +163,7 @@ interface IPActionCore {
         TokenInput calldata input
     ) external returns (uint256 netLpOut);
 
-    function removeLiquidity(
+    function removeLiquidityDualScyAndPt(
         address receiver,
         address market,
         uint256 lpToRemove,
@@ -138,6 +171,15 @@ interface IPActionCore {
         uint256 ptOutMin
     ) external returns (uint256 netScyOut, uint256 netPtOut);
 
+    /// @dev refer to the internal function
+    function removeLiquidityDualIbTokenAndPt(
+        address receiver,
+        address market,
+        uint256 lpToRemove,
+        uint256 ibTokenMin,
+        uint256 ptOutMin
+    ) external returns (uint256 netIbTokenOut, uint256 netPtOut);
+
     function removeLiquiditySinglePt(
         address receiver,
         address market,

package/contracts/interfaces/IPRouterStatic.sol

@@ -86,7 +86,7 @@ interface IPRouterStatic {
 
     // ============= MARKET ACTIONS =============
 
-    function addLiquidityStatic(
+    function addLiquidityDualScyAndPtStatic(
         address market,
         uint256 scyDesired,
         uint256 ptDesired
@@ -98,7 +98,7 @@ interface IPRouterStatic {
             uint256 ptUsed
         );
 
-    function removeLiquidityStatic(address market, uint256 lpToRemove)
+    function removeLiquidityDualScyAndPtStatic(address market, uint256 lpToRemove)
         external
         view
         returns (uint256 netScyOut, uint256 netPtOut);

package/contracts/libraries/math/Math.sol

@@ -59,6 +59,10 @@ library Math {
         }
     }
 
+    function rawDivUp(uint256 a, uint256 b) internal pure returns (uint256) {
+        return (a + b - 1) / b;
+    }
+
     // @author Uniswap
     function sqrt(uint256 y) internal pure returns (uint256 z) {
         if (y > 3) {

package/contracts/offchain-helpers/RouterStatic.sol

@@ -139,7 +139,7 @@ contract RouterStatic is IPRouterStatic {
 
     // ============= MARKET ACTIONS =============
 
-    function addLiquidityStatic(
+    function addLiquidityDualScyAndPtStatic(
         address market,
         uint256 scyDesired,
         uint256 ptDesired
@@ -160,6 +160,35 @@ contract RouterStatic is IPRouterStatic {
         );
     }
 
+    function addLiquidityDualIbTokenAndPtStatic(
+        address market,
+        uint256 ibTokenDesired,
+        uint256 ptDesired
+    )
+        external
+        returns (
+            uint256 netLpOut,
+            uint256 ibTokenUsed,
+            uint256 ptUsed
+        )
+    {
+        (ISuperComposableYield SCY, , ) = IPMarket(market).readTokens();
+
+        address ibToken = SCY.yieldToken();
+        uint256 scyDesired = SCY.previewDeposit(ibToken, ibTokenDesired);
+        uint256 scyUsed;
+
+        MarketState memory state = IPMarket(market).readState(false);
+        (, netLpOut, scyUsed, ptUsed) = state.addLiquidity(
+            pyIndex(market),
+            scyDesired,
+            ptDesired,
+            block.timestamp
+        );
+
+        ibTokenUsed = (ibTokenDesired * scyUsed).rawDivUp(scyDesired);
+    }
+
     function addLiquiditySinglePtStatic(address market, uint256 netPtIn)
         external
         returns (
@@ -197,7 +226,7 @@ contract RouterStatic is IPRouterStatic {
         require(false, "NOT IMPLEMENTED");
     }
 
-    function removeLiquidityStatic(address market, uint256 lpToRemove)
+    function removeLiquidityDualScyAndPtStatic(address market, uint256 lpToRemove)
         external
         view
         returns (uint256 netScyOut, uint256 netPtOut)
@@ -206,6 +235,22 @@ contract RouterStatic is IPRouterStatic {
         (netScyOut, netPtOut) = state.removeLiquidity(lpToRemove);
     }
 
+    function removeLiquidityDualIbTokenAndPtStatic(address market, uint256 lpToRemove)
+        external
+        view
+        returns (uint256 netIbTokenOut, uint256 netPtOut)
+    {
+        (ISuperComposableYield SCY, , ) = IPMarket(market).readTokens();
+
+        address ibToken = SCY.yieldToken();
+
+        uint256 netScyOut;
+        MarketState memory state = IPMarket(market).readState(false);
+        (netScyOut, netPtOut) = state.removeLiquidity(lpToRemove);
+
+        netIbTokenOut = SCY.previewRedeem(ibToken, netScyOut);
+    }
+
     function removeLiquiditySinglePtStatic(address market, uint256 lpToRemove)
         external
         returns (

package/deployments/43113-core.json

@@ -8,7 +8,7 @@
     "yieldContractFactory": "0xf9397B3b93d118587c29bA2a166c0192251fc758",
     "marketFactory": "0x2FfdD5E68ce0F668498029c1219Db39f79ebD5bd",
     "router": "0xFEdBED4682D136925d30FFb9B8977CC9b3a6c406",
-    "routerStatic": "0x501E089e6BD6b78e6E435C15118E52c665931850",
+    "routerStatic": "0x4f8d23b849578541760b4cf2c6Eb67D2c65AE11F",
     "startTime": 1657756800,
     "vePendle": "0xa94936409d9B0633dB6271Fc2789aBa9C74bD729",
     "votingController": "0x676A97883D396b21f3a7554A73F30187752c7C45",

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "0.9.0-gamma-2",
+  "version": "0.9.3-beta",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",