@pendle/core-v2 0.12.2-testnet → 0.13.1-testnet

package/contracts/{core/LiquidityMining → LiquidityMining}/VotingController/VotingControllerStorageUpg.sol

@@ -1,13 +1,16 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
-
-import "../../../interfaces/IPVeToken.sol";
-import "../../../libraries/VeBalanceLib.sol";
-import "../../../libraries/math/WeekMath.sol";
-import "../../../libraries/helpers/MiniHelpers.sol";
-import "../../../libraries/VeHistoryLib.sol";
-import "../../../libraries/Errors.sol";
-import "../../../interfaces/IPVotingController.sol";
+pragma solidity 0.8.17;
+
+import "../../interfaces/IPVeToken.sol";
+import "../../interfaces/IPVotingController.sol";
+
+import "../libraries/VeBalanceLib.sol";
+import "../libraries/WeekMath.sol";
+import "../libraries/VeHistoryLib.sol";
+
+import "../../core/libraries/MiniHelpers.sol";
+import "../../core/libraries/Errors.sol";
+
 import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
 /// This contract is upgradable because
@@ -46,12 +49,12 @@ abstract contract VotingControllerStorageUpg is IPVotingController {
     }
 
     uint128 public constant MAX_LOCK_TIME = 104 weeks;
-    uint128 public constant WEEK = 1 days;
+    uint128 public constant WEEK = 1 weeks;
     uint128 public constant GOVERNANCE_PENDLE_VOTE = 10**24;
 
     IPVeToken public immutable vePendle;
 
-    uint128 public immutable deployedWTime;
+    uint128 public deployedWTime;
 
     uint128 public pendlePerSec;
 
