@pendle/core-v2 0.8.0-beta-9 → 0.8.0-beta-11

package/contracts/core/actions/ActionCore.sol

@@ -43,6 +43,37 @@ contract ActionCore is IPActionCore, ActionSCYAndPTBase {
         emit AddLiquidity(msg.sender, market, receiver, scyUsed, ptUsed, netLpOut);
     }
 
+    function addLiquiditySinglePt(
+        address receiver,
+        address market,
+        uint256 netPtIn,
+        uint256 minLpOut,
+        ApproxParams memory guessPtSwapToScy
+    ) external returns (uint256 netLpOut) {
+        require(false, "NOT IMPLEMENTED");
+    }
+
+    function addLiquiditySingleScy(
+        address receiver,
+        address market,
+        uint256 netScyIn,
+        uint256 minLpOut,
+        ApproxParams memory guessPtReceivedFromScy
+    ) external returns (uint256 netLpOut) {
+        require(false, "NOT IMPLEMENTED");
+    }
+
+    function addLiquiditySingleRawToken(
+        address receiver,
+        address market,
+        uint256 netRawTokenIn,
+        uint256 minLpOut,
+        address[] calldata path,
+        ApproxParams memory guessPtReceivedFromScy
+    ) external returns (uint256 netLpOut) {
+        require(false, "NOT IMPLEMENTED");
+    }
+
     /// @dev refer to the internal function
     function removeLiquidity(
         address receiver,
@@ -62,6 +93,35 @@ contract ActionCore is IPActionCore, ActionSCYAndPTBase {
         emit RemoveLiquidity(msg.sender, market, receiver, lpToRemove, netPtOut, netScyOut);
     }
 
+    function removeLiquiditySinglePt(
+        address receiver,
+        address market,
+        uint256 lpToRemove,
+        uint256 minPtOut,
+        ApproxParams memory guessPtOut
+    ) external returns (uint256 netPtOut) {
+        require(false, "NOT IMPLEMENTED");
+    }
+
+    function removeLiquiditySingleScy(
+        address receiver,
+        address market,
+        uint256 lpToRemove,
+        uint256 minScyOut
+    ) external returns (uint256 netScyOut) {
+        require(false, "NOT IMPLEMENTED");
+    }
+
+    function removeLiquiditySingleRawToken(
+        address receiver,
+        address market,
+        uint256 lpToRemove,
+        uint256 minRawTokenOut,
+        address[] memory path
+    ) external returns (uint256 netRawTokenOut) {
+        require(false, "NOT IMPLEMENTED");
+    }
+
     /// @dev refer to the internal function
     function swapExactPtForScy(
         address receiver,
@@ -169,6 +229,26 @@ contract ActionCore is IPActionCore, ActionSCYAndPTBase {
         );
     }
 
+    function mintPyFromScy(
+        address receiver,
+        address YT,
+        uint256 netScyIn,
+        uint256 minPyOut
+    ) external returns (uint256 netPyOut) {
+        netPyOut = _mintPyFromScy(receiver, YT, netScyIn, minPyOut, true);
+        emit MintPyFromScy(msg.sender, receiver, YT, netScyIn, netPyOut);
+    }
+
+    function redeemPyToScy(
+        address receiver,
+        address YT,
+        uint256 netPyIn,
+        uint256 minScyOut
+    ) external returns (uint256 netScyOut) {
+        netScyOut = _redeemPyToScy(receiver, YT, netPyIn, minScyOut, true);
+        emit RedeemPyToScy(msg.sender, receiver, YT, netPyIn, netScyOut);
+    }
+
     /// @dev refer to the internal function
     function swapExactRawTokenForPt(
         address receiver,

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

@@ -129,4 +129,40 @@ abstract contract ActionSCYAndPYBase is PendleJoeSwapHelperUpg, TokenHelper {
 
         netRawTokenOut = _redeemScyToRawToken(receiver, SCY, 0, minRawTokenOut, path, false);
     }
+
+    function _mintPyFromScy(
+        address receiver,
+        address YT,
+        uint256 netScyIn,
+        uint256 minPyOut,
+        bool doPull
+    ) internal returns (uint256 netPyOut) {
+        address SCY = IPYieldToken(YT).SCY();
+
+        if (doPull) {
+            IERC20(SCY).safeTransferFrom(msg.sender, YT, netScyIn);
+        }
+
+        netPyOut = IPYieldToken(YT).mintPY(receiver, receiver);
+        require(netPyOut >= minPyOut, "insufficient PY out");
+    }
+
+    function _redeemPyToScy(
+        address receiver,
+        address YT,
+        uint256 netPyIn,
+        uint256 minScyOut,
+        bool doPull
+    ) internal returns (uint256 netScyOut) {
+        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);
+        }
+
+        netScyOut = IPYieldToken(YT).redeemPY(receiver);
+        require(netScyOut >= minScyOut, "insufficient SCY out");
+    }
 }

