@pendle/core-v2 0.5.1-beta-5 → 0.6.2

package/contracts/interfaces/IPAllAction.sol

@@ -4,6 +4,6 @@ pragma solidity 0.8.9;
 
 import "./IPActionCore.sol";
 import "./IPActionYT.sol";
-import "./IPRouterStatic.sol";
+import "./IPActionRedeem.sol";
 
-interface IPAllAction is IPActionCore, IPActionYT {}
+interface IPAllAction is IPActionCore, IPActionYT, IPActionRedeem {}

package/contracts/interfaces/IPMarket.sol

@@ -2,47 +2,70 @@
 pragma solidity 0.8.9;
 
 import "./IPBaseToken.sol";
-import "./IPOwnershipToken.sol";
+import "./IPPrincipalToken.sol";
 import "./IPYieldToken.sol";
 import "../libraries/math/MarketMathCore.sol";
 
 interface IPMarket is IPBaseToken {
+    event AddLiquidity(
+        address indexed receiver,
+        uint256 lpToAccount,
+        uint256 scyUsed,
+        uint256 ptUsed
+    );
+
+    event RemoveLiquidity(
+        address indexed receiver,
+        uint256 lpRemoved,
+        uint256 scyToAccount,
+        uint256 ptToAccount
+    );
+
+    event Swap(
+        address indexed receiver,
+        int256 ptToAccount,
+        int256 scyToAccount,
+        uint256 netScyToReserve
+    );
+
+    event UpdateImpliedRate(uint256 indexed timestamp, uint256 lnLastImpliedRate);
+
     function addLiquidity(
         address receiver,
         uint256 scyDesired,
-        uint256 otDesired,
+        uint256 ptDesired,
         bytes calldata data
     )
         external
         returns (
             uint256 lpToAccount,
             uint256 scyUsed,
-            uint256 otUsed
+            uint256 ptUsed
         );
 
     function removeLiquidity(
         address receiver,
         uint256 lpToRemove,
         bytes calldata data
-    ) external returns (uint256 scyToAccount, uint256 otToAccount);
+    ) external returns (uint256 scyToAccount, uint256 ptToAccount);
 
