@pendle/core-v2 5.0.7-beta → 5.1.0

package/contracts/core/StandardizedYield/implementations/Usual/PendleUsualUSD0PPSY.sol

@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.17;
+import "../../SYBase.sol";
+import "../../../../interfaces/Usual/IUsualUSD0PP.sol";
+
+contract PendleUsualUSD0PPSY is SYBase {
+    address public constant USD0PP = 0x35D8949372D46B7a3D5A56006AE77B215fc69bC0;
+    address public constant USD0 = 0x73A15FeD60Bf67631dC6cd7Bc5B6e8da8190aCF5;
+
+    constructor() SYBase("SY USD0++", "SY-USD0++", USD0PP) {
+        _safeApproveInf(USD0, USD0PP);
+    }
+
+    function _deposit(
+        address tokenIn,
+        uint256 amountDeposited
+    ) internal virtual override returns (uint256 /*amountSharesOut*/) {
+        if (tokenIn == USD0) {
+            IUsualUSD0PP(USD0PP).mint(amountDeposited);
+        }
+        return amountDeposited;
+    }
+
+    function _redeem(
+        address receiver,
+        address /*tokenOut*/,
+        uint256 amountSharesToRedeem
+    ) internal override returns (uint256) {
+        _transferOut(yieldToken, receiver, amountSharesToRedeem);
+        return amountSharesToRedeem;
+    }
+
+    function exchangeRate() public view virtual override returns (uint256 res) {
+        return PMath.ONE;
+    }
+
+    function _previewDeposit(
+        address /*tokenIn*/,
+        uint256 amountTokenToDeposit
+    ) internal view virtual override returns (uint256 /*amountSharesOut*/) {
+        return amountTokenToDeposit;
+    }
+
+    function _previewRedeem(
+        address /*tokenOut*/,
+        uint256 amountSharesToRedeem
+    ) internal view virtual override returns (uint256 /*amountTokenOut*/) {
+        return amountSharesToRedeem;
+    }
+
+    function getTokensIn() public pure override returns (address[] memory res) {
+        return ArrayLib.create(USD0PP, USD0);
+    }
+
+    function getTokensOut() public pure override returns (address[] memory res) {
+        return ArrayLib.create(USD0PP);
+    }
+
+    function isValidTokenIn(address token) public pure override returns (bool) {
+        return token == USD0PP || token == USD0;
+    }
+
+    function isValidTokenOut(address token) public pure override returns (bool) {
+        return token == USD0PP;
+    }
+
+    function assetInfo() external view returns (AssetType assetType, address assetAddress, uint8 assetDecimals) {
+        return (AssetType.TOKEN, USD0PP, IERC20Metadata(USD0PP).decimals());
+    }
+}

package/contracts/core/libraries/math/PMath.sol

@@ -67,14 +67,38 @@ library PMath {
         return (a + b - 1) / b;
     }
 
