@pendle/core-v2 3.0.0-beta-11 → 3.0.0-beta-12

package/contracts/interfaces/IPLimitRouter.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
 
 import "../core/StandardizedYield/PYIndex.sol";
 
-interface IPOrderMixinType {
+interface IPLimitOrderType {
     enum OrderType {
         SY_FOR_PT,
         PT_FOR_SY,
@@ -26,7 +26,7 @@ interface IPOrderMixinType {
         uint256 failSafeRate;
     }
 
-    struct NormalResults {
+    struct FillResults {
         uint256 totalMaking;
         uint256 totalTaking;
         uint256 totalFee;
@@ -42,7 +42,7 @@ struct Order {
     uint256 salt;
     uint256 expiry;
     uint256 nonce;
-    IPOrderMixinType.OrderType orderType;
+    IPLimitOrderType.OrderType orderType;
     address token;
     address YT;
     address maker;
@@ -59,13 +59,16 @@ struct FillOrderParams {
     uint256 makingAmount;
 }
 
-interface IPLimitRouterCallback is IPOrderMixinType {
-    function normalFillCallback(uint256 actualMaking, uint256 actualTaking, uint256 totalFee, bytes memory data)
-        external
-        returns (bytes memory);
+interface IPLimitRouterCallback is IPLimitOrderType {
+    function limitRouterCallback(
+        uint256 actualMaking,
+        uint256 actualTaking,
+        uint256 totalFee,
+        bytes memory data
+    ) external returns (bytes memory);
 }
 
-interface IPLimitRouter is IPOrderMixinType {
+interface IPLimitRouter is IPLimitOrderType {
     struct OrderStatus {
         uint128 filledAmount;
         uint128 remaining;
@@ -85,9 +88,13 @@ interface IPLimitRouter is IPOrderMixinType {
     );
 
     // @dev actualMaking, actualTaking are in the SY form
-    function normalFill(FillOrderParams[] memory params, address receiver, uint256 maxTaking, bytes calldata callback)
-        external
-        returns (uint256 actualMaking, uint256 actualTaking, uint256 totalFee, bytes memory callbackReturn);
+    function fill(
+        FillOrderParams[] memory params,
+        address receiver,
+        uint256 maxTaking,
+        bytes calldata optData,
+        bytes calldata callback
+    ) external returns (uint256 actualMaking, uint256 actualTaking, uint256 totalFee, bytes memory callbackReturn);
 
     function feeRecipient() external view returns (address);
 
@@ -97,15 +104,13 @@ interface IPLimitRouter is IPOrderMixinType {
 
     function cancelBatch(Order[] calldata orders) external;
 
-    function orderStatusesRaw(bytes32[] memory orderHashes)
-        external
-        view
-        returns (uint256[] memory remainingsRaw, uint256[] memory filledAmounts);
+    function orderStatusesRaw(
+        bytes32[] memory orderHashes
+    ) external view returns (uint256[] memory remainingsRaw, uint256[] memory filledAmounts);
 
-    function orderStatuses(bytes32[] memory orderHashes)
-        external
-        view
-        returns (uint256[] memory remainings, uint256[] memory filledAmounts);
+    function orderStatuses(
+        bytes32[] memory orderHashes
+    ) external view returns (uint256[] memory remainings, uint256[] memory filledAmounts);
 
     function DOMAIN_SEPARATOR() external view returns (bytes32);
 

package/contracts/interfaces/IPLinearDistributor.sol

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.17;
+
+interface IPLinearDistributor {
+    event VestQueued(address indexed token, address indexed addr, uint256 amount);
+    event Vested(address indexed token, address indexed addr, uint256 amount, uint256 duration);
+    event Claim(address indexed token, address indexed addr, uint256 amount);
+
+    struct DistributionData {
+        uint128 accruedReward;
+        uint128 unvestedReward;
+        // [irregular uint192] reward tokens might be up to 1e18 decimals, at 1e18 based, the reward per sec might be very close to 1e38 limit of uint128
+        uint192 rewardPerSec;
+        uint32 lastDistributedTime;
+        uint32 endTime;
+    }
+
+    function queueVestAndClaim(address token, uint256 amountToVest) external returns (uint256 amountOut);
+
+    function claim(address token) external returns (uint256 amountOut);
+}

package/contracts/interfaces/IPMarket.sol

@@ -9,12 +9,7 @@ import "./IPGauge.sol";
 import "../core/Market/MarketMathCore.sol";
 
 interface IPMarket is IERC20Metadata, IPGauge {
-    event Mint(
-        address indexed receiver,
-        uint256 netLpMinted,
-        uint256 netSyUsed,
-        uint256 netPtUsed
-    );
+    event Mint(address indexed receiver, uint256 netLpMinted, uint256 netSyUsed, uint256 netPtUsed);
 
     event Burn(
         address indexed receiverSy,
@@ -68,16 +63,11 @@ interface IPMarket is IERC20Metadata, IPGauge {
 
     function readState(address router) external view returns (MarketState memory market);
 
-    function observe(
-        uint32[] memory secondsAgos
-    ) external view returns (uint216[] memory lnImpliedRateCumulative);
+    function observe(uint32[] memory secondsAgos) external view returns (uint216[] memory lnImpliedRateCumulative);
 
     function increaseObservationsCardinalityNext(uint16 cardinalityNext) external;
 
-    function readTokens()
-        external
-        view
-        returns (IStandardizedYield _SY, IPPrincipalToken _PT, IPYieldToken _YT);
+    function readTokens() external view returns (IStandardizedYield _SY, IPPrincipalToken _PT, IPYieldToken _YT);
 
     function getRewardTokens() external view returns (address[] memory);
 
@@ -87,10 +77,7 @@ interface IPMarket is IERC20Metadata, IPGauge {
 
     function observations(
         uint256 index
-    )
-        external
-        view
-        returns (uint32 blockTimestamp, uint216 lnImpliedRateCumulative, bool initialized);
+    ) external view returns (uint32 blockTimestamp, uint216 lnImpliedRateCumulative, bool initialized);
 
     function _storage()
         external

package/contracts/interfaces/IPMarketFactory.sol

@@ -8,20 +8,11 @@ interface IPMarketFactory {
         bool active;
     }
 
-    event NewMarketConfig(
-        address indexed treasury,
-        uint80 defaultLnFeeRateRoot,
-        uint8 reserveFeePercent
-    );
+    event NewMarketConfig(address indexed treasury, uint80 defaultLnFeeRateRoot, uint8 reserveFeePercent);
     event SetOverriddenFee(address indexed router, uint80 lnFeeRateRoot, uint8 reserveFeePercent);
     event UnsetOverriddenFee(address indexed router);
 
-    event CreateNewMarket(
-        address indexed market,
-        address indexed PT,
-        int256 scalarRoot,
-        int256 initialAnchor
-    );
+    event CreateNewMarket(address indexed market, address indexed PT, int256 scalarRoot, int256 initialAnchor);
 
     function isValidMarket(address market) external view returns (bool);
 
@@ -29,6 +20,4 @@ interface IPMarketFactory {
     function getMarketConfig(
         address router
     ) external view returns (address treasury, uint80 lnFeeRateRoot, uint8 reserveFeePercent);
-
-
 }

package/contracts/interfaces/IPMarketFactoryV3.sol

@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.0;
+
+interface IPMarketFactoryV3 {
+    event SetOverriddenFee(address indexed router, address indexed market, uint80 lnFeeRateRoot);
+
+    event CreateNewMarket(
+        address indexed market,
+        address indexed PT,
+        int256 scalarRoot,
+        int256 initialAnchor,
+        uint256 lnFeeRateRoot
+    );
+
+    event NewTreasuryAndFeeReserve(address indexed treasury, uint8 reserveFeePercent);
+
+    function isValidMarket(address market) external view returns (bool);
+
+    // If this is changed, change the readState function in market as well
+    function getMarketConfig(
+        address market,
+        address router
+    ) external view returns (address treasury, uint80 overriddenFee, uint8 reserveFeePercent);
+}

package/contracts/interfaces/IPMarketV3.sol

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.0;
+
+import "./IPMarket.sol";
+
+interface IPMarketV3 is IPMarket {
+    function getNonOverrideLnFeeRateRoot() external view returns (uint80);
+}

package/contracts/interfaces/IPOffchainStorage.sol

@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+interface IPOffchainStorage {
+    event SetStorage(bytes32 indexed key, bytes value);
+
+    function setStorageUint256(bytes32 key, uint256 value) external;
+
+    function getUint256(bytes32 key) external view returns (uint256);
+}

package/contracts/interfaces/IPPriceFeed.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.17;
+
+interface IPPriceFeed {
+    function getPrice() external view returns (uint256);
+}

package/contracts/interfaces/IPPtOracle.sol

@@ -4,10 +4,7 @@ pragma solidity ^0.8.0;
 interface IPPtOracle {
     event SetBlockCycleNumerator(uint16 newBlockCycleNumerator);
 
-    function getPtToAssetRate(
-        address market,
-        uint32 duration
-    ) external view returns (uint256 ptToAssetRate);
+    function getPtToAssetRate(address market, uint32 duration) external view returns (uint256 ptToAssetRate);
 
     function getOracleState(
         address market,
@@ -15,9 +12,5 @@ interface IPPtOracle {
     )
         external
         view
-        returns (
-            bool increaseCardinalityRequired,
-            uint16 cardinalityRequired,
-            bool oldestObservationSatisfied
-        );
+        returns (bool increaseCardinalityRequired, uint16 cardinalityRequired, bool oldestObservationSatisfied);
 }

package/contracts/interfaces/IPRouterHelper.sol

@@ -90,7 +90,11 @@ interface IPRouterHelper {
     );
 
     event AddLiquiditySingleSy(
-        address indexed caller, address indexed market, address indexed receiver, uint256 netSyIn, uint256 netLpOut
+        address indexed caller,
+        address indexed market,
+        address indexed receiver,
+        uint256 netSyIn,
+        uint256 netLpOut
     );
 
     event AddLiquiditySingleTokenKeepYt(
@@ -132,11 +136,11 @@ interface IPRouterHelper {
         AddLiquiditySingleSyKeepYtStruct calldata toMarket
     ) external returns (uint256 netLpOut, uint256 netYtOut, uint256 netSyZapIn, uint256 netSyFeeOfRemove);
 
-    function removeLiquiditySingleToken(RemoveLiquiditySingleTokenStruct calldata fromMarket)
-        external
-        returns (uint256 netTokenOut, uint256 netSyFee);
+    function removeLiquiditySingleToken(
+        RemoveLiquiditySingleTokenStruct calldata fromMarket
+    ) external returns (uint256 netTokenOut, uint256 netSyFee);
 
-    function removeLiquiditySingleSy(RemoveLiquiditySingleSyStruct calldata fromMarket)
-        external
-        returns (uint256 netSyOut, uint256 netSyFee);
+    function removeLiquiditySingleSy(
+        RemoveLiquiditySingleSyStruct calldata fromMarket
+    ) external returns (uint256 netSyOut, uint256 netSyFee);
 }

package/contracts/interfaces/IPRouterStatic.sol

@@ -18,6 +18,4 @@ interface IPRouterStatic is
     IPActionVePendleStatic,
     IPMiniDiamond,
     IPActionStorageStatic
-{
-
-}
+{}

package/contracts/interfaces/IPVotingController.sol

@@ -14,11 +14,7 @@ interface IPVotingController {
 
     event SetPendlePerSec(uint256 newPendlePerSec);
 
-    event BroadcastResults(
-        uint64 indexed chainId,
-        uint128 indexed wTime,
-        uint128 totalPendlePerSec
-    );
+    event BroadcastResults(uint64 indexed chainId, uint128 indexed wTime, uint128 totalPendlePerSec);
 
     function applyPoolSlopeChanges(address pool) external;
 
@@ -26,20 +22,12 @@ interface IPVotingController {
     function getUserPoolHistoryLength(address user, address pool) external view returns (uint256);
 
     /// @notice deprecated, only kept for compatibility reasons
-    function getUserPoolHistoryAt(
-        address user,
-        address pool,
-        uint256 index
-    ) external view returns (Checkpoint memory);
-
-    function getWeekData(uint128 wTime, address[] calldata pools)
-        external
-        view
-        returns (
-            bool isEpochFinalized,
-            uint128 totalVotes,
-            uint128[] memory poolVotes
-        );
+    function getUserPoolHistoryAt(address user, address pool, uint256 index) external view returns (Checkpoint memory);
+
+    function getWeekData(
+        uint128 wTime,
+        address[] calldata pools
+    ) external view returns (bool isEpochFinalized, uint128 totalVotes, uint128[] memory poolVotes);
 
     function getPoolTotalVoteAt(address pool, uint128 wTime) external view returns (uint128);
 

package/contracts/interfaces/IPVotingEscrowMainchain.sol

@@ -17,10 +17,7 @@ interface IPVotingEscrowMainchain is IPVeToken {
 
     // ============= ACTIONS =============
 
-    function increaseLockPosition(
-        uint128 additionalAmountToLock,
-        uint128 expiry
-    ) external returns (uint128);
+    function increaseLockPosition(uint128 additionalAmountToLock, uint128 expiry) external returns (uint128);
 
     function withdraw() external returns (uint128);
 
@@ -28,8 +25,5 @@ interface IPVotingEscrowMainchain is IPVeToken {
 
     function getUserHistoryLength(address user) external view returns (uint256);
 
-    function getUserHistoryAt(
-        address user,
-        uint256 index
-    ) external view returns (Checkpoint memory);
+    function getUserHistoryAt(address user, uint256 index) external view returns (Checkpoint memory);
 }

package/contracts/interfaces/IPYieldToken.sol

@@ -15,18 +15,13 @@ interface IPYieldToken is IERC20Metadata, IRewardManager, IPInterestManagerYT {
         uint256 amountPYOut
     );
 
-    event Burn(
-        address indexed caller,
-        address indexed receiver,
-        uint256 amountPYToRedeem,
-        uint256 amountSyOut
-    );
+    event Burn(address indexed caller, address indexed receiver, uint256 amountPYToRedeem, uint256 amountSyOut);
 
     event RedeemRewards(address indexed user, uint256[] amountRewardsOut);
 
     event RedeemInterest(address indexed user, uint256 interestOut);
 
-    event WithdrawFeeToTreasury(uint256[] amountRewardsOut, uint256 syOut);
+    event CollectRewardFee(address indexed rewardToken, uint256 amountRewardFee);
 
     function mintPY(address receiverPT, address receiverYT) external returns (uint256 amountPYOut);
 
@@ -64,5 +59,4 @@ interface IPYieldToken is IERC20Metadata, IRewardManager, IPInterestManagerYT {
     function doCacheIndexSameBlock() external view returns (bool);
 
     function pyIndexLastUpdatedBlock() external view returns (uint128);
-
 }

package/contracts/interfaces/IPYieldTokenV2.sol

@@ -13,12 +13,7 @@ interface IPYieldTokenV2 is IERC20Metadata, IRewardManager, IPInterestManagerYTV
         uint256 amountPYOut
     );
 
-    event Burn(
-        address indexed caller,
-        address indexed receiver,
-        uint256 amountPYToRedeem,
-        uint256 amountSyOut
-    );
+    event Burn(address indexed caller, address indexed receiver, uint256 amountPYToRedeem, uint256 amountSyOut);
 
     event RedeemRewards(address indexed user, uint256[] amountRewardsOut);
 

package/contracts/interfaces/IPendlePreviewHelper.sol

@@ -2,13 +2,7 @@
 pragma solidity ^0.8.0;
 
 interface IPendlePreviewHelper {
-    function previewDeposit(
-        address tokenIn,
-        uint256 amountTokenIn
-    ) external view returns (uint256 amountSharesOut);
+    function previewDeposit(address tokenIn, uint256 amountTokenIn) external view returns (uint256 amountSharesOut);
 
-    function previewRedeem(
-        address tokenOut,
-        uint256 amountSharesToBurn
-    ) external view returns (uint256 amountTokenOut);
+    function previewRedeem(address tokenOut, uint256 amountSharesToBurn) external view returns (uint256 amountTokenOut);
 }

package/contracts/interfaces/IRewardManager.sol

@@ -2,8 +2,5 @@
 pragma solidity ^0.8.0;
 
 interface IRewardManager {
-    function userReward(
-        address token,
-        address user
-    ) external view returns (uint128 index, uint128 accrued);
+    function userReward(address token, address user) external view returns (uint128 index, uint128 accrued);
 }

package/contracts/interfaces/IStETH.sol

@@ -8,10 +8,7 @@ interface IStETH {
 
     function submit(address referral) external payable returns (uint256 amount);
 
-    function burnShares(
-        address _account,
-        uint256 _sharesAmount
-    ) external returns (uint256 newTotalShares);
+    function burnShares(address _account, uint256 _sharesAmount) external returns (uint256 newTotalShares);
 
     function sharesOf(address account) external view returns (uint256);
 

package/contracts/interfaces/IStandardizedYield.sol

@@ -146,15 +146,15 @@ interface IStandardizedYield is IERC20Metadata {
 
     function isValidTokenOut(address token) external view returns (bool);
 
-    function previewDeposit(address tokenIn, uint256 amountTokenToDeposit)
-        external
-        view
-        returns (uint256 amountSharesOut);
+    function previewDeposit(
+        address tokenIn,
+        uint256 amountTokenToDeposit
+    ) external view returns (uint256 amountSharesOut);
 
-    function previewRedeem(address tokenOut, uint256 amountSharesToRedeem)
-        external
-        view
-        returns (uint256 amountTokenOut);
+    function previewRedeem(
+        address tokenOut,
+        uint256 amountSharesToRedeem
+    ) external view returns (uint256 amountTokenOut);
 
     /**
      * @notice This function contains information to interpret what the asset is
@@ -163,12 +163,5 @@ interface IStandardizedYield is IERC20Metadata {
      * @return assetAddress the address of the asset
      * @return assetDecimals the decimals of the asset
      */
-    function assetInfo()
-        external
-        view
-        returns (
-            AssetType assetType,
-            address assetAddress,
-            uint8 assetDecimals
-        );
+    function assetInfo() external view returns (AssetType assetType, address assetAddress, uint8 assetDecimals);
 }

package/contracts/interfaces/IStargateLP.sol

@@ -23,8 +23,6 @@
 pragma solidity ^0.8.0;
 
 interface IStargateLP {
-
-
     struct SwapObj {
         uint256 amount;
         uint256 eqFee;
@@ -58,5 +56,4 @@ interface IStargateLP {
     function convertRate() external view returns (uint256);
 
     function deltaCredit() external view returns (uint256);
-
 }

package/contracts/interfaces/IStargateRouter.sol

@@ -25,9 +25,5 @@ pragma solidity ^0.8.0;
 interface IStargateRouter {
     function addLiquidity(uint256 _poolId, uint256 _amountLD, address _to) external;
 
-    function instantRedeemLocal(
-        uint16 _srcPoolId,
-        uint256 _amountLP,
-        address _to
-    ) external returns (uint256 amountSD);
+    function instantRedeemLocal(uint16 _srcPoolId, uint256 _amountLP, address _to) external returns (uint256 amountSD);
 }