@pendle/core-v2 3.0.0-beta-3 → 3.0.0-beta-4

package/contracts/router/{ActionSwapPT.sol → ActionSwapPTV3.sol}

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity ^0.8.17;
 
 import "./base/ActionBase.sol";
-import "../interfaces/IPActionSwapPT.sol";
+import "../interfaces/IPActionSwapPTV3.sol";
 
-contract ActionSwapPT is IPActionSwapPT, ActionBase {
+contract ActionSwapPTV3 is IPActionSwapPTV3, ActionBase {
     using PMath for uint256;
 
     // ------------------ SWAP TOKEN FOR PT ------------------
@@ -15,14 +15,14 @@ contract ActionSwapPT is IPActionSwapPT, ActionBase {
         ApproxParams calldata guessPtOut,
         TokenInput calldata input,
         LimitOrderData calldata limit
-    ) external payable returns (uint256 netPtOut, uint256 netSyFee) {
+    ) external payable returns (uint256 netPtOut, uint256 netSyFee, uint256 netSyInterm) {
         (IStandardizedYield SY,,) = IPMarket(market).readTokens();
+        netSyInterm = _mintSyFromToken(_entry_swapExactSyForPt(market, limit), address(SY), 1, input);
 
-        uint256 netSyUseToBuyPt = _mintSyFromToken(_entry_swapExactSyForPt(market, limit), address(SY), 1, input);
-
-        (netPtOut, netSyFee) = _swapExactSyForPt(receiver, market, netSyUseToBuyPt, minPtOut, guessPtOut, limit);
-
-        emit SwapPtAndToken(msg.sender, market, input.tokenIn, receiver, netPtOut.Int(), input.netTokenIn.neg());
+        (netPtOut, netSyFee) = _swapExactSyForPt(receiver, market, netSyInterm, minPtOut, guessPtOut, limit);
+        emit SwapPtAndToken(
+            msg.sender, market, input.tokenIn, receiver, netPtOut.Int(), input.netTokenIn.neg(), netSyInterm
+        );
     }
 
     function swapExactSyForPt(
@@ -40,23 +40,23 @@ contract ActionSwapPT is IPActionSwapPT, ActionBase {
         emit SwapPtAndSy(msg.sender, market, receiver, netPtOut.Int(), exactSyIn.neg());
     }
 
-    // ------------------ SWAP PT FOR TOKEN ------------------
     function swapExactPtForToken(
         address receiver,
         address market,
         uint256 exactPtIn,
         TokenOutput calldata output,
         LimitOrderData calldata limit
-    ) external returns (uint256 netTokenOut, uint256 netSyFee) {
+    ) external returns (uint256 netTokenOut, uint256 netSyFee, uint256 netSyInterm) {
         (IStandardizedYield SY, IPPrincipalToken PT,) = IPMarket(market).readTokens();
         _transferFrom(PT, msg.sender, _entry_swapExactPtForSy(market, limit), exactPtIn);
 
-        uint256 netSyReceived;
-        (netSyReceived, netSyFee) = _swapExactPtForSy(address(SY), market, exactPtIn, 0, limit);
+        (netSyInterm, netSyFee) = _swapExactPtForSy(address(SY), market, exactPtIn, 0, limit);
 
-        netTokenOut = _redeemSyToToken(receiver, address(SY), netSyReceived, output, false);
+        netTokenOut = _redeemSyToToken(receiver, address(SY), netSyInterm, output, false);
 
-        emit SwapPtAndToken(msg.sender, market, output.tokenOut, receiver, exactPtIn.neg(), netTokenOut.Int());
+        emit SwapPtAndToken(
+            msg.sender, market, output.tokenOut, receiver, exactPtIn.neg(), netTokenOut.Int(), netSyInterm
+        );
     }
 
     function swapExactPtForSy(

package/contracts/router/{ActionSwapYT.sol → ActionSwapYTV3.sol}

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity ^0.8.17;
 
 import "./base/ActionBase.sol";
 import "./base/ActionBaseCallback.sol";
-import "../interfaces/IPActionSwapYT.sol";
+import "../interfaces/IPActionSwapYTV3.sol";
 
-contract ActionSwapYT is ActionBaseCallback, IPActionSwapYT, ActionBase {
+contract ActionSwapYTV3 is ActionBaseCallback, IPActionSwapYTV3, ActionBase {
     using PMath for uint256;
     using MarketApproxPtInLib for MarketState;
     using MarketApproxPtOutLib for MarketState;
@@ -20,14 +20,15 @@ contract ActionSwapYT is ActionBaseCallback, IPActionSwapYT, ActionBase {
         ApproxParams calldata guessYtOut,
         TokenInput calldata input,
         LimitOrderData calldata limit
-    ) external payable returns (uint256 netYtOut, uint256 netSyFee) {
+    ) external payable returns (uint256 netYtOut, uint256 netSyFee, uint256 netSyInterm) {
         (IStandardizedYield SY,, IPYieldToken YT) = IPMarket(market).readTokens();
 
-        uint256 netSyUsedToBuyYT = _mintSyFromToken(_entry_swapExactSyForYt(YT, limit), address(SY), 1, input);
-        (netYtOut, netSyFee) =
-            _swapExactSyForYt(receiver, market, SY, YT, netSyUsedToBuyYT, minYtOut, guessYtOut, limit);
+        netSyInterm = _mintSyFromToken(_entry_swapExactSyForYt(YT, limit), address(SY), 1, input);
+        (netYtOut, netSyFee) = _swapExactSyForYt(receiver, market, SY, YT, netSyInterm, minYtOut, guessYtOut, limit);
 
-        emit SwapYtAndToken(msg.sender, market, input.tokenIn, receiver, netYtOut.Int(), input.netTokenIn.neg());
+        emit SwapYtAndToken(
+            msg.sender, market, input.tokenIn, receiver, netYtOut.Int(), input.netTokenIn.neg(), netSyInterm
+        );
     }
 
     function swapExactSyForYt(
@@ -63,7 +64,7 @@ contract ActionSwapYT is ActionBaseCallback, IPActionSwapYT, ActionBase {
         bool doMarketOrder = true;
 
         if (!_isEmptyLimit(limit)) {
-            (netSyLeft, netYtOut, netSyFee, doMarketOrder) = _fillLimit(receiver, netSyLeft, limit);
+            (netSyLeft, netYtOut, netSyFee, doMarketOrder) = _fillLimit(receiver, SY, netSyLeft, limit);
             if (doMarketOrder) {
                 _transferOut(address(SY), address(YT), netSyLeft);
             }
@@ -94,17 +95,17 @@ contract ActionSwapYT is ActionBaseCallback, IPActionSwapYT, ActionBase {
         uint256 exactYtIn,
         TokenOutput calldata output,
         LimitOrderData calldata limit
-    ) external returns (uint256 netTokenOut, uint256 netSyFee) {
+    ) external returns (uint256 netTokenOut, uint256 netSyFee, uint256 netSyInterm) {
         (IStandardizedYield SY,, IPYieldToken YT) = IPMarket(market).readTokens();
         _transferFrom(YT, msg.sender, _entry_swapExactYtForSy(YT, limit), exactYtIn);
 
-        uint256 netSyOut;
-
-        (netSyOut, netSyFee) = _swapExactYtForSy(address(SY), market, SY, YT, exactYtIn, 0, limit);
+        (netSyInterm, netSyFee) = _swapExactYtForSy(address(SY), market, SY, YT, exactYtIn, 0, limit);
 
-        netTokenOut = _redeemSyToToken(receiver, address(SY), netSyOut, output, false);
+        netTokenOut = _redeemSyToToken(receiver, address(SY), netSyInterm, output, false);
 
-        emit SwapYtAndToken(msg.sender, market, output.tokenOut, receiver, exactYtIn.neg(), netTokenOut.Int());
+        emit SwapYtAndToken(
+            msg.sender, market, output.tokenOut, receiver, exactYtIn.neg(), netTokenOut.Int(), netSyInterm
+        );
     }
 
     function swapExactYtForSy(
@@ -138,7 +139,7 @@ contract ActionSwapYT is ActionBaseCallback, IPActionSwapYT, ActionBase {
         bool doMarketOrder = true;
 
         if (!_isEmptyLimit(limit)) {
-            (netYtLeft, netSyOut, netSyFee, doMarketOrder) = _fillLimit(receiver, netYtLeft, limit);
+            (netYtLeft, netSyOut, netSyFee, doMarketOrder) = _fillLimit(receiver, YT, netYtLeft, limit);
             if (doMarketOrder) {
                 _transferOut(address(YT), address(YT), netYtLeft);
             }
@@ -173,10 +174,11 @@ contract ActionSwapYT is ActionBaseCallback, IPActionSwapYT, ActionBase {
         (, IPPrincipalToken PT, IPYieldToken YT) = IPMarket(market).readTokens();
 
         uint256 totalPtToSwap;
-        (, totalPtToSwap, netSyFee) =
+        (netYtOut, totalPtToSwap, netSyFee) =
             _readMarket(market).approxSwapExactPtForYt(YT.newIndex(), exactPtIn, block.timestamp, guessTotalPtToSwap);
 
         _transferFrom(IERC20(PT), msg.sender, market, exactPtIn);
+
         IPMarket(market).swapExactPtForSy(
             address(YT), totalPtToSwap, _encodeSwapExactPtForYt(receiver, exactPtIn, minYtOut, YT)
         );

package/contracts/router/PendleRouterHelper.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity ^0.8.17;
 
 import "../interfaces/IPMarket.sol";
 import "../interfaces/IPRouterHelper.sol";

package/contracts/router/{PendleRouter.sol → PendleRouterV3.sol}

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity ^0.8.17;
 
 import "@openzeppelin/contracts/proxy/Proxy.sol";
-import "../interfaces/IPAllAction.sol";
+import "../interfaces/IPAllActionV3.sol";
 import "../interfaces/IDiamondLoupe.sol";
 import "../interfaces/IDiamondCut.sol";
 
 // solhint-disable no-empty-blocks
-contract PendleRouter is Proxy, IDiamondLoupe {
+contract PendleRouterV3 is Proxy, IDiamondLoupe {
     address internal immutable ACTION_ADD_REMOVE_LIQ;
     address internal immutable ACTION_SWAP_PT;
     address internal immutable ACTION_SWAP_YT;
@@ -98,33 +98,33 @@ contract PendleRouter is Proxy, IDiamondLoupe {
             res[6] = 0xfa483e72; // swapCallback
         }
         if (facet == ACTION_SWAP_PT) {
-            res = new bytes4[](5);
+            res = new bytes4[](6);
             res[0] = 0x12c15afc; // swapExactSyForPt
             res[1] = 0x32aea98a; // swapExactTokenForPt
             res[2] = 0x5d3e105c; // swapTokenToToken
             res[3] = 0x7a95dddd; // swapExactPtForSy
-            res[4] = 0xc245e48d; // swapExactPtForToken
+            res[4] = 0xa89eba4a; // swapTokenToTokenViaSy
+            res[5] = 0xc245e48d; // swapExactPtForToken
         }
         if (facet == ACTION_MISC) {
-            res = new bytes4[](12);
+            res = new bytes4[](11);
             res[0] = 0x1a8631b2; // mintPyFromSy
             res[1] = 0x1cf0f536; // callThenRevert
-            res[2] = 0x2e071dc6; // mintSyFromToken
-            res[3] = 0x339748cb; // redeemPyToSy
-            res[4] = 0x339a5572; // redeemSyToToken
-            res[5] = 0x375351d5; // marketsBoost
+            res[2] = 0x2d8f9d8d; // boostMarkets
+            res[3] = 0x2e071dc6; // mintSyFromToken
+            res[4] = 0x339748cb; // redeemPyToSy
+            res[5] = 0x339a5572; // redeemSyToToken
             res[6] = 0x47f1de22; // redeemPyToToken
             res[7] = 0x60fc8466; // multicall
             res[8] = 0x657b87d8; // multicallRevert
-            res[9] = 0xacdb32df; // approveInf
-            res[10] = 0xd0f42385; // mintPyFromToken
-            res[11] = 0xf7e375e8; // redeemDueInterestAndRewards
+            res[9] = 0xd0f42385; // mintPyFromToken
+            res[10] = 0xf7e375e8; // redeemDueInterestAndRewards
         }
     }
 
     function facetAddress(bytes4 sig) public view returns (address) {
         if (sig < 0x7a0ed627) {
-            if (sig < 0x375351d5) {
+            if (sig < 0x339a5572) {
                 if (sig < 0x2756ce06) {
                     if (sig < 0x1a8631b2) {
                         if (sig == 0x0a793c62) return ACTION_SWAP_YT; //swapExactYtForSy
@@ -135,19 +135,19 @@ contract PendleRouter is Proxy, IDiamondLoupe {
                         if (sig == 0x237287c8) return ACTION_ADD_REMOVE_LIQ; //removeLiquiditySinglePt
                     }
                 } else {
-                    if (sig < 0x32aea98a) {
+                    if (sig < 0x2e071dc6) {
                         if (sig == 0x2756ce06) return ACTION_ADD_REMOVE_LIQ; //addLiquidityDualTokenAndPt
-                        if (sig == 0x2e071dc6) return ACTION_MISC; //mintSyFromToken
+                        if (sig == 0x2d8f9d8d) return ACTION_MISC; //boostMarkets
                     } else {
+                        if (sig == 0x2e071dc6) return ACTION_MISC; //mintSyFromToken
                         if (sig == 0x32aea98a) return ACTION_SWAP_PT; //swapExactTokenForPt
                         if (sig == 0x339748cb) return ACTION_MISC; //redeemPyToSy
-                        if (sig == 0x339a5572) return ACTION_MISC; //redeemSyToToken
                     }
                 }
             } else {
                 if (sig < 0x587e3950) {
                     if (sig < 0x448b9b95) {
-                        if (sig == 0x375351d5) return ACTION_MISC; //marketsBoost
+                        if (sig == 0x339a5572) return ACTION_MISC; //redeemSyToToken
                         if (sig == 0x3dbe1c55) return ACTION_ADD_REMOVE_LIQ; //addLiquiditySingleTokenKeepYt
                     } else {
                         if (sig == 0x448b9b95) return ACTION_SWAP_YT; //swapExactYtForPt
@@ -177,11 +177,11 @@ contract PendleRouter is Proxy, IDiamondLoupe {
                         if (sig == 0x97ee279e) return ACTION_ADD_REMOVE_LIQ; //addLiquidityDualSyAndPt
                     }
                 } else {
-                    if (sig < 0xacdb32df) {
+                    if (sig < 0xa89eba4a) {
                         if (sig == 0x9c1010ec) return ACTION_SWAP_YT; //swapExactTokenForYt
                         if (sig == 0x9cb6711e) return ACTION_ADD_REMOVE_LIQ; //addLiquiditySingleToken
                     } else {
-                        if (sig == 0xacdb32df) return ACTION_MISC; //approveInf
+                        if (sig == 0xa89eba4a) return ACTION_SWAP_PT; //swapTokenToTokenViaSy
                         if (sig == 0xadfca15e) return address(this); //facetFunctionSelectors
                         if (sig == 0xb00f09d7) return ACTION_ADD_REMOVE_LIQ; //removeLiquidityDualTokenAndPt
                     }

package/contracts/router/base/ActionBase.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import "../../core/libraries/TokenHelper.sol";
 import "../../interfaces/IStandardizedYield.sol";
 import "../../interfaces/IPYieldToken.sol";
-import "../../interfaces/IPAllActionType.sol";
+import "../../interfaces/IPAllActionTypeV3.sol";
 import "../../interfaces/IPMarket.sol";
 import "../../router/base/MarketApproxLib.sol";
 
@@ -57,6 +57,7 @@ abstract contract ActionBase is TokenHelper {
         returns (uint256 netSyOut)
     {
         uint256 netNative = inp.tokenMintSy == NATIVE ? netTokenMintSy : 0;
+        _safeApproveInf(inp.tokenMintSy, SY);
         netSyOut = IStandardizedYield(SY).deposit{value: netNative}(receiver, inp.tokenMintSy, netTokenMintSy, minSyOut);
     }
 
@@ -152,7 +153,7 @@ abstract contract ActionBase is TokenHelper {
         bool doMarketOrder = true;
 
         if (!_isEmptyLimit(limit)) {
-            (netPtLeft, netSyOut, netSyFee, doMarketOrder) = _fillLimit(receiver, netPtLeft, limit);
+            (netPtLeft, netSyOut, netSyFee, doMarketOrder) = _fillLimit(receiver, PT, netPtLeft, limit);
             if (doMarketOrder) {
                 _transferOut(address(PT), market, netPtLeft);
             }
@@ -186,7 +187,7 @@ abstract contract ActionBase is TokenHelper {
         bool doMarketOrder = true;
 
         if (!_isEmptyLimit(limit)) {
-            (netSyLeft, netPtOut, netSyFee, doMarketOrder) = _fillLimit(receiver, netSyLeft, limit);
+            (netSyLeft, netPtOut, netSyFee, doMarketOrder) = _fillLimit(receiver, SY, netSyLeft, limit);
             if (doMarketOrder) {
                 _transferOut(address(SY), market, netSyLeft);
             }
@@ -206,13 +207,15 @@ abstract contract ActionBase is TokenHelper {
     }
 
     // ----------------- LIMIT ORDERS -----------------
-    function _fillLimit(address receiver, uint256 netInput, LimitOrderData calldata lim)
+    function _fillLimit(address receiver, IERC20 tokenIn, uint256 netInput, LimitOrderData calldata lim)
         internal
         returns (uint256 netLeft, uint256 netOut, uint256 netSyFee, bool doMarketOrder)
     {
         IPLimitRouter router = IPLimitRouter(lim.limitRouter);
         netLeft = netInput;
 
+        _safeApproveInf(address(tokenIn), lim.limitRouter);
+
         if (lim.normalFills.length != 0) {
             (uint256 actualMaking, uint256 actualTaking, uint256 totalFee) =
                 router.normalFill(lim.normalFills, receiver, netLeft, EMPTY_BYTES);

package/contracts/router/swap-aggregator/PendleSwap.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity ^0.8.17;
 
 import "../../core/libraries/TokenHelper.sol";
 import "./IPSwapAggregator.sol";

package/deployments/42161-core.json

@@ -18,9 +18,9 @@
     "PENDLE": "0x0c880f6761F1af8d9Aa9C466984b80DAb9a8c9e8",
     "yieldContractFactory": "0x28dE02Ac3c3F5ef427e55c321F73fDc7F192e8E4",
     "marketFactory": "0xf5a7De2D276dbda3EEf1b62A9E718EFf4d29dDC8",
-    "router": "0x704Af9c4D6F19fb4EEdC746Ec5FB0Ed489Baf485",
+    "router": "0xAEDbe69A168422A8fCd9F5C14B208A02e431419A",
     "routerStatic": "0xAdB09F65bd90d19e3148D9ccb693F3161C6DB3E8",
-    "pendleSwap": "0x38812c3ac3563bf200482ac9d096952d7cb55f9b",
+    "pendleSwap": "0x0F1b0bb4bBC9d12C6e3f63e3318D0f4F8789B616",
     "routerHelper": "0x462206b11d185ef6F64B41D344325401C37EC335",
     "ptOracle": "0x1f6Cee6740e1492C279532348137FF40E0f23D05",
     "liquiditySeedingHelper": "0x5e5A839443f59776a789C40506A63C0c70071008",

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "3.0.0-beta-3",
+  "version": "3.0.0-beta-4",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",
@@ -25,14 +25,14 @@
   "devDependencies": {
     "@typechain/ethers-v5": "^9.0.0",
     "@typechain/hardhat": "^4.0.0",
-    "hardhat": "^2.18.0",
+    "hardhat": "^2.19.0",
     "hardhat-contract-sizer": "^2.10.0",
-    "prettier": "^3.0.3",
-    "prettier-plugin-solidity": "^1.1.3",
-    "solc": "^0.8.21",
-    "solhint": "^3.6.2",
+    "prettier": "^3.1.0",
+    "prettier-plugin-solidity": "^1.2.0",
+    "solc": "^0.8.23-fixed",
+    "solhint": "^4.0.0",
     "ts-node": "^10.9.1",
-    "typechain": "^8.3.1",
+    "typechain": "^8.3.2",
     "typescript": "^5.2.2"
   },
   "scripts": {