@pendle/core-v2 0.17.4-testnet → 0.17.6-testnet

package/contracts/interfaces/IPBulkSeller.sol

@@ -4,17 +4,41 @@ pragma solidity 0.8.17;
 import "../core/BulkSeller/BulkSellerMathCore.sol";
 
 interface IPBulkSeller {
-    function swapExactSyForToken(
-        address receiver,
-        uint256 exactSyIn,
-        uint256 minTokenOut
-    ) external returns (uint256 netTokenOut);
+    event SwapExactTokenForSy(address receiver, uint256 netTokenIn, uint256 netSyOut);
+    event SwapExactSyForToken(address receiver, uint256 netSyIn, uint256 netTokenOut);
+    event RateUpdated(
+        uint256 newRateTokenToSy,
+        uint256 newRateSyToToken,
+        uint256 oldRateTokenToSy,
+        uint256 oldRateSyToToken
+    );
+    event ReBalanceTokenToSy(
+        uint256 netTokenDeposit,
+        uint256 netSyFromToken,
+        uint256 newTokenProp,
+        uint256 oldTokenProp
+    );
+    event ReBalanceSyToToken(
+        uint256 netSyRedeem,
+        uint256 netTokenFromSy,
+        uint256 newTokenProp,
+        uint256 oldTokenProp
+    );
+    event ReserveUpdated(uint256 totalToken, uint256 totalSy);
+    event FeeRateUpdated(uint256 newFeeRate, uint256 oldFeeRate);
 
     function swapExactTokenForSy(
         address receiver,
         uint256 netTokenIn,
         uint256 minSyOut
-    ) external returns (uint256 netSyOut);
+    ) external payable returns (uint256 netSyOut);
+
+    function swapExactSyForToken(
+        address receiver,
+        uint256 exactSyIn,
+        uint256 minTokenOut,
+        bool swapFromInternalBalance
+    ) external returns (uint256 netTokenOut);
 
     function SY() external view returns (address);
 

package/contracts/interfaces/IPBulkSellerFactory.sol

@@ -9,6 +9,4 @@ interface IPBulkSellerFactory {
     function get(address token, address SY) external view returns (address);
 
     function isMaintainer(address addr) external view returns (bool);
-
-    function isAdmin(address addr) external view returns (bool);
 }

package/contracts/interfaces/IPGaugeController.sol

@@ -4,7 +4,13 @@ pragma solidity 0.8.17;
 interface IPGaugeController {
     event MarketClaimReward(address indexed market, uint256 amount);
 
-    event ReceiveVotingResults(uint128 wTime, address[] markets, uint256[] pendleAmounts);
+    event ReceiveVotingResults(uint128 indexed wTime, address[] markets, uint256[] pendleAmounts);
+
+    event UpdateMarketReward(
+        address indexed market,
+        uint256 pendlePerSec,
+        uint256 incentiveEndsAt
+    );
 
     function fundPendle(uint256 amount) external;
 

package/contracts/interfaces/IPMarket.sol

@@ -62,23 +62,13 @@ interface IPMarket is IERC20Metadata, IPGauge {
         address receiver,
         uint256 exactPtIn,
         bytes calldata data
-    )
-        external
-        returns (
-            uint256 netSyOut,
-            uint256 netSyFee
-        );
+    ) external returns (uint256 netSyOut, uint256 netSyFee);
 
     function swapSyForExactPt(
         address receiver,
         uint256 exactPtOut,
         bytes calldata data
-    )
-        external
-        returns (
-            uint256 netSyIn,
-            uint256 netSyFee
-        );
+    ) external returns (uint256 netSyIn, uint256 netSyFee);
 
     function redeemRewards(address user) external returns (uint256[] memory);
 

package/contracts/interfaces/IPMsgReceiverApp.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0-only
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 pragma solidity >=0.8.0;
 

package/contracts/interfaces/IPMsgSendEndpoint.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0-only
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 pragma solidity >=0.8.0;
 

package/contracts/interfaces/IPVeToken.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 pragma solidity 0.8.17;
 

