@pendle/core-v2 0.7.0 → 0.7.1-beta-2

package/contracts/interfaces/IPRouterStatic.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
+import "./ISuperComposableYield.sol";
 import "../libraries/math/MarketMathCore.sol";
 
 interface IPRouterStatic {
@@ -9,6 +10,12 @@ interface IPRouterStatic {
         uint256 amount;
     }
 
+    struct AssetAmount {
+        ISuperComposableYield.AssetType assetType;
+        address assetAddress;
+        uint256 amount;
+    }
+
     struct RewardIndex {
         address rewardToken;
         uint256 index;
@@ -28,15 +35,64 @@ interface IPRouterStatic {
         uint256 lpBalance;
         TokenAmount ptBalance;
         TokenAmount scyBalance;
-        TokenAmount assetBalance;
+        AssetAmount assetBalance;
     }
 
+    // ============= SYSTEM INFO =============
+
+    function getPYInfo(address py)
+        external
+        returns (
+            uint256 exchangeRate,
+            uint256 totalSupply,
+            RewardIndex[] memory rewardIndexes
+        );
+
+    function getPendleTokenType(address token)
+        external
+        view
+        returns (
+            bool isPT,
+            bool isYT,
+            bool isMarket
+        );
+
+    function getMarketInfo(address market)
+        external
+        view
+        returns (
+            address pt,
+            address scy,
+            MarketState memory state,
+            int256 impliedYield
+        );
+
+    // ============= USER INFO =============
+
+    function getUserPYPositionsByPYs(address user, address[] calldata pys)
+        external
+        view
+        returns (UserPYInfo[] memory userPYPositions);
+
+    function getUserMarketPositions(address user, address[] calldata markets)
+        external
+        view
+        returns (UserMarketInfo[] memory userMarketPositions);
+
+    function getUserSCYInfo(address scy, address user)
+        external
+        view
+        returns (uint256 balance, TokenAmount[] memory rewards);
+
+    // ============= MARKET ACTIONS =============
+
     function addLiquidityStatic(
         address market,
         uint256 scyDesired,
         uint256 ptDesired
     )
         external
+        view
         returns (
             uint256 netLpOut,
             uint256 scyUsed,
@@ -50,70 +106,34 @@ interface IPRouterStatic {
 
     function swapPtForScyStatic(address market, uint256 exactPtIn)
         external
+        view
         returns (uint256 netScyOut, uint256 netScyFee);
 
     function swapScyForPtStatic(address market, uint256 exactPtOut)
         external
+        view
         returns (uint256 netScyIn, uint256 netScyFee);
 
-    function scyIndex(address market) external returns (SCYIndex index);
+    // ============= OTHER HELPERS =============
 
-    function getPtImpliedYield(address market) external view returns (int256);
+    function scyIndex(address market) external view returns (SCYIndex index);
 
-    function getPendleTokenType(address token)
-        external
-        view
-        returns (
-            bool isPT,
-            bool isYT,
-            bool isMarket
-        );
+    function getPY(address py) external view returns (address pt, address yt);
+
+    function getPtImpliedYield(address market) external view returns (int256);
 
     function getUserPYInfo(address py, address user)
         external
         view
         returns (UserPYInfo memory userPYInfo);
 
-    function getPYInfo(address py)
-        external
-        returns (
-            uint256 exchangeRate,
-            uint256 totalSupply,
-            RewardIndex[] memory rewardIndexes
-        );
-
-    function getPY(address py) external view returns (address yt, address pt);
-
-    function getMarketInfo(address market)
-        external
-        view
-        returns (
-            address pt,
-            address scy,
-            MarketState memory state,
-            int256 impliedYield,
-            uint256 exchangeRate
-        );
-
     function getUserMarketInfo(address market, address user)
         external
         view
         returns (UserMarketInfo memory userMarketInfo);
 
-    function getUserPYPositionsByPYs(address user, address[] calldata pys)
+    function hasPYPosition(UserPYInfo calldata userPYInfo)
         external
-        view
-        returns (UserPYInfo[] memory userPYPositions);
-
-    function getUserMarketPositions(address user, address[] calldata markets)
-        external
-        view
-        returns (UserMarketInfo[] memory userMarketPositions);
-
-    function hasPYPosition(UserPYInfo memory userPYInfo) external pure returns (bool hasPosition);
-
-    function getUserSCYInfo(address scy, address user)
-        external
-        view
-        returns (uint256 balance, TokenAmount[] memory rewards);
+        pure
+        returns (bool hasPosition);
 }

package/contracts/interfaces/IPVeToken.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 interface IPVeToken {
     // ============= USER INFO =============

package/contracts/interfaces/IPVotingController.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 import "../libraries/VeBalanceLib.sol";
 

package/contracts/interfaces/IPVotingEscrow.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 import "./IPVeToken.sol";
 import "../libraries/VeBalanceLib.sol";

package/contracts/interfaces/IPYieldContractFactory.sol

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
 
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 interface IPYieldContractFactory {
     event CreateYieldContract(address indexed SCY, address PT, address YT, uint256 expiry);

package/contracts/interfaces/IPYieldToken.sol

@@ -1,10 +1,18 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import "./IRewardManager.sol";
 import "./IPInterestManagerYT.sol";
 
 interface IPYieldToken is IERC20Metadata, IRewardManager, IPInterestManagerYT {
+    event Mint(
+        address indexed caller,
+        address indexed receiverPT,
+        address indexed receiverYT,
+        uint256 amount
+    );
+    event Redeem(address indexed caller, address indexed receiver, uint256 amount);
+
     event RedeemRewards(address indexed user, uint256[] amountRewardsOut);
     event RedeemInterest(address indexed user, uint256 interestOut);
 
@@ -14,9 +22,9 @@ interface IPYieldToken is IERC20Metadata, IRewardManager, IPInterestManagerYT {
 
     function redeemPY(address receiver) external returns (uint256 amountScyOut);
 
-    function redeemPY(address[] memory receivers, uint256[] memory amounts)
+    function redeemPY(address[] memory receivers, uint256[] memory maxAmountScyOuts)
         external
-        returns (uint256 amountScyOut);
+        returns (uint256 totalAmountScyOut);
 
     function redeemDueInterestAndRewards(address user)
         external
@@ -28,7 +36,9 @@ interface IPYieldToken is IERC20Metadata, IRewardManager, IPInterestManagerYT {
 
     function rewardIndexesCurrent() external returns (uint256[] memory);
 
-    function getScyIndex() external view returns (uint256 currentIndex);
+    function scyIndexCurrent() external returns (uint256);
+
+    function scyIndexStored() external view returns (uint256);
 
     function getRewardTokens() external view returns (address[] memory);
 

package/contracts/interfaces/IQiAvax.sol

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
 
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 import "./IQiToken.sol";
 
 interface IQiAvax is IQiToken {

package/contracts/interfaces/IQiErc20.sol

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
 
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 import "./IQiToken.sol";
 
 interface IQiErc20 is IQiToken {

package/contracts/interfaces/IQiToken.sol

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
 
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "./IBenQiInterestRateModel.sol";
 

package/contracts/interfaces/IREDACTEDStaking.sol

@@ -20,7 +20,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 interface IREDACTEDStaking {
     function stake(uint256 _amount, address _receiver) external returns (bool);

package/contracts/interfaces/IRewardManager.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 interface IRewardManager {
     function userReward(address token, address user)

package/contracts/interfaces/ISuperComposableYield.sol

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
 
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 interface ISuperComposableYield is IERC20Metadata {

package/contracts/interfaces/IWETH.sol

@@ -20,7 +20,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

package/contracts/interfaces/IWXBTRFLY.sol

@@ -20,7 +20,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 interface IWXBTRFLY {
     function wrapFromBTRFLY(uint256 _amount) external returns (uint256);

package/contracts/interfaces/IWstETH.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 interface IWstETH {
     function wrap(uint256 _stETHAmount) external returns (uint256);

package/contracts/interfaces/IYearnVault.sol

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
 
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 interface IYearnVault {
     function deposit(uint256 amount) external returns (uint256);

package/contracts/libraries/RewardManager.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 import "../interfaces/IRewardManager.sol";
 import "./RewardManagerAbstract.sol";
 import "./math/Math.sol";

package/contracts/libraries/RewardManagerAbstract.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 import "../interfaces/IRewardManager.sol";
 import "./helpers/TokenHelper.sol";
 import "./math/Math.sol";
@@ -47,7 +47,11 @@ abstract contract RewardManagerAbstract is IRewardManager, TokenHelper {
             uint256 index = indexes[i];
             uint256 userIndex = userReward[token][user].index;
 
-            if (userIndex == 0) userIndex = index;
+            if (userIndex == 0) {
+                userReward[token][user].index = index.Uint128();
+                continue;
+            }
+
             if (userIndex == index) continue;
 
             uint256 deltaIndex = index - userIndex;

package/contracts/libraries/SCY/SCYIndex.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 import "../../interfaces/ISuperComposableYield.sol";
 import "./SCYUtils.sol";
 import "../math/Math.sol";

package/contracts/libraries/SCY/SCYUtils.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 library SCYUtils {
     uint256 internal constant ONE = 1e18;

package/contracts/libraries/VeBalanceLib.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 struct VeBalance {
     uint128 bias;
@@ -11,11 +11,6 @@ struct LockedPosition {
     uint128 expiry;
 }
 
-struct Checkpoint {
-    VeBalance balance;
-    uint128 timestamp;
-}
-
 library VeBalanceLib {
     uint128 internal constant MAX_LOCK_TIME = 104 weeks;
 
@@ -64,35 +59,6 @@ library VeBalanceLib {
         return a.bias / a.slope;
     }
 
-    function getCheckpointValueAt(Checkpoint[] storage checkpoints, uint128 timestamp)
-        internal
-        view
-        returns (uint128)
-    {
-        if (checkpoints.length == 0 || checkpoints[0].timestamp > timestamp) {
-            return 0;
-        }
-
-        uint256 left = 0;
-        uint256 right = checkpoints.length;
-
-        while (left < right) {
-            uint256 mid = (left + right) / 2;
-            if (checkpoints[mid].timestamp <= timestamp) {
-                left = mid;
-            } else {
-                right = mid - 1;
-            }
-        }
-
-        VeBalance memory bal = checkpoints[left].balance;
-        if (getExpiry(bal) <= timestamp) {
-            return 0;
-        } else {
-            return getValueAt(bal, timestamp);
-        }
-    }
-
     function convertToVeBalance(LockedPosition memory position)
         internal
         pure

package/contracts/libraries/VeHistoryLib.sol

@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: MIT
+// Forked from OpenZeppelin (v4.5.0) (utils/Checkpoints.sol)
+pragma solidity ^0.8.0;
+
+import "./math/Math.sol";
+import "./VeBalanceLib.sol";
+
+library Checkpoints {
+    struct Checkpoint {
+        uint32 _timestamp;
+        VeBalance _value;
+    }
+
+    struct History {
+        Checkpoint[] _checkpoints;
+    }
+
+    /**
+     * @dev Returns the value at a given block number. If a checkpoint is not available at that block, the closest one
+     * before it is returned, or zero otherwise.
+     */
+    function getAtTimestamp(History storage self, uint256 timestamp)
+        internal
+        view
+        returns (uint128)
+    {
+        require(timestamp < block.timestamp, "Checkpoints: block not yet mined");
+
+        uint256 high = self._checkpoints.length;
+        uint256 low = 0;
+        while (low < high) {
+            uint256 mid = (low + high) / 2;
+            if (self._checkpoints[mid]._timestamp > timestamp) {
+                high = mid;
+            } else {
+                low = mid + 1;
+            }
+        }
+        return
+            high == 0
+                ? 0
+                : VeBalanceLib.getValueAt(self._checkpoints[high - 1]._value, uint128(timestamp));
+    }
+
+    /**
+     * @dev Pushes a value onto a History so that it is stored as the checkpoint for the current block.
+     *
+     * Returns previous value and new value.
+     */
+    function push(History storage self, VeBalance memory value) internal {
+        uint256 pos = self._checkpoints.length;
+        if (pos > 0 && self._checkpoints[pos - 1]._timestamp == block.timestamp) {
+            self._checkpoints[pos - 1]._value = value;
+        } else {
+            self._checkpoints.push(
+                Checkpoint({ _timestamp: uint32(block.timestamp), _value: value })
+            );
+        }
+    }
+}

package/contracts/libraries/helpers/ExpiryUtilsLib.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 library ExpiryUtils {
     struct Date {

package/contracts/libraries/helpers/MiniHelpers.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 library MiniHelpers {
     function isCurrentlyExpired(uint256 expiry) internal view returns (bool) {

package/contracts/libraries/helpers/SSTORE2Deployer.sol

@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.15;
+import "../solmate/SSTORE2.sol";
+import "@openzeppelin/contracts/utils/Create2.sol";
+
+/// @dev save creation code of a contract onchain, and load it when necessary
+library SSTORE2Deployer {
+    function setCreationCode(bytes memory newCreationCode) internal returns (address pointer) {
+        require(newCreationCode.length > 0, "zero length");
+        pointer = SSTORE2.write(newCreationCode);
+    }
+
+    function create2(
+        address creationCodePointer,
+        bytes32 salt,
+        bytes memory args
+    ) internal returns (address) {
+        return create2(SSTORE2.read(creationCodePointer), salt, args);
+    }
+
+    // call create2 directly by the provided creationCode
+    function create2(
+        bytes memory creationCode,
+        bytes32 salt,
+        bytes memory args
+    ) internal returns (address) {
+        bytes memory finalCreationCode = abi.encodePacked(creationCode, args);
+        return Create2.deploy(0, salt, finalCreationCode);
+    }
+}

package/contracts/libraries/helpers/TokenHelper.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 

package/contracts/libraries/math/LogExpMath.sol

@@ -12,7 +12,7 @@
 // COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 /* solhint-disable */
 

package/contracts/libraries/math/MarketApproxLib.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 import "./Math.sol";
 import "./MarketMathCore.sol";

package/contracts/libraries/math/MarketMathCore.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 import "./Math.sol";
 import "./LogExpMath.sol";

package/contracts/libraries/math/Math.sol

@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 /* solhint-disable private-vars-leading-underscore, reason-string */
 

package/contracts/libraries/math/WeekMath.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 library WeekMath {
     uint128 internal constant WEEK = 7 days;

package/contracts/libraries/traderjoe/JoeLibrary.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 import "../../interfaces/IJoePair.sol";
 

package/contracts/libraries/traderjoe/PendleJoeSwapHelperUpg.sol

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
 
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 import "../../interfaces/IJoeRouter01.sol";
 import "./JoeLibrary.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";