@pendle/core-v2 2.18.0 → 2.19.0

package/contracts/interfaces/IPActionMarketCoreStatic.sol

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.17;
 
 interface IPActionMarketCoreStatic {
@@ -5,7 +6,14 @@ interface IPActionMarketCoreStatic {
         address market,
         uint256 netSyDesired,
         uint256 netPtDesired
-    ) external view returns (uint256 netLpOut, uint256 netSyUsed, uint256 netPtUsed);
+    )
+        external
+        view
+        returns (
+            uint256 netLpOut,
+            uint256 netSyUsed,
+            uint256 netPtUsed
+        );
 
     function addLiquidityDualTokenAndPtStatic(
         address market,
@@ -24,11 +32,9 @@ interface IPActionMarketCoreStatic {
             uint256 netSyDesired
         );
 
-    function addLiquiditySinglePtStatic(
-        address market,
-        uint256 netPtIn
-    )
+    function addLiquiditySinglePtStatic(address market, uint256 netPtIn)
         external
+        view
         returns (
             uint256 netLpOut,
             uint256 netPtToSwap,
@@ -38,16 +44,18 @@ interface IPActionMarketCoreStatic {
             uint256 netSyFromSwap
         );
 
-    function addLiquiditySingleSyKeepYtStatic(
-        address market,
-        uint256 netSyIn
-    ) external 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 (
             uint256 netLpOut,
             uint256 netPtFromSwap,
@@ -64,7 +72,13 @@ interface IPActionMarketCoreStatic {
         address bulk
     )
         external
-        returns (uint256 netLpOut, uint256 netYtOut, uint256 netSyMinted, uint256 netSyToPY);
+        view
+        returns (
+            uint256 netLpOut,
+            uint256 netYtOut,
+            uint256 netSyMinted,
+            uint256 netSyToPY
+        );
 
     function addLiquiditySingleTokenStatic(
         address market,
@@ -73,6 +87,7 @@ interface IPActionMarketCoreStatic {
         address bulk
     )
         external
+        view
         returns (
             uint256 netLpOut,
             uint256 netPtFromSwap,
@@ -83,23 +98,28 @@ 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,
         address bulk
-    ) external view returns (uint256 netTokenOut, uint256 netPtOut, uint256 netSyToRedeem);
-
-    function removeLiquiditySinglePtStatic(
-        address market,
-        uint256 netLpToRemove
     )
         external
+        view
+        returns (
+            uint256 netTokenOut,
+            uint256 netPtOut,
+            uint256 netSyToRedeem
+        );
+
+    function removeLiquiditySinglePtStatic(address market, uint256 netLpToRemove)
+        external
+        view
         returns (
             uint256 netPtOut,
             uint256 netPtFromSwap,
@@ -110,11 +130,9 @@ interface IPActionMarketCoreStatic {
             uint256 netPtFromBurn
         );
 
-    function removeLiquiditySingleSyStatic(
-        address market,
-        uint256 netLpToRemove
-    )
+    function removeLiquiditySingleSyStatic(address market, uint256 netLpToRemove)
         external
+        view
         returns (
             uint256 netSyOut,
             uint256 netSyFee,
@@ -132,6 +150,7 @@ interface IPActionMarketCoreStatic {
         address bulk
     )
         external
+        view
         returns (
             uint256 netTokenOut,
             uint256 netSyFee,
@@ -143,11 +162,9 @@ interface IPActionMarketCoreStatic {
             uint256 netSyFromSwap
         );
 
-    function swapExactPtForSyStatic(
-        address market,
-        uint256 exactPtIn
-    )
+    function swapExactPtForSyStatic(address market, uint256 exactPtIn)
         external
+        view
         returns (
             uint256 netSyOut,
             uint256 netSyFee,
@@ -162,6 +179,7 @@ interface IPActionMarketCoreStatic {
         address bulk
     )
         external
+        view
         returns (
             uint256 netTokenOut,
             uint256 netSyToRedeem,
@@ -170,11 +188,9 @@ interface IPActionMarketCoreStatic {
             uint256 exchangeRateAfter
         );
 
-    function swapExactPtForYtStatic(
-        address market,
-        uint256 exactPtIn
-    )
+    function swapExactPtForYtStatic(address market, uint256 exactPtIn)
         external
+        view
         returns (
             uint256 netYtOut,
             uint256 totalPtToSwap,
@@ -183,11 +199,9 @@ interface IPActionMarketCoreStatic {
             uint256 exchangeRateAfter
         );
 
-    function swapExactSyForPtStatic(
-        address market,
-        uint256 exactSyIn
-    )
+    function swapExactSyForPtStatic(address market, uint256 exactSyIn)
         external
+        view
         returns (
             uint256 netPtOut,
             uint256 netSyFee,
@@ -195,11 +209,9 @@ interface IPActionMarketCoreStatic {
             uint256 exchangeRateAfter
         );
 
-    function swapExactSyForYtStatic(
-        address market,
-        uint256 exactSyIn
-    )
+    function swapExactSyForYtStatic(address market, uint256 exactSyIn)
         external
+        view
         returns (
             uint256 netYtOut,
             uint256 netSyFee,
@@ -214,6 +226,7 @@ interface IPActionMarketCoreStatic {
         address bulk
     )
         external
+        view
         returns (
             uint256 netPtOut,
             uint256 netSyMinted,
@@ -229,6 +242,7 @@ interface IPActionMarketCoreStatic {
         address bulk
     )
         external
+        view
         returns (
             uint256 netYtOut,
             uint256 netSyMinted,
@@ -237,11 +251,9 @@ interface IPActionMarketCoreStatic {
             uint256 exchangeRateAfter
         );
 
-    function swapExactYtForPtStatic(
-        address market,
-        uint256 exactYtIn
-    )
+    function swapExactYtForPtStatic(address market, uint256 exactYtIn)
         external
+        view
         returns (
             uint256 netPtOut,
             uint256 totalPtSwapped,
@@ -250,11 +262,9 @@ interface IPActionMarketCoreStatic {
             uint256 exchangeRateAfter
         );
 
-    function swapExactYtForSyStatic(
-        address market,
-        uint256 exactYtIn
-    )
+    function swapExactYtForSyStatic(address market, uint256 exactYtIn)
         external
+        view
         returns (
             uint256 netSyOut,
             uint256 netSyFee,
@@ -272,6 +282,7 @@ interface IPActionMarketCoreStatic {
         address bulk
     )
         external
+        view
         returns (
             uint256 netTokenOut,
             uint256 netSyFee,
@@ -283,11 +294,9 @@ interface IPActionMarketCoreStatic {
             uint256 netPYToRedeemSyOutInt
         );
 
-    function swapPtForExactSyStatic(
-        address market,
-        uint256 exactSyOut
-    )
+    function swapPtForExactSyStatic(address market, uint256 exactSyOut)
         external
+        view
         returns (
             uint256 netPtIn,
             uint256 netSyFee,
@@ -295,11 +304,9 @@ interface IPActionMarketCoreStatic {
             uint256 exchangeRateAfter
         );
 
-    function swapSyForExactPtStatic(
-        address market,
-        uint256 exactPtOut
-    )
+    function swapSyForExactPtStatic(address market, uint256 exactPtOut)
         external
+        view
         returns (
             uint256 netSyIn,
             uint256 netSyFee,
@@ -307,11 +314,9 @@ interface IPActionMarketCoreStatic {
             uint256 exchangeRateAfter
         );
 
-    function swapSyForExactYtStatic(
-        address market,
-        uint256 exactYtOut
-    )
+    function swapSyForExactYtStatic(address market, uint256 exactYtOut)
         external
+        view
         returns (
             uint256 netSyIn,
             uint256 netSyFee,
@@ -321,11 +326,9 @@ interface IPActionMarketCoreStatic {
             uint256 totalSyNeedInt
         );
 
-    function swapYtForExactSyStatic(
-        address market,
-        uint256 exactSyOut
-    )
+    function swapYtForExactSyStatic(address market, uint256 exactSyOut)
         external
+        view
         returns (
             uint256 netYtIn,
             uint256 netSyFee,

package/contracts/interfaces/IPActionMintRedeemStatic.sol

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.17;
 
 interface IPActionMintRedeemStatic {
@@ -13,19 +14,26 @@ interface IPActionMintRedeemStatic {
         address SY,
         uint256 netTokenIn,
         uint256 netSyIn
-    ) external view returns (address bulk, uint256 totalToken, uint256 totalSy);
+    )
+        external
+        view
+        returns (
+            address bulk,
+            uint256 totalToken,
+            uint256 totalSy
+        );
 
-    function mintPyFromSyStatic(
-        address YT,
-        uint256 netSyToMint
-    ) external returns (uint256 netPYOut);
+    function mintPyFromSyStatic(address YT, uint256 netSyToMint)
+        external
+        view
+        returns (uint256 netPYOut);
 
     function mintPyFromTokenStatic(
         address YT,
         address tokenIn,
         uint256 netTokenIn,
         address bulk
-    ) external returns (uint256 netPyOut);
+    ) external view returns (uint256 netPyOut);
 
     function mintSyFromTokenStatic(
         address SY,
@@ -34,17 +42,17 @@ interface IPActionMintRedeemStatic {
         address bulk
     ) external view returns (uint256 netSyOut);
 
-    function redeemPyToSyStatic(
-        address YT,
-        uint256 netPYToRedeem
-    ) external returns (uint256 netSyOut);
+    function redeemPyToSyStatic(address YT, uint256 netPYToRedeem)
+        external
+        view
+        returns (uint256 netSyOut);
 
     function redeemPyToTokenStatic(
         address YT,
         uint256 netPYToRedeem,
         address tokenOut,
         address bulk
-    ) external returns (uint256 netTokenOut);
+    ) external view returns (uint256 netTokenOut);
 
     function redeemSyToTokenStatic(
         address SY,
@@ -52,4 +60,8 @@ interface IPActionMintRedeemStatic {
         uint256 netSyIn,
         address bulk
     ) external view returns (uint256 netTokenOut);
+
+    function pyIndexCurrentViewMarket(address market) external view returns (uint256);
+
+    function pyIndexCurrentViewYt(address yt) external view returns (uint256);
 }

package/contracts/interfaces/IPRouterStatic.sol

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.17;
 
 import "./IPActionMarketAuxStatic.sol";
@@ -8,6 +9,7 @@ import "./IPActionVePendleStatic.sol";
 import "./IPMiniDiamond.sol";
 import "./IPActionStorageStatic.sol";
 
+//solhint-disable-next-line no-empty-blocks
 interface IPRouterStatic is
     IPActionMintRedeemStatic,
     IPActionInfoStatic,
@@ -16,4 +18,6 @@ interface IPRouterStatic is
     IPActionVePendleStatic,
     IPMiniDiamond,
     IPActionStorageStatic
-{}
+{
+
+}

package/contracts/interfaces/IStandardizedYield.sol

@@ -146,24 +146,29 @@ interface IStandardizedYield is IERC20Metadata {
 
     function isValidTokenOut(address token) external view returns (bool);
 
-    function previewDeposit(
-        address tokenIn,
-        uint256 amountTokenToDeposit
-    ) external view returns (uint256 amountSharesOut);
+    function previewDeposit(address tokenIn, uint256 amountTokenToDeposit)
+        external
+        view
+        returns (uint256 amountSharesOut);
 
-    function previewRedeem(
-        address tokenOut,
-        uint256 amountSharesToRedeem
-    ) external view returns (uint256 amountTokenOut);
+    function previewRedeem(address tokenOut, uint256 amountSharesToRedeem)
+        external
+        view
+        returns (uint256 amountTokenOut);
 
     /**
      * @notice This function contains information to interpret what the asset is
-     * @return assetType the type of the asset (0 for ERC20 tokens, 1 for AMM liquidity tokens)
+     * @return assetType the type of the asset (0 for ERC20 tokens, 1 for AMM liquidity tokens,
+        2 for bridged yield bearing tokens like wstETH, rETH on Arbi whose the underlying asset doesn't exist on the chain)
      * @return assetAddress the address of the asset
      * @return assetDecimals the decimals of the asset
      */
     function assetInfo()
         external
         view
-        returns (AssetType assetType, address assetAddress, uint8 assetDecimals);
+        returns (
+            AssetType assetType,
+            address assetAddress,
+            uint8 assetDecimals
+        );
 }

package/contracts/offchain-helpers/BoringLpSeller.sol

@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.17;
+import "../interfaces/IPMarket.sol";
+
+abstract contract BoringLpSeller {
+    bytes internal constant EMPTY_BYTES = abi.encode();
+
+    constructor() {}
+
+    /// @dev slippage control should be done on a higher level with the returned parameter
+    /// @param market market address
+    /// @param netLpIn amount of Lp to sell
+    /// @param tokenOut should be included in SY.getTokensOut()
+    /// @return netTokenOut amount of token out
+    function _sellLpForToken(
+        address market,
+        uint256 netLpIn,
+        address tokenOut
+    ) internal returns (uint256 netTokenOut) {
+        (IStandardizedYield SY, IPPrincipalToken PT, IPYieldToken YT) = IPMarket(market)
+            .readTokens();
+
+        IPMarket(market).transfer(market, netLpIn);
+
+        uint256 netSyToRedeem;
+
+        if (PT.isExpired()) {
+            (uint256 netSyRemoved, ) = IPMarket(market).burn(address(SY), address(YT), netLpIn);
+            uint256 netSyFromPt = YT.redeemPY(address(SY));
+            netSyToRedeem = netSyRemoved + netSyFromPt;
+        } else {
+            (uint256 netSyRemoved, uint256 netPtRemoved) = IPMarket(market).burn(
+                address(SY),
+                market,
+                netLpIn
+            );
+            (uint256 netSySwappedOut, ) = IPMarket(market).swapExactPtForSy(
+                address(SY),
+                netPtRemoved,
+                EMPTY_BYTES
+            );
+            netSyToRedeem = netSyRemoved + netSySwappedOut;
+        }
+
+        netTokenOut = SY.redeem(address(this), netSyToRedeem, tokenOut, 0, true);
+    }
+}

package/contracts/offchain-helpers/BulkSellerOffchain.sol

@@ -3,15 +3,16 @@ pragma solidity 0.8.17;
 
 import "../core/BulkSeller/BulkSellerMathCore.sol";
 import "../core/BulkSeller/BulkSeller.sol";
-import "hardhat/console.sol";
 
 contract BulkSellerOffchain {
     using BulkSellerMathCore for BulkSellerState;
     using Math for uint256;
 
-    function calcCurrentRates(
-        IPBulkSeller bulk
-    ) external view returns (uint256 rateTokenToSy, uint256 rateSyToToken) {
+    function calcCurrentRates(IPBulkSeller bulk)
+        external
+        view
+        returns (uint256 rateTokenToSy, uint256 rateSyToToken)
+    {
         BulkSellerState memory state = bulk.readState();
         address SY = bulk.SY();
         address token = bulk.token();
@@ -30,12 +31,14 @@ contract BulkSellerOffchain {
         }
     }
 
-    function getCurrentState(
-        IPBulkSeller bulk
-    )
+    function getCurrentState(IPBulkSeller bulk)
         external
         view
-        returns (BulkSellerState memory state, uint256 tokenProp, uint256 hypoTokenBal)
+        returns (
+            BulkSellerState memory state,
+            uint256 tokenProp,
+            uint256 hypoTokenBal
+        )
     {
         state = bulk.readState();
 

package/contracts/offchain-helpers/PtAndLpToAsset.sol

@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.17;
+
+import "../interfaces/IPMarket.sol";
+import "../core/libraries/math/Math.sol";
+import "../core/Market/MarketMathCore.sol";
+
+contract PtAndLpToAsset {
+    using Math for int256;
+    using Math for uint256;
+    using MarketMathCore for MarketState;
+
+    function getLpToAssetRate(IPMarket market) public view returns (uint256 lpToAssetRate) {
+        MarketState memory state = market.readState(address(0));
+        uint256 pyIndexCurrent = _getPYIndexCurrent(market);
+        MarketPreCompute memory comp = state.getMarketPreCompute(
+            PYIndex.wrap(pyIndexCurrent),
+            block.timestamp
+        );
+
+        int256 totalHypotheticalAsset = comp.totalAsset +
+            state.totalPt.mulDown(int256(_getPtToAssetRate(market, state, pyIndexCurrent)));
+
+        lpToAssetRate = uint256(totalHypotheticalAsset.divDown(state.totalLp));
+    }
+
+    function getPtToAssetRate(IPMarket market) public view returns (uint256 ptToAssetRate) {
+        MarketState memory state = market.readState(address(0));
+        return _getPtToAssetRate(market, state, _getPYIndexCurrent(market));
+    }
+
+    function _getPtToAssetRate(
+        IPMarket market,
+        MarketState memory state,
+        uint256 pyIndexCurrent
+    ) internal view returns (uint256 ptToAssetRate) {
+        if (state.expiry <= block.timestamp) {
+            (IStandardizedYield SY, , ) = market.readTokens();
+            return (SY.exchangeRate().divDown(pyIndexCurrent));
+        }
+        uint256 timeToExpiry = state.expiry - block.timestamp;
+        int256 assetToPtRate = MarketMathCore._getExchangeRateFromImpliedRate(
+            state.lastLnImpliedRate,
+            timeToExpiry
+        );
+
+        ptToAssetRate = uint256(Math.IONE.divDown(assetToPtRate));
+    }
+
+    function _getPYIndexCurrent(IPMarket market) private view returns (uint256) {
+        (IStandardizedYield SY, , IPYieldToken YT) = market.readTokens();
+
+        uint256 syIndex = SY.exchangeRate();
+        uint256 pyIndexStored = YT.pyIndexStored();
+
+        if (YT.doCacheIndexSameBlock() && YT.pyIndexLastUpdatedBlock() == block.number) {
+            return pyIndexStored;
+        } else {
+            return Math.max(syIndex, pyIndexStored);
+        }
+    }
+}

package/contracts/offchain-helpers/router-static/base/ActionInfoStatic.sol

@@ -21,9 +21,11 @@ contract ActionInfoStatic is IPActionInfoStatic {
     }
 
     /// 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)
+    {
         try IStandardizedYield(token).getTokensIn() returns (address[] memory res) {
             return (res, IStandardizedYield(token).getTokensOut());
         } catch {}
@@ -78,10 +80,10 @@ contract ActionInfoStatic is IPActionInfoStatic {
         res.unclaimedRewards = _zipTokenAmounts(rewardTokens, rewardsOut);
     }
 
-    function getUserMarketInfo(
-        address market,
-        address user
-    ) external returns (UserMarketInfo memory res) {
+    function getUserMarketInfo(address market, address user)
+        external
+        returns (UserMarketInfo memory res)
+    {
         IPMarket _market = IPMarket(market);
         MarketState memory state = _market.readState(address(this));
 
@@ -105,10 +107,11 @@ contract ActionInfoStatic is IPActionInfoStatic {
         res.unclaimedRewards = _zipTokenAmounts(rewardTokens, rewardsOut);
     }
 
-    function _zipTokenAmounts(
-        address[] memory tokens,
-        uint256[] memory amounts
-    ) internal pure returns (TokenAmount[] memory res) {
+    function _zipTokenAmounts(address[] memory tokens, uint256[] memory amounts)
+        internal
+        pure
+        returns (TokenAmount[] memory res)
+    {
         res = new TokenAmount[](tokens.length);
 
         for (uint256 i = 0; i < tokens.length; i++) {