@pendle/core-v2 0.13.0-testnet → 0.14.0-testnet

package/contracts/core/{SuperComposableYield/implementations/Convex/ConvexCurveLP/PendleConvexCurveLPSCY.sol → StandardizedYield/implementations/Convex/ConvexCurveLP/PendleConvexLPSY.sol}

@@ -1,57 +1,48 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.17;
 
-import "../../../SCYBaseWithRewards.sol";
+import "../../../SYBaseWithRewards.sol";
 import "../../../../../interfaces/ConvexCurve/IBooster.sol";
 import "../../../../../interfaces/ConvexCurve/IRewards.sol";
 import "../../../../../interfaces/Curve/ICrvPool.sol";
 
-abstract contract PendleConvexCurveLPSCY is SCYBaseWithRewards {
+abstract contract PendleConvexLPSY is SYBaseWithRewards {
     using SafeERC20 for IERC20;
 
-    uint256 public immutable pid;
-    address public immutable booster;
-    address public immutable baseRewards;
+    uint256 public immutable cvxPid;
+    address public immutable cvxRewardManager;
+
     address public immutable crvPool;
+    address public immutable crvLp;
 
-    address public immutable CRV;
-    address public immutable CVX;
-    address public immutable LP;
+    address public constant BOOSTER = 0xF403C135812408BFbE8713b5A23a04b3D48AAE31;
+    address public constant CRV = 0xD533a949740bb3306d119CC777fa900bA034cd52;
+    address public constant CVX = 0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B;
 
     constructor(
         string memory _name,
         string memory _symbol,
-        uint256 _pid,
-        address _convexBooster,
-        address _crvLpToken,
-        address _cvx,
-        address _baseCrvPool
-    ) SCYBaseWithRewards(_name, _symbol, _crvLpToken) {
-        pid = _pid;
-        CVX = _cvx;
-        crvPool = _baseCrvPool;
-
-        booster = _convexBooster;
-
-        (LP, baseRewards, CRV) = _getPoolInfo(pid);
-        if (LP != _crvLpToken) revert Errors.SCYCurveInvalidPid();
-
-        _safeApprove(LP, booster, type(uint256).max);
+        uint256 _cvxPid,
+        address _crvLp,
+        address _crvPool
+    ) SYBaseWithRewards(_name, _symbol, _crvLp) {
+        cvxPid = _cvxPid;
+        crvPool = _crvPool;
+
+        (crvLp, cvxRewardManager) = _getPoolInfo(cvxPid);
+        if (crvLp != _crvLp) revert Errors.SYCurveInvalidPid();
+
+        _safeApprove(crvLp, BOOSTER, type(uint256).max);
     }
 
-    function _getPoolInfo(uint256 _pid)
+    function _getPoolInfo(uint256 _cvxPid)
         internal
         view
-        returns (
-            address lptoken,
-            address crvRewards,
-            address crv
-        )
+        returns (address _crvLp, address _cvxRewardManager)
     {
-        if (_pid > IBooster(booster).poolLength()) revert Errors.SCYCurveInvalidPid();
+        if (_cvxPid > IBooster(BOOSTER).poolLength()) revert Errors.SYCurveInvalidPid();
 
-        (lptoken, , , crvRewards, , ) = IBooster(booster).poolInfo(_pid);
-        crv = IBooster(booster).crv();
+        (_crvLp, , , _cvxRewardManager, , ) = IBooster(BOOSTER).poolInfo(_cvxPid);
     }
 
     /*///////////////////////////////////////////////////////////////
@@ -68,17 +59,13 @@ abstract contract PendleConvexCurveLPSCY is SCYBaseWithRewards {
         override
         returns (uint256 amountSharesOut)
     {
-        if (tokenIn == LP) {
-            IBooster(booster).deposit(pid, amount, true);
+        if (tokenIn == crvLp) {
             amountSharesOut = amount;
         } else {
-            uint256 prevLpBalance = _selfBalance(LP);
-            _depositToCurve(tokenIn, amount);
-            amountSharesOut = _selfBalance(LP) - prevLpBalance;
-
-            // Deposit LP Token received into Convex Booster
-            IBooster(booster).deposit(pid, amountSharesOut, true);
+            amountSharesOut = _depositToCurve(tokenIn, amount);
         }
+
+        IBooster(BOOSTER).deposit(cvxPid, amountSharesOut, true);
     }
 
     /**
@@ -90,21 +77,14 @@ abstract contract PendleConvexCurveLPSCY is SCYBaseWithRewards {
         address tokenOut,
         uint256 amountSharesToRedeem
     ) internal virtual override returns (uint256 amountTokenOut) {
-        IRewards(baseRewards).withdrawAndUnwrap(amountSharesToRedeem, false);
-
-        if (_isBaseToken(tokenOut)) {
-            uint256 prevBal = _selfBalance(tokenOut);
-            ICrvPool(crvPool).remove_liquidity_one_coin(
-                amountSharesToRedeem,
-                Math.Int128(_getBaseTokenIndex(tokenOut)),
-                0
-            );
-            amountTokenOut = _selfBalance(tokenOut) - prevBal;
-        } else {
-            // 'tokenOut' is LP
+        IRewards(cvxRewardManager).withdrawAndUnwrap(amountSharesToRedeem, false);
+
+        if (tokenOut == crvLp) {
             amountTokenOut = amountSharesToRedeem;
+        } else {
+            amountTokenOut = _redeemFromCurve(tokenOut, amountSharesToRedeem);
         }
-        if (receiver != address(this)) _transferOut(tokenOut, receiver, amountTokenOut);
+        _transferOut(tokenOut, receiver, amountTokenOut);
     }
 
     /*///////////////////////////////////////////////////////////////
@@ -135,7 +115,7 @@ abstract contract PendleConvexCurveLPSCY is SCYBaseWithRewards {
 
     function _redeemExternalReward() internal virtual override {
         // Redeem all extra rewards from the curve pool
-        IRewards(baseRewards).getReward();
+        IRewards(cvxRewardManager).getReward();
     }
 
     /*///////////////////////////////////////////////////////////////
@@ -149,10 +129,9 @@ abstract contract PendleConvexCurveLPSCY is SCYBaseWithRewards {
         override
         returns (uint256 amountSharesOut)
     {
-        if (tokenIn == LP) {
+        if (tokenIn == crvLp) {
             amountSharesOut = amountTokenToDeposit;
         } else {
-            // Calculate expected amount of LpToken to receive
             amountSharesOut = _previewDepositToCurve(tokenIn, amountTokenToDeposit);
         }
     }
@@ -166,14 +145,10 @@ abstract contract PendleConvexCurveLPSCY is SCYBaseWithRewards {
     {
         uint256 amountLpTokenToReceive = (amountSharesToRedeem * exchangeRate()) / 1e18;
 
-        if (tokenOut == LP) {
+        if (tokenOut == crvLp) {
             amountTokenOut = amountLpTokenToReceive;
         } else {
-            // If 'tokenOut' is a CrvBaseToken, withdraw liquidity from curvePool to return the base token back to user.
-            amountTokenOut = ICrvPool(crvPool).calc_withdraw_one_coin(
-                amountLpTokenToReceive,
-                Math.Int128(_getBaseTokenIndex(tokenOut))
-            );
+            amountTokenOut = _previewRedeemFromCurve(tokenOut, amountLpTokenToReceive);
         }
     }
 
@@ -185,21 +160,27 @@ abstract contract PendleConvexCurveLPSCY is SCYBaseWithRewards {
 
     function isValidTokenOut(address token) public view virtual override returns (bool);
 
-    function _depositToCurve(address token, uint256 amount) internal virtual;
+    function _depositToCurve(address tokenIn, uint256 amountTokenToDeposit)
+        internal
+        virtual
+        returns (uint256);
+
+    function _redeemFromCurve(address tokenOut, uint256 amountLpToRedeem)
+        internal
+        virtual
+        returns (uint256);
 
-    function _previewDepositToCurve(address token, uint256 amount)
+    function _previewDepositToCurve(address token, uint256 amountTokenToDeposit)
         internal
         view
         virtual
         returns (uint256 amountLpOut);
 
-    function _getBaseTokenIndex(address crvBaseToken)
+    function _previewRedeemFromCurve(address token, uint256 amountLpToRedeem)
         internal
         view
         virtual
-        returns (uint256 index);
-
-    function _isBaseToken(address token) internal view virtual returns (bool res);
+        returns (uint256 amountTokenOut);
 
     function assetInfo()
         external
@@ -210,6 +191,6 @@ abstract contract PendleConvexCurveLPSCY is SCYBaseWithRewards {
             uint8 assetDecimals
         )
     {
-        return (AssetType.LIQUIDITY, LP, IERC20Metadata(LP).decimals());
+        return (AssetType.LIQUIDITY, crvLp, IERC20Metadata(crvLp).decimals());
     }
 }

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

@@ -8,11 +8,11 @@ import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 library Pendle3CrvHelper {
     using Math for uint256;
 
-    address public constant TOKEN = address(0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490);
-    address public constant POOL = address(0xbEbc44782C7dB0a1A60Cb6fe97d0b483032FF1C7);
-    address public constant DAI = address(0x6B175474E89094C44Da98b954EedeAC495271d0F);
-    address public constant USDC = address(0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48);
-    address public constant USDT = address(0xdAC17F958D2ee523a2206206994597C13D831ec7);
+    address public constant LP = 0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490;
+    address public constant POOL = 0xbEbc44782C7dB0a1A60Cb6fe97d0b483032FF1C7;
+    address public constant DAI = 0x6B175474E89094C44Da98b954EedeAC495271d0F;
+    address public constant USDC = 0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48;
+    address public constant USDT = 0xdAC17F958D2ee523a2206206994597C13D831ec7;
 
     function preview3CrvDeposit(address tokenIn, uint256 amountTokenToDeposit)
         internal
@@ -42,9 +42,9 @@ library Pendle3CrvHelper {
         internal
         returns (uint256)
     {
-        uint256 balBefore = IERC20(TOKEN).balanceOf(address(this));
+        uint256 balBefore = IERC20(LP).balanceOf(address(this));
         ICrvPool(POOL).add_liquidity(_getTokenAmounts(tokenIn, amountTokenToDeposit), 0);
-        uint256 balAfter = IERC20(TOKEN).balanceOf(address(this));
+        uint256 balAfter = IERC20(LP).balanceOf(address(this));
         return balAfter - balBefore;
     }
 

package/contracts/core/{SuperComposableYield/implementations/PendleWstEthSCY.sol → StandardizedYield/implementations/PendleWstEthSY.sol}

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.17;
 
-import "../SCYBase.sol";
+import "../SYBase.sol";
 import "../../../interfaces/IWstETH.sol";
 import "../../../interfaces/IWETH.sol";
 import "../../../interfaces/IStETH.sol";
 
-contract PendleWstEthSCY is SCYBase {
+contract PendleWstEthSY is SYBase {
     address public immutable wETH;
     address public immutable stETH;
     address public immutable wstETH;
@@ -16,7 +16,7 @@ contract PendleWstEthSCY is SCYBase {
         string memory _symbol,
         address _wETH,
         address _wstETH
-    ) SCYBase(_name, _symbol, _wstETH) {
+    ) SYBase(_name, _symbol, _wstETH) {
         wETH = _wETH;
         wstETH = _wstETH;
         stETH = IWstETH(wstETH).stETH();
@@ -28,7 +28,7 @@ contract PendleWstEthSCY is SCYBase {
     //////////////////////////////////////////////////////////////*/
 
     /**
-     * @dev See {SCYBase-_deposit}
+     * @dev See {SYBase-_deposit}
      *
      * The underlying yield token is wstETH. If the base token deposited is stETH, the function wraps
      * it into wstETH first. Then the corresponding amount of shares is returned.
@@ -56,7 +56,7 @@ contract PendleWstEthSCY is SCYBase {
     }
 
     /**
-     * @dev See {SCYBase-_redeem}
+     * @dev See {SYBase-_redeem}
      *
      * The shares are redeemed into the same amount of wstETH. If `tokenOut` is stETH, the function also
      * unwraps said amount of wstETH into stETH for redemption.

package/contracts/core/YieldContracts/InterestManagerYT.sol

@@ -10,13 +10,13 @@ import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 import "../libraries/math/Math.sol";
 import "../libraries/TokenHelper.sol";
-import "../SuperComposableYield/SCYUtils.sol";
+import "../StandardizedYield/SYUtils.sol";
 
 /*
-With YT yielding more SCYs overtime, which is allowed to be redeemed by users, the reward distribution should
-be based on the amount of SCYs that their YT currently represent, plus with their dueInterest.
+With YT yielding more SYs overtime, which is allowed to be redeemed by users, the reward distribution should
+be based on the amount of SYs that their YT currently represent, plus with their dueInterest.
 
-It has been proven and tested that totalScyRedeemable will not change over time, unless users redeem their interest or redeemPY.
+It has been proven and tested that totalSyRedeemable will not change over time, unless users redeem their interest or redeemPY.
 
 Due to this, it is required to update users' accruedReward STRICTLY BEFORE redeeming their interest.
 */
@@ -44,7 +44,7 @@ abstract contract InterestManagerYT is TokenHelper, IPInterestManagerYT {
 
     function _doTransferOutInterest(
         address user,
-        address SCY,
+        address SY,
         address factory
     ) internal returns (uint256 interestAmount) {
         address treasury = IPYieldContractFactory(factory).treasury();
@@ -56,8 +56,8 @@ abstract contract InterestManagerYT is TokenHelper, IPInterestManagerYT {
         uint256 feeAmount = interestPreFee.mulDown(feeRate);
         interestAmount = interestPreFee - feeAmount;
 
-        _transferOut(SCY, treasury, feeAmount);
-        _transferOut(SCY, user, interestAmount);
+        _transferOut(SY, treasury, feeAmount);
+        _transferOut(SY, user, interestAmount);
     }
 
     // should only be callable from `_distributeInterestForTwo` & make sure user != address(0) && user != address(this)

package/contracts/core/YieldContracts/PendlePrincipalToken.sol

@@ -12,7 +12,7 @@ import "../erc20/PendleERC20Permit.sol";
 import "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 
 contract PendlePrincipalToken is PendleERC20Permit, Initializable, IPPrincipalToken {
-    address public immutable SCY;
+    address public immutable SY;
     address public immutable factory;
     uint256 public immutable expiry;
     address public YT;
@@ -28,13 +28,13 @@ contract PendlePrincipalToken is PendleERC20Permit, Initializable, IPPrincipalTo
     }
 
     constructor(
-        address _SCY,
+        address _SY,
         string memory _name,
         string memory _symbol,
         uint8 __decimals,
         uint256 _expiry
     ) PendleERC20Permit(_name, _symbol, __decimals) {
-        SCY = _SCY;
+        SY = _SY;
         expiry = _expiry;
         factory = msg.sender;
     }

package/contracts/core/YieldContracts/PendleYieldContractFactory.sol

@@ -57,7 +57,7 @@ contract PendleYieldContractFactory is BoringOwnableUpgradeable, IPYieldContract
     address public treasury;
     uint96 public expiryDivisor;
 
-    // SCY => expiry => address
+    // SY => expiry => address
     mapping(address => mapping(uint256 => address)) public getPT;
     mapping(address => mapping(uint256 => address)) public getYT;
     mapping(address => bool) public isPT;
@@ -89,21 +89,21 @@ contract PendleYieldContractFactory is BoringOwnableUpgradeable, IPYieldContract
     }
 
     /**
-     * @notice Create a pair of (PT, YT) from any SCY and valid expiry. Anyone can create a yield contract
+     * @notice Create a pair of (PT, YT) from any SY and valid expiry. Anyone can create a yield contract
      * @dev It's intentional to make expiry an uint32 to guard against fat fingers. uint32.max is year 2106
      */
-    function createYieldContract(address SCY, uint32 expiry)
+    function createYieldContract(address SY, uint32 expiry)
         external
         returns (address PT, address YT)
     {
         if (MiniHelpers.isTimeInThePast(expiry) || expiry % expiryDivisor != 0)
             revert Errors.YCFactoryInvalidExpiry();
 
-        if (getPT[SCY][expiry] != address(0)) revert Errors.YCFactoryYieldContractExisted();
+        if (getPT[SY][expiry] != address(0)) revert Errors.YCFactoryYieldContractExisted();
 
-        ISuperComposableYield _SCY = ISuperComposableYield(SCY);
+        IStandardizedYield _SY = IStandardizedYield(SY);
 
-        (, , uint8 assetDecimals) = _SCY.assetInfo();
+        (, , uint8 assetDecimals) = _SY.assetInfo();
 
         PT = Create2.deploy(
             0,
@@ -111,9 +111,9 @@ contract PendleYieldContractFactory is BoringOwnableUpgradeable, IPYieldContract
             abi.encodePacked(
                 type(PendlePrincipalToken).creationCode,
                 abi.encode(
-                    SCY,
-                    PT_PREFIX.concat(_SCY.name(), expiry, " "),
-                    PT_PREFIX.concat(_SCY.symbol(), expiry, "-"),
+                    SY,
+                    PT_PREFIX.concat(_SY.name(), expiry, " "),
+                    PT_PREFIX.concat(_SY.symbol(), expiry, "-"),
                     assetDecimals,
                     expiry
                 )
@@ -124,10 +124,10 @@ contract PendleYieldContractFactory is BoringOwnableUpgradeable, IPYieldContract
             0,
             bytes32(block.chainid),
             abi.encode(
-                SCY,
+                SY,
                 PT,
-                YT_PREFIX.concat(_SCY.name(), expiry, " "),
-                YT_PREFIX.concat(_SCY.symbol(), expiry, "-"),
+                YT_PREFIX.concat(_SY.name(), expiry, " "),
+                YT_PREFIX.concat(_SY.symbol(), expiry, "-"),
                 assetDecimals,
                 expiry
             ),
@@ -139,12 +139,12 @@ contract PendleYieldContractFactory is BoringOwnableUpgradeable, IPYieldContract
 
         IPPrincipalToken(PT).initialize(YT);
 
-        getPT[SCY][expiry] = PT;
-        getYT[SCY][expiry] = YT;
+        getPT[SY][expiry] = PT;
+        getYT[SY][expiry] = YT;
         isPT[PT] = true;
         isYT[YT] = true;
 
-        emit CreateYieldContract(SCY, PT, YT, expiry);
+        emit CreateYieldContract(SY, PT, YT, expiry);
     }
 
     function setExpiryDivisor(uint96 newExpiryDivisor) public onlyOwner {