@pendle/core-v2 2.18.1 → 2.19.0

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++) {

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

@@ -13,10 +13,9 @@ contract ActionMarketAuxStatic is IPActionMarketAuxStatic {
     using PYIndexLib for PYIndex;
     using PYIndexLib for IPYieldToken;
 
-    function getMarketState(
-        address market
-    )
+    function getMarketState(address market)
         public
+        view
         returns (
             address pt,
             address yt,
@@ -26,9 +25,7 @@ contract ActionMarketAuxStatic is IPActionMarketAuxStatic {
             MarketState memory state
         )
     {
-        (IStandardizedYield SY, IPPrincipalToken PT, IPYieldToken YT) = IPMarket(market)
-            .readTokens();
-
+        (IStandardizedYield SY, IPPrincipalToken PT, IPYieldToken YT) = _readTokens(market);
         pt = address(PT);
         yt = address(YT);
         sy = address(SY);
@@ -37,10 +34,11 @@ contract ActionMarketAuxStatic is IPActionMarketAuxStatic {
         marketExchangeRateExcludeFee = getTradeExchangeRateExcludeFee(market, state);
     }
 
-    function getTradeExchangeRateExcludeFee(
-        address market,
-        MarketState memory state
-    ) public returns (uint256) {
+    function getTradeExchangeRateExcludeFee(address market, MarketState memory state)
+        public
+        view
+        returns (uint256)
+    {
         if (IPMarket(market).isExpired()) return Math.ONE;
 
         MarketPreCompute memory comp = state.getMarketPreCompute(
@@ -57,10 +55,11 @@ contract ActionMarketAuxStatic is IPActionMarketAuxStatic {
         return preFeeExchangeRate.Uint();
     }
 
-    function getTradeExchangeRateIncludeFee(
-        address market,
-        int256 netPtOut
-    ) public returns (uint256) {
+    function getTradeExchangeRateIncludeFee(address market, int256 netPtOut)
+        public
+        view
+        returns (uint256)
+    {
         if (IPMarket(market).isExpired()) return Math.ONE;
 
         int256 netPtToAccount = netPtOut;
@@ -88,19 +87,21 @@ contract ActionMarketAuxStatic is IPActionMarketAuxStatic {
         }
     }
 
-    function calcPriceImpactPt(
-        address market,
-        int256 netPtOut
-    ) public returns (uint256 priceImpact) {
+    function calcPriceImpactPt(address market, int256 netPtOut)
+        public
+        view
+        returns (uint256 priceImpact)
+    {
         uint256 preTradeRate = getTradeExchangeRateIncludeFee(market, _getSign(netPtOut));
         uint256 tradedRate = getTradeExchangeRateIncludeFee(market, netPtOut);
         priceImpact = _calculateImpact(preTradeRate, tradedRate);
     }
 
-    function calcPriceImpactYt(
-        address market,
-        int256 netPtOut
-    ) public returns (uint256 priceImpact) {
+    function calcPriceImpactYt(address market, int256 netPtOut)
+        public
+        view
+        returns (uint256 priceImpact)
+    {
         uint256 ytPreTradeRate = _calcVirtualYTPrice(
             getTradeExchangeRateIncludeFee(market, _getSign(netPtOut))
         );
@@ -110,10 +111,11 @@ contract ActionMarketAuxStatic is IPActionMarketAuxStatic {
         priceImpact = _calculateImpact(ytPreTradeRate, ytTradedRate);
     }
 
-    function calcPriceImpactPY(
-        address market,
-        int256 netPtOut
-    ) public returns (uint256 priceImpact) {
+    function calcPriceImpactPY(address market, int256 netPtOut)
+        public
+        view
+        returns (uint256 priceImpact)
+    {
         uint256 ptPreTradeRate = getTradeExchangeRateIncludeFee(market, _getSign(netPtOut));
         uint256 ytPreTradeRate = _calcVirtualYTPrice(ptPreTradeRate);
         uint256 ptTradeRate = getTradeExchangeRateIncludeFee(market, netPtOut);
@@ -124,6 +126,50 @@ contract ActionMarketAuxStatic is IPActionMarketAuxStatic {
         priceImpact = _calculateImpact(pyPreTradeRate, pyTradeRate);
     }
 
+    function getLpToSyRate(address market) public view returns (uint256) {
+        (IStandardizedYield SY, , ) = _readTokens(market);
+        return getLpToAssetRate(market).divDown(SY.exchangeRate());
+    }
+
+    function getPtToSyRate(address market) public view returns (uint256) {
+        (IStandardizedYield SY, , ) = _readTokens(market);
+        return getPtToAssetRate(market).divDown(SY.exchangeRate());
+    }
+
+    function getLpToAssetRate(address market) public view returns (uint256) {
+        MarketState memory state = _readState(market);
+        PYIndex pyIndexCurrent = _pyIndex(market);
+        MarketPreCompute memory comp = state.getMarketPreCompute(pyIndexCurrent, block.timestamp);
+
+        int256 totalHypotheticalAsset = comp.totalAsset +
+            state.totalPt.mulDown(int256(_getPtToAssetRate(market, state, pyIndexCurrent)));
+
+        return uint256(totalHypotheticalAsset.divDown(state.totalLp));
+    }
+
+    function getPtToAssetRate(address market) public view returns (uint256) {
+        MarketState memory state = _readState(market);
+        return _getPtToAssetRate(market, state, _pyIndex(market));
+    }
+
+    function _getPtToAssetRate(
+        address market,
+        MarketState memory state,
+        PYIndex pyIndexCurrent
+    ) internal view returns (uint256 ptToAssetRate) {
+        if (state.expiry <= block.timestamp) {
+            (IStandardizedYield SY, , ) = _readTokens(market);
+            return (SY.exchangeRate().divDown(PYIndex.unwrap(pyIndexCurrent)));
+        }
+        uint256 timeToExpiry = state.expiry - block.timestamp;
+        int256 assetToPtRate = MarketMathCore._getExchangeRateFromImpliedRate(
+            state.lastLnImpliedRate,
+            timeToExpiry
+        );
+
+        ptToAssetRate = uint256(Math.IONE.divDown(assetToPtRate));
+    }
+
     function _getPtImpliedYield(address market) internal view returns (int256) {
         MarketState memory state = _readState(market);
 
@@ -131,9 +177,11 @@ contract ActionMarketAuxStatic is IPActionMarketAuxStatic {
         return lnImpliedRate.exp();
     }
 
-    function _calcVirtualYTPrice(
-        uint256 ptAssetExchangeRate
-    ) private pure returns (uint256 ytAssetExchangeRate) {
+    function _calcVirtualYTPrice(uint256 ptAssetExchangeRate)
+        private
+        pure
+        returns (uint256 ytAssetExchangeRate)
+    {
         // 1 asset = EX pt
         // 1 pt = 1/EX Asset
         // 1 yt + 1/EX Asset = 1 Asset
@@ -146,20 +194,31 @@ contract ActionMarketAuxStatic is IPActionMarketAuxStatic {
         return IPMarket(market).readState(address(this));
     }
 
+    function _readTokens(address market)
+        internal
+        view
+        returns (
+            IStandardizedYield _SY,
+            IPPrincipalToken _PT,
+            IPYieldToken _YT
+        )
+    {
+        return IPMarket(market).readTokens();
+    }
+
     function _getSign(int256 netPtOut) private pure returns (int256) {
         return netPtOut > 0 ? int256(1) : int256(-1);
     }
 
-    function _calculateImpact(
-        uint256 rateBefore,
-        uint256 rateTraded
-    ) private pure returns (uint256 impact) {
+    function _calculateImpact(uint256 rateBefore, uint256 rateTraded)
+        private
+        pure
+        returns (uint256 impact)
+    {
         impact = (rateBefore.Int() - rateTraded.Int()).abs().divDown(rateBefore);
     }
 
-    function _pyIndex(address market) internal returns (PYIndex index) {
-        (, , IPYieldToken YT) = IPMarket(market).readTokens();
-
-        return YT.newIndex();
+    function _pyIndex(address market) private view returns (PYIndex) {
+        return PYIndex.wrap(IPRouterStatic(address(this)).pyIndexCurrentViewMarket(market));
     }
 }

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

@@ -22,7 +22,15 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         address market,
         uint256 netSyDesired,
         uint256 netPtDesired
-    ) public view returns (uint256 netLpOut, uint256 netSyUsed, uint256 netPtUsed) {
+    )
+        public
+        view
+        returns (
+            uint256 netLpOut,
+            uint256 netSyUsed,
+            uint256 netPtUsed
+        )
+    {
         MarketState memory state = _readState(market);
         (, netLpOut, netSyUsed, netPtUsed) = state.addLiquidity(
             netSyDesired,
@@ -63,11 +71,9 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     }
 
     /// @dev netPtToSwap is the parameter to approx
-    function addLiquiditySinglePtStatic(
-        address market,
-        uint256 netPtIn
-    )
+    function addLiquiditySinglePtStatic(address market, uint256 netPtIn)
         public
+        view
         returns (
             uint256 netLpOut,
             uint256 netPtToSwap,
@@ -105,11 +111,9 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     }
 
     /// @dev netPtFromSwap is the parameter to approx
-    function addLiquiditySingleSyStatic(
-        address market,
-        uint256 netSyIn
-    )
+    function addLiquiditySingleSyStatic(address market, uint256 netSyIn)
         public
+        view
         returns (
             uint256 netLpOut,
             uint256 netPtFromSwap,
@@ -153,6 +157,7 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         address bulk
     )
         public
+        view
         returns (
             uint256 netLpOut,
             uint256 netPtFromSwap,
@@ -182,6 +187,7 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         address bulk
     )
         public
+        view
         returns (
             uint256 netLpOut,
             uint256 netYtOut,
@@ -194,11 +200,9 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         (netLpOut, netYtOut, netSyToPY) = addLiquiditySingleSyKeepYtStatic(market, netSyMinted);
     }
 
-    function addLiquiditySingleSyKeepYtStatic(
-        address market,
-        uint256 netSyIn
-    )
+    function addLiquiditySingleSyKeepYtStatic(address market, uint256 netSyIn)
         public
+        view
         returns (
             uint256 netLpOut,
             uint256 netYtOut,
@@ -218,10 +222,11 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         (, netLpOut, , ) = state.addLiquidity(netSyIn - netSyToPY, netYtOut, block.timestamp);
     }
 
-    function removeLiquidityDualSyAndPtStatic(
-        address market,
-        uint256 netLpToRemove
-    ) public view returns (uint256 netSyOut, uint256 netPtOut) {
+    function removeLiquidityDualSyAndPtStatic(address market, uint256 netLpToRemove)
+        public
+        view
+        returns (uint256 netSyOut, uint256 netPtOut)
+    {
         MarketState memory state = _readState(market);
         (netSyOut, netPtOut) = state.removeLiquidity(netLpToRemove);
     }
@@ -231,18 +236,24 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         uint256 netLpToRemove,
         address tokenOut,
         address bulk
-    ) public view returns (uint256 netTokenOut, uint256 netPtOut, uint256 netSyToRedeem) {
+    )
+        public
+        view
+        returns (
+            uint256 netTokenOut,
+            uint256 netPtOut,
+            uint256 netSyToRedeem
+        )
+    {
         (netSyToRedeem, netPtOut) = removeLiquidityDualSyAndPtStatic(market, netLpToRemove);
         netTokenOut = _redeemSyToTokenStatic(market, tokenOut, netSyToRedeem, bulk);
     }
 
     /// @dev netPtFromSwap is the parameter to approx
     /// @notice should revert post-expiry
-    function removeLiquiditySinglePtStatic(
-        address market,
-        uint256 netLpToRemove
-    )
+    function removeLiquiditySinglePtStatic(address market, uint256 netLpToRemove)
         public
+        view
         returns (
             uint256 netPtOut,
             uint256 netPtFromSwap,
@@ -272,11 +283,9 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
-    function removeLiquiditySingleSyStatic(
-        address market,
-        uint256 netLpToRemove
-    )
+    function removeLiquiditySingleSyStatic(address market, uint256 netLpToRemove)
         public
+        view
         returns (
             uint256 netSyOut,
             uint256 netSyFee,
@@ -317,6 +326,7 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         address bulk
     )
         public
+        view
         returns (
             uint256 netTokenOut,
             uint256 netSyFee,
@@ -344,11 +354,9 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
 
     // ============ SWAP PT ============
 
-    function swapExactPtForSyStatic(
-        address market,
-        uint256 exactPtIn
-    )
+    function swapExactPtForSyStatic(address market, uint256 exactPtIn)
         public
+        view
         returns (
             uint256 netSyOut,
             uint256 netSyFee,
@@ -366,12 +374,15 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
-    function swapSyForExactPtStatic(
-        address market,
-        uint256 exactPtOut
-    )
+    function swapSyForExactPtStatic(address market, uint256 exactPtOut)
         public
-        returns (uint256 netSyIn, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter)
+        view
+        returns (
+            uint256 netSyIn,
+            uint256 netSyFee,
+            uint256 priceImpact,
+            uint256 exchangeRateAfter
+        )
     {
         MarketState memory state = _readState(market);
         (netSyIn, netSyFee, ) = state.swapSyForExactPt(
@@ -384,11 +395,9 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     }
 
     /// @dev netPtOut is the parameter to approx
-    function swapExactSyForPtStatic(
-        address market,
-        uint256 exactSyIn
-    )
+    function swapExactSyForPtStatic(address market, uint256 exactSyIn)
         public
+        view
         returns (
             uint256 netPtOut,
             uint256 netSyFee,
@@ -411,12 +420,15 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     }
 
     /// @dev netPtIn is the parameter to approx
-    function swapPtForExactSyStatic(
-        address market,
-        uint256 exactSyOut
-    )
+    function swapPtForExactSyStatic(address market, uint256 exactSyOut)
         public
-        returns (uint256 netPtIn, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter)
+        view
+        returns (
+            uint256 netPtIn,
+            uint256 netSyFee,
+            uint256 priceImpact,
+            uint256 exchangeRateAfter
+        )
     {
         MarketState memory state = _readState(market);
 
@@ -440,6 +452,7 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         address bulk
     )
         public
+        view
         returns (
             uint256 netPtOut,
             uint256 netSyMinted,
@@ -463,6 +476,7 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         address bulk
     )
         public
+        view
         returns (
             uint256 netTokenOut,
             uint256 netSyToRedeem,
@@ -481,11 +495,9 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
 
     // ============ SWAP YT ============
 
-    function swapSyForExactYtStatic(
-        address market,
-        uint256 exactYtOut
-    )
+    function swapSyForExactYtStatic(address market, uint256 exactYtOut)
         public
+        view
         returns (
             uint256 netSyIn,
             uint256 netSyFee,
@@ -514,11 +526,9 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     }
 
     /// @dev netYtOut is the parameter to approx
-    function swapExactSyForYtStatic(
-        address market,
-        uint256 exactSyIn
-    )
+    function swapExactSyForYtStatic(address market, uint256 exactSyIn)
         public
+        view
         returns (
             uint256 netYtOut,
             uint256 netSyFee,
@@ -543,11 +553,9 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
-    function swapExactYtForSyStatic(
-        address market,
-        uint256 exactYtIn
-    )
+    function swapExactYtForSyStatic(address market, uint256 exactYtIn)
         public
+        view
         returns (
             uint256 netSyOut,
             uint256 netSyFee,
@@ -581,6 +589,7 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         address bulk
     )
         public
+        view
         returns (
             uint256 netTokenOut,
             uint256 netSyFee,
@@ -607,12 +616,15 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     }
 
     /// @dev netYtIn is the parameter to approx
-    function swapYtForExactSyStatic(
-        address market,
-        uint256 exactSyOut
-    )
+    function swapYtForExactSyStatic(address market, uint256 exactSyOut)
         public
-        returns (uint256 netYtIn, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter)
+        view
+        returns (
+            uint256 netYtIn,
+            uint256 netSyFee,
+            uint256 priceImpact,
+            uint256 exchangeRateAfter
+        )
     {
         MarketState memory state = _readState(market);
 
@@ -638,6 +650,7 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         address bulk
     )
         public
+        view
         returns (
             uint256 netYtOut,
             uint256 netSyMinted,
@@ -654,11 +667,9 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     }
 
     // totalPtToSwap is the param to approx
-    function swapExactPtForYtStatic(
-        address market,
-        uint256 exactPtIn
-    )
+    function swapExactPtForYtStatic(address market, uint256 exactPtIn)
         public
+        view
         returns (
             uint256 netYtOut,
             uint256 totalPtToSwap,
@@ -684,11 +695,9 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     }
 
     // totalPtSwapped is the param to approx
-    function swapExactYtForPtStatic(
-        address market,
-        uint256 exactYtIn
-    )
+    function swapExactYtForPtStatic(address market, uint256 exactYtIn)
         public
+        view
         returns (
             uint256 netPtOut,
             uint256 totalPtSwapped,
@@ -714,15 +723,15 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
-    function _calcPriceImpactPY(address market, int256 netPtOut) internal returns (uint256) {
+    function _calcPriceImpactPY(address market, int256 netPtOut) internal view returns (uint256) {
         return IPRouterStatic(address(this)).calcPriceImpactPY(market, netPtOut);
     }
 
-    function _calcPriceImpactPt(address market, int256 netPtOut) internal returns (uint256) {
+    function _calcPriceImpactPt(address market, int256 netPtOut) internal view returns (uint256) {
         return IPRouterStatic(address(this)).calcPriceImpactPt(market, netPtOut);
     }
 
-    function _calcPriceImpactYt(address market, int256 netPtOut) internal returns (uint256) {
+    function _calcPriceImpactYt(address market, int256 netPtOut) internal view returns (uint256) {
         return IPRouterStatic(address(this)).calcPriceImpactYt(market, netPtOut);
     }
 
@@ -756,10 +765,11 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
             );
     }
 
-    function _getTradeExchangeRateExcludeFee(
-        address market,
-        MarketState memory state
-    ) internal returns (uint256) {
+    function _getTradeExchangeRateExcludeFee(address market, MarketState memory state)
+        internal
+        view
+        returns (uint256)
+    {
         return IPRouterStatic(address(this)).getTradeExchangeRateExcludeFee(market, state);
     }
 
@@ -767,10 +777,8 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         return IPMarket(market).readState(address(this));
     }
 
-    function _pyIndex(address market) internal returns (PYIndex index) {
-        (, , IPYieldToken YT) = IPMarket(market).readTokens();
-
-        return YT.newIndex();
+    function _pyIndex(address market) private view returns (PYIndex) {
+        return PYIndex.wrap(IPRouterStatic(address(this)).pyIndexCurrentViewMarket(market));
     }
 
     function _getSyMarket(address market) internal view returns (address) {