@@ -78,7 +81,6 @@ abstract contract VotingControllerStorageUpg is IPVotingController {
 
     constructor(address _vePendle) {
         vePendle = IPVeToken(_vePendle);
-        deployedWTime = WeekMath.getCurrentWeekStart();
     }
 
     /*///////////////////////////////////////////////////////////////
@@ -242,6 +244,7 @@ abstract contract VotingControllerStorageUpg is IPVotingController {
     ) internal {
         poolData[pool].totalVote = vote;
         poolData[pool].lastSlopeChangeAppliedAt = wTime;
+        emit PoolVoteChange(pool, vote);
     }
 
     function _modifyVoteWeight(
@@ -279,6 +282,7 @@ abstract contract VotingControllerStorageUpg is IPVotingController {
         }
 
         userPoolHistory[user][pool].push(newVote);
+        emit PoolVoteChange(pool, pData.totalVote);
     }
 
     function _setAllPastEpochsAsFinalized() internal {

package/contracts/{core/LiquidityMining → LiquidityMining}/VotingEscrow/VotingEscrowPendleMainchain.sol

@@ -1,14 +1,18 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
-import "../../../interfaces/IPVotingEscrowMainchain.sol";
-import "../../../libraries/helpers/MiniHelpers.sol";
-import "./VotingEscrowTokenBase.sol";
-import "../CrossChainMsg/PendleMsgSenderAppUpg.sol";
-import "../../../libraries/VeHistoryLib.sol";
-import "../../../libraries/Errors.sol";
+pragma solidity 0.8.17;
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
+import "../../interfaces/IPVotingEscrowMainchain.sol";
+
+import "../libraries/VeHistoryLib.sol";
+
+import "../../core/libraries/MiniHelpers.sol";
+import "../../core/libraries/Errors.sol";
+
+import "./VotingEscrowTokenBase.sol";
+import "../CrossChainMsg/PendleMsgSenderAppUpg.sol";
+
 contract VotingEscrowPendleMainchain is
     VotingEscrowTokenBase,
     IPVotingEscrowMainchain,

package/contracts/{core/LiquidityMining → LiquidityMining}/VotingEscrow/VotingEscrowPendleSidechain.sol

@@ -1,14 +1,19 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
+
+import "../libraries/VeBalanceLib.sol";
+import "../libraries/WeekMath.sol";
 
-import "../../../libraries/VeBalanceLib.sol";
-import "../../../libraries/math/WeekMath.sol";
 import "./VotingEscrowTokenBase.sol";
 import "../CrossChainMsg/PendleMsgReceiverAppUpg.sol";
 
 // solhint-disable no-empty-blocks
-contract VotingEscrowPendleSidechain is VotingEscrowTokenBase, PendleMsgReceiverAppUpg {
+contract VotingEscrowPendleSidechain is
+    VotingEscrowTokenBase,
+    PendleMsgReceiverAppUpg,
+    BoringOwnableUpgradeable
+{
     mapping(address => address) internal delegatorOf;
 
     event SetNewDelegator(address delegator, address receiver);

package/contracts/{core/LiquidityMining → LiquidityMining}/VotingEscrow/VotingEscrowTokenBase.sol

@@ -1,10 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
-import "../../../interfaces/IPVeToken.sol";
-import "../../../libraries/VeBalanceLib.sol";
-import "../../../libraries/math/WeekMath.sol";
-import "../../../libraries/helpers/MiniHelpers.sol";
+import "../../interfaces/IPVeToken.sol";
+
+import "../../core/libraries/MiniHelpers.sol";
+
+import "../libraries/VeBalanceLib.sol";
+import "../libraries/WeekMath.sol";
 
 /**
  * @dev this contract is an abstract for its mainchain and sidechain variant
@@ -23,9 +25,9 @@ abstract contract VotingEscrowTokenBase is IPVeToken {
     using VeBalanceLib for VeBalance;
     using VeBalanceLib for LockedPosition;
 
-    uint128 public constant WEEK = 1 days;
+    uint128 public constant WEEK = 1 weeks;
     uint128 public constant MAX_LOCK_TIME = 104 weeks;
-    uint128 public constant MIN_LOCK_TIME = 1 days;
+    uint128 public constant MIN_LOCK_TIME = 1 weeks;
 
     VeBalance internal _totalSupply;
     uint128 public lastSlopeChangeAppliedAt;

package/contracts/{libraries → LiquidityMining/libraries}/VeBalanceLib.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
-import "./math/Math.sol";
-import "./Errors.sol";
+import "../../core/libraries/math/Math.sol";
+import "../../core/libraries/Errors.sol";
 
 struct VeBalance {
     uint128 bias;

package/contracts/{libraries → LiquidityMining/libraries}/VeHistoryLib.sol

@@ -2,9 +2,9 @@
 // Forked from OpenZeppelin (v4.5.0) (utils/Checkpoints.sol)
 pragma solidity ^0.8.0;
 
-import "./math/Math.sol";
+import "../../core/libraries/math/Math.sol";
 import "./VeBalanceLib.sol";
-import "./math/WeekMath.sol";
+import "./WeekMath.sol";
 
 struct Checkpoint {
     uint128 timestamp;

package/contracts/{libraries/math → LiquidityMining/libraries}/WeekMath.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 library WeekMath {
-    uint128 internal constant WEEK = 1 days;
+    uint128 internal constant WEEK = 7 days;
 
     function getWeekStartTimestamp(uint128 timestamp) internal pure returns (uint128) {
         return (timestamp / WEEK) * WEEK;

package/contracts/{libraries/math → core/Market}/MarketMathCore.sol

@@ -1,11 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
-import "./Math.sol";
-import "./LogExpMath.sol";
-import "../helpers/PYIndex.sol";
-import "../helpers/MiniHelpers.sol";
-import "../Errors.sol";
+import "../libraries/math/Math.sol";
+import "../libraries/math/LogExpMath.sol";
+
+import "../SuperComposableYield/PYIndex.sol";
+import "../libraries/MiniHelpers.sol";
+import "../libraries/Errors.sol";
 
 struct MarketState {
     int256 totalPt;
@@ -227,16 +228,7 @@ library MarketMathCore {
         /// ------------------------------------------------------------
         MarketPreCompute memory comp = getMarketPreCompute(market, index, blockTime);
 
-        (int256 netAssetToAccount, int256 netAssetToReserve) = calcTrade(
-            market,
-            comp,
-            netPtToAccount
-        );
-
-        netScyToAccount = netAssetToAccount < 0
-            ? index.assetToScyUp(netAssetToAccount)
-            : index.assetToScy(netAssetToAccount);
-        netScyToReserve = index.assetToScy(netAssetToReserve);
+        (netScyToAccount, netScyToReserve) = calcTrade(market, comp, index, netPtToAccount);
 
         /// ------------------------------------------------------------
         /// WRITE
@@ -280,8 +272,9 @@ library MarketMathCore {
     function calcTrade(
         MarketState memory market,
         MarketPreCompute memory comp,
+        PYIndex index,
         int256 netPtToAccount
-    ) internal pure returns (int256 netAssetToAccount, int256 netAssetToReserve) {
+    ) internal pure returns (int256 netScyToAccount, int256 netScyToReserve) {
         int256 preFeeExchangeRate = _getExchangeRate(
             market.totalPt,
             comp.totalAsset,
@@ -303,8 +296,13 @@ library MarketMathCore {
             fee = ((preFeeAssetToAccount * (Math.IONE - fee)) / fee).neg();
         }
 
-        netAssetToReserve = (fee * market.reserveFeePercent.Int()) / PERCENTAGE_DECIMALS;
-        netAssetToAccount = preFeeAssetToAccount - fee;
+        int256 netAssetToReserve = (fee * market.reserveFeePercent.Int()) / PERCENTAGE_DECIMALS;
+        int256 netAssetToAccount = preFeeAssetToAccount - fee;
+
+        netScyToAccount = netAssetToAccount < 0
+            ? index.assetToScyUp(netAssetToAccount)
+            : index.assetToScy(netAssetToAccount);
+        netScyToReserve = index.assetToScy(netAssetToReserve);
     }
 
     function _setNewMarketStateTrade(

package/contracts/{libraries → core/Market}/OracleLib.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
-import "./Errors.sol";
+import "../libraries/Errors.sol";
 
 /// Adapted from UniswapV3's Oracle
 

package/contracts/core/{LiquidityMining → Market}/PendleGauge.sol

@@ -1,14 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 import "../../interfaces/IPGauge.sol";
-import "../../interfaces/IPGaugeController.sol";
 import "../../interfaces/IPVeToken.sol";
+import "../../interfaces/IPGaugeController.sol";
 import "../../interfaces/ISuperComposableYield.sol";
-import "../../libraries/RewardManager.sol";
-import "../../libraries/math/Math.sol";
-import "../../libraries/helpers/ArrayLib.sol";
-import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+
+import "../RewardManager/RewardManager.sol";
 
 /**
 Invariants to maintain:

package/contracts/core/Market/PendleMarket.sol

@@ -1,21 +1,13 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
-import "../PendleERC20Permit.sol";
-import "../../interfaces/IPPrincipalToken.sol";
-import "../../interfaces/ISuperComposableYield.sol";
 import "../../interfaces/IPMarket.sol";
 import "../../interfaces/IPMarketFactory.sol";
 import "../../interfaces/IPMarketSwapCallback.sol";
 
-import "../../libraries/OracleLib.sol";
-import "../../libraries/math/LogExpMath.sol";
-import "../../libraries/math/Math.sol";
-import "../../libraries/helpers/MiniHelpers.sol";
-import "../../libraries/Errors.sol";
-
-import "../LiquidityMining/PendleGauge.sol";
-import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import "../erc20/PendleERC20Permit.sol";
+import "./PendleGauge.sol";
+import "./OracleLib.sol";
 
 /**
 Invariance to maintain:

package/contracts/core/Market/PendleMarketFactory.sol

@@ -1,17 +1,17 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
 import "../../interfaces/IPMarket.sol";
 import "../../interfaces/IPYieldContractFactory.sol";
 import "../../interfaces/IPMarketFactory.sol";
 
-import "../../libraries/helpers/BaseSplitCodeFactory.sol";
-import "../../libraries/Errors.sol";
-import "../../periphery/BoringOwnableUpgradeable.sol";
+import "../libraries/BaseSplitCodeFactory.sol";
+import "../libraries/Errors.sol";
+import "../libraries/BoringOwnableUpgradeable.sol";
 
 import "./PendleMarket.sol";
-import "../LiquidityMining/PendleGauge.sol";
+import "./PendleGauge.sol";
 
 contract PendleMarketFactory is BoringOwnableUpgradeable, IPMarketFactory {
     using EnumerableSet for EnumerableSet.AddressSet;

package/contracts/{libraries → core/RewardManager}/RewardManager.sol

@@ -1,9 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
-import "../interfaces/IRewardManager.sol";
+pragma solidity 0.8.17;
+
 import "./RewardManagerAbstract.sol";
-import "./math/Math.sol";
-import "../libraries/helpers/ArrayLib.sol";
 
 /// NOTE: This RewardManager is used with PendleMarket & SCY. For YT, it will use RewardManagerAbstract
 /// NOTE: RewardManager must not have duplicated rewardTokens

package/contracts/{libraries → core/RewardManager}/RewardManagerAbstract.sol

@@ -1,8 +1,13 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
-import "../interfaces/IRewardManager.sol";
-import "./helpers/TokenHelper.sol";
-import "./math/Math.sol";
+pragma solidity 0.8.17;
+
+import "../../interfaces/IRewardManager.sol";
+
+import "../libraries/ArrayLib.sol";
+import "../libraries/TokenHelper.sol";
+import "../libraries/math/Math.sol";
+
+import "./RewardManagerAbstract.sol";
 
 /// NOTE: RewardManager must not have duplicated rewardTokens
 abstract contract RewardManagerAbstract is IRewardManager, TokenHelper {

package/contracts/{libraries/helpers → core/SuperComposableYield}/PYIndex.sol

@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 import "../../interfaces/IPYieldToken.sol";
 import "../../interfaces/IPPrincipalToken.sol";
-import "../SCY/SCYUtils.sol";
-import "../math/Math.sol";
+
+import "./SCYUtils.sol";
+import "../libraries/math/Math.sol";
 
 type PYIndex is uint256;
 

package/contracts/{SuperComposableYield/base-implementations → core/SuperComposableYield}/SCYBase.sol

@@ -1,14 +1,17 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
-import "../../interfaces/ISuperComposableYield.sol";
-import "../../libraries/RewardManager.sol";
+pragma solidity 0.8.17;
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
-import "../../libraries/math/Math.sol";
-import "../../libraries/SCY/SCYUtils.sol";
-import "../../libraries/helpers/TokenHelper.sol";
-import "../../libraries/Errors.sol";
-import "../../../contracts/core/PendleERC20Permit.sol";
+
+import "../../interfaces/ISuperComposableYield.sol";
+
+import "../erc20/PendleERC20Permit.sol";
+
+import "../RewardManager/RewardManager.sol";
+import "../libraries/math/Math.sol";
+import "../libraries/TokenHelper.sol";
+import "../libraries/Errors.sol";
+import "./SCYUtils.sol";
 
 abstract contract SCYBase is ISuperComposableYield, PendleERC20Permit, TokenHelper {
     using Math for uint256;

package/contracts/{SuperComposableYield/base-implementations → core/SuperComposableYield}/SCYBaseWithRewards.sol

@@ -1,10 +1,11 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
 import "../../interfaces/ISuperComposableYield.sol";
-import "../../libraries/RewardManager.sol";
+
+import "../libraries/math/Math.sol";
 import "./SCYBase.sol";
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import "../../libraries/math/Math.sol";
 
 /// NOTE: yieldToken MUST NEVER BE a rewardToken, else the rewardManager will behave erroneously
 abstract contract SCYBaseWithRewards is SCYBase, RewardManager {

package/contracts/{libraries/SCY → core/SuperComposableYield}/SCYUtils.sol

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

package/contracts/{SuperComposableYield/SCY-implementations → core/SuperComposableYield/implementations}/BenQi/PendleQiTokenHelper.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
-import "../../../interfaces/IQiToken.sol";
+import "../../../../interfaces/IQiToken.sol";
 import "../../../libraries/Errors.sol";
 
 contract PendleQiTokenHelper {

package/contracts/{SuperComposableYield/SCY-implementations → core/SuperComposableYield/implementations}/BenQi/PendleQiTokenSCY.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
-import "../../base-implementations/SCYBaseWithRewards.sol";
-import "../../../interfaces/IQiErc20.sol";
-import "../../../interfaces/IQiAvax.sol";
-import "../../../interfaces/IBenQiComptroller.sol";
-import "../../../interfaces/IWETH.sol";
+import "../../SCYBaseWithRewards.sol";
+import "../../../../interfaces/IQiErc20.sol";
+import "../../../../interfaces/IQiAvax.sol";
+import "../../../../interfaces/IBenQiComptroller.sol";
+import "../../../../interfaces/IWETH.sol";
 
 import "./PendleQiTokenHelper.sol";
 

package/contracts/{SuperComposableYield/SCY-implementations → core/SuperComposableYield/implementations}/Convex/ConvexCurveLP/Pendle3CrvAndTokenSCY.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 import "./PendleConvexCurveLP2PoolSCY.sol";
 import "../Pendle3CrvHelper.sol";
-import "../../../../libraries/helpers/ArrayLib.sol";
+import "../../../../libraries/ArrayLib.sol";
 
 contract Pendle3CrvAndTokenSCY is PendleConvexCurveLP2PoolSCY {
     using ArrayLib for address[];

package/contracts/{SuperComposableYield/SCY-implementations → core/SuperComposableYield/implementations}/Convex/ConvexCurveLP/PendleConvexCurveLP2PoolSCY.sol

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

package/contracts/{SuperComposableYield/SCY-implementations → core/SuperComposableYield/implementations}/Convex/ConvexCurveLP/PendleConvexCurveLPSCY.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
-import "../../../base-implementations/SCYBaseWithRewards.sol";
-import "../../../../interfaces/ConvexCurve/IBooster.sol";
-import "../../../../interfaces/ConvexCurve/IRewards.sol";
-import "../../../../interfaces/Curve/ICrvPool.sol";
+import "../../../SCYBaseWithRewards.sol";
+import "../../../../../interfaces/ConvexCurve/IBooster.sol";
+import "../../../../../interfaces/ConvexCurve/IRewards.sol";
+import "../../../../../interfaces/Curve/ICrvPool.sol";
 
 abstract contract PendleConvexCurveLPSCY is SCYBaseWithRewards {
     using SafeERC20 for IERC20;

package/contracts/{SuperComposableYield/SCY-implementations → core/SuperComposableYield/implementations}/Convex/Pendle3CrvHelper.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
-import "../../../interfaces/Curve/ICrvPool.sol";
+import "../../../../interfaces/Curve/ICrvPool.sol";
 import "../../../libraries/math/Math.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 

package/contracts/{SuperComposableYield/SCY-implementations → core/SuperComposableYield/implementations}/PendleWstEthSCY.sol

@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
-import "../base-implementations/SCYBase.sol";
-import "../../interfaces/IWstETH.sol";
-import "../../interfaces/IWETH.sol";
-import "../../interfaces/IStETH.sol";
+pragma solidity 0.8.17;
+
+import "../SCYBase.sol";
+import "../../../interfaces/IWstETH.sol";
+import "../../../interfaces/IWETH.sol";
+import "../../../interfaces/IStETH.sol";
 
 contract PendleWstEthSCY is SCYBase {
     address public immutable wETH;

package/contracts/core/YieldContracts/InterestManagerYT.sol

@@ -1,16 +1,16 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 import "../../interfaces/IPYieldToken.sol";
 import "../../interfaces/IPPrincipalToken.sol";
 import "../../interfaces/IPInterestManagerYT.sol";
+import "../../interfaces/IPYieldContractFactory.sol";
 
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
-import "../../libraries/math/Math.sol";
-import "../../interfaces/IPYieldContractFactory.sol";
-import "../../libraries/SCY/SCYUtils.sol";
-import "../../libraries/helpers/TokenHelper.sol";
+import "../libraries/math/Math.sol";
+import "../libraries/TokenHelper.sol";
+import "../SuperComposableYield/SCYUtils.sol";
 
 /*
 With YT yielding more SCYs overtime, which is allowed to be redeemed by users, the reward distribution should

package/contracts/core/YieldContracts/PendlePrincipalToken.sol

@@ -1,12 +1,14 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 import "../../interfaces/IPPrincipalToken.sol";
 import "../../interfaces/IPYieldToken.sol";
 
-import "../PendleERC20Permit.sol";
-import "../../libraries/helpers/MiniHelpers.sol";
-import "../../libraries/Errors.sol";
+import "../libraries/MiniHelpers.sol";
+import "../libraries/Errors.sol";
+
+import "../erc20/PendleERC20Permit.sol";
+
 import "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 
 contract PendlePrincipalToken is PendleERC20Permit, Initializable, IPPrincipalToken {

package/contracts/core/YieldContracts/PendleYieldContractFactory.sol

@@ -21,19 +21,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
 
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 import "../../interfaces/IPYieldContractFactory.sol";
 
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
-import "../../libraries/helpers/ExpiryUtilsLib.sol";
-import "../../libraries/helpers/BaseSplitCodeFactory.sol";
-import "../../libraries/helpers/MiniHelpers.sol";
-import "../../libraries/Errors.sol";
-
-import "../../periphery/BoringOwnableUpgradeable.sol";
+import "../libraries/ExpiryUtilsLib.sol";
+import "../libraries/BaseSplitCodeFactory.sol";
+import "../libraries/MiniHelpers.sol";
+import "../libraries/Errors.sol";
+import "../libraries/BoringOwnableUpgradeable.sol";
 
 import "./PendlePrincipalToken.sol";
 import "./PendleYieldToken.sol";

package/contracts/core/YieldContracts/PendleYieldToken.sol

@@ -1,20 +1,21 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
+
+import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 import "../../interfaces/ISuperComposableYield.sol";
 import "../../interfaces/IPYieldToken.sol";
 import "../../interfaces/IPPrincipalToken.sol";
 
-import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-
-import "../../libraries/math/Math.sol";
-import "../../libraries/helpers/ArrayLib.sol";
+import "../libraries/math/Math.sol";
+import "../libraries/ArrayLib.sol";
 import "../../interfaces/IPYieldContractFactory.sol";
-import "../../libraries/SCY/SCYUtils.sol";
-import "../../libraries/Errors.sol";
-import "../../libraries/helpers/MiniHelpers.sol";
-import "../../libraries/RewardManagerAbstract.sol";
-import "../PendleERC20Permit.sol";
+import "../SuperComposableYield/SCYUtils.sol";
+import "../libraries/Errors.sol";
+import "../libraries/MiniHelpers.sol";
+
+import "../RewardManager/RewardManagerAbstract.sol";
+import "../erc20/PendleERC20Permit.sol";
 import "./InterestManagerYT.sol";
 
 /**