@pendle/core-v2 3.0.0-beta-9 → 3.0.0

package/contracts/interfaces/{IPActionAddRemoveLiqV3.sol → IPActionAddRemoveLiq.sol}

@@ -2,9 +2,9 @@
 pragma solidity ^0.8.0;
 
 import "../router/base/MarketApproxLib.sol";
-import "./IPAllActionTypeV3.sol";
+import "../router/base/ActionBaseMintRedeem.sol";
 
-interface IPActionAddRemoveLiqV3 {
+interface IPActionAddRemoveLiq {
     event AddLiquidityDualSyAndPt(
         address indexed caller,
         address indexed market,
@@ -21,16 +21,23 @@ interface IPActionAddRemoveLiqV3 {
         address receiver,
         uint256 netTokenUsed,
         uint256 netPtUsed,
-        uint256 netLpOut,
-        uint256 netSyInterm
+        uint256 netLpOut
     );
 
     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(
@@ -39,8 +46,7 @@ interface IPActionAddRemoveLiqV3 {
         address indexed token,
         address receiver,
         uint256 netTokenIn,
-        uint256 netLpOut,
-        uint256 netSyInterm
+        uint256 netLpOut
     );
 
     event AddLiquiditySingleSyKeepYt(
@@ -48,7 +54,6 @@ interface IPActionAddRemoveLiqV3 {
         address indexed market,
         address indexed receiver,
         uint256 netSyIn,
-        uint256 netSyMintPy,
         uint256 netLpOut,
         uint256 netYtOut
     );
@@ -59,10 +64,8 @@ interface IPActionAddRemoveLiqV3 {
         address indexed token,
         address receiver,
         uint256 netTokenIn,
-        uint256 netSyMintPy,
         uint256 netLpOut,
-        uint256 netYtOut,
-        uint256 netSyInterm
+        uint256 netYtOut
     );
 
     event RemoveLiquidityDualSyAndPt(
@@ -81,8 +84,7 @@ interface IPActionAddRemoveLiqV3 {
         address receiver,
         uint256 netLpToRemove,
         uint256 netPtOut,
-        uint256 netTokenOut,
-        uint256 netSyInterm
+        uint256 netTokenOut
     );
 
     event RemoveLiquiditySinglePt(
@@ -107,60 +109,48 @@ interface IPActionAddRemoveLiqV3 {
         address indexed token,
         address receiver,
         uint256 netLpToRemove,
-        uint256 netTokenOut,
-        uint256 netSyInterm
+        uint256 netTokenOut
     );
 
-    function addLiquidityDualTokenAndPt(
+    function addLiquidityDualSyAndPt(
         address receiver,
         address market,
-        TokenInput calldata input,
+        uint256 netSyDesired,
         uint256 netPtDesired,
         uint256 minLpOut
-    ) external payable returns (uint256 netLpOut, uint256 netPtUsed, uint256 netSyInterm);
+    ) external returns (uint256 netLpOut, uint256 netSyUsed, uint256 netPtUsed);
 
-    function addLiquidityDualSyAndPt(
+    function addLiquidityDualTokenAndPt(
         address receiver,
         address market,
-        uint256 netSyDesired,
+        TokenInput calldata input,
         uint256 netPtDesired,
         uint256 minLpOut
-    ) external returns (uint256 netLpOut, uint256 netSyUsed, uint256 netPtUsed);
+    ) external payable returns (uint256 netLpOut, uint256 netTokenUsed, uint256 netPtUsed);
 
     function addLiquiditySinglePt(
         address receiver,
         address market,
         uint256 netPtIn,
         uint256 minLpOut,
-        ApproxParams calldata guessPtSwapToSy,
-        LimitOrderData calldata limit
+        ApproxParams calldata guessPtSwapToSy
     ) external returns (uint256 netLpOut, uint256 netSyFee);
 
-    function addLiquiditySingleToken(
-        address receiver,
-        address market,
-        uint256 minLpOut,
-        ApproxParams calldata guessPtReceivedFromSy,
-        TokenInput calldata input,
-        LimitOrderData calldata limit
-    ) external payable returns (uint256 netLpOut, uint256 netSyFee, uint256 netSyInterm);
-
     function addLiquiditySingleSy(
         address receiver,
         address market,
         uint256 netSyIn,
         uint256 minLpOut,
-        ApproxParams calldata guessPtReceivedFromSy,
-        LimitOrderData calldata limit
+        ApproxParams calldata guessPtReceivedFromSy
     ) external returns (uint256 netLpOut, uint256 netSyFee);
 
-    function addLiquiditySingleTokenKeepYt(
+    function addLiquiditySingleToken(
         address receiver,
         address market,
         uint256 minLpOut,
-        uint256 minYtOut,
+        ApproxParams calldata guessPtReceivedFromSy,
         TokenInput calldata input
-    ) external payable returns (uint256 netLpOut, uint256 netYtOut, uint256 netSyMintPy, uint256 netSyInterm);
+    ) external payable returns (uint256 netLpOut, uint256 netSyFee);
 
     function addLiquiditySingleSyKeepYt(
         address receiver,
@@ -168,15 +158,15 @@ interface IPActionAddRemoveLiqV3 {
         uint256 netSyIn,
         uint256 minLpOut,
         uint256 minYtOut
-    ) external returns (uint256 netLpOut, uint256 netYtOut, uint256 netSyMintPy);
+    ) external returns (uint256 netLpOut, uint256 netYtOut);
 
-    function removeLiquidityDualTokenAndPt(
+    function addLiquiditySingleTokenKeepYt(
         address receiver,
         address market,
-        uint256 netLpToRemove,
-        TokenOutput calldata output,
-        uint256 minPtOut
-    ) external returns (uint256 netTokenOut, uint256 netPtOut, uint256 netSyInterm);
+        uint256 minLpOut,
+        uint256 minYtOut,
+        TokenInput calldata input
+    ) external returns (uint256 netLpOut, uint256 netYtOut);
 
     function removeLiquidityDualSyAndPt(
         address receiver,
@@ -186,27 +176,33 @@ interface IPActionAddRemoveLiqV3 {
         uint256 minPtOut
     ) external returns (uint256 netSyOut, uint256 netPtOut);
 
+    function removeLiquidityDualTokenAndPt(
+        address receiver,
+        address market,
+        uint256 netLpToRemove,
+        TokenOutput calldata output,
+        uint256 minPtOut
+    ) external returns (uint256 netTokenOut, uint256 netPtOut);
+
     function removeLiquiditySinglePt(
         address receiver,
         address market,
         uint256 netLpToRemove,
         uint256 minPtOut,
-        ApproxParams calldata guessPtReceivedFromSy,
-        LimitOrderData calldata limit
+        ApproxParams calldata guessPtOut
     ) external returns (uint256 netPtOut, uint256 netSyFee);
-    function removeLiquiditySingleToken(
+
+    function removeLiquiditySingleSy(
         address receiver,
         address market,
         uint256 netLpToRemove,
-        TokenOutput calldata output,
-        LimitOrderData calldata limit
-    ) external returns (uint256 netTokenOut, uint256 netSyFee, uint256 netSyInterm);
+        uint256 minSyOut
+    ) external returns (uint256 netSyOut, uint256 netSyFee);
 
-    function removeLiquiditySingleSy(
+    function removeLiquiditySingleToken(
         address receiver,
         address market,
         uint256 netLpToRemove,
-        uint256 minSyOut,
-        LimitOrderData calldata limit
-    ) external returns (uint256 netSyOut, uint256 netSyFee);
+        TokenOutput calldata output
+    ) external returns (uint256 netTokenOut, uint256 netSyFee);
 }

package/contracts/interfaces/IPActionInfoStatic.sol

@@ -29,16 +29,13 @@ interface IPActionInfoStatic {
     function getPY(address py) external view returns (address pt, address yt);
 
     /// can be SY, PY or Market
-    function getTokensInOut(address token)
-        external
-        view
-        returns (address[] memory tokensIn, address[] memory tokensOut);
+    function getTokensInOut(
+        address token
+    ) external view returns (address[] memory tokensIn, address[] memory tokensOut);
 
     function getUserSYInfo(address sy, address user) external returns (UserSYInfo memory res);
 
     function getUserPYInfo(address py, address user) external returns (UserPYInfo memory res);
 
-    function getUserMarketInfo(address market, address user)
-        external
-        returns (UserMarketInfo memory res);
+    function getUserMarketInfo(address market, address user) external returns (UserMarketInfo memory res);
 }

package/contracts/interfaces/IPActionMarketAuxStatic.sol

@@ -9,7 +9,9 @@ interface IPActionMarketAuxStatic {
 
     function calcPriceImpactYt(address market, int256 netPtOut) external view returns (uint256);
 
-    function getMarketState(address market)
+    function getMarketState(
+        address market
+    )
         external
         view
         returns (
@@ -21,15 +23,9 @@ interface IPActionMarketAuxStatic {
             MarketState memory state
         );
 
-    function getTradeExchangeRateExcludeFee(address market, MarketState memory state)
-        external
-        view
-        returns (uint256);
+    function getTradeExchangeRateExcludeFee(address market, MarketState memory state) external view returns (uint256);
 
-    function getTradeExchangeRateIncludeFee(address market, int256 netPtOut)
-        external
-        view
-        returns (uint256);
+    function getTradeExchangeRateIncludeFee(address market, int256 netPtOut) external view returns (uint256);
 
     function getLpToSyRate(address market) external view returns (uint256);
 

package/contracts/interfaces/IPActionMarketCoreStatic.sol

@@ -2,22 +2,27 @@
 pragma solidity ^0.8.0;
 
 interface IPActionMarketCoreStatic {
-    function addLiquidityDualSyAndPtStatic(address market, uint256 netSyDesired, uint256 netPtDesired)
-        external
-        view
-        returns (uint256 netLpOut, uint256 netSyUsed, uint256 netPtUsed);
+    function addLiquidityDualSyAndPtStatic(
+        address market,
+        uint256 netSyDesired,
+        uint256 netPtDesired
+    ) external view 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);
 
-    function addLiquiditySinglePtStatic(address market, uint256 netPtIn)
+    function addLiquiditySinglePtStatic(
+        address market,
+        uint256 netPtIn
+    )
         external
         view
         returns (
@@ -29,12 +34,15 @@ interface IPActionMarketCoreStatic {
             uint256 netSyFromSwap
         );
 
-    function addLiquiditySingleSyKeepYtStatic(address market, uint256 netSyIn)
-        external
-        view
-        returns (uint256 netLpOut, uint256 netYtOut, uint256 netSyToPY);
+    function addLiquiditySingleSyKeepYtStatic(
+        address market,
+        uint256 netSyIn
+    ) external view returns (uint256 netLpOut, uint256 netYtOut, uint256 netSyToPY);
 
-    function addLiquiditySingleSyStatic(address market, uint256 netSyIn)
+    function addLiquiditySingleSyStatic(
+        address market,
+        uint256 netSyIn
+    )
         external
         view
         returns (
@@ -46,12 +54,19 @@ interface IPActionMarketCoreStatic {
             uint256 netSyToSwap
         );
 
-    function addLiquiditySingleTokenKeepYtStatic(address market, address tokenIn, uint256 netTokenIn)
-        external
-        view
-        returns (uint256 netLpOut, uint256 netYtOut, uint256 netSyMinted, uint256 netSyToPY);
+    function addLiquiditySingleTokenKeepYtStatic(
+        address market,
+        address tokenIn,
+        uint256 netTokenIn,
+        address bulk
+    ) external view returns (uint256 netLpOut, uint256 netYtOut, uint256 netSyMinted, uint256 netSyToPY);
 
-    function addLiquiditySingleTokenStatic(address market, address tokenIn, uint256 netTokenIn)
+    function addLiquiditySingleTokenStatic(
+        address market,
+        address tokenIn,
+        uint256 netTokenIn,
+        address bulk
+    )
         external
         view
         returns (
@@ -64,17 +79,22 @@ interface IPActionMarketCoreStatic {
             uint256 netSyToSwap
         );
 
-    function removeLiquidityDualSyAndPtStatic(address market, uint256 netLpToRemove)
-        external
-        view
-        returns (uint256 netSyOut, uint256 netPtOut);
+    function removeLiquidityDualSyAndPtStatic(
+        address market,
+        uint256 netLpToRemove
+    ) external view returns (uint256 netSyOut, uint256 netPtOut);
 
-    function removeLiquidityDualTokenAndPtStatic(address market, uint256 netLpToRemove, address tokenOut)
-        external
-        view
-        returns (uint256 netTokenOut, uint256 netPtOut, uint256 netSyToRedeem);
+    function removeLiquidityDualTokenAndPtStatic(
+        address market,
+        uint256 netLpToRemove,
+        address tokenOut,
+        address bulk
+    ) external view returns (uint256 netTokenOut, uint256 netPtOut, uint256 netSyToRedeem);
 
-    function removeLiquiditySinglePtStatic(address market, uint256 netLpToRemove)
+    function removeLiquiditySinglePtStatic(
+        address market,
+        uint256 netLpToRemove
+    )
         external
         view
         returns (
@@ -87,7 +107,10 @@ interface IPActionMarketCoreStatic {
             uint256 netPtFromBurn
         );
 
-    function removeLiquiditySingleSyStatic(address market, uint256 netLpToRemove)
+    function removeLiquiditySingleSyStatic(
+        address market,
+        uint256 netLpToRemove
+    )
         external
         view
         returns (
@@ -100,7 +123,12 @@ interface IPActionMarketCoreStatic {
             uint256 netSyFromSwap
         );
 
-    function removeLiquiditySingleTokenStatic(address market, uint256 netLpToRemove, address tokenOut)
+    function removeLiquiditySingleTokenStatic(
+        address market,
+        uint256 netLpToRemove,
+        address tokenOut,
+        address bulk
+    )
         external
         view
         returns (
@@ -114,12 +142,17 @@ interface IPActionMarketCoreStatic {
             uint256 netSyFromSwap
         );
 
-    function swapExactPtForSyStatic(address market, uint256 exactPtIn)
-        external
-        view
-        returns (uint256 netSyOut, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter);
+    function swapExactPtForSyStatic(
+        address market,
+        uint256 exactPtIn
+    ) external view returns (uint256 netSyOut, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter);
 
-    function swapExactPtForTokenStatic(address market, uint256 exactPtIn, address tokenOut)
+    function swapExactPtForTokenStatic(
+        address market,
+        uint256 exactPtIn,
+        address tokenOut,
+        address bulk
+    )
         external
         view
         returns (
@@ -130,7 +163,10 @@ interface IPActionMarketCoreStatic {
             uint256 exchangeRateAfter
         );
 
-    function swapExactPtForYtStatic(address market, uint256 exactPtIn)
+    function swapExactPtForYtStatic(
+        address market,
+        uint256 exactPtIn
+    )
         external
         view
         returns (
@@ -141,17 +177,22 @@ interface IPActionMarketCoreStatic {
             uint256 exchangeRateAfter
         );
 
-    function swapExactSyForPtStatic(address market, uint256 exactSyIn)
-        external
-        view
-        returns (uint256 netPtOut, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter);
+    function swapExactSyForPtStatic(
+        address market,
+        uint256 exactSyIn
+    ) external view 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);
+    function swapExactSyForYtStatic(
+        address market,
+        uint256 exactSyIn
+    ) external view returns (uint256 netYtOut, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter);
 
-    function swapExactTokenForPtStatic(address market, address tokenIn, uint256 amountTokenIn)
+    function swapExactTokenForPtStatic(
+        address market,
+        address tokenIn,
+        uint256 amountTokenIn,
+        address bulk
+    )
         external
         view
         returns (
@@ -162,7 +203,12 @@ interface IPActionMarketCoreStatic {
             uint256 exchangeRateAfter
         );
 
-    function swapExactTokenForYtStatic(address market, address tokenIn, uint256 amountTokenIn)
+    function swapExactTokenForYtStatic(
+        address market,
+        address tokenIn,
+        uint256 amountTokenIn,
+        address bulk
+    )
         external
         view
         returns (
@@ -173,7 +219,10 @@ interface IPActionMarketCoreStatic {
             uint256 exchangeRateAfter
         );
 
-    function swapExactYtForPtStatic(address market, uint256 exactYtIn)
+    function swapExactYtForPtStatic(
+        address market,
+        uint256 exactYtIn
+    )
         external
         view
         returns (
@@ -184,7 +233,10 @@ interface IPActionMarketCoreStatic {
             uint256 exchangeRateAfter
         );
 
-    function swapExactYtForSyStatic(address market, uint256 exactYtIn)
+    function swapExactYtForSyStatic(
+        address market,
+        uint256 exactYtIn
+    )
         external
         view
         returns (
@@ -197,7 +249,12 @@ interface IPActionMarketCoreStatic {
             uint256 netPYToRedeemSyOutInt
         );
 
-    function swapExactYtForTokenStatic(address market, uint256 exactYtIn, address tokenOut)
+    function swapExactYtForTokenStatic(
+        address market,
+        uint256 exactYtIn,
+        address tokenOut,
+        address bulk
+    )
         external
         view
         returns (
@@ -211,17 +268,20 @@ interface IPActionMarketCoreStatic {
             uint256 netPYToRedeemSyOutInt
         );
 
-    function swapPtForExactSyStatic(address market, uint256 exactSyOut)
-        external
-        view
-        returns (uint256 netPtIn, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter);
+    function swapPtForExactSyStatic(
+        address market,
+        uint256 exactSyOut
+    ) external view 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);
+    function swapSyForExactPtStatic(
+        address market,
+        uint256 exactPtOut
+    ) external view returns (uint256 netSyIn, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter);
 
-    function swapSyForExactYtStatic(address market, uint256 exactYtOut)
+    function swapSyForExactYtStatic(
+        address market,
+        uint256 exactYtOut
+    )
         external
         view
         returns (
@@ -233,8 +293,8 @@ interface IPActionMarketCoreStatic {
             uint256 totalSyNeedInt
         );
 
-    function swapYtForExactSyStatic(address market, uint256 exactSyOut)
-        external
-        view
-        returns (uint256 netYtIn, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter);
+    function swapYtForExactSyStatic(
+        address market,
+        uint256 exactSyOut
+    ) external view returns (uint256 netYtIn, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter);
 }

package/contracts/interfaces/IPActionMintRedeem.sol

@@ -0,0 +1,108 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.0;
+
+import "../router/base/MarketApproxLib.sol";
+import "../router/base/ActionBaseMintRedeem.sol";
+
+interface IPActionMintRedeem {
+    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;
+}