@pendle/core-v2 2.29.4 → 2.30.1

package/contracts/router/PendleRouterHelper.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import "../interfaces/IPAllAction.sol";
 import "../interfaces/IPMarket.sol";
@@ -18,11 +18,7 @@ contract PendleRouterHelper is TokenHelper, IPRouterHelper {
         _safeApproveInf(WETH, address(ROUTER));
     }
 
-    function _getWETHAddress(IAddressProvider provider, uint256 providerId)
-        internal
-        view
-        returns (address)
-    {
+    function _getWETHAddress(IAddressProvider provider, uint256 providerId) internal view returns (address) {
         return provider.get(providerId);
     }
 
@@ -45,13 +41,7 @@ contract PendleRouterHelper is TokenHelper, IPRouterHelper {
         _transferIn(NATIVE, msg.sender, input.netTokenIn);
 
         _wrap_unwrap_ETH(NATIVE, WETH, input.netTokenIn);
-        (netLpOut, netYtOut) = ROUTER.addLiquiditySingleTokenKeepYt(
-            receiver,
-            market,
-            minLpOut,
-            minYtOut,
-            input
-        );
+        (netLpOut, netYtOut) = ROUTER.addLiquiditySingleTokenKeepYt(receiver, market, minLpOut, minYtOut, input);
 
         emit AddLiquiditySingleTokenKeepYt(
             msg.sender,
@@ -67,55 +57,23 @@ contract PendleRouterHelper is TokenHelper, IPRouterHelper {
     function transferLiquidityDifferentSyNormal(
         RemoveLiquiditySingleTokenStruct calldata fromMarket,
         AddLiquiditySingleTokenStruct calldata toMarket
-    )
-        external
-        returns (
-            uint256 netLpOut,
-            uint256 netTokenZapIn,
-            uint256 netSyFeeOfRemove,
-            uint256 netSyFeeOfAdd
-        )
-    {
+    ) external returns (uint256 netLpOut, uint256 netTokenZapIn, uint256 netSyFeeOfRemove, uint256 netSyFeeOfAdd) {
         (netTokenZapIn, netSyFeeOfRemove) = removeLiquiditySingleToken(fromMarket);
-        (netLpOut, netSyFeeOfAdd) = _addLiquiditySingleToken(
-            toMarket,
-            fromMarket.output.tokenOut,
-            netTokenZapIn
-        );
+        (netLpOut, netSyFeeOfAdd) = _addLiquiditySingleToken(toMarket, fromMarket.output.tokenOut, netTokenZapIn);
     }
 
     function transferLiquidityDifferentSyKeepYt(
         RemoveLiquiditySingleTokenStruct calldata fromMarket,
         AddLiquiditySingleTokenKeepYtStruct calldata toMarket
-    )
-        external
-        returns (
-            uint256 netLpOut,
-            uint256 netYtOut,
-            uint256 netTokenZapIn,
-            uint256 netSyFeeOfRemove
-        )
-    {
+    ) external returns (uint256 netLpOut, uint256 netYtOut, uint256 netTokenZapIn, uint256 netSyFeeOfRemove) {
         (netTokenZapIn, netSyFeeOfRemove) = removeLiquiditySingleToken(fromMarket);
-        (netLpOut, netYtOut) = _addLiquiditySingleTokenKeepYt(
-            toMarket,
-            fromMarket.output.tokenOut,
-            netTokenZapIn
-        );
+        (netLpOut, netYtOut) = _addLiquiditySingleTokenKeepYt(toMarket, fromMarket.output.tokenOut, netTokenZapIn);
     }
 
     function transferLiquiditySameSyNormal(
         RemoveLiquiditySingleSyStruct calldata fromMarket,
         AddLiquiditySingleSyStruct calldata toMarket
-    )
-        external
-        returns (
-            uint256 netLpOut,
-            uint256 netSyZapIn,
-            uint256 netSyFeeOfRemove,
-            uint256 netSyFeeOfAdd
-        )
-    {
+    ) external returns (uint256 netLpOut, uint256 netSyZapIn, uint256 netSyFeeOfRemove, uint256 netSyFeeOfAdd) {
         (netSyZapIn, netSyFeeOfRemove) = removeLiquiditySingleSy(fromMarket);
         (netLpOut, netSyFeeOfAdd) = _addLiquiditySingleSy(toMarket, netSyZapIn);
     }
@@ -123,29 +81,15 @@ contract PendleRouterHelper is TokenHelper, IPRouterHelper {
     function transferLiquiditySameSyKeepYt(
         RemoveLiquiditySingleSyStruct calldata fromMarket,
         AddLiquiditySingleSyKeepYtStruct calldata toMarket
-    )
-        external
-        returns (
-            uint256 netLpOut,
-            uint256 netYtOut,
-            uint256 netSyZapIn,
-            uint256 netSyFeeOfRemove
-        )
-    {
+    ) external returns (uint256 netLpOut, uint256 netYtOut, uint256 netSyZapIn, uint256 netSyFeeOfRemove) {
         (netSyZapIn, netSyFeeOfRemove) = removeLiquiditySingleSy(fromMarket);
         (netLpOut, netYtOut) = _addLiquiditySingleSyKeepYt(toMarket, netSyZapIn);
     }
 
-    function removeLiquiditySingleToken(RemoveLiquiditySingleTokenStruct calldata fromMarket)
-        public
-        returns (uint256 netTokenOut, uint256 netSyFee)
-    {
-        _transferFrom(
-            IERC20(fromMarket.market),
-            msg.sender,
-            address(this),
-            fromMarket.netLpToRemove
-        );
+    function removeLiquiditySingleToken(
+        RemoveLiquiditySingleTokenStruct calldata fromMarket
+    ) public returns (uint256 netTokenOut, uint256 netSyFee) {
+        _transferFrom(IERC20(fromMarket.market), msg.sender, address(this), fromMarket.netLpToRemove);
 
         _safeApproveInf(fromMarket.market, address(ROUTER));
 
@@ -170,16 +114,10 @@ contract PendleRouterHelper is TokenHelper, IPRouterHelper {
         );
     }
 
-    function removeLiquiditySingleSy(RemoveLiquiditySingleSyStruct calldata fromMarket)
-        public
-        returns (uint256 netSyOut, uint256 netSyFee)
-    {
-        _transferFrom(
-            IERC20(fromMarket.market),
-            msg.sender,
-            address(this),
-            fromMarket.netLpToRemove
-        );
+    function removeLiquiditySingleSy(
+        RemoveLiquiditySingleSyStruct calldata fromMarket
+    ) public returns (uint256 netSyOut, uint256 netSyFee) {
+        _transferFrom(IERC20(fromMarket.market), msg.sender, address(this), fromMarket.netLpToRemove);
 
         _safeApproveInf(fromMarket.market, address(ROUTER));
 
@@ -194,13 +132,7 @@ contract PendleRouterHelper is TokenHelper, IPRouterHelper {
             IPMarket(fromMarket.market).redeemRewards(msg.sender);
         }
 
-        emit RemoveLiquiditySingleSy(
-            msg.sender,
-            fromMarket.market,
-            msg.sender,
-            fromMarket.netLpToRemove,
-            netSyOut
-        );
+        emit RemoveLiquiditySingleSy(msg.sender, fromMarket.market, msg.sender, fromMarket.netLpToRemove, netSyOut);
     }
 
     function _addLiquiditySingleToken(
@@ -215,26 +147,15 @@ contract PendleRouterHelper is TokenHelper, IPRouterHelper {
 
         _safeApproveInf(tokenToZapIn, address(ROUTER));
 
-        (netLpOut, netSyFee) = ROUTER.addLiquiditySingleToken{ value: netNativeToAttach }(
+        (netLpOut, netSyFee) = ROUTER.addLiquiditySingleToken{value: netNativeToAttach}(
             msg.sender,
             toMarket.market,
             toMarket.minLpOut,
-            _scaleApproxParams(
-                toMarket.guessPtReceivedFromSy,
-                toMarket.guessNetTokenIn,
-                actualNetTokenIn
-            ),
+            _scaleApproxParams(toMarket.guessPtReceivedFromSy, toMarket.guessNetTokenIn, actualNetTokenIn),
             _newTokenInputStruct(tokenToZapIn, actualNetTokenIn, toMarket.bulk)
         );
 
-        emit AddLiquiditySingleToken(
-            msg.sender,
-            toMarket.market,
-            tokenToZapIn,
-            msg.sender,
-            actualNetTokenIn,
-            netLpOut
-        );
+        emit AddLiquiditySingleToken(msg.sender, toMarket.market, tokenToZapIn, msg.sender, actualNetTokenIn, netLpOut);
     }
 
     function _addLiquiditySingleSy(
@@ -250,20 +171,10 @@ contract PendleRouterHelper is TokenHelper, IPRouterHelper {
             toMarket.market,
             actualNetSyIn,
             toMarket.minLpOut,
-            _scaleApproxParams(
-                toMarket.guessPtReceivedFromSy,
-                toMarket.guessNetSyIn,
-                actualNetSyIn
-            )
+            _scaleApproxParams(toMarket.guessPtReceivedFromSy, toMarket.guessNetSyIn, actualNetSyIn)
         );
 
-        emit AddLiquiditySingleSy(
-            msg.sender,
-            toMarket.market,
-            msg.sender,
-            actualNetSyIn,
-            netLpOut
-        );
+        emit AddLiquiditySingleSy(msg.sender, toMarket.market, msg.sender, actualNetSyIn, netLpOut);
     }
 
     function _addLiquiditySingleTokenKeepYt(
@@ -313,14 +224,7 @@ contract PendleRouterHelper is TokenHelper, IPRouterHelper {
             toMarket.minYtOut
         );
 
-        emit AddLiquiditySingleSyKeepYt(
-            msg.sender,
-            toMarket.market,
-            msg.sender,
-            actualNetSyIn,
-            netLpOut,
-            netYtOut
-        );
+        emit AddLiquiditySingleSyKeepYt(msg.sender, toMarket.market, msg.sender, actualNetSyIn, netLpOut, netYtOut);
     }
 
     // ============ struct helpers ============

package/contracts/router/PendleRouterHelper2.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import "../interfaces/IPAllAction.sol";
 import "../interfaces/IPMarket.sol";
@@ -25,11 +25,12 @@ contract PendleRouterHelper2 is TokenHelper {
      *  generated for the main Router, except that input.tokenIn & swapData should be generated
      *  for tokenIn == WETH instead of ETH
      */
-    function mintSyFromToken(address receiver, address SY, uint256 minSyOut, TokenInput calldata input)
-        external
-        payable
-        returns (uint256 netSyOut)
-    {
+    function mintSyFromToken(
+        address receiver,
+        address SY,
+        uint256 minSyOut,
+        TokenInput calldata input
+    ) external payable returns (uint256 netSyOut) {
         require(input.tokenIn == WETH);
 
         _transferIn(NATIVE, msg.sender, input.netTokenIn);

package/contracts/router/base/ActionBaseCallback.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import "../..//interfaces/IPMarketFactory.sol";
 import "../..//interfaces/IPMarket.sol";
@@ -21,8 +21,7 @@ abstract contract ActionBaseCallback is IPMarketSwapCallback, CallbackHelper, To
     address internal immutable marketFactory;
 
     modifier onlyPendleMarket(address caller) {
-        if (!IPMarketFactory(marketFactory).isValidMarket(caller))
-            revert Errors.RouterCallbackNotPendleMarket(caller);
+        if (!IPMarketFactory(marketFactory).isValidMarket(caller)) revert Errors.RouterCallbackNotPendleMarket(caller);
         _;
     }
 
@@ -34,11 +33,7 @@ abstract contract ActionBaseCallback is IPMarketSwapCallback, CallbackHelper, To
     /**
      * @dev The callback is only callable by a Pendle Market created by the factory
      */
-    function swapCallback(
-        int256 ptToAccount,
-        int256 syToAccount,
-        bytes calldata data
-    ) external override {
+    function swapCallback(int256 ptToAccount, int256 syToAccount, bytes calldata data) external override {
         ActionType swapType = _getActionType(data);
         if (swapType == ActionType.SwapExactSyForYt) {
             _callbackSwapExactSyForYt(ptToAccount, syToAccount, data);
@@ -56,11 +51,7 @@ abstract contract ActionBaseCallback is IPMarketSwapCallback, CallbackHelper, To
     }
 
     /// @dev refer to _swapExactSyForYt
-    function _callbackSwapExactSyForYt(
-        int256 ptToAccount,
-        int256 /*syToAccount*/,
-        bytes calldata data
-    ) internal {
+    function _callbackSwapExactSyForYt(int256 ptToAccount, int256 /*syToAccount*/, bytes calldata data) internal {
         (address receiver, uint256 minYtOut, IPYieldToken YT) = _decodeSwapExactSyForYt(data);
 
         uint256 ptOwed = ptToAccount.abs();
@@ -98,8 +89,7 @@ abstract contract ActionBaseCallback is IPMarketSwapCallback, CallbackHelper, To
         uint256 syReceived = syToAccount.Uint();
         uint256 netSyToPull = totalSyNeed.subMax0(syReceived);
 
-        if (netSyToPull > maxSyToPull)
-            revert Errors.RouterExceededLimitSyIn(netSyToPull, maxSyToPull);
+        if (netSyToPull > maxSyToPull) revert Errors.RouterExceededLimitSyIn(netSyToPull, maxSyToPull);
 
         /// ------------------------------------------------------------
         /// mint & transfer
@@ -113,11 +103,7 @@ abstract contract ActionBaseCallback is IPMarketSwapCallback, CallbackHelper, To
     }
 
     /// @dev refer to _swapExactYtForSy or _swapYtForExactSy
-    function _callbackSwapYtForSy(
-        int256 ptToAccount,
-        int256 syToAccount,
-        bytes calldata data
-    ) internal {
+    function _callbackSwapYtForSy(int256 ptToAccount, int256 syToAccount, bytes calldata data) internal {
         (address receiver, uint256 minSyOut, IPYieldToken YT) = _decodeSwapYtForSy(data);
         PYIndex pyIndex = YT.newIndex();
 
@@ -127,40 +113,22 @@ abstract contract ActionBaseCallback is IPMarketSwapCallback, CallbackHelper, To
         uint256[] memory amountPYToRedeems = new uint256[](2);
 
         (receivers[0], amountPYToRedeems[0]) = (msg.sender, pyIndex.syToAssetUp(syOwed));
-        (receivers[1], amountPYToRedeems[1]) = (
-            receiver,
-            ptToAccount.Uint() - amountPYToRedeems[0]
-        );
+        (receivers[1], amountPYToRedeems[1]) = (receiver, ptToAccount.Uint() - amountPYToRedeems[0]);
 
         uint256[] memory amountSyOuts = YT.redeemPYMulti(receivers, amountPYToRedeems);
-        if (amountSyOuts[1] < minSyOut)
-            revert Errors.RouterInsufficientSyOut(amountSyOuts[1], minSyOut);
+        if (amountSyOuts[1] < minSyOut) revert Errors.RouterInsufficientSyOut(amountSyOuts[1], minSyOut);
     }
 
-    function _callbackSwapExactPtForYt(
-        int256 ptToAccount,
-        int256 /*syToAccount*/,
-        bytes calldata data
-    ) internal {
-        (
-            address receiver,
-            uint256 exactPtIn,
-            uint256 minYtOut,
-            IPYieldToken YT
-        ) = _decodeSwapExactPtForYt(data);
+    function _callbackSwapExactPtForYt(int256 ptToAccount, int256 /*syToAccount*/, bytes calldata data) internal {
+        (address receiver, uint256 exactPtIn, uint256 minYtOut, IPYieldToken YT) = _decodeSwapExactPtForYt(data);
         uint256 netPtOwed = ptToAccount.abs();
 
         uint256 netPyOut = YT.mintPY(msg.sender, receiver);
         if (netPyOut < minYtOut) revert Errors.RouterInsufficientYtOut(netPyOut, minYtOut);
-        if (exactPtIn + netPyOut < netPtOwed)
-            revert Errors.RouterInsufficientPtRepay(exactPtIn + netPyOut, netPtOwed);
+        if (exactPtIn + netPyOut < netPtOwed) revert Errors.RouterInsufficientPtRepay(exactPtIn + netPyOut, netPtOwed);
     }
 
-    function _callbackSwapExactYtForPt(
-        int256 ptToAccount,
-        int256 syToAccount,
-        bytes calldata data
-    ) internal {
+    function _callbackSwapExactYtForPt(int256 ptToAccount, int256 syToAccount, bytes calldata data) internal {
         (
             address receiver,
             uint256 exactYtIn,
@@ -174,8 +142,7 @@ abstract contract ActionBaseCallback is IPMarketSwapCallback, CallbackHelper, To
         _transferOut(address(PT), address(YT), exactYtIn);
         uint256 netSyToMarket = YT.redeemPY(msg.sender);
 
-        if (netSyToMarket < netSyOwed)
-            revert Errors.RouterInsufficientSyRepay(netSyToMarket, netSyOwed);
+        if (netSyToMarket < netSyOwed) revert Errors.RouterInsufficientSyRepay(netSyToMarket, netSyOwed);
 
         uint256 netPtOut = ptToAccount.Uint() - exactYtIn;
         if (netPtOut < minPtOut) revert Errors.RouterInsufficientPtOut(netPtOut, minPtOut);

package/contracts/router/base/ActionBaseMintRedeem.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import "../../core/libraries/TokenHelper.sol";
 import "../../interfaces/IStandardizedYield.sol";
@@ -56,9 +56,11 @@ abstract contract ActionBaseMintRedeem is TokenHelper {
             if (inp.tokenIn == NATIVE) _transferIn(NATIVE, msg.sender, inp.netTokenIn);
             else _transferFrom(IERC20(inp.tokenIn), msg.sender, inp.pendleSwap, inp.netTokenIn);
 
-            IPSwapAggregator(inp.pendleSwap).swap{
-                value: inp.tokenIn == NATIVE ? inp.netTokenIn : 0
-            }(inp.tokenIn, inp.netTokenIn, inp.swapData);
+            IPSwapAggregator(inp.pendleSwap).swap{value: inp.tokenIn == NATIVE ? inp.netTokenIn : 0}(
+                inp.tokenIn,
+                inp.netTokenIn,
+                inp.swapData
+            );
             netTokenMintSy = _selfBalance(inp.tokenMintSy);
         }
 
@@ -78,13 +80,9 @@ abstract contract ActionBaseMintRedeem is TokenHelper {
         uint256 netNative = inp.tokenMintSy == NATIVE ? netTokenMintSy : 0;
 
         if (inp.bulk != address(0)) {
-            netSyOut = IPBulkSeller(inp.bulk).swapExactTokenForSy{ value: netNative }(
-                receiver,
-                netTokenMintSy,
-                minSyOut
-            );
+            netSyOut = IPBulkSeller(inp.bulk).swapExactTokenForSy{value: netNative}(receiver, netTokenMintSy, minSyOut);
         } else {
-            netSyOut = IStandardizedYield(SY).deposit{ value: netNative }(
+            netSyOut = IStandardizedYield(SY).deposit{value: netNative}(
                 receiver,
                 inp.tokenMintSy,
                 netTokenMintSy,
@@ -113,11 +111,7 @@ abstract contract ActionBaseMintRedeem is TokenHelper {
         } else {
             uint256 netTokenRedeemed = __redeemSy(out.pendleSwap, SY, netSyIn, out, doPull);
 
-            IPSwapAggregator(out.pendleSwap).swap(
-                out.tokenRedeemSy,
-                netTokenRedeemed,
-                out.swapData
-            );
+            IPSwapAggregator(out.pendleSwap).swap(out.tokenRedeemSy, netTokenRedeemed, out.swapData);
 
             netTokenOut = _selfBalance(out.tokenOut);
 
@@ -143,20 +137,9 @@ abstract contract ActionBaseMintRedeem is TokenHelper {
         }
 
         if (out.bulk != address(0)) {
-            netTokenRedeemed = IPBulkSeller(out.bulk).swapExactSyForToken(
-                receiver,
-                netSyIn,
-                0,
-                true
-            );
+            netTokenRedeemed = IPBulkSeller(out.bulk).swapExactSyForToken(receiver, netSyIn, 0, true);
         } else {
-            netTokenRedeemed = IStandardizedYield(SY).redeem(
-                receiver,
-                netSyIn,
-                out.tokenRedeemSy,
-                0,
-                true
-            );
+            netTokenRedeemed = IStandardizedYield(SY).redeem(receiver, netSyIn, out.tokenRedeemSy, 0, true);
         }
     }
 
@@ -193,11 +176,7 @@ abstract contract ActionBaseMintRedeem is TokenHelper {
         if (netSyOut < minSyOut) revert Errors.RouterInsufficientSyOut(netSyOut, minSyOut);
     }
 
-    function _syOrBulk(address SY, TokenOutput calldata output)
-        internal
-        pure
-        returns (address addr)
-    {
+    function _syOrBulk(address SY, TokenOutput calldata output) internal pure returns (address addr) {
         return output.bulk != address(0) ? output.bulk : SY;
     }
 }

package/contracts/router/base/CallbackHelper.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import "../../interfaces/IPYieldToken.sol";
 import "../../interfaces/IPPrincipalToken.sol";
@@ -71,17 +71,7 @@ abstract contract CallbackHelper {
 
     function _decodeSwapSyForExactYt(
         bytes calldata data
-    )
-        internal
-        pure
-        returns (
-            address payer,
-            address receiver,
-            uint256 maxSyIn,
-            IStandardizedYield SY,
-            IPYieldToken YT
-        )
-    {
+    ) internal pure returns (address payer, address receiver, uint256 maxSyIn, IStandardizedYield SY, IPYieldToken YT) {
         assembly {
             // first 32 bytes is ActionType
             payer := calldataload(add(data.offset, 32))
@@ -148,13 +138,7 @@ abstract contract CallbackHelper {
     )
         internal
         pure
-        returns (
-            address receiver,
-            uint256 exactYtIn,
-            uint256 minPtOut,
-            IPPrincipalToken PT,
-            IPYieldToken YT
-        )
+        returns (address receiver, uint256 exactYtIn, uint256 minPtOut, IPPrincipalToken PT, IPYieldToken YT)
     {
         assembly {
             // first 32 bytes is ActionType
@@ -186,11 +170,7 @@ abstract contract CallbackHelper {
 
     function _decodeSwapExactPtForYt(
         bytes calldata data
-    )
-        internal
-        pure
-        returns (address receiver, uint256 exactPtIn, uint256 minYtOut, IPYieldToken YT)
-    {
+    ) internal pure returns (address receiver, uint256 exactPtIn, uint256 minYtOut, IPYieldToken YT) {
         assembly {
             // first 32 bytes is ActionType
             receiver := calldataload(add(data.offset, 32))