@pendle/core-v2 2.29.1 → 3.0.0-beta-2

package/contracts/core/libraries/TokenHelper.sol

@@ -1,11 +1,13 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.0;
+
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "../../interfaces/IWETH.sol";
 
 abstract contract TokenHelper {
     using SafeERC20 for IERC20;
+
     address internal constant NATIVE = address(0);
     uint256 internal constant LOWER_BOUND_APPROVAL = type(uint96).max / 2; // some tokens use 96 bits for approval
 
@@ -15,13 +17,13 @@ abstract contract TokenHelper {
     }
 
     function _transferFrom(IERC20 token, address from, address to, uint256 amount) internal {
-        if (amount != 0) token.safeTransferFrom(from, to, amount);
+        if (amount != 0 && from != address(this)) token.safeTransferFrom(from, to, amount);
     }
 
     function _transferOut(address token, address to, uint256 amount) internal {
         if (amount == 0) return;
         if (token == NATIVE) {
-            (bool success, ) = to.call{ value: amount }("");
+            (bool success,) = to.call{value: amount}("");
             require(success, "eth send failed");
         } else {
             IERC20(token).safeTransfer(to, amount);
@@ -31,7 +33,7 @@ abstract contract TokenHelper {
     function _transferOut(address[] memory tokens, address to, uint256[] memory amounts) internal {
         uint256 numTokens = tokens.length;
         require(numTokens == amounts.length, "length mismatch");
-        for (uint256 i = 0; i < numTokens; ) {
+        for (uint256 i = 0; i < numTokens;) {
             _transferOut(tokens[i], to, amounts[i]);
             unchecked {
                 i++;
@@ -50,9 +52,7 @@ abstract contract TokenHelper {
     /// @notice Approves the stipulated contract to spend the given allowance in the given token
     /// @dev PLS PAY ATTENTION to tokens that requires the approval to be set to 0 before changing it
     function _safeApprove(address token, address to, uint256 value) internal {
-        (bool success, bytes memory data) = token.call(
-            abi.encodeWithSelector(IERC20.approve.selector, to, value)
-        );
+        (bool success, bytes memory data) = token.call(abi.encodeWithSelector(IERC20.approve.selector, to, value));
         require(success && (data.length == 0 || abi.decode(data, (bool))), "Safe Approve");
     }
 
@@ -65,7 +65,7 @@ abstract contract TokenHelper {
     }
 
     function _wrap_unwrap_ETH(address tokenIn, address tokenOut, uint256 netTokenIn) internal {
-        if (tokenIn == NATIVE) IWETH(tokenOut).deposit{ value: netTokenIn }();
+        if (tokenIn == NATIVE) IWETH(tokenOut).deposit{value: netTokenIn}();
         else IWETH(tokenIn).withdraw(netTokenIn);
     }
 }

package/contracts/interfaces/IDailLikePermit.sol

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+/// @title Interface for DAI-style permits
+interface IDaiLikePermit {
+    function permit(
+        address holder,
+        address spender,
+        uint256 nonce,
+        uint256 expiry,
+        bool allowed,
+        uint8 v,
+        bytes32 r,
+        bytes32 s
+    ) external;
+}

package/contracts/interfaces/IPActionAddRemoveLiq.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import "../router/base/MarketApproxLib.sol";
-import "../router/base/ActionBaseMintRedeem.sol";
+import "./IPAllActionType.sol";
 
 interface IPActionAddRemoveLiq {
     event AddLiquidityDualSyAndPt(
@@ -25,19 +25,11 @@ interface IPActionAddRemoveLiq {
     );
 
     event AddLiquiditySinglePt(
-        address indexed caller,
-        address indexed market,
-        address indexed receiver,
-        uint256 netPtIn,
-        uint256 netLpOut
+        address indexed caller, address indexed market, address indexed receiver, uint256 netPtIn, uint256 netLpOut
     );
 
     event AddLiquiditySingleSy(
-        address indexed caller,
-        address indexed market,
-        address indexed receiver,
-        uint256 netSyIn,
-        uint256 netLpOut
+        address indexed caller, address indexed market, address indexed receiver, uint256 netSyIn, uint256 netLpOut
     );
 
     event AddLiquiditySingleToken(
@@ -126,14 +118,15 @@ interface IPActionAddRemoveLiq {
         TokenInput calldata input,
         uint256 netPtDesired,
         uint256 minLpOut
-    ) external payable returns (uint256 netLpOut, uint256 netTokenUsed, uint256 netPtUsed);
+    ) external payable returns (uint256 netLpOut, uint256 netPtUsed);
 
     function addLiquiditySinglePt(
         address receiver,
         address market,
         uint256 netPtIn,
         uint256 minLpOut,
-        ApproxParams calldata guessPtSwapToSy
+        ApproxParams calldata guessPtSwapToSy,
+        LimitOrderData calldata limit
     ) external returns (uint256 netLpOut, uint256 netSyFee);
 
     function addLiquiditySingleSy(
@@ -141,7 +134,8 @@ interface IPActionAddRemoveLiq {
         address market,
         uint256 netSyIn,
         uint256 minLpOut,
-        ApproxParams calldata guessPtReceivedFromSy
+        ApproxParams calldata guessPtReceivedFromSy,
+        LimitOrderData calldata limit
     ) external returns (uint256 netLpOut, uint256 netSyFee);
 
     function addLiquiditySingleToken(
@@ -149,7 +143,8 @@ interface IPActionAddRemoveLiq {
         address market,
         uint256 minLpOut,
         ApproxParams calldata guessPtReceivedFromSy,
-        TokenInput calldata input
+        TokenInput calldata input,
+        LimitOrderData calldata limit
     ) external payable returns (uint256 netLpOut, uint256 netSyFee);
 
     function addLiquiditySingleSyKeepYt(
@@ -189,20 +184,23 @@ interface IPActionAddRemoveLiq {
         address market,
         uint256 netLpToRemove,
         uint256 minPtOut,
-        ApproxParams calldata guessPtOut
+        ApproxParams calldata guessPtOut,
+        LimitOrderData calldata limit
     ) external returns (uint256 netPtOut, uint256 netSyFee);
 
     function removeLiquiditySingleSy(
         address receiver,
         address market,
         uint256 netLpToRemove,
-        uint256 minSyOut
+        uint256 minSyOut,
+        LimitOrderData calldata limit
     ) external returns (uint256 netSyOut, uint256 netSyFee);
 
     function removeLiquiditySingleToken(
         address receiver,
         address market,
         uint256 netLpToRemove,
-        TokenOutput calldata output
+        TokenOutput calldata output,
+        LimitOrderData calldata limit
     ) external returns (uint256 netTokenOut, uint256 netSyFee);
 }

package/contracts/interfaces/IPActionMarketCoreStatic.sol

@@ -2,35 +2,20 @@
 pragma solidity ^0.8.0;
 
 interface IPActionMarketCoreStatic {
-    function addLiquidityDualSyAndPtStatic(
-        address market,
-        uint256 netSyDesired,
-        uint256 netPtDesired
-    )
+    function addLiquidityDualSyAndPtStatic(address market, uint256 netSyDesired, uint256 netPtDesired)
         external
         view
-        returns (
-            uint256 netLpOut,
-            uint256 netSyUsed,
-            uint256 netPtUsed
-        );
+        returns (uint256 netLpOut, uint256 netSyUsed, uint256 netPtUsed);
 
     function addLiquidityDualTokenAndPtStatic(
         address market,
         address tokenIn,
         uint256 netTokenDesired,
-        address bulk,
         uint256 netPtDesired
     )
         external
         view
-        returns (
-            uint256 netLpOut,
-            uint256 netTokenUsed,
-            uint256 netPtUsed,
-            uint256 netSyUsed,
-            uint256 netSyDesired
-        );
+        returns (uint256 netLpOut, uint256 netTokenUsed, uint256 netPtUsed, uint256 netSyUsed, uint256 netSyDesired);
 
     function addLiquiditySinglePtStatic(address market, uint256 netPtIn)
         external
@@ -47,11 +32,7 @@ interface IPActionMarketCoreStatic {
     function addLiquiditySingleSyKeepYtStatic(address market, uint256 netSyIn)
         external
         view
-        returns (
-            uint256 netLpOut,
-            uint256 netYtOut,
-            uint256 netSyToPY
-        );
+        returns (uint256 netLpOut, uint256 netYtOut, uint256 netSyToPY);
 
     function addLiquiditySingleSyStatic(address market, uint256 netSyIn)
         external
@@ -65,27 +46,12 @@ interface IPActionMarketCoreStatic {
             uint256 netSyToSwap
         );
 
-    function addLiquiditySingleTokenKeepYtStatic(
-        address market,
-        address tokenIn,
-        uint256 netTokenIn,
-        address bulk
-    )
+    function addLiquiditySingleTokenKeepYtStatic(address market, address tokenIn, uint256 netTokenIn)
         external
         view
-        returns (
-            uint256 netLpOut,
-            uint256 netYtOut,
-            uint256 netSyMinted,
-            uint256 netSyToPY
-        );
+        returns (uint256 netLpOut, uint256 netYtOut, uint256 netSyMinted, uint256 netSyToPY);
 
-    function addLiquiditySingleTokenStatic(
-        address market,
-        address tokenIn,
-        uint256 netTokenIn,
-        address bulk
-    )
+    function addLiquiditySingleTokenStatic(address market, address tokenIn, uint256 netTokenIn)
         external
         view
         returns (
@@ -103,19 +69,10 @@ interface IPActionMarketCoreStatic {
         view
         returns (uint256 netSyOut, uint256 netPtOut);
 
-    function removeLiquidityDualTokenAndPtStatic(
-        address market,
-        uint256 netLpToRemove,
-        address tokenOut,
-        address bulk
-    )
+    function removeLiquidityDualTokenAndPtStatic(address market, uint256 netLpToRemove, address tokenOut)
         external
         view
-        returns (
-            uint256 netTokenOut,
-            uint256 netPtOut,
-            uint256 netSyToRedeem
-        );
+        returns (uint256 netTokenOut, uint256 netPtOut, uint256 netSyToRedeem);
 
     function removeLiquiditySinglePtStatic(address market, uint256 netLpToRemove)
         external
@@ -143,12 +100,7 @@ interface IPActionMarketCoreStatic {
             uint256 netSyFromSwap
         );
 
-    function removeLiquiditySingleTokenStatic(
-        address market,
-        uint256 netLpToRemove,
-        address tokenOut,
-        address bulk
-    )
+    function removeLiquiditySingleTokenStatic(address market, uint256 netLpToRemove, address tokenOut)
         external
         view
         returns (
@@ -165,19 +117,9 @@ interface IPActionMarketCoreStatic {
     function swapExactPtForSyStatic(address market, uint256 exactPtIn)
         external
         view
-        returns (
-            uint256 netSyOut,
-            uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
-        );
+        returns (uint256 netSyOut, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter);
 
-    function swapExactPtForTokenStatic(
-        address market,
-        uint256 exactPtIn,
-        address tokenOut,
-        address bulk
-    )
+    function swapExactPtForTokenStatic(address market, uint256 exactPtIn, address tokenOut)
         external
         view
         returns (
@@ -202,29 +144,14 @@ interface IPActionMarketCoreStatic {
     function swapExactSyForPtStatic(address market, uint256 exactSyIn)
         external
         view
-        returns (
-            uint256 netPtOut,
-            uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
-        );
+        returns (uint256 netPtOut, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter);
 
     function swapExactSyForYtStatic(address market, uint256 exactSyIn)
         external
         view
-        returns (
-            uint256 netYtOut,
-            uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
-        );
+        returns (uint256 netYtOut, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter);
 
-    function swapExactTokenForPtStatic(
-        address market,
-        address tokenIn,
-        uint256 amountTokenIn,
-        address bulk
-    )
+    function swapExactTokenForPtStatic(address market, address tokenIn, uint256 amountTokenIn)
         external
         view
         returns (
@@ -235,12 +162,7 @@ interface IPActionMarketCoreStatic {
             uint256 exchangeRateAfter
         );
 
-    function swapExactTokenForYtStatic(
-        address market,
-        address tokenIn,
-        uint256 amountTokenIn,
-        address bulk
-    )
+    function swapExactTokenForYtStatic(address market, address tokenIn, uint256 amountTokenIn)
         external
         view
         returns (
@@ -275,12 +197,7 @@ interface IPActionMarketCoreStatic {
             uint256 netPYToRedeemSyOutInt
         );
 
-    function swapExactYtForTokenStatic(
-        address market,
-        uint256 exactYtIn,
-        address tokenOut,
-        address bulk
-    )
+    function swapExactYtForTokenStatic(address market, uint256 exactYtIn, address tokenOut)
         external
         view
         returns (
@@ -297,22 +214,12 @@ interface IPActionMarketCoreStatic {
     function swapPtForExactSyStatic(address market, uint256 exactSyOut)
         external
         view
-        returns (
-            uint256 netPtIn,
-            uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
-        );
+        returns (uint256 netPtIn, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter);
 
     function swapSyForExactPtStatic(address market, uint256 exactPtOut)
         external
         view
-        returns (
-            uint256 netSyIn,
-            uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
-        );
+        returns (uint256 netSyIn, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter);
 
     function swapSyForExactYtStatic(address market, uint256 exactYtOut)
         external
@@ -329,10 +236,5 @@ interface IPActionMarketCoreStatic {
     function swapYtForExactSyStatic(address market, uint256 exactSyOut)
         external
         view
-        returns (
-            uint256 netYtIn,
-            uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
-        );
+        returns (uint256 netYtIn, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter);
 }

package/contracts/interfaces/IPActionMintRedeemStatic.sol

@@ -2,64 +2,34 @@
 pragma solidity ^0.8.0;
 
 interface IPActionMintRedeemStatic {
-    function getAmountTokenToMintSy(
-        address SY,
-        address tokenIn,
-        address bulk,
-        uint256 netSyOut
-    ) external view returns (uint256 netTokenIn);
-
-    function getBulkSellerInfo(
-        address token,
-        address SY,
-        uint256 netTokenIn,
-        uint256 netSyIn
-    )
+    function getAmountTokenToMintSy(address SY, address tokenIn, uint256 netSyOut)
         external
         view
-        returns (
-            address bulk,
-            uint256 totalToken,
-            uint256 totalSy
-        );
+        returns (uint256 netTokenIn);
+
+    function mintPyFromSyStatic(address YT, uint256 netSyToMint) external view returns (uint256 netPYOut);
 
-    function mintPyFromSyStatic(address YT, uint256 netSyToMint)
+    function mintPyFromTokenStatic(address YT, address tokenIn, uint256 netTokenIn)
         external
         view
-        returns (uint256 netPYOut);
-
-    function mintPyFromTokenStatic(
-        address YT,
-        address tokenIn,
-        uint256 netTokenIn,
-        address bulk
-    ) external view returns (uint256 netPyOut);
+        returns (uint256 netPyOut);
 
-    function mintSyFromTokenStatic(
-        address SY,
-        address tokenIn,
-        uint256 netTokenIn,
-        address bulk
-    ) external view returns (uint256 netSyOut);
-
-    function redeemPyToSyStatic(address YT, uint256 netPYToRedeem)
+    function mintSyFromTokenStatic(address SY, address tokenIn, uint256 netTokenIn)
         external
         view
         returns (uint256 netSyOut);
 
-    function redeemPyToTokenStatic(
-        address YT,
-        uint256 netPYToRedeem,
-        address tokenOut,
-        address bulk
-    ) external view returns (uint256 netTokenOut);
+    function redeemPyToSyStatic(address YT, uint256 netPYToRedeem) external view returns (uint256 netSyOut);
 
-    function redeemSyToTokenStatic(
-        address SY,
-        address tokenOut,
-        uint256 netSyIn,
-        address bulk
-    ) external view returns (uint256 netTokenOut);
+    function redeemPyToTokenStatic(address YT, uint256 netPYToRedeem, address tokenOut)
+        external
+        view
+        returns (uint256 netTokenOut);
+
+    function redeemSyToTokenStatic(address SY, address tokenOut, uint256 netSyIn)
+        external
+        view
+        returns (uint256 netTokenOut);
 
     function pyIndexCurrentViewMarket(address market) external view returns (uint256);
 

package/contracts/interfaces/IPActionMisc.sol

@@ -1,6 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.0;
 
+import "../router/base/MarketApproxLib.sol";
+import "./IPAllActionType.sol";
+
 interface IPActionMisc {
     struct MultiApproval {
         address[] tokens;
@@ -17,7 +20,91 @@ interface IPActionMisc {
         bytes returnData;
     }
 
+    event MintSyFromToken(
+        address indexed caller,
+        address indexed tokenIn,
+        address indexed SY,
+        address receiver,
+        uint256 netTokenIn,
+        uint256 netSyOut
+    );
+
+    event RedeemSyToToken(
+        address indexed caller,
+        address indexed tokenOut,
+        address indexed SY,
+        address receiver,
+        uint256 netSyIn,
+        uint256 netTokenOut
+    );
+
+    event MintPyFromSy(
+        address indexed caller, address indexed receiver, address indexed YT, uint256 netSyIn, uint256 netPyOut
+    );
+
+    event RedeemPyToSy(
+        address indexed caller, address indexed receiver, address indexed YT, uint256 netPyIn, uint256 netSyOut
+    );
+
+    event MintPyFromToken(
+        address indexed caller,
+        address indexed tokenIn,
+        address indexed YT,
+        address receiver,
+        uint256 netTokenIn,
+        uint256 netPyOut
+    );
+
+    event RedeemPyToToken(
+        address indexed caller,
+        address indexed tokenOut,
+        address indexed YT,
+        address receiver,
+        uint256 netPyIn,
+        uint256 netTokenOut
+    );
+
+    function mintSyFromToken(address receiver, address SY, uint256 minSyOut, TokenInput calldata input)
+        external
+        payable
+        returns (uint256 netSyOut);
+
+    function redeemSyToToken(address receiver, address SY, uint256 netSyIn, TokenOutput calldata output)
+        external
+        returns (uint256 netTokenOut);
+
+    function mintPyFromToken(address receiver, address YT, uint256 minPyOut, TokenInput calldata input)
+        external
+        payable
+        returns (uint256 netPyOut);
+
+    function redeemPyToToken(address receiver, address YT, uint256 netPyIn, TokenOutput calldata output)
+        external
+        returns (uint256 netTokenOut);
+
+    function mintPyFromSy(address receiver, address YT, uint256 netSyIn, uint256 minPyOut)
+        external
+        returns (uint256 netPyOut);
+
+    function redeemPyToSy(address receiver, address YT, uint256 netPyIn, uint256 minSyOut)
+        external
+        returns (uint256 netSyOut);
+
+    function redeemDueInterestAndRewards(
+        address user,
+        address[] calldata sys,
+        address[] calldata yts,
+        address[] calldata markets
+    ) external;
+
     function approveInf(MultiApproval[] calldata) external;
 
-    function batchExec(Call3[] calldata calls) external returns (Result[] memory returnData);
+    function multicall(Call3[] calldata calls) external payable returns (Result[] memory returnData);
+
+    function multicallRevert(uint256 gasLimit, Call3[] calldata calls)
+        external
+        payable
+        returns (bytes[] memory res, uint256[] memory gasUsed);
+
+    function callThenRevert(address target, bytes memory callData) external payable;
 }

package/contracts/interfaces/IPActionStorageStatic.sol

@@ -9,14 +9,7 @@ interface IPActionStorageStatic {
 
     function getDefaultApproxParams() external view returns (ApproxParams memory);
 
-    function setBulkSellerFactory(address _bulkSellerFactory) external;
-
-    function getBulkSellerFactory() external view returns (address);
-
-    function getOwnerAndPendingOwner()
-        external
-        view
-        returns (address _owner, address _pendingOwner);
+    function getOwnerAndPendingOwner() external view returns (address _owner, address _pendingOwner);
 
     function transferOwnership(address newOwner, bool direct, bool renounce) external;
 

package/contracts/interfaces/IPActionSwapPT.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import "../router/base/MarketApproxLib.sol";
-import "../router/base/ActionBaseMintRedeem.sol";
+import "./IPAllActionType.sol";
 
 interface IPActionSwapPT {
     event SwapPtAndSy(
@@ -26,30 +26,17 @@ interface IPActionSwapPT {
         address receiver,
         address market,
         uint256 exactPtIn,
-        uint256 minSyOut
+        uint256 minSyOut,
+        LimitOrderData calldata limit
     ) external returns (uint256 netSyOut, uint256 netSyFee);
 
-    function swapPtForExactSy(
-        address receiver,
-        address market,
-        uint256 exactSyOut,
-        uint256 maxPtIn,
-        ApproxParams calldata guessPtIn
-    ) external returns (uint256 netPtIn, uint256 netSyFee);
-
-    function swapSyForExactPt(
-        address receiver,
-        address market,
-        uint256 exactPtOut,
-        uint256 maxSyIn
-    ) external returns (uint256 netSyIn, uint256 netSyFee);
-
     function swapExactSyForPt(
         address receiver,
         address market,
         uint256 exactSyIn,
         uint256 minPtOut,
-        ApproxParams calldata guessPtOut
+        ApproxParams calldata guessPtOut,
+        LimitOrderData calldata limit
     ) external returns (uint256 netPtOut, uint256 netSyFee);
 
     function swapExactTokenForPt(
@@ -57,13 +44,15 @@ interface IPActionSwapPT {
         address market,
         uint256 minPtOut,
         ApproxParams calldata guessPtOut,
-        TokenInput calldata input
+        TokenInput calldata input,
+        LimitOrderData calldata limit
     ) external payable returns (uint256 netPtOut, uint256 netSyFee);
 
     function swapExactPtForToken(
         address receiver,
         address market,
         uint256 exactPtIn,
-        TokenOutput calldata output
+        TokenOutput calldata output,
+        LimitOrderData calldata limit
     ) external returns (uint256 netTokenOut, uint256 netSyFee);
 }