package/contracts/interfaces/IREDACTEDStaking.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: GPL-3.0-or-later
 /*
  * MIT License
  * ===========

package/contracts/interfaces/IStETH.sol

@@ -11,7 +11,7 @@ interface IStETH {
     function burnShares(address _account, uint256 _sharesAmount)
         external
         returns (uint256 newTotalShares);
-    
+
     function sharesOf(address account) external view returns (uint256);
 
     function getTotalShares() external view returns (uint256);

package/contracts/interfaces/IStargateLPStaking.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: GPL-3.0-or-later
 /*
  * MIT License
  * ===========

package/contracts/interfaces/IStargatePool.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: GPL-3.0-or-later
 /*
  * MIT License
  * ===========

package/contracts/interfaces/IStargateRouter.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: GPL-3.0-or-later
 /*
  * MIT License
  * ===========

package/contracts/interfaces/IWXBTRFLY.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: GPL-3.0-or-later
 /*
  * MIT License
  * ===========

package/contracts/offchain-helpers/MarketMathStatic.sol

@@ -46,7 +46,8 @@ library MarketMathStatic {
             uint256 netLpOut,
             uint256 netPtToSwap,
             uint256 netSyFee,
-            uint256 priceImpact
+            uint256 priceImpact,
+            uint256 exchangeRateAfter
         )
     {
         MarketState memory state = IPMarket(market).readState(address(this));
@@ -72,7 +73,8 @@ library MarketMathStatic {
             block.timestamp
         );
 
-        priceImpact = calcPriceImpact(market, netPtToSwap.neg());
+        priceImpact = calcPriceImpactPt(market, netPtToSwap.neg());
+        exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
     /// @dev netPtFromSwap is the parameter to approx
@@ -86,7 +88,8 @@ library MarketMathStatic {
             uint256 netLpOut,
             uint256 netPtFromSwap,
             uint256 netSyFee,
-            uint256 priceImpact
+            uint256 priceImpact,
+            uint256 exchangeRateAfter
         )
     {
         MarketState memory state = IPMarket(market).readState(address(this));
@@ -108,7 +111,8 @@ library MarketMathStatic {
         );
         (, netLpOut, , ) = state.addLiquidity(netSyIn - netSySwap, netPtFromSwap, block.timestamp);
 
-        priceImpact = calcPriceImpact(market, netPtFromSwap.Int());
+        priceImpact = calcPriceImpactPt(market, netPtFromSwap.Int());
+        exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
     function removeLiquidityDualSyAndPtStatic(address market, uint256 netLpToRemove)
@@ -131,7 +135,8 @@ library MarketMathStatic {
             uint256 netPtOut,
             uint256 netPtFromSwap,
             uint256 netSyFee,
-            uint256 priceImpact
+            uint256 priceImpact,
+            uint256 exchangeRateAfter
         )
     {
         MarketState memory state = IPMarket(market).readState(address(this));
@@ -145,7 +150,11 @@ library MarketMathStatic {
         );
 
         netPtOut = ptFromBurn + netPtFromSwap;
-        priceImpact = calcPriceImpact(market, netPtFromSwap.Int());
+        priceImpact = calcPriceImpactPt(market, netPtFromSwap.Int());
+
+        // Execute swap to calculate exchangeRateAfter
+        state.swapSyForExactPt(pyIndex(market), netPtFromSwap, block.timestamp);
+        exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
     function removeLiquiditySingleSyStatic(address market, uint256 netLpToRemove)
@@ -153,7 +162,8 @@ library MarketMathStatic {
         returns (
             uint256 netSyOut,
             uint256 netSyFee,
-            uint256 priceImpact
+            uint256 priceImpact,
+            uint256 exchangeRateAfter
         )
     {
         MarketState memory state = IPMarket(market).readState(address(this));
@@ -171,7 +181,8 @@ library MarketMathStatic {
             );
 
             netSyOut = syFromBurn + syFromSwap;
-            priceImpact = calcPriceImpact(market, ptFromBurn.neg());
+            priceImpact = calcPriceImpactPt(market, ptFromBurn.neg());
+            exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
         }
     }
 
@@ -180,7 +191,8 @@ library MarketMathStatic {
         returns (
             uint256 netSyOut,
             uint256 netSyFee,
-            uint256 priceImpact
+            uint256 priceImpact,
+            uint256 exchangeRateAfter
         )
     {
         MarketState memory state = IPMarket(market).readState(address(this));
@@ -189,7 +201,8 @@ library MarketMathStatic {
             exactPtIn,
             block.timestamp
         );
-        priceImpact = calcPriceImpact(market, exactPtIn.neg());
+        priceImpact = calcPriceImpactPt(market, exactPtIn.neg());
+        exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
     function swapSyForExactPtStatic(address market, uint256 exactPtOut)
@@ -197,7 +210,8 @@ library MarketMathStatic {
         returns (
             uint256 netSyIn,
             uint256 netSyFee,
-            uint256 priceImpact
+            uint256 priceImpact,
+            uint256 exchangeRateAfter
         )
     {
         MarketState memory state = IPMarket(market).readState(address(this));
@@ -206,7 +220,8 @@ library MarketMathStatic {
             exactPtOut,
             block.timestamp
         );
-        priceImpact = calcPriceImpact(market, exactPtOut.Int());
+        priceImpact = calcPriceImpactPt(market, exactPtOut.Int());
+        exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
     /// @dev netPtOut is the parameter to approx
@@ -219,7 +234,8 @@ library MarketMathStatic {
         returns (
             uint256 netPtOut,
             uint256 netSyFee,
-            uint256 priceImpact
+            uint256 priceImpact,
+            uint256 exchangeRateAfter
         )
     {
         MarketState memory state = IPMarket(market).readState(address(this));
@@ -229,7 +245,11 @@ library MarketMathStatic {
             block.timestamp,
             approxParams
         );
-        priceImpact = calcPriceImpact(market, netPtOut.Int());
+        priceImpact = calcPriceImpactPt(market, netPtOut.Int());
+
+        // Execute swap to calculate exchangeRateAfter
+        state.swapSyForExactPt(pyIndex(market), netPtOut, block.timestamp);
+        exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
     /// @dev netPtIn is the parameter to approx
@@ -242,7 +262,8 @@ library MarketMathStatic {
         returns (
             uint256 netPtIn,
             uint256 netSyFee,
-            uint256 priceImpact
+            uint256 priceImpact,
+            uint256 exchangeRateAfter
         )
     {
         MarketState memory state = IPMarket(market).readState(address(this));
@@ -253,7 +274,11 @@ library MarketMathStatic {
             block.timestamp,
             approxParams
         );
-        priceImpact = calcPriceImpact(market, netPtIn.neg());
+        priceImpact = calcPriceImpactPt(market, netPtIn.neg());
+
+        // Execute swap to calculate exchangeRateAfter
+        state.swapExactPtForSy(pyIndex(market), netPtIn, block.timestamp);
+        exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
     function swapSyForExactYtStatic(address market, uint256 exactYtOut)
@@ -261,11 +286,13 @@ library MarketMathStatic {
         returns (
             uint256 netSyIn,
             uint256 netSyFee,
-            uint256 priceImpact
+            uint256 priceImpact,
+            uint256 exchangeRateAfter
         )
     {
-        MarketState memory state = IPMarket(market).readState(address(this));
+        priceImpact = calcPriceImpactYt(market, exactYtOut.neg());
 
+        MarketState memory state = IPMarket(market).readState(address(this));
         PYIndex index = pyIndex(market);
 
         uint256 syReceived;
@@ -278,7 +305,7 @@ library MarketMathStatic {
         uint256 totalSyNeed = index.assetToSyUp(exactYtOut);
         netSyIn = totalSyNeed.subMax0(syReceived);
 
-        priceImpact = calcPriceImpact(market, exactYtOut.neg());
+        exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
     /// @dev netYtOut is the parameter to approx
@@ -291,7 +318,8 @@ library MarketMathStatic {
         returns (
             uint256 netYtOut,
             uint256 netSyFee,
-            uint256 priceImpact
+            uint256 priceImpact,
+            uint256 exchangeRateAfter
         )
     {
         MarketState memory state = IPMarket(market).readState(address(this));
@@ -304,7 +332,11 @@ library MarketMathStatic {
             approxParams
         );
 
-        priceImpact = calcPriceImpact(market, netYtOut.neg());
+        priceImpact = calcPriceImpactYt(market, netYtOut.neg());
+
+        // Execute swap to calculate exchangeRateAfter
+        state.swapSyForExactPt(index, netYtOut, block.timestamp);
+        exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
     function swapExactYtForSyStatic(address market, uint256 exactYtIn)
@@ -312,9 +344,12 @@ library MarketMathStatic {
         returns (
             uint256 netSyOut,
             uint256 netSyFee,
-            uint256 priceImpact
+            uint256 priceImpact,
+            uint256 exchangeRateAfter
         )
     {
+        priceImpact = calcPriceImpactYt(market, exactYtIn.Int());
+
         MarketState memory state = IPMarket(market).readState(address(this));
 
         PYIndex index = pyIndex(market);
@@ -326,7 +361,7 @@ library MarketMathStatic {
         uint256 amountPYToRedeemSyOut = exactYtIn - amountPYToRepaySyOwed;
 
         netSyOut = index.assetToSy(amountPYToRedeemSyOut);
-        priceImpact = calcPriceImpact(market, exactYtIn.Int());
+        exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
     /// @dev netYtIn is the parameter to approx
@@ -339,7 +374,8 @@ library MarketMathStatic {
         returns (
             uint256 netYtIn,
             uint256 netSyFee,
-            uint256 priceImpact
+            uint256 priceImpact,
+            uint256 exchangeRateAfter
         )
     {
         MarketState memory state = IPMarket(market).readState(address(this));
@@ -352,7 +388,11 @@ library MarketMathStatic {
             block.timestamp,
             approxParams
         );
-        priceImpact = calcPriceImpact(market, netYtIn.Int());
+        priceImpact = calcPriceImpactYt(market, netYtIn.Int());
+
+        // Execute swap to calculate exchangeRateAfter
+        state.swapSyForExactPt(index, netYtIn, block.timestamp);
+        exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
     // totalPtToSwap is the param to approx
@@ -366,7 +406,8 @@ library MarketMathStatic {
             uint256 netYtOut,
             uint256 totalPtToSwap,
             uint256 netSyFee,
-            uint256 priceImpact
+            uint256 priceImpact,
+            uint256 exchangeRateAfter
         )
     {
         MarketState memory state = IPMarket(market).readState(address(this));
@@ -378,7 +419,11 @@ library MarketMathStatic {
             block.timestamp,
             approxParams
         );
-        priceImpact = calcPriceImpact(market, totalPtToSwap.neg());
+        priceImpact = calcPriceImpactPY(market, totalPtToSwap.neg());
+
+        // Execute swap to calculate exchangeRateAfter
+        state.swapExactPtForSy(index, totalPtToSwap, block.timestamp);
+        exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
     // totalPtSwapped is the param to approx
@@ -392,7 +437,8 @@ library MarketMathStatic {
             uint256 netPtOut,
             uint256 totalPtSwapped,
             uint256 netSyFee,
-            uint256 priceImpact
+            uint256 priceImpact,
+            uint256 exchangeRateAfter
         )
     {
         MarketState memory state = IPMarket(market).readState(address(this));
@@ -405,7 +451,11 @@ library MarketMathStatic {
             approxParams
         );
 
-        priceImpact = calcPriceImpact(market, totalPtSwapped.Int());
+        priceImpact = calcPriceImpactPY(market, totalPtSwapped.Int());
+
+        // Execute swap to calculate exchangeRateAfter
+        state.swapSyForExactPt(index, totalPtSwapped, block.timestamp);
+        exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
     function pyIndex(address market) public returns (PYIndex index) {
@@ -414,8 +464,25 @@ library MarketMathStatic {
         return YT.newIndex();
     }
 
-    function getExchangeRate(address market) public returns (uint256) {
-        return getTradeExchangeRateIncludeFee(market, 0);
+    function getTradeExchangeRateExcludeFee(address market) public returns (uint256) {
+        if (IPMarket(market).isExpired()) return Math.ONE;
+        MarketState memory state = IPMarket(market).readState(address(this));
+        return _getTradeExchangeRateExcludeFee(market, state);
+    }
+
+    function _getTradeExchangeRateExcludeFee(address market, MarketState memory state)
+        public
+        returns (uint256)
+    {
+        MarketPreCompute memory comp = state.getMarketPreCompute(pyIndex(market), block.timestamp);
+        int256 preFeeExchangeRate = MarketMathCore._getExchangeRate(
+            state.totalPt,
+            comp.totalAsset,
+            comp.rateScalar,
+            comp.rateAnchor,
+            0
+        );
+        return preFeeExchangeRate.Uint();
     }
 
     function getTradeExchangeRateIncludeFee(address market, int256 netPtOut)
@@ -445,14 +512,40 @@ library MarketMathStatic {
         }
     }
 
-    function calcPriceImpact(address market, int256 netPtOut)
+    function calcPriceImpactPt(address market, int256 netPtOut)
         public
         returns (uint256 priceImpact)
     {
-        uint256 preTradeRate = getExchangeRate(market);
+        uint256 preTradeRate = getTradeExchangeRateIncludeFee(market, _getSign(netPtOut));
         uint256 tradedRate = getTradeExchangeRateIncludeFee(market, netPtOut);
+        priceImpact = _calculateImpact(preTradeRate, tradedRate);
+    }
 
-        priceImpact = (tradedRate.Int() - preTradeRate.Int()).abs().divDown(preTradeRate);
+    function calcPriceImpactYt(address market, int256 netPtOut)
+        public
+        returns (uint256 priceImpact)
+    {
+        uint256 ytPreTradeRate = _calcVirtualYTPrice(
+            getTradeExchangeRateIncludeFee(market, _getSign(netPtOut))
+        );
+        uint256 ytTradedRate = _calcVirtualYTPrice(
+            getTradeExchangeRateIncludeFee(market, netPtOut)
+        );
+        priceImpact = _calculateImpact(ytPreTradeRate, ytTradedRate);
+    }
+
+    function calcPriceImpactPY(address market, int256 netPtOut)
+        public
+        returns (uint256 priceImpact)
+    {
+        uint256 ptPreTradeRate = getTradeExchangeRateIncludeFee(market, _getSign(netPtOut));
+        uint256 ytPreTradeRate = _calcVirtualYTPrice(ptPreTradeRate);
+        uint256 ptTradeRate = getTradeExchangeRateIncludeFee(market, netPtOut);
+        uint256 ytTradeRate = _calcVirtualYTPrice(ptTradeRate);
+
+        uint256 pyPreTradeRate = ytPreTradeRate.divDown(ptPreTradeRate);
+        uint256 pyTradeRate = ytTradeRate.divDown(ptTradeRate);
+        priceImpact = _calculateImpact(pyPreTradeRate, pyTradeRate);
     }
 
     function getPtImpliedYield(address market) public view returns (int256) {
@@ -461,4 +554,29 @@ library MarketMathStatic {
         int256 lnImpliedRate = (state.lastLnImpliedRate).Int();
         return lnImpliedRate.exp();
     }
+
+    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
+        // 1 yt = 1 Asset - 1/EX Asset
+        // 1 yt = (EX - 1) / EX Asset
+        return (ptAssetExchangeRate - Math.ONE).divDown(ptAssetExchangeRate);
+    }
+
+    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)
+    {
+        impact = (rateBefore.Int() - rateTraded.Int()).abs().divDown(rateBefore);
+    }
 }