package/contracts/interfaces/IPActionCore.sol

@@ -57,6 +57,22 @@ interface IPActionCore {
         uint256 netRawTokenOut
     );
 
+    event MintPyFromScy(
+        address indexed caller,
+        address indexed receiver,
+        address indexed YT,
+        uint256 netScyIn,
+        uint256 netPyOut
+    );
+
+    event RedeemPyToScy(
+        address indexed caller,
+        address indexed receiver,
+        address indexed YT,
+        uint256 netPyIn,
+        uint256 netScyOut
+    );
+
     event MintPyFromRawToken(
         address indexed caller,
         address indexed receiver,
@@ -89,6 +105,31 @@ interface IPActionCore {
             uint256 ptUsed
         );
 
+    function addLiquiditySinglePt(
+        address receiver,
+        address market,
+        uint256 netPtIn,
+        uint256 minLpOut,
+        ApproxParams memory guessPtSwapToScy
+    ) external returns (uint256 netLpOut);
+
+    function addLiquiditySingleScy(
+        address receiver,
+        address market,
+        uint256 netScyIn,
+        uint256 minLpOut,
+        ApproxParams memory guessPtReceivedFromScy
+    ) external returns (uint256 netLpOut);
+
+    function addLiquiditySingleRawToken(
+        address receiver,
+        address market,
+        uint256 netRawTokenIn,
+        uint256 minLpOut,
+        address[] calldata path,
+        ApproxParams memory guessPtReceivedFromScy
+    ) external returns (uint256 netLpOut);
+
     function removeLiquidity(
         address receiver,
         address market,
@@ -97,6 +138,29 @@ interface IPActionCore {
         uint256 ptOutMin
     ) external returns (uint256 netScyOut, uint256 netPtOut);
 
+    function removeLiquiditySinglePt(
+        address receiver,
+        address market,
+        uint256 lpToRemove,
+        uint256 minPtOut,
+        ApproxParams memory guessPtOut
+    ) external returns (uint256 netPtOut);
+
+    function removeLiquiditySingleScy(
+        address receiver,
+        address market,
+        uint256 lpToRemove,
+        uint256 minScyOut
+    ) external returns (uint256 netScyOut);
+
+    function removeLiquiditySingleRawToken(
+        address receiver,
+        address market,
+        uint256 lpToRemove,
+        uint256 minRawTokenOut,
+        address[] memory path
+    ) external returns (uint256 netRawTokenOut);
+
     function swapExactPtForScy(
         address receiver,
         address market,
@@ -159,6 +223,20 @@ interface IPActionCore {
         address[] memory path
     ) external returns (uint256 netRawTokenOut);
 
+    function mintPyFromScy(
+        address receiver,
+        address YT,
+        uint256 netScyIn,
+        uint256 minPyOut
+    ) external returns (uint256 netPyOut);
+
+    function redeemPyToScy(
+        address receiver,
+        address YT,
+        uint256 netPyIn,
+        uint256 minScyOut
+    ) external returns (uint256 netScyOut);
+
     function swapExactRawTokenForPt(
         address receiver,
         address market,

package/contracts/interfaces/IPRouterStatic.sol

@@ -64,7 +64,8 @@ interface IPRouterStatic {
             address pt,
             address scy,
             MarketState memory state,
-            int256 impliedYield
+            int256 impliedYield,
+            uint256 exchangeRate
         );
 
     // ============= USER INFO =============

package/contracts/offchain-helpers/RouterStatic.sol

@@ -83,7 +83,8 @@ contract RouterStatic is IPRouterStatic {
             address pt,
             address scy,
             MarketState memory state,
-            int256 impliedYield
+            int256 impliedYield,
+            uint256 exchangeRate
         )
     {
         IPMarket _market = IPMarket(market);
@@ -93,6 +94,7 @@ contract RouterStatic is IPRouterStatic {
         scy = address(SCY);
         state = _market.readState(true);
         impliedYield = getPtImpliedYield(market);
+        exchangeRate = getExchangeRate(market);
     }
 
     // ============= USER INFO =============
@@ -159,6 +161,28 @@ contract RouterStatic is IPRouterStatic {
         );
     }
 
+    function addLiquiditySinglePtStatic(address market, uint256 netPtIn)
+        external
+        returns (uint256 netLpOut)
+    {
+        require(false, "NOT IMPLEMENTED");
+    }
+
+    function addLiquiditySingleScy(address market, uint256 netScyIn)
+        external
+        returns (uint256 netLpOut)
+    {
+        require(false, "NOT IMPLEMENTED");
+    }
+
+    function addLiquiditySingleBaseToken(
+        address market,
+        address baseToken,
+        uint256 netBaseTokenIn
+    ) external returns (uint256 netLpOut) {
+        require(false, "NOT IMPLEMENTED");
+    }
+
     function removeLiquidityStatic(address market, uint256 lpToRemove)
         external
         view
@@ -168,6 +192,28 @@ contract RouterStatic is IPRouterStatic {
         (netScyOut, netPtOut) = state.removeLiquidity(lpToRemove);
     }
 
+    function removeLiquiditySinglePtStatic(address market, uint256 lpToRemove)
+        external
+        returns (uint256 netPtOut)
+    {
+        require(false, "NOT IMPLEMENTED");
+    }
+
+    function removeLiquiditySingleScy(address market, uint256 lpToRemove)
+        external
+        returns (uint256 netScyOut)
+    {
+        require(false, "NOT IMPLEMENTED");
+    }
+
+    function removeLiquiditySingleBaseToken(
+        address market,
+        uint256 lpToRemove,
+        address baseToken
+    ) external returns (uint256 netBaseTokenOut) {
+        require(false, "NOT IMPLEMENTED");
+    }
+
     function swapExactPtForScyStatic(address market, uint256 exactPtIn)
         public
         view
@@ -457,16 +503,22 @@ contract RouterStatic is IPRouterStatic {
         userMarketInfo.market = market;
         userMarketInfo.lpBalance = userLp;
 
+        (ISuperComposableYield SCY, IPPrincipalToken PT, ) = _market.readTokens();
+        (userMarketInfo.assetBalance.assetType, userMarketInfo.assetBalance.assetAddress, ) = SCY
+            .assetInfo();
+
         MarketState memory state = _market.readState(false);
         uint256 totalLp = uint256(state.totalLp);
+
+        if (totalLp == 0) {
+            return userMarketInfo;
+        }
+
         uint256 userPt = (userLp * uint256(state.totalPt)) / totalLp;
         uint256 userScy = (userLp * uint256(state.totalScy)) / totalLp;
 
-        (ISuperComposableYield SCY, IPPrincipalToken PT, ) = _market.readTokens();
         userMarketInfo.ptBalance = TokenAmount(address(PT), userPt);
         userMarketInfo.scyBalance = TokenAmount(address(SCY), userScy);
-        (userMarketInfo.assetBalance.assetType, userMarketInfo.assetBalance.assetAddress, ) = SCY
-            .assetInfo();
         userMarketInfo.assetBalance.amount = (userScy * SCY.exchangeRate()) / Math.ONE;
     }
 

package/deployments/43113-benqi.json

@@ -3,8 +3,8 @@
     "QI": "0x09Fe18C4C0cFE929a6CD40903129F9bA3C837866",
     "USD": "0x2018ecc38fbca2ce3A62f96f9F0D38F0DEE2f99D",
     "qiUSD": "0x884f8d66862b03434E11f4Bd5527A1119c115D83",
-    "scyQiUSD": "0x924a6bc9F52a201a09Fe380576D382e05880BF90",
+    "scyQiUSD": "0x4c91cC2062ABE2000A0E8AdF6b9b3Ceea839EAF7",
     "WAVAX": "0xD323E5337713D2e01fb341D960BC31e1FB42348d",
     "qiAVAX": "0xABD65178Aa35051277b062327A70644F10D3cB9d",
-    "scyQiAVAX": "0x22a559ae3bf7A7eB4BB6d9CEEa0FfdDA63582ac7"
+    "scyQiAVAX": "0xe0c34CeF3980988a71aFC902FD7B12E0c51961E3"
 }

package/deployments/43113-core.json

@@ -8,7 +8,7 @@
     "yieldContractFactory": "0x2B233F133f3DA67698453F4A251BAF8BAc1E584d",
     "marketFactory": "0xE3a730f28EAe40309A9868Fb5b66B5BaaF531204",
     "router": "0xFEdBED4682D136925d30FFb9B8977CC9b3a6c406",
-    "routerStatic": "0x1f42eB778ee2e07daAd39FA46d8021486cCd69Fb",
+    "routerStatic": "0x1436Cb03C753bB9fAc7fcfE5627d08F143D6d8ed",
     "startTime": 1657756800,
     "vePendle": "0xD05B49500F35d879F3Bf220c81BE3ff9d73Ca205",
     "votingController": "0x449f676be160C5C682E1E64934f29641D6096116",

package/deployments/43113-markets/benqi-market-5C60ba.json

@@ -0,0 +1,7 @@
+{
+    "SCY": "0x4c91cC2062ABE2000A0E8AdF6b9b3Ceea839EAF7",
+    "expiry": 1673308800,
+    "PT": "0x37b8F3cBE94f6f97B81e0c4C8b80A6FDA6944DEF",
+    "YT": "0x01107448ad233C327f773FD299a7B4A56aDAbd90",
+    "market": "0x6C065eB5ae144a949FF27c7359672367de5C60ba"
+}

package/deployments/43113-markets/benqi-market-611eA3.json

@@ -0,0 +1,7 @@
+{
+    "SCY": "0xe0c34CeF3980988a71aFC902FD7B12E0c51961E3",
+    "expiry": 1673308800,
+    "PT": "0x415E6AC74177f5D64dA8885994FEC62FD1d4C9f3",
+    "YT": "0x12F34F0E47bB42B7B924F948dd9e6A3652B210C0",
+    "market": "0x1E8799512acafa62A96Ab7421CCD93C401611eA3"
+}

package/deployments/80001-benqi.json

@@ -3,8 +3,8 @@
     "QI": "0x48a6107e24de381E283340871C927A2Fa2844e17",
     "USD": "0x0059a72A5e545F6998AF038aBBB625FC702b1a97",
     "qiUSD": "0x03d73AC818312802536a41e0C9fCbff342B2A62C",
-    "scyQiUSD": "0x7DCC9D9b39AE078486F854680ac61d91D5de2cb6",
+    "scyQiUSD": "0xff1B93a18Ac40CADE55a1F62A19c92ec2e5b0B78",
     "WAVAX": "0xd965c925Fd933029F8e5b7AD0C13bC875a026b09",
     "qiAVAX": "0x7b42e48BEd90Ab5b2392984182B87bfF6B9c8863",
-    "scyQiAVAX": "0x2AAD9C2B82003467e511BF08651fbA9162De4e7e"
+    "scyQiAVAX": "0xB180706D89f10A3529eEA66aC467dE26eaC7aCc5"
 }

package/deployments/80001-core.json

@@ -8,7 +8,7 @@
     "yieldContractFactory": "0xa8E22cc2E74dACb43E73cFa89172bfa30eFA0A56",
     "marketFactory": "0x5539C4BCcff8d5881eCb1B95D2f6E7Eb47f0f801",
     "router": "0x24d7CEaFBA7c7b32BE200aD6dA38C03797F0611f",
-    "routerStatic": "0x3b4503f6E4c077C111Ac09a8d9294C24e2E8491c",
+    "routerStatic": "0xf68aD0dF5E6034A934bE0e3E8b23Ab77f9778315",
     "startTime": 1657756800,
     "vePendle": "0x35d294d0922838b0899Cbf4C35f4945B2b3D20f1",
     "gaugeController": "0x36e65521b2a1AEBA9a009226e75125cEcf00702f"

package/deployments/80001-markets/benqi-market-5E1104.json

@@ -0,0 +1,7 @@
+{
+    "SCY": "0xB180706D89f10A3529eEA66aC467dE26eaC7aCc5",
+    "expiry": 1673308800,
+    "PT": "0xeC2BF0299517B66fF30D05191859A2b735Bfa3C9",
+    "YT": "0x9C6C41E3641B063C214F7C4bd3A6C5A8C036c0cA",
+    "market": "0xe7cc742F50D18D1751519c1FEc7063319F5E1104"
+}

package/deployments/80001-markets/benqi-market-c68429.json

@@ -0,0 +1,7 @@
+{
+    "SCY": "0xff1B93a18Ac40CADE55a1F62A19c92ec2e5b0B78",
+    "expiry": 1673308800,
+    "PT": "0x0d6377660e5963668BF44d15de662Fe4578C8A0d",
+    "YT": "0x2112daa371bb2f57D313a3A91980E89c72dC74E8",
+    "market": "0xdCdcbd30906807EC54eF85d3e0143721f0c68429"
+}

package/package.json

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