-    function swapExactOtForScy(
+    function swapExactPtForScy(
         address receiver,
-        uint256 exactOtIn,
+        uint256 exactPtIn,
         uint256 minScyOut,
         bytes calldata data
     ) external returns (uint256 netScyOut, uint256 netScyToReserve);
 
-    function swapScyForExactOt(
+    function swapScyForExactPt(
         address receiver,
-        uint256 exactOtOut,
+        uint256 exactPtOut,
         uint256 maxScyIn,
         bytes calldata data
     ) external returns (uint256 netScyIn, uint256 netScyToReserve);
 
     function readState(bool updateRateOracle) external view returns (MarketState memory market);
 
-    function OT() external view returns (address);
+    function PT() external view returns (address);
 
     function YT() external view returns (address);
 
@@ -53,7 +76,7 @@ interface IPMarket is IPBaseToken {
         view
         returns (
             ISuperComposableYield _SCY,
-            IPOwnershipToken _OT,
+            IPPrincipalToken _PT,
             IPYieldToken _YT
         );
 }

package/contracts/interfaces/IPMarketAddRemoveCallback.sol

@@ -5,14 +5,14 @@ interface IPMarketAddRemoveCallback {
     function addLiquidityCallback(
         uint256 lpToAccount,
         uint256 scyOwed,
-        uint256 otOwed,
+        uint256 ptOwed,
         bytes calldata data
     ) external;
 
     function removeLiquidityCallback(
         uint256 lpOwed,
         uint256 scyToAccount,
-        uint256 otToAccount,
+        uint256 ptToAccount,
         bytes calldata data
     ) external;
 }

package/contracts/interfaces/IPMarketFactory.sol

@@ -2,6 +2,8 @@
 pragma solidity 0.8.9;
 
 interface IPMarketFactory {
+    event CreateNewMarket(address indexed PT, int256 scalarRoot, int256 initialAnchor);
+
     function isValidMarket(address market) external view returns (bool);
 
     function treasury() external view returns (address);
@@ -12,7 +14,7 @@ interface IPMarketFactory {
         view
         returns (
             address treasury,
-            uint96 feeRateRoot,
+            uint96 lnFeeRateRoot,
             uint32 rateOracleTimeWindow,
             uint8 reserveFeePercent
         );

package/contracts/interfaces/IPMarketSwapCallback.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.9;
 
 interface IPMarketSwapCallback {
     function swapCallback(
-        int256 otToAccount,
+        int256 ptToAccount,
         int256 scyToAccount,
         bytes calldata data
     ) external;

package/contracts/interfaces/{IPOwnershipToken.sol → IPPrincipalToken.sol}

@@ -2,7 +2,7 @@
 pragma solidity 0.8.9;
 import "./IPBaseToken.sol";
 
-interface IPOwnershipToken is IPBaseToken {
+interface IPPrincipalToken is IPBaseToken {
     function initialize(address _YT) external;
 
     function burnByYT(address user, uint256 amount) external;

package/contracts/interfaces/IPRouterStatic.sol

@@ -14,11 +14,11 @@ interface IPRouterStatic {
         uint256 index;
     }
 
-    struct UserYOInfo {
+    struct UserPYInfo {
         address yt;
-        address ot;
+        address pt;
         uint256 ytBalance;
-        uint256 otBalance;
+        uint256 ptBalance;
         TokenAmount unclaimedInterest;
         TokenAmount[] unclaimedRewards;
     }
@@ -26,7 +26,7 @@ interface IPRouterStatic {
     struct UserMarketInfo {
         address market;
         uint256 lpBalance;
-        TokenAmount otBalance;
+        TokenAmount ptBalance;
         TokenAmount scyBalance;
         TokenAmount assetBalance;
     }
@@ -34,47 +34,47 @@ interface IPRouterStatic {
     function addLiquidityStatic(
         address market,
         uint256 scyDesired,
-        uint256 otDesired
+        uint256 ptDesired
     )
         external
         returns (
             uint256 netLpOut,
             uint256 scyUsed,
-            uint256 otUsed
+            uint256 ptUsed
         );
 
     function removeLiquidityStatic(address market, uint256 lpToRemove)
         external
         view
-        returns (uint256 netScyOut, uint256 netOtOut);
+        returns (uint256 netScyOut, uint256 netPtOut);
 
-    function swapOtForScyStatic(address market, uint256 exactOtIn)
+    function swapPtForScyStatic(address market, uint256 exactPtIn)
         external
         returns (uint256 netScyOut, uint256 netScyFee);
 
-    function swapScyForOtStatic(address market, uint256 exactOtOut)
+    function swapScyForPtStatic(address market, uint256 exactPtOut)
         external
         returns (uint256 netScyIn, uint256 netScyFee);
 
     function scyIndex(address market) external returns (SCYIndex index);
 
-    function getOtImpliedYield(address market) external view returns (int256);
+    function getPtImpliedYield(address market) external view returns (int256);
 
     function getPendleTokenType(address token)
         external
         view
         returns (
-            bool isOT,
+            bool isPT,
             bool isYT,
             bool isMarket
         );
 
-    function getUserYOInfo(address yo, address user)
+    function getUserPYInfo(address py, address user)
         external
         view
-        returns (UserYOInfo memory userYOInfo);
+        returns (UserPYInfo memory userPYInfo);
 
-    function getYOInfo(address yo)
+    function getPYInfo(address py)
         external
         returns (
             uint256 exchangeRate,
@@ -82,13 +82,13 @@ interface IPRouterStatic {
             RewardIndex[] memory rewardIndexes
         );
 
-    function getYO(address yo) external view returns (address yt, address ot);
+    function getPY(address py) external view returns (address yt, address pt);
 
     function getMarketInfo(address market)
         external
         view
         returns (
-            address ot,
+            address pt,
             address scy,
             MarketState memory state,
             int256 impliedYield,
@@ -100,17 +100,17 @@ interface IPRouterStatic {
         view
         returns (UserMarketInfo memory userMarketInfo);
 
-    function getUserYOPositionsByYOs(address user, address[] calldata yos)
+    function getUserPYPositionsByPYs(address user, address[] calldata pys)
         external
         view
-        returns (UserYOInfo[] memory userYOPositions);
+        returns (UserPYInfo[] memory userPYPositions);
 
     function getUserMarketPositions(address user, address[] calldata markets)
         external
         view
         returns (UserMarketInfo[] memory userMarketPositions);
 
-    function hasYOPosition(UserYOInfo memory userYOInfo) external pure returns (bool hasPosition);
+    function hasPYPosition(UserPYInfo memory userPYInfo) external pure returns (bool hasPosition);
 
     function getUserSCYInfo(address scy, address user)
         external

package/contracts/interfaces/IPYieldContractFactory.sol

@@ -24,7 +24,15 @@
 pragma solidity 0.8.9;
 
 interface IPYieldContractFactory {
-    function getOT(address SCY, uint256 expiry) external view returns (address);
+    event CreateYieldContract(address indexed SCY, address PT, address YT, uint256 expiry);
+
+    event SetExpiryDivisor(uint256 newExpiryDivisor);
+
+    event SetInterestFeeRate(uint256 newInterestFeeRate);
+
+    event SetTreasury(address indexed treasury);
+
+    function getPT(address SCY, uint256 expiry) external view returns (address);
 
     function getYT(address SCY, uint256 expiry) external view returns (address);
 
@@ -34,7 +42,7 @@ interface IPYieldContractFactory {
 
     function treasury() external view returns (address);
 
-    function isOT(address) external view returns (bool);
+    function isPT(address) external view returns (bool);
 
     function isYT(address) external view returns (bool);
 }

package/contracts/interfaces/IPYieldToken.sol

@@ -4,11 +4,20 @@ import "./IPBaseToken.sol";
 import "../SuperComposableYield/implementations/IRewardManager.sol";
 
 interface IPYieldToken is IPBaseToken, IRewardManager {
-    function mintYO(address receiverOT, address receiverYT) external returns (uint256 amountYOOut);
+    event RedeemReward(address indexed user, uint256[] amountRewardsOut);
+    event RedeemInterest(address indexed user, uint256 interestOut);
 
-    function redeemYO(address receiver) external returns (uint256 amountScyOut);
+    event WithdrawFeeToTreasury(uint256[] amountRewardsOut, uint256 scyOut);
 
-    // minimum of OT & YT balance
+    function mintPY(address receiverPT, address receiverYT) external returns (uint256 amountPYOut);
+
+    function redeemPY(address receiver) external returns (uint256 amountScyOut);
+
+    // minimum of PT & YT balance
+
+    function redeemDueInterestAndRewards(address user)
+        external
+        returns (uint256 interestOut, uint256[] memory rewardsOut);
 
     function redeemDueInterest(address user) external returns (uint256 interestOut);
 
@@ -25,11 +34,11 @@ interface IPYieldToken is IPBaseToken, IRewardManager {
         view
         returns (uint256 lastScyIndex, uint256 dueInterest);
 
-    function getScyIndexBeforeExpiry() external returns (uint256 res);
+    function getScyIndex() external returns (uint256 currentIndex, uint256 lastIndexBeforeExpiry);
 
     function withdrawFeeToTreasury() external;
 
     function SCY() external view returns (address);
 
-    function OT() external view returns (address);
+    function PT() external view returns (address);
 }

package/contracts/interfaces/IWstETH.sol

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.9;
+
+interface IWstETH {
+    function wrap(uint256 _stETHAmount) external returns (uint256);
+
+    function unwrap(uint256 _wstETHAmount) external returns (uint256);
+
+    function stEthPerToken() external view returns (uint256);
+}

package/contracts/libraries/JoeLibrary.sol

@@ -98,7 +98,7 @@ library JoeLibrary {
         require(path.length >= 2, "JoeLibrary: INVALID_PATH");
         amounts = new uint256[](path.length);
         amounts[0] = amountIn;
-        for (uint256 i; i < path.length - 1; i++) {
+        for (uint256 i = 0; i < path.length - 1; i++) {
             (uint256 reserveIn, uint256 reserveOut) = getReserves(factory, path[i], path[i + 1]);
             amounts[i + 1] = getAmountOut(amounts[i], reserveIn, reserveOut);
         }

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.0;
+pragma solidity 0.8.9;
 
 /* solhint-disable */