@pendle/core-v2 0.16.6-testnet → 0.17.0-testnet

package/contracts/interfaces/IPMsgSendEndpoint.sol

@@ -8,7 +8,7 @@ interface IPMsgSendEndpoint {
         uint256 dstChainId,
         bytes memory payload,
         uint256 estimatedGasAmount
-    ) external view returns (uint256);
+    ) external view returns (uint256 fee);
 
     function sendMessage(
         address dstAddress,

package/contracts/interfaces/IPYieldContractFactory.sol

@@ -24,13 +24,13 @@
 pragma solidity 0.8.17;
 
 interface IPYieldContractFactory {
-    event CreateYieldContract(address indexed SY, address PT, address YT, uint256 expiry);
+    event CreateYieldContract(address indexed SY, uint256 indexed expiry, address PT, address YT);
 
     event SetExpiryDivisor(uint256 newExpiryDivisor);
 
     event SetInterestFeeRate(uint256 newInterestFeeRate);
 
-    event SetRewardFeeRate(uint256 newInterestFeeRate);
+    event SetRewardFeeRate(uint256 newRewardFeeRate);
 
     event SetTreasury(address indexed treasury);
 

package/contracts/interfaces/IPYieldToken.sol

@@ -59,4 +59,6 @@ interface IPYieldToken is IERC20Metadata, IRewardManager, IPInterestManagerYT {
     function expiry() external view returns (uint256);
 
     function isExpired() external view returns (bool);
+
+    function doCacheIndexSameBlock() external view returns (bool);
 }

package/contracts/interfaces/IStandardizedYield.sol

@@ -43,7 +43,7 @@ interface IStandardizedYield is IERC20Metadata {
         uint256 amountTokenOut
     );
 
-    /// @dev check assetInfo for more information
+    /// @dev check `assetInfo()` for more information
     enum AssetType {
         TOKEN,
         LIQUIDITY
@@ -74,9 +74,10 @@ interface IStandardizedYield is IERC20Metadata {
     /**
      * @notice redeems an amount of base tokens by burning some shares
      * @param receiver recipient address
-     * @param amountSharesToRedeem amount of shares to be burned from (`msg.sender`)
+     * @param amountSharesToRedeem amount of shares to be burned
      * @param tokenOut address of the base token to be redeemed
      * @param minTokenOut reverts if amount of base token redeemed is lower than this
+     * @param burnFromInternalBalance if true, burns from balance of `address(this)`, otherwise burns from `msg.sender`
      * @return amountTokenOut amount of base tokens redeemed
      * @dev Emits a {Redeem} event
      *
@@ -105,7 +106,7 @@ interface IStandardizedYield is IERC20Metadata {
      * @param user the user receiving their rewards
      * @return rewardAmounts an array of reward amounts in the same order as `getRewardTokens`
      * @dev
-     * Emits a `ClaimRewardss` event
+     * Emits a `ClaimRewards` event
      * See {getRewardTokens} for list of reward tokens
      */
     function claimRewards(address user) external returns (uint256[] memory rewardAmounts);
@@ -131,8 +132,14 @@ interface IStandardizedYield is IERC20Metadata {
      */
     function yieldToken() external view returns (address);
 
+    /**
+     * @notice returns all tokens that can mint this SY
+     */
     function getTokensIn() external view returns (address[] memory res);
 
+    /**
+     * @notice returns all tokens that can be redeemed by this SY
+     */
     function getTokensOut() external view returns (address[] memory res);
 
     function isValidTokenIn(address token) external view returns (bool);
@@ -150,13 +157,11 @@ interface IStandardizedYield is IERC20Metadata {
         returns (uint256 amountTokenOut);
 
     /**
-    * @notice This function contains information to interpret what the asset is
-    * @notice decimals is the decimals to format asset balances
-    * @notice if asset is an ERC20 token, assetType = 0, assetAddress is the address of the token
-    * @notice if asset is liquidity of an AMM (like sqrt(k) in UniswapV2 forks), assetType = 1,
-    assetAddress is the address of the LP token
-    * @notice assetDecimals is the decimals of the asset
-    */
+     * @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 assetAddress the address of the asset
+     * @return assetDecimals the decimals of the asset
+     */
     function assetInfo()
         external
         view

package/contracts/offchain-helpers/BulkSellerOffchain.sol

@@ -5,12 +5,10 @@ import "../core/BulkSeller/BulkSellerMathCore.sol";
 import "../core/BulkSeller/BulkSeller.sol";
 import "hardhat/console.sol";
 
-// upgradable bla bla
 contract BulkSellerOffchain {
     using BulkSellerMathCore for BulkSellerState;
     using Math for uint256;
 
-    // rmb to add fee here
     function calcCurrentRates(IPBulkSeller bulk)
         external
         view
@@ -34,6 +32,23 @@ contract BulkSellerOffchain {
         }
     }
 
+    function getCurrentState(IPBulkSeller bulk)
+        external
+        view
+        returns (
+            BulkSellerState memory state,
+            uint256 tokenProp,
+            uint256 hypoTokenBal
+        )
+    {
+        state = bulk.readState();
+
+        tokenProp = state.getTokenProp();
+        hypoTokenBal =
+            state.totalToken +
+            IStandardizedYield(bulk.SY()).previewRedeem(bulk.token(), state.totalSy);
+    }
+
     function calcCurrentRatesWithAmount(
         IPBulkSeller bulk,
         uint256 hypoTotalToken,
@@ -52,10 +67,4 @@ contract BulkSellerOffchain {
             rateSyToToken = netTokenFromSy.divDown(hypoTotalSy);
         }
     }
-
-    // TODO: pause contract when rate is bad compared to market
-    // TODO: Sound alarm if updates fail
-    // TODO: audit even the typescript code
-    // TODO: add a max with currentRate to guarantee no loss?
-    // TODO: pause immediately if lost enough money
 }

package/contracts/offchain-helpers/MarketMathStatic.sol

@@ -27,7 +27,7 @@ library MarketMathStatic {
             uint256 netPtUsed
         )
     {
-        MarketState memory state = IPMarket(market).readState();
+        MarketState memory state = IPMarket(market).readState(address(this));
         (, netLpOut, netSyUsed, netPtUsed) = state.addLiquidity(
             netSyDesired,
             netPtDesired,
@@ -35,35 +35,6 @@ library MarketMathStatic {
         );
     }
 
-    function addLiquidityDualTokenAndPtStatic(
-        address market,
-        address tokenIn,
-        uint256 netTokenDesired,
-        uint256 netPtDesired
-    )
-        external
-        view
-        returns (
-            uint256 netLpOut,
-            uint256 netTokenUsed,
-            uint256 netPtUsed
-        )
-    {
-        (IStandardizedYield SY, , ) = IPMarket(market).readTokens();
-
-        uint256 syDesired = SY.previewDeposit(tokenIn, netTokenDesired);
-        uint256 syUsed;
-
-        MarketState memory state = IPMarket(market).readState();
-        (, netLpOut, syUsed, netPtUsed) = state.addLiquidity(
-            syDesired,
-            netPtDesired,
-            block.timestamp
-        );
-
-        netTokenUsed = getAmountTokenToMintSy(address(SY), tokenIn, syUsed);
-    }
-
     /// @dev netPtToSwap is the parameter to approx
     function addLiquiditySinglePtStatic(
         address market,
@@ -78,7 +49,7 @@ library MarketMathStatic {
             uint256 priceImpact
         )
     {
-        MarketState memory state = IPMarket(market).readState();
+        MarketState memory state = IPMarket(market).readState(address(this));
 
         (netPtToSwap, , ) = state.approxSwapPtToAddLiquidity(
             pyIndex(market),
@@ -87,10 +58,10 @@ library MarketMathStatic {
             approxParams
         );
 
-        state = IPMarket(market).readState(); // re-read
+        state = IPMarket(market).readState(address(this)); // re-read
 
         uint256 netSyReceived;
-        (netSyReceived, netSyFee) = state.swapExactPtForSy(
+        (netSyReceived, netSyFee, ) = state.swapExactPtForSy(
             pyIndex(market),
             netPtToSwap,
             block.timestamp
@@ -118,7 +89,7 @@ library MarketMathStatic {
             uint256 priceImpact
         )
     {
-        MarketState memory state = IPMarket(market).readState();
+        MarketState memory state = IPMarket(market).readState(address(this));
 
         (netPtFromSwap, , ) = state.approxSwapSyToAddLiquidity(
             pyIndex(market),
@@ -127,10 +98,10 @@ library MarketMathStatic {
             approxParams
         );
 
-        state = IPMarket(market).readState(); // re-read
+        state = IPMarket(market).readState(address(this)); // re-read
 
         uint256 netSySwap;
-        (netSySwap, netSyFee) = state.swapSyForExactPt(
+        (netSySwap, netSyFee, ) = state.swapSyForExactPt(
             pyIndex(market),
             netPtFromSwap,
             block.timestamp
@@ -145,7 +116,7 @@ library MarketMathStatic {
         view
         returns (uint256 netSyOut, uint256 netPtOut)
     {
-        MarketState memory state = IPMarket(market).readState();
+        MarketState memory state = IPMarket(market).readState(address(this));
         (netSyOut, netPtOut) = state.removeLiquidity(netLpToRemove);
     }
 
@@ -163,7 +134,7 @@ library MarketMathStatic {
             uint256 priceImpact
         )
     {
-        MarketState memory state = IPMarket(market).readState();
+        MarketState memory state = IPMarket(market).readState(address(this));
 
         (uint256 syFromBurn, uint256 ptFromBurn) = state.removeLiquidity(netLpToRemove);
         (netPtFromSwap, netSyFee) = state.approxSwapExactSyForPt(
@@ -185,7 +156,7 @@ library MarketMathStatic {
             uint256 priceImpact
         )
     {
-        MarketState memory state = IPMarket(market).readState();
+        MarketState memory state = IPMarket(market).readState(address(this));
 
         (uint256 syFromBurn, uint256 ptFromBurn) = state.removeLiquidity(netLpToRemove);
 
@@ -193,7 +164,7 @@ library MarketMathStatic {
             netSyOut = syFromBurn + pyIndex(market).assetToSy(ptFromBurn);
         } else {
             uint256 syFromSwap;
-            (syFromSwap, netSyFee) = state.swapExactPtForSy(
+            (syFromSwap, netSyFee, ) = state.swapExactPtForSy(
                 pyIndex(market),
                 ptFromBurn,
                 block.timestamp
@@ -212,8 +183,12 @@ library MarketMathStatic {
             uint256 priceImpact
         )
     {
-        MarketState memory state = IPMarket(market).readState();
-        (netSyOut, netSyFee) = state.swapExactPtForSy(pyIndex(market), exactPtIn, block.timestamp);
+        MarketState memory state = IPMarket(market).readState(address(this));
+        (netSyOut, netSyFee, ) = state.swapExactPtForSy(
+            pyIndex(market),
+            exactPtIn,
+            block.timestamp
+        );
         priceImpact = calcPriceImpact(market, exactPtIn.neg());
     }
 
@@ -225,8 +200,12 @@ library MarketMathStatic {
             uint256 priceImpact
         )
     {
-        MarketState memory state = IPMarket(market).readState();
-        (netSyIn, netSyFee) = state.swapSyForExactPt(pyIndex(market), exactPtOut, block.timestamp);
+        MarketState memory state = IPMarket(market).readState(address(this));
+        (netSyIn, netSyFee, ) = state.swapSyForExactPt(
+            pyIndex(market),
+            exactPtOut,
+            block.timestamp
+        );
         priceImpact = calcPriceImpact(market, exactPtOut.Int());
     }
 
@@ -243,7 +222,7 @@ library MarketMathStatic {
             uint256 priceImpact
         )
     {
-        MarketState memory state = IPMarket(market).readState();
+        MarketState memory state = IPMarket(market).readState(address(this));
         (netPtOut, netSyFee) = state.approxSwapExactSyForPt(
             pyIndex(market),
             exactSyIn,
@@ -266,7 +245,7 @@ library MarketMathStatic {
             uint256 priceImpact
         )
     {
-        MarketState memory state = IPMarket(market).readState();
+        MarketState memory state = IPMarket(market).readState(address(this));
 
         (netPtIn, , netSyFee) = state.approxSwapPtForExactSy(
             pyIndex(market),
@@ -285,12 +264,12 @@ library MarketMathStatic {
             uint256 priceImpact
         )
     {
-        MarketState memory state = IPMarket(market).readState();
+        MarketState memory state = IPMarket(market).readState(address(this));
 
         PYIndex index = pyIndex(market);
 
         uint256 syReceived;
-        (syReceived, netSyFee) = state.swapExactPtForSy(
+        (syReceived, netSyFee, ) = state.swapExactPtForSy(
             pyIndex(market),
             exactYtOut,
             block.timestamp
@@ -315,7 +294,7 @@ library MarketMathStatic {
             uint256 priceImpact
         )
     {
-        MarketState memory state = IPMarket(market).readState();
+        MarketState memory state = IPMarket(market).readState(address(this));
         PYIndex index = pyIndex(market);
 
         (netYtOut, netSyFee) = state.approxSwapExactSyForYt(
@@ -336,12 +315,12 @@ library MarketMathStatic {
             uint256 priceImpact
         )
     {
-        MarketState memory state = IPMarket(market).readState();
+        MarketState memory state = IPMarket(market).readState(address(this));
 
         PYIndex index = pyIndex(market);
 
         uint256 syOwed;
-        (syOwed, netSyFee) = state.swapSyForExactPt(index, exactYtIn, block.timestamp);
+        (syOwed, netSyFee, ) = state.swapSyForExactPt(index, exactYtIn, block.timestamp);
 
         uint256 amountPYToRepaySyOwed = index.syToAssetUp(syOwed);
         uint256 amountPYToRedeemSyOut = exactYtIn - amountPYToRepaySyOwed;
@@ -363,7 +342,7 @@ library MarketMathStatic {
             uint256 priceImpact
         )
     {
-        MarketState memory state = IPMarket(market).readState();
+        MarketState memory state = IPMarket(market).readState(address(this));
 
         PYIndex index = pyIndex(market);
 
@@ -390,7 +369,7 @@ library MarketMathStatic {
             uint256 priceImpact
         )
     {
-        MarketState memory state = IPMarket(market).readState();
+        MarketState memory state = IPMarket(market).readState(address(this));
         PYIndex index = pyIndex(market);
 
         (netYtOut, totalPtToSwap, netSyFee) = state.approxSwapExactPtForYt(
@@ -416,7 +395,7 @@ library MarketMathStatic {
             uint256 priceImpact
         )
     {
-        MarketState memory state = IPMarket(market).readState();
+        MarketState memory state = IPMarket(market).readState(address(this));
         PYIndex index = pyIndex(market);
 
         (netPtOut, totalPtSwapped, netSyFee) = state.approxSwapExactYtForPt(
@@ -445,7 +424,7 @@ library MarketMathStatic {
     {
         if (IPMarket(market).isExpired()) return Math.ONE;
         int256 netPtToAccount = netPtOut;
-        MarketState memory state = IPMarket(market).readState();
+        MarketState memory state = IPMarket(market).readState(address(this));
         MarketPreCompute memory comp = state.getMarketPreCompute(pyIndex(market), block.timestamp);
 
         int256 preFeeExchangeRate = MarketMathCore._getExchangeRate(
@@ -477,49 +456,9 @@ library MarketMathStatic {
     }
 
     function getPtImpliedYield(address market) public view returns (int256) {
-        MarketState memory state = IPMarket(market).readState();
+        MarketState memory state = IPMarket(market).readState(address(this));
 
         int256 lnImpliedRate = (state.lastLnImpliedRate).Int();
         return lnImpliedRate.exp();
     }
-
-    function getAmountTokenToMintSy(
-        address SY,
-        address tokenIn,
-        uint256 netSyOut
-    ) internal view returns (uint256 netTokenIn) {
-        uint256 pivotAmount = netSyOut;
-
-        uint256 low = pivotAmount;
-        {
-            while (true) {
-                uint256 lowSyOut = IStandardizedYield(SY).previewDeposit(tokenIn, low);
-                if (lowSyOut >= netSyOut) low /= 10;
-                else break;
-            }
-        }
-
-        uint256 high = pivotAmount;
-        {
-            while (true) {
-                uint256 highSyOut = IStandardizedYield(SY).previewDeposit(tokenIn, high);
-                if (highSyOut < netSyOut) high *= 10;
-                else break;
-            }
-        }
-
-        while(low <= high) {
-            uint256 mid = (low + high) / 2;
-            uint256 syOut = IStandardizedYield(SY).previewDeposit(tokenIn, mid);
-
-            if (syOut >= netSyOut) {
-                netTokenIn = mid;
-                high = mid - 1;
-            } else {
-                low = mid + 1;
-            }
-        }
-
-        assert(netTokenIn > 0);
-    }
 }

package/contracts/offchain-helpers/RouterStatic.sol

@@ -12,7 +12,7 @@ import "./MarketMathStatic.sol";
 import "../core/libraries/BoringOwnableUpgradeable.sol";
 import "../LiquidityMining/libraries/VeBalanceLib.sol";
 
-import "@openzeppelin/contracts/proxy/utils/Initializable.sol";
+import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
 
 /// EXCLUDED FROM ALL AUDITS, TO BE CALLED ONLY BY PENDLE's SDK
@@ -85,7 +85,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
                 guessMax: type(uint256).max,
                 guessOffchain: 0,
                 maxIteration: 256,
-                eps: 1e15
+                eps: 1e14
             });
     }
 
@@ -155,7 +155,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
 
         pt = address(PT);
         sy = address(SY);
-        state = _market.readState();
+        state = _market.readState(address(this));
         impliedYield = getPtImpliedYield(market);
         exchangeRate = MarketMathStatic.getExchangeRate(market);
     }
@@ -244,7 +244,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
         (userMarketInfo.assetBalance.assetType, userMarketInfo.assetBalance.assetAddress, ) = SY
             .assetInfo();
 
-        MarketState memory state = _market.readState();
+        MarketState memory state = _market.readState(address(this));
         uint256 totalLp = uint256(state.totalLp);
 
         if (totalLp == 0) {
@@ -852,8 +852,10 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
         bulk = IPBulkSellerFactory(bulkFactory).get(token, SY);
         if (bulk != address(0)) {
             BulkSellerState memory state = IPBulkSeller(bulk).readState();
-            totalToken = state.totalToken;
-            totalSy = state.totalSy;
+            if (state.rateTokenToSy != 0 || state.rateSyToToken != 0) {
+                totalToken = state.totalToken;
+                totalSy = state.totalSy;
+            }
         }
     }
 }