-    function slipUp(uint256 a, uint256 factor) internal pure returns (uint256) {
+    function tweakUp(uint256 a, uint256 factor) internal pure returns (uint256) {
         return mulDown(a, ONE + factor);
     }
 
-    function slipDown(uint256 a, uint256 factor) internal pure returns (uint256) {
+    function tweakDown(uint256 a, uint256 factor) internal pure returns (uint256) {
         return mulDown(a, ONE - factor);
     }
 
+    /// @return res = min(a + b, bound)
+    /// @dev This function should handle arithmetic operation and bound check without overflow/underflow
+    function addWithUpperBound(uint256 a, uint256 b, uint256 bound) internal pure returns (uint256 res) {
+        unchecked {
+            if (type(uint256).max - b < a) res = bound;
+            else res = min(bound, a + b);
+        }
+    }
+
+    /// @return res = max(a - b, bound)
+    /// @dev This function should handle arithmetic operation and bound check without overflow/underflow
+    function subWithLowerBound(uint256 a, uint256 b, uint256 bound) internal pure returns (uint256 res) {
+        unchecked {
+            if (b > a) res = bound;
+            else res = max(a - b, bound);
+        }
+    }
+
+    function clamp(uint256 x, uint256 lower, uint256 upper) internal pure returns (uint256 res) {
+        res = x;
+        if (x < lower) res = lower;
+        else if (x > upper) res = upper;
+    }
+
     // @author Uniswap
     function sqrt(uint256 y) internal pure returns (uint256 z) {
         if (y > 3) {

package/contracts/interfaces/Corn/ICornSilo.sol

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.17;
+
+interface ICornSilo {
+    function deposit(address token, uint256 assets) external returns (uint256 shares);
+
+    function redeemToken(address token, uint256 shares) external returns (uint256 assets);
+}

package/contracts/interfaces/Equilibria/IEquilibriaConverter.sol

@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+pragma solidity ^0.8.0;
+
+interface IEquilibriaConverter {
+    function deposit(uint256 _amount) external returns (uint256);
+
+    function estimateTotalConversion(uint256 _amount) external view returns (uint256);
+}

package/contracts/interfaces/Equilibria/IEquilibriaVault.sol

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+pragma solidity ^0.8.0;
+
+interface IEquilibriaVault {
+    function deposit(uint256 _amount) external returns (uint256);
+
+    function withdraw(uint256 _shares) external returns (uint256);
+
+    function getReward(address _account) external;
+
+    function balance() external view returns (uint256);
+}

package/contracts/interfaces/EtherFi/IVedaTeller.sol

@@ -2,6 +2,12 @@
 pragma solidity ^0.8.23;
 
 interface IVedaTeller {
+    struct Asset {
+        bool allowDeposits;
+        bool allowWithdraws;
+        uint16 sharePremium;
+    }
+
     function deposit(
         address depositAsset,
         uint256 depositAmount,
@@ -16,4 +22,6 @@ interface IVedaTeller {
         uint256 minimumMint,
         address to
     ) external returns (uint256 shares);
+
+    function assetData(address) external view returns (Asset memory);
 }

package/contracts/interfaces/IPActionAddRemoveLiqV3.sol

@@ -1,135 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.0;
 
-import "../router/base/MarketApproxLib.sol";
+import "../router/math/MarketApproxLib.sol";
 import "./IPAllActionTypeV3.sol";
+import {IPAllEventsV3} from "./IPAllEventsV3.sol";
 
-/*
- *******************************************************************************************************************
- *******************************************************************************************************************
- * NOTICE *
- * Refer to https://docs.pendle.finance/Developers/Contracts/PendleRouter for more information on
- * TokenInput, TokenOutput, ApproxParams, LimitOrderData
- * It's recommended to use Pendle's Hosted SDK to generate the params
- *******************************************************************************************************************
- *******************************************************************************************************************
- */
-
-interface IPActionAddRemoveLiqV3 {
-    event AddLiquidityDualSyAndPt(
-        address indexed caller,
-        address indexed market,
-        address indexed receiver,
-        uint256 netSyUsed,
-        uint256 netPtUsed,
-        uint256 netLpOut
-    );
-
-    event AddLiquidityDualTokenAndPt(
-        address indexed caller,
-        address indexed market,
-        address indexed tokenIn,
-        address receiver,
-        uint256 netTokenUsed,
-        uint256 netPtUsed,
-        uint256 netLpOut,
-        uint256 netSyInterm
-    );
-
-    event AddLiquiditySinglePt(
-        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
-    );
-
-    event AddLiquiditySingleToken(
-        address indexed caller,
-        address indexed market,
-        address indexed token,
-        address receiver,
-        uint256 netTokenIn,
-        uint256 netLpOut,
-        uint256 netSyInterm
-    );
-
-    event AddLiquiditySingleSyKeepYt(
-        address indexed caller,
-        address indexed market,
-        address indexed receiver,
-        uint256 netSyIn,
-        uint256 netSyMintPy,
-        uint256 netLpOut,
-        uint256 netYtOut
-    );
-
-    event AddLiquiditySingleTokenKeepYt(
-        address indexed caller,
-        address indexed market,
-        address indexed token,
-        address receiver,
-        uint256 netTokenIn,
-        uint256 netLpOut,
-        uint256 netYtOut,
-        uint256 netSyMintPy,
-        uint256 netSyInterm
-    );
-
-    event RemoveLiquidityDualSyAndPt(
-        address indexed caller,
-        address indexed market,
-        address indexed receiver,
-        uint256 netLpToRemove,
-        uint256 netPtOut,
-        uint256 netSyOut
-    );
-
-    event RemoveLiquidityDualTokenAndPt(
-        address indexed caller,
-        address indexed market,
-        address indexed tokenOut,
-        address receiver,
-        uint256 netLpToRemove,
-        uint256 netPtOut,
-        uint256 netTokenOut,
-        uint256 netSyInterm
-    );
-
-    event RemoveLiquiditySinglePt(
-        address indexed caller,
-        address indexed market,
-        address indexed receiver,
-        uint256 netLpToRemove,
-        uint256 netPtOut
-    );
-
-    event RemoveLiquiditySingleSy(
-        address indexed caller,
-        address indexed market,
-        address indexed receiver,
-        uint256 netLpToRemove,
-        uint256 netSyOut
-    );
-
-    event RemoveLiquiditySingleToken(
-        address indexed caller,
-        address indexed market,
-        address indexed token,
-        address receiver,
-        uint256 netLpToRemove,
-        uint256 netTokenOut,
-        uint256 netSyInterm
-    );
-
+/// Refer to IPAllActionTypeV3.sol for details on the parameters
+interface IPActionAddRemoveLiqV3 is IPAllEventsV3 {
     function addLiquidityDualTokenAndPt(
         address receiver,
         address market,

package/contracts/interfaces/IPActionMarketAuxStatic.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.8.0;
 
 import "./IPMarket.sol";
-import {ApproxParams} from "../router/base/MarketApproxLib.sol";
+import {ApproxParams} from "../router/math/MarketApproxLib.sol";
 
 interface IPActionMarketAuxStatic {
     function calcPriceImpactPY(address market, int256 netPtOut) external view returns (uint256);

package/contracts/interfaces/IPActionMiscV3.sol

@@ -1,23 +1,14 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.0;
 
-import "../router/base/MarketApproxLib.sol";
+import "../router/math/MarketApproxLib.sol";
 import "./IPAllActionTypeV3.sol";
+import {IPAllEventsV3} from "./IPAllEventsV3.sol";
 import "./IStandardizedYield.sol";
 import "./IPMarket.sol";
 
-/*
- *******************************************************************************************************************
- *******************************************************************************************************************
- * NOTICE *
- * Refer to https://docs.pendle.finance/Developers/Contracts/PendleRouter for more information on
- * TokenInput, TokenOutput, ApproxParams, LimitOrderData
- * It's recommended to use Pendle's Hosted SDK to generate the params
- *******************************************************************************************************************
- *******************************************************************************************************************
- */
-
-interface IPActionMiscV3 {
+/// Refer to IPAllActionTypeV3.sol for details on the parameters
+interface IPActionMiscV3 is IPAllEventsV3 {
     struct Call3 {
         bool allowFailure;
         bytes callData;
@@ -28,124 +19,6 @@ interface IPActionMiscV3 {
         bytes returnData;
     }
 
-    struct RedeemYtIncomeToTokenStruct {
-        IPYieldToken yt;
-        bool doRedeemInterest;
-        bool doRedeemRewards;
-        address tokenRedeemSy;
-        uint256 minTokenRedeemOut;
-    }
-
-    struct ExitPreExpReturnParams {
-        uint256 netPtFromRemove;
-        uint256 netSyFromRemove;
-        uint256 netPyRedeem;
-        uint256 netSyFromRedeem;
-        uint256 netPtSwap;
-        uint256 netYtSwap;
-        uint256 netSyFromSwap;
-        uint256 netSyFee;
-        uint256 totalSyOut;
-    }
-
-    struct ExitPostExpReturnParams {
-        uint256 netPtFromRemove;
-        uint256 netSyFromRemove;
-        uint256 netPtRedeem;
-        uint256 netSyFromRedeem;
-        uint256 totalSyOut;
-    }
-
-    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,
-        uint256 netSyInterm
-    );
-
-    event RedeemPyToToken(
-        address indexed caller,
-        address indexed tokenOut,
-        address indexed YT,
-        address receiver,
-        uint256 netPyIn,
-        uint256 netTokenOut,
-        uint256 netSyInterm
-    );
-
-    event ExitPreExpToToken(
-        address indexed caller,
-        address indexed market,
-        address indexed token,
-        address receiver,
-        uint256 netLpIn,
-        uint256 totalTokenOut,
-        ExitPreExpReturnParams params
-    );
-
-    event ExitPreExpToSy(
-        address indexed caller,
-        address indexed market,
-        address indexed receiver,
-        uint256 netLpIn,
-        ExitPreExpReturnParams params
-    );
-
-    event ExitPostExpToToken(
-        address indexed caller,
-        address indexed market,
-        address indexed token,
-        address receiver,
-        uint256 netLpIn,
-        uint256 totalTokenOut,
-        ExitPostExpReturnParams params
-    );
-
-    event ExitPostExpToSy(
-        address indexed caller,
-        address indexed market,
-        address indexed receiver,
-        uint256 netLpIn,
-        ExitPostExpReturnParams params
-    );
-
     function mintSyFromToken(
         address receiver,
         address SY,

package/contracts/interfaces/IPActionSimple.sol

@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.0;
+
+import {TokenInput} from "./IPAllActionTypeV3.sol";
+import {IPAllEventsV3} from "./IPAllEventsV3.sol";
+import "./IPAllActionTypeV3.sol";
+
+/// All of these functions are for internal router use only and should not be called directly.
+interface IPActionSimple is IPAllEventsV3 {
+    function addLiquiditySinglePtSimple(
+        address receiver,
+        address market,
+        uint256 netPtIn,
+        uint256 minLpOut
+    ) external returns (uint256 netLpOut, uint256 netSyFee);
+
+    function addLiquiditySingleTokenSimple(
+        address receiver,
+        address market,
+        uint256 minLpOut,
+        TokenInput calldata input
+    ) external payable returns (uint256 netLpOut, uint256 netSyFee, uint256 netSyInterm);
+
+    function addLiquiditySingleSySimple(
+        address receiver,
+        address market,
+        uint256 netSyIn,
+        uint256 minLpOut
+    ) external returns (uint256 netLpOut, uint256 netSyFee);
+
+    function removeLiquiditySinglePtSimple(
+        address receiver,
+        address market,
+        uint256 netLpToRemove,
+        uint256 minPtOut
+    ) external returns (uint256 netPtOut, uint256 netSyFee);
+
+    function swapExactTokenForPtSimple(
+        address receiver,
+        address market,
+        uint256 minPtOut,
+        TokenInput calldata input
+    ) external payable returns (uint256 netPtOut, uint256 netSyFee, uint256 netSyInterm);
+
+    function swapExactSyForPtSimple(
+        address receiver,
+        address market,
+        uint256 exactSyIn,
+        uint256 minPtOut
+    ) external returns (uint256 netPtOut, uint256 netSyFee);
+
+    function swapExactTokenForYtSimple(
+        address receiver,
+        address market,
+        uint256 minYtOut,
+        TokenInput calldata input
+    ) external payable returns (uint256 netYtOut, uint256 netSyFee, uint256 netSyInterm);
+
+    function swapExactSyForYtSimple(
+        address receiver,
+        address market,
+        uint256 exactSyIn,
+        uint256 minYtOut
+    ) external returns (uint256 netYtOut, uint256 netSyFee);
+}

package/contracts/interfaces/IPActionStorageStatic.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.0;
 
-import "../router/base/MarketApproxLib.sol";
+import "../router/math/MarketApproxLib.sol";
 
-interface IPActionStorageStatic {
-    event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+import {IPAllEventsV3} from "./IPAllEventsV3.sol";
 
+interface IPActionStorageStatic is IPAllEventsV3 {
     function setDefaultApproxParams(ApproxParams memory params) external;
 
     function getDefaultApproxParams() external view returns (ApproxParams memory);

package/contracts/interfaces/IPActionStorageV4.sol

@@ -1,16 +1,14 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.0;
 
-interface IPActionStorageV4 {
+import {IPAllEventsV3} from "./IPAllEventsV3.sol";
+
+interface IPActionStorageV4 is IPAllEventsV3 {
     struct SelectorsToFacet {
         address facet;
         bytes4[] selectors;
     }
 
-    event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
-
-    event SelectorToFacetSet(bytes4 indexed selector, address indexed facet);
-
     function owner() external view returns (address);
 
     function pendingOwner() external view returns (address);

package/contracts/interfaces/IPActionSwapPTV3.sol

@@ -1,39 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.0;
 
-import "../router/base/MarketApproxLib.sol";
+import "../router/math/MarketApproxLib.sol";
 import "./IPAllActionTypeV3.sol";
+import {IPAllEventsV3} from "./IPAllEventsV3.sol";
 
-/*
- *******************************************************************************************************************
- *******************************************************************************************************************
- * NOTICE *
- * Refer to https://docs.pendle.finance/Developers/Contracts/PendleRouter for more information on
- * TokenInput, TokenOutput, ApproxParams, LimitOrderData
- * It's recommended to use Pendle's Hosted SDK to generate the params
- *******************************************************************************************************************
- *******************************************************************************************************************
- */
-
-interface IPActionSwapPTV3 {
-    event SwapPtAndSy(
-        address indexed caller,
-        address indexed market,
-        address indexed receiver,
-        int256 netPtToAccount,
-        int256 netSyToAccount
-    );
-
-    event SwapPtAndToken(
-        address indexed caller,
-        address indexed market,
-        address indexed token,
-        address receiver,
-        int256 netPtToAccount,
-        int256 netTokenToAccount,
-        uint256 netSyInterm
-    );
-
+/// Refer to IPAllActionTypeV3.sol for details on the parameters
+interface IPActionSwapPTV3 is IPAllEventsV3 {
     function swapExactTokenForPt(
         address receiver,
         address market,

package/contracts/interfaces/IPActionSwapYTV3.sol

@@ -1,47 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.0;
 
-import "../router/base/MarketApproxLib.sol";
+import "../router/math/MarketApproxLib.sol";
 import "./IPAllActionTypeV3.sol";
+import {IPAllEventsV3} from "./IPAllEventsV3.sol";
 
-/*
- *******************************************************************************************************************
- *******************************************************************************************************************
- * NOTICE *
- * Refer to https://docs.pendle.finance/Developers/Contracts/PendleRouter for more information on
- * TokenInput, TokenOutput, ApproxParams, LimitOrderData
- * It's recommended to use Pendle's Hosted SDK to generate the params
- *******************************************************************************************************************
- *******************************************************************************************************************
- */
-
-interface IPActionSwapYTV3 {
-    event SwapYtAndSy(
-        address indexed caller,
-        address indexed market,
-        address indexed receiver,
-        int256 netYtToAccount,
-        int256 netSyToAccount
-    );
-
-    event SwapYtAndToken(
-        address indexed caller,
-        address indexed market,
-        address indexed token,
-        address receiver,
-        int256 netYtToAccount,
-        int256 netTokenToAccount,
-        uint256 netSyInterm
-    );
-
-    event SwapPtAndYt(
-        address indexed caller,
-        address indexed market,
-        address indexed receiver,
-        int256 netPtToAccount,
-        int256 netYtToAccount
-    );
-
+/// Refer to IPAllActionTypeV3.sol for details on the parameters
+interface IPActionSwapYTV3 is IPAllEventsV3 {
     function swapExactTokenForYt(
         address receiver,
         address market,