@pendle/core-v2 0.7.0 → 0.7.1-beta

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";

package/contracts/offchain-helpers/RouterStatic.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 "../interfaces/IRewardManager.sol";
@@ -79,7 +79,7 @@ contract RouterStatic is IPRouterStatic {
         );
     }
 
-    function scyIndex(address market) public returns (SCYIndex index) {
+    function scyIndex(address market) public view returns (SCYIndex index) {
         (ISuperComposableYield SCY, , ) = IPMarket(market).readTokens();
 
         return SCYIndexLib.newIndex(SCY);
@@ -145,7 +145,7 @@ contract RouterStatic is IPRouterStatic {
     {
         (address yt, ) = getPY(py);
         IPYieldToken YT = IPYieldToken(yt);
-        exchangeRate = YT.getScyIndex();
+        exchangeRate = YT.scyIndexCurrent();
         totalSupply = YT.totalSupply();
         address[] memory rewardTokens = YT.getRewardTokens();
         rewardIndexes = new RewardIndex[](rewardTokens.length);

package/contracts/periphery/PendleGovernanceManager.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 contract PendleGovernanceManager {
     address public governance;

package/contracts/periphery/PermissionsV2Upg.sol

@@ -1,12 +1,18 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.13;
+pragma solidity 0.8.15;
 
 import "../interfaces/IPGovernanceManager.sol";
 import "../interfaces/IPPermissionsV2Upg.sol";
 
+/// This contract is upgradable because
+/// - its constructor only sets immutable variables
+/// - it has storage gaps for safe addition of future variables
+/// - it inherits only upgradable contract
 abstract contract PermissionsV2Upg is IPermissionsV2Upg {
     address public immutable governanceManager;
 
+    uint256[100] private __gap;
+
     modifier onlyGovernance() {
         require(msg.sender == _governance(), "ONLY_GOVERNANCE");
         _;

package/deployments/43113-benqi.json

@@ -0,0 +1,6 @@
+{
+    "USDC": "0x2018ecc38fbca2ce3A62f96f9F0D38F0DEE2f99D",
+    "QI": "0x5954237dFE8748fb3CD9fE3dBb2e440c4F0FbD40",
+    "qiUSDC": "0x8d4A91A0c51B6D2C0F833ef5BfA283F2aFC42bfB",
+    "fundKeeper": "0xeB259AAF297Bd149dB0d32b2d9666De17b3b8801"
+}

package/deployments/43113-core.json

@@ -0,0 +1,14 @@
+{
+    "deployer": "0x1FcCC097db89A86Bfc474A1028F93958295b1Fb7",
+    "network": 43113,
+    "celerBus": "0xE9533976C590200E32d95C53f06AE12d292cFc47",
+    "treasury": "0x8c73eEef8A74223717c129e6F18Df27508dbCb23",
+    "governanceManager": "0xe8d12F4e6933107C797E369Dd577bfca9f412758",
+    "PENDLE": "0xd6403Ff542290C38EE4fCFf48552FA85fbe8539B",
+    "yieldContractFactory": "0x0EA46a4C257071352b57E9F6d054fC137F6E14b9",
+    "marketFactory": "0x9e7be80205815111617B9578157e130ECd9757e4",
+    "startTime": 1656547200,
+    "vePendle": "0x5CA98fBE317f0165499E886286A2737FE5A913E7",
+    "votingController": "0xcb0d3d9147845C7F2B77DCFBE4dB8114d928DC93",
+    "gaugeController": "0x38F5320795CE3BeD55b87decca0A60e52f65c522"
+}

package/deployments/43113-markets/benqi-market.json

@@ -0,0 +1,7 @@
+{
+    "SCY": "0xb597dE4e247945A4D0e577ef65a32Bd4E459C3A7",
+    "expiry": 1672099200,
+    "PT": "0x43963e93a024f1131549C657116321a67e3004B8",
+    "YT": "0x8774E8D4A17f6DbDF93da23189df6026DD77aA34",
+    "market": "0x700E66aD6C98d04f7c426060211fd98f12E0F1b6"
+}

package/deployments/80001-benqi.json

@@ -0,0 +1,6 @@
+{
+    "USDC": "0x0059a72A5e545F6998AF038aBBB625FC702b1a97",
+    "QI": "0xC7565D2282198b4B50EC29dee7b942E2B9bbc203",
+    "qiUSDC": "0x439B4d66255eFf74e621FBacb00D7162b588Ff4b",
+    "fundKeeper": "0x67507f3E26E7e2Fd0A42c48FbC85069cCFCBD2FF"
+}

package/deployments/80001-core.json

@@ -0,0 +1,13 @@
+{
+    "deployer": "0x1FcCC097db89A86Bfc474A1028F93958295b1Fb7",
+    "network": 80001,
+    "celerBus": "0x7d43AABC515C356145049227CeE54B608342c0ad",
+    "treasury": "0x3865D8a1Bd6D281f6c77d4e233d26Cd56380EF45",
+    "governanceManager": "0xFC7eC014280A98850F4167aF47c0272f0E7490A5",
+    "PENDLE": "0x53F435CEC95c597d905f0903a13F4dAbEA8491dB",
+    "yieldContractFactory": "0x4e5De6339FC7Ef63c176f9A7e7a8B2aC21744B8D",
+    "marketFactory": "0xCAd502Bb55d1A3F79952F969BFF3f011CF30a94a",
+    "startTime": 1656547200,
+    "vePendle": "0x69A23F16974024A1b6A5362ac2A11BFeEEFd5827",
+    "gaugeController": "0x847da006F940833bB44709CBa241c99e3c531F38"
+}

package/deployments/80001-markets/benqi-market.json

@@ -0,0 +1,7 @@
+{
+    "SCY": "0x0fE14FEB320a8DFF7b2Ee47E6BBedF309eF4B0C8",
+    "expiry": 1672099200,
+    "PT": "0x10AfeBB063A3c1A4e8A1E9274c4c9EbDDC574f0a",
+    "YT": "0x52a59B51eb72E6c2e0F3FE4C2940123671a60DA5",
+    "market": "0x0c37E7E799c9A41008b3d246B86F944992660dD5"
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "0.7.0",
+  "version": "0.7.1-beta",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",
@@ -29,7 +29,7 @@
     "hardhat-contract-sizer": "^2.5.1",
     "prettier": "^2.6.2",
     "prettier-plugin-solidity": "^1.0.0-beta.19",
-    "solc": "^0.8.13",
+    "solc": "^0.8.15",
     "solhint": "^3.3.7",
     "ts-node": "^10.7.0",
     "typechain": "^8.0.0",

package/typechain-types/{CelerReceiver.ts → CelerReceiverUpg.ts}

@@ -23,8 +23,8 @@ import type {
   OnEvent,
 } from "./common";
 
-export interface CelerReceiverInterface extends utils.Interface {
-  contractName: "CelerReceiver";
+export interface CelerReceiverUpgInterface extends utils.Interface {
+  contractName: "CelerReceiverUpg";
   functions: {
     "celerMessageBus()": FunctionFragment;
     "executeMessage(address,uint64,bytes,address)": FunctionFragment;
@@ -93,13 +93,13 @@ export interface CelerReceiverInterface extends utils.Interface {
   events: {};
 }
 
-export interface CelerReceiver extends BaseContract {
-  contractName: "CelerReceiver";
+export interface CelerReceiverUpg extends BaseContract {
+  contractName: "CelerReceiverUpg";
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: CelerReceiverInterface;
+  interface: CelerReceiverUpgInterface;
 
   queryFilter<TEvent extends TypedEvent>(
     event: TypedEventFilter<TEvent>,