@pendle/core-v2 0.9.2-beta → 0.9.4-beta

package/contracts/core/actions/ActionCore.sol

@@ -44,32 +44,35 @@ contract ActionCore is IPActionCore, ActionSCYAndPTBase {
     }
 
     /// @dev refer to the internal function
-    function addLiquidityDualIbTokenAndPt(
+    function addLiquidityDualTokenAndPt(
         address receiver,
         address market,
-        uint256 ibTokenDesired,
+        address tokenIn,
+        uint256 tokenDesired,
         uint256 ptDesired,
         uint256 minLpOut
     )
         external
         returns (
             uint256 netLpOut,
-            uint256 ibTokenUsed,
+            uint256 tokenUsed,
             uint256 ptUsed
         )
     {
-        (netLpOut, ibTokenUsed, ptUsed) = _addLiquidityDualIbTokenAndPt(
+        (netLpOut, tokenUsed, ptUsed) = _addLiquidityDualTokenAndPt(
             receiver,
             market,
-            ibTokenDesired,
+            tokenIn,
+            tokenDesired,
             ptDesired,
             minLpOut
         );
-        emit AddLiquidityDualIbTokenAndPt(
+        emit AddLiquidityDualTokenAndPt(
             msg.sender,
             market,
             receiver,
-            ibTokenDesired,
+            tokenIn,
+            tokenDesired,
             ptUsed,
             netLpOut
         );
@@ -131,18 +134,20 @@ contract ActionCore is IPActionCore, ActionSCYAndPTBase {
     }
 
     /// @dev refer to the internal function
-    function removeLiquidityDualIbTokenAndPt(
+    function removeLiquidityDualTokenAndPt(
         address receiver,
         address market,
         uint256 lpToRemove,
-        uint256 ibTokenMin,
+        address tokenOut,
+        uint256 tokenOutMin,
         uint256 ptOutMin
-    ) external returns (uint256 netIbTokenOut, uint256 netPtOut) {
-        (netIbTokenOut, netPtOut) = _removeLiquidityDualIbTokenAndPt(
+    ) external returns (uint256 netTokenOut, uint256 netPtOut) {
+        (netTokenOut, netPtOut) = _removeLiquidityDualTokenAndPt(
             receiver,
             market,
             lpToRemove,
-            ibTokenMin,
+            tokenOut,
+            tokenOutMin,
             ptOutMin
         );
         emit RemoveLiquidityDualIbTokenAndPt(
@@ -151,7 +156,7 @@ contract ActionCore is IPActionCore, ActionSCYAndPTBase {
             receiver,
             lpToRemove,
             netPtOut,
-            netIbTokenOut
+            netTokenOut
         );
     }
 

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

@@ -63,25 +63,25 @@ abstract contract ActionSCYAndPTBase is ActionSCYAndPYBase {
         require(netLpOut >= minLpOut, "FS insufficient lp out");
     }
 
-    function _addLiquidityDualIbTokenAndPt(
+    function _addLiquidityDualTokenAndPt(
         address receiver,
         address market,
-        uint256 ibTokenDesired,
+        address tokenIn,
+        uint256 tokenDesired,
         uint256 ptDesired,
         uint256 minLpOut
     )
         internal
         returns (
             uint256 netLpOut,
-            uint256 ibTokenUsed,
+            uint256 tokenUsed,
             uint256 ptUsed
         )
     {
         (ISuperComposableYield SCY, IPPrincipalToken PT, IPYieldToken YT) = IPMarket(market)
             .readTokens();
 
-        address ibToken = SCY.yieldToken();
-        uint256 scyDesired = SCY.previewDeposit(ibToken, ibTokenDesired);
+        uint256 scyDesired = SCY.previewDeposit(tokenIn, tokenDesired);
         uint256 scyUsed;
 
         {
@@ -99,14 +99,14 @@ abstract contract ActionSCYAndPTBase is ActionSCYAndPYBase {
 
         IERC20(PT).safeTransferFrom(msg.sender, market, ptUsed);
 
-        // convert ibToken to SCY to deposit
-        ibTokenUsed = (ibTokenDesired * scyUsed).rawDivUp(scyDesired);
+        // convert tokenIn to SCY to deposit
+        tokenUsed = (tokenDesired * scyUsed).rawDivUp(scyDesired);
 
-        IERC20(ibToken).safeTransferFrom(msg.sender, address(this), ibTokenUsed);
+        IERC20(tokenIn).safeTransferFrom(msg.sender, address(this), tokenUsed);
 
-        _safeApproveInf(ibToken, address(SCY));
+        _safeApproveInf(tokenIn, address(SCY));
 
-        SCY.deposit(market, ibToken, ibTokenUsed, scyDesired);
+        SCY.deposit(market, tokenIn, tokenUsed, scyUsed);
 
         netLpOut = IPMarket(market).mint(receiver);
         // fail-safe
@@ -128,21 +128,21 @@ abstract contract ActionSCYAndPTBase is ActionSCYAndPYBase {
         require(netPtOut >= ptOutMin, "insufficient PT out");
     }
 
-    function _removeLiquidityDualIbTokenAndPt(
+    function _removeLiquidityDualTokenAndPt(
         address receiver,
         address market,
         uint256 lpToRemove,
-        uint256 ibTokenOutMin,
+        address tokenOut,
+        uint256 tokenOutMin,
         uint256 ptOutMin
-    ) internal returns (uint256 netIbTokenOut, uint256 netPtOut) {
+    ) internal returns (uint256 netTokenOut, uint256 netPtOut) {
         (ISuperComposableYield SCY, , ) = IPMarket(market).readTokens();
-        address ibToken = SCY.yieldToken();
 
         IERC20(market).safeTransferFrom(msg.sender, market, lpToRemove);
 
         (, netPtOut) = IPMarket(market).burn(address(SCY), receiver);
 
-        netIbTokenOut = SCY.redeemAfterTransfer(receiver, ibToken, ibTokenOutMin);
+        netTokenOut = SCY.redeemAfterTransfer(receiver, tokenOut, tokenOutMin);
 
         require(netPtOut >= ptOutMin, "insufficient PT out");
     }

package/contracts/interfaces/IPActionCore.sol

@@ -14,11 +14,12 @@ interface IPActionCore {
         uint256 lpOut
     );
 
-    event AddLiquidityDualIbTokenAndPt(
+    event AddLiquidityDualTokenAndPt(
         address indexed caller,
         address indexed market,
         address indexed receiver,
-        uint256 ibTokenUsed,
+        address tokenIn,
+        uint256 tokenUsed,
         uint256 ptUsed,
         uint256 lpOut
     );
@@ -27,7 +28,7 @@ interface IPActionCore {
         address indexed caller,
         address indexed market,
         address receiver,
-        uint256 lpIn,
+        uint256 netlpIn,
         uint256 amountPTOut,
         uint256 amountSCYOut
     );
@@ -124,18 +125,18 @@ interface IPActionCore {
             uint256 ptUsed
         );
 
-    /// @dev refer to the internal function
-    function addLiquidityDualIbTokenAndPt(
+    function addLiquidityDualTokenAndPt(
         address receiver,
         address market,
-        uint256 ibTokenDesired,
+        address tokenIn,
+        uint256 tokenDesired,
         uint256 ptDesired,
         uint256 minLpOut
     )
         external
         returns (
             uint256 netLpOut,
-            uint256 ibTokenUsed,
+            uint256 tokenUsed,
             uint256 ptUsed
         );
 
@@ -171,14 +172,14 @@ interface IPActionCore {
         uint256 ptOutMin
     ) external returns (uint256 netScyOut, uint256 netPtOut);
 
-    /// @dev refer to the internal function
-    function removeLiquidityDualIbTokenAndPt(
+    function removeLiquidityDualTokenAndPt(
         address receiver,
         address market,
         uint256 lpToRemove,
-        uint256 ibTokenMin,
+        address tokenOut,
+        uint256 tokenOutMin,
         uint256 ptOutMin
-    ) external returns (uint256 netIbTokenOut, uint256 netPtOut);
+    ) external returns (uint256 netTokenOut, uint256 netPtOut);
 
     function removeLiquiditySinglePt(
         address receiver,

package/contracts/offchain-helpers/RouterStatic.sol

@@ -160,22 +160,22 @@ contract RouterStatic is IPRouterStatic {
         );
     }
 
-    function addLiquidityDualIbTokenAndPtStatic(
+    function addLiquidityDualTokenAndPtStatic(
         address market,
-        uint256 ibTokenDesired,
+        address tokenIn,
+        uint256 tokenDesired,
         uint256 ptDesired
     )
         external
         returns (
             uint256 netLpOut,
-            uint256 ibTokenUsed,
+            uint256 tokenUsed,
             uint256 ptUsed
         )
     {
         (ISuperComposableYield SCY, , ) = IPMarket(market).readTokens();
 
-        address ibToken = SCY.yieldToken();
-        uint256 scyDesired = SCY.previewDeposit(ibToken, ibTokenDesired);
+        uint256 scyDesired = SCY.previewDeposit(tokenIn, tokenDesired);
         uint256 scyUsed;
 
         MarketState memory state = IPMarket(market).readState(false);
@@ -186,7 +186,7 @@ contract RouterStatic is IPRouterStatic {
             block.timestamp
         );
 
-        ibTokenUsed = (ibTokenDesired * scyUsed).rawDivUp(scyDesired);
+        tokenUsed = (tokenDesired * scyUsed).rawDivUp(scyDesired);
     }
 
     function addLiquiditySinglePtStatic(address market, uint256 netPtIn)
@@ -229,17 +229,24 @@ contract RouterStatic is IPRouterStatic {
     function removeLiquidityDualScyAndPtStatic(address market, uint256 lpToRemove)
         external
         view
-        returns (uint256 netIbTokenOut, uint256 netPtOut)
+        returns (uint256 netScyOut, uint256 netPtOut)
     {
-        (ISuperComposableYield SCY, , ) = IPMarket(market).readTokens();
+        MarketState memory state = IPMarket(market).readState(false);
+        (netScyOut, netPtOut) = state.removeLiquidity(lpToRemove);
+    }
 
-        address ibToken = SCY.yieldToken();
+    function removeLiquidityDualTokenAndPtStatic(
+        address market,
+        uint256 lpToRemove,
+        address tokenOut
+    ) external view returns (uint256 netTokenOut, uint256 netPtOut) {
+        (ISuperComposableYield SCY, , ) = IPMarket(market).readTokens();
 
         uint256 netScyOut;
         MarketState memory state = IPMarket(market).readState(false);
         (netScyOut, netPtOut) = state.removeLiquidity(lpToRemove);
 
-        netIbTokenOut = SCY.previewRedeem(ibToken, netScyOut);
+        netTokenOut = SCY.previewRedeem(tokenOut, netScyOut);
     }
 
     function removeLiquiditySinglePtStatic(address market, uint256 lpToRemove)

package/deployments/43113-benqi.json

@@ -3,8 +3,8 @@
     "QI": "0x09Fe18C4C0cFE929a6CD40903129F9bA3C837866",
     "USD": "0x2018ecc38fbca2ce3A62f96f9F0D38F0DEE2f99D",
     "qiUSD": "0x884f8d66862b03434E11f4Bd5527A1119c115D83",
-    "scyQiUSD": "0xc68Fe29C91a5611e332A57d4FC091eDe7fD5156d",
+    "scyQiUSD": "0xb58DAE6a0d929beE1C873C666D1958870e308a98",
     "WAVAX": "0xD323E5337713D2e01fb341D960BC31e1FB42348d",
     "qiAVAX": "0xABD65178Aa35051277b062327A70644F10D3cB9d",
-    "scyQiAVAX": "0x60e235D9836Ecf533966E2ef94795C83FcB5E7e3"
+    "scyQiAVAX": "0xA58dD1b2aCa656C1A6FA281C7CAeC22eb66aE449"
 }

package/deployments/43113-core.json

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

package/deployments/43113-markets/benqi-market-95E744.json

@@ -0,0 +1,7 @@
+{
+    "SCY": "0xA58dD1b2aCa656C1A6FA281C7CAeC22eb66aE449",
+    "expiry": 1688860800,
+    "PT": "0x575e427500ab3B4Ae09A63cceD578aef9E1FE9fB",
+    "YT": "0x7f0D1F2d613675e19C79fE63F496D9d95Af57e04",
+    "market": "0x7a0B5Afa018Fe67eAB9EeE83722253b82a95E744"
+}

package/deployments/43113-markets/benqi-market-D91a3F.json

@@ -0,0 +1,7 @@
+{
+    "SCY": "0xb58DAE6a0d929beE1C873C666D1958870e308a98",
+    "expiry": 1688860800,
+    "PT": "0xe42d01507eF472C1BaAaa9F8338D281D8A722767",
+    "YT": "0xFC33Be0752D20981c4c3C35C41465161a058Ceb9",
+    "market": "0x185B71bA09654752D4E12292419363D821D91a3F"
+}

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.2-beta",
+  "version": "0.9.4-beta",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",