@pendle/core-v2 0.2.2 → 0.3.0

package/typechain-types/hardhat.d.ts

@@ -12,6 +12,10 @@ import * as Contracts from ".";
 
 declare module "hardhat/types/runtime" {
   interface HardhatEthersHelpers extends HardhatEthersHelpersBase {
+    getContractFactory(
+      name: "OwnableUpgradeable",
+      signerOrOptions?: ethers.Signer | FactoryOptions
+    ): Promise<Contracts.OwnableUpgradeable__factory>;
     getContractFactory(
       name: "IERC1822ProxiableUpgradeable",
       signerOrOptions?: ethers.Signer | FactoryOptions
@@ -44,26 +48,6 @@ declare module "hardhat/types/runtime" {
       name: "IERC20",
       signerOrOptions?: ethers.Signer | FactoryOptions
     ): Promise<Contracts.IERC20__factory>;
-    getContractFactory(
-      name: "BoringOwnable",
-      signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.BoringOwnable__factory>;
-    getContractFactory(
-      name: "BoringOwnableData",
-      signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.BoringOwnableData__factory>;
-    getContractFactory(
-      name: "BoringOwnableUpg",
-      signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.BoringOwnableUpg__factory>;
-    getContractFactory(
-      name: "BoringOwnableUpgData",
-      signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.BoringOwnableUpgData__factory>;
-    getContractFactory(
-      name: "PendleJoeSwapHelperUpg",
-      signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.PendleJoeSwapHelperUpg__factory>;
     getContractFactory(
       name: "PendleBaseToken",
       signerOrOptions?: ethers.Signer | FactoryOptions
@@ -185,9 +169,9 @@ declare module "hardhat/types/runtime" {
       signerOrOptions?: ethers.Signer | FactoryOptions
     ): Promise<Contracts.IPOwnershipToken__factory>;
     getContractFactory(
-      name: "IPermissionsV2",
+      name: "IPermissionsV2Upg",
       signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.IPermissionsV2__factory>;
+    ): Promise<Contracts.IPermissionsV2Upg__factory>;
     getContractFactory(
       name: "IPRouterCore",
       signerOrOptions?: ethers.Signer | FactoryOptions
@@ -237,9 +221,13 @@ declare module "hardhat/types/runtime" {
       signerOrOptions?: ethers.Signer | FactoryOptions
     ): Promise<Contracts.PendleGovernanceManager__factory>;
     getContractFactory(
-      name: "PermissionsV2",
+      name: "PendleJoeSwapHelperUpg",
       signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.PermissionsV2__factory>;
+    ): Promise<Contracts.PendleJoeSwapHelperUpg__factory>;
+    getContractFactory(
+      name: "PermissionsV2Upg",
+      signerOrOptions?: ethers.Signer | FactoryOptions
+    ): Promise<Contracts.PermissionsV2Upg__factory>;
     getContractFactory(
       name: "RewardManager",
       signerOrOptions?: ethers.Signer | FactoryOptions
@@ -257,6 +245,11 @@ declare module "hardhat/types/runtime" {
       signerOrOptions?: ethers.Signer | FactoryOptions
     ): Promise<Contracts.ISuperComposableYield__factory>;
 
+    getContractAt(
+      name: "OwnableUpgradeable",
+      address: string,
+      signer?: ethers.Signer
+    ): Promise<Contracts.OwnableUpgradeable>;
     getContractAt(
       name: "IERC1822ProxiableUpgradeable",
       address: string,
@@ -297,31 +290,6 @@ declare module "hardhat/types/runtime" {
       address: string,
       signer?: ethers.Signer
     ): Promise<Contracts.IERC20>;
-    getContractAt(
-      name: "BoringOwnable",
-      address: string,
-      signer?: ethers.Signer
-    ): Promise<Contracts.BoringOwnable>;
-    getContractAt(
-      name: "BoringOwnableData",
-      address: string,
-      signer?: ethers.Signer
-    ): Promise<Contracts.BoringOwnableData>;
-    getContractAt(
-      name: "BoringOwnableUpg",
-      address: string,
-      signer?: ethers.Signer
-    ): Promise<Contracts.BoringOwnableUpg>;
-    getContractAt(
-      name: "BoringOwnableUpgData",
-      address: string,
-      signer?: ethers.Signer
-    ): Promise<Contracts.BoringOwnableUpgData>;
-    getContractAt(
-      name: "PendleJoeSwapHelperUpg",
-      address: string,
-      signer?: ethers.Signer
-    ): Promise<Contracts.PendleJoeSwapHelperUpg>;
     getContractAt(
       name: "PendleBaseToken",
       address: string,
@@ -473,10 +441,10 @@ declare module "hardhat/types/runtime" {
       signer?: ethers.Signer
     ): Promise<Contracts.IPOwnershipToken>;
     getContractAt(
-      name: "IPermissionsV2",
+      name: "IPermissionsV2Upg",
       address: string,
       signer?: ethers.Signer
-    ): Promise<Contracts.IPermissionsV2>;
+    ): Promise<Contracts.IPermissionsV2Upg>;
     getContractAt(
       name: "IPRouterCore",
       address: string,
@@ -538,10 +506,15 @@ declare module "hardhat/types/runtime" {
       signer?: ethers.Signer
     ): Promise<Contracts.PendleGovernanceManager>;
     getContractAt(
-      name: "PermissionsV2",
+      name: "PendleJoeSwapHelperUpg",
+      address: string,
+      signer?: ethers.Signer
+    ): Promise<Contracts.PendleJoeSwapHelperUpg>;
+    getContractAt(
+      name: "PermissionsV2Upg",
       address: string,
       signer?: ethers.Signer
-    ): Promise<Contracts.PermissionsV2>;
+    ): Promise<Contracts.PermissionsV2Upg>;
     getContractAt(
       name: "RewardManager",
       address: string,

package/typechain-types/index.ts

@@ -1,6 +1,7 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
+export type { OwnableUpgradeable } from "./OwnableUpgradeable";
 export type { IERC1822ProxiableUpgradeable } from "./IERC1822ProxiableUpgradeable";
 export type { IBeaconUpgradeable } from "./IBeaconUpgradeable";
 export type { ERC1967UpgradeUpgradeable } from "./ERC1967UpgradeUpgradeable";
@@ -9,11 +10,6 @@ export type { Proxy } from "./Proxy";
 export type { ERC20 } from "./ERC20";
 export type { IERC20Metadata } from "./IERC20Metadata";
 export type { IERC20 } from "./IERC20";
-export type { BoringOwnable } from "./BoringOwnable";
-export type { BoringOwnableData } from "./BoringOwnableData";
-export type { BoringOwnableUpg } from "./BoringOwnableUpg";
-export type { BoringOwnableUpgData } from "./BoringOwnableUpgData";
-export type { PendleJoeSwapHelperUpg } from "./PendleJoeSwapHelperUpg";
 export type { PendleBaseToken } from "./PendleBaseToken";
 export type { PendleMarket } from "./PendleMarket";
 export type { PendleMarketFactory } from "./PendleMarketFactory";
@@ -44,7 +40,7 @@ export type { IPMarketAddRemoveCallback } from "./IPMarketAddRemoveCallback";
 export type { IPMarketFactory } from "./IPMarketFactory";
 export type { IPMarketSwapCallback } from "./IPMarketSwapCallback";
 export type { IPOwnershipToken } from "./IPOwnershipToken";
-export type { IPermissionsV2 } from "./IPermissionsV2";
+export type { IPermissionsV2Upg } from "./IPermissionsV2Upg";
 export type { IPRouterCore } from "./IPRouterCore";
 export type { IPRouterStatic } from "./IPRouterStatic";
 export type { IPRouterYT } from "./IPRouterYT";
@@ -57,12 +53,14 @@ export type { IWETH } from "./IWETH";
 export type { IWXBTRFLY } from "./IWXBTRFLY";
 export type { IYearnVault } from "./IYearnVault";
 export type { PendleGovernanceManager } from "./PendleGovernanceManager";
-export type { PermissionsV2 } from "./PermissionsV2";
+export type { PendleJoeSwapHelperUpg } from "./PendleJoeSwapHelperUpg";
+export type { PermissionsV2Upg } from "./PermissionsV2Upg";
 export type { RewardManager } from "./RewardManager";
 export type { SCYBase } from "./SCYBase";
 export type { SCYBaseWithRewards } from "./SCYBaseWithRewards";
 export type { ISuperComposableYield } from "./ISuperComposableYield";
 
+export { OwnableUpgradeable__factory } from "./factories/OwnableUpgradeable__factory";
 export { IERC1822ProxiableUpgradeable__factory } from "./factories/IERC1822ProxiableUpgradeable__factory";
 export { IBeaconUpgradeable__factory } from "./factories/IBeaconUpgradeable__factory";
 export { ERC1967UpgradeUpgradeable__factory } from "./factories/ERC1967UpgradeUpgradeable__factory";
@@ -71,11 +69,6 @@ export { Proxy__factory } from "./factories/Proxy__factory";
 export { ERC20__factory } from "./factories/ERC20__factory";
 export { IERC20Metadata__factory } from "./factories/IERC20Metadata__factory";
 export { IERC20__factory } from "./factories/IERC20__factory";
-export { BoringOwnable__factory } from "./factories/BoringOwnable__factory";
-export { BoringOwnableData__factory } from "./factories/BoringOwnableData__factory";
-export { BoringOwnableUpg__factory } from "./factories/BoringOwnableUpg__factory";
-export { BoringOwnableUpgData__factory } from "./factories/BoringOwnableUpgData__factory";
-export { PendleJoeSwapHelperUpg__factory } from "./factories/PendleJoeSwapHelperUpg__factory";
 export { PendleBaseToken__factory } from "./factories/PendleBaseToken__factory";
 export { PendleMarket__factory } from "./factories/PendleMarket__factory";
 export { PendleMarketFactory__factory } from "./factories/PendleMarketFactory__factory";
@@ -106,7 +99,7 @@ export { IPMarketAddRemoveCallback__factory } from "./factories/IPMarketAddRemov
 export { IPMarketFactory__factory } from "./factories/IPMarketFactory__factory";
 export { IPMarketSwapCallback__factory } from "./factories/IPMarketSwapCallback__factory";
 export { IPOwnershipToken__factory } from "./factories/IPOwnershipToken__factory";
-export { IPermissionsV2__factory } from "./factories/IPermissionsV2__factory";
+export { IPermissionsV2Upg__factory } from "./factories/IPermissionsV2Upg__factory";
 export { IPRouterCore__factory } from "./factories/IPRouterCore__factory";
 export { IPRouterStatic__factory } from "./factories/IPRouterStatic__factory";
 export { IPRouterYT__factory } from "./factories/IPRouterYT__factory";
@@ -119,7 +112,8 @@ export { IWETH__factory } from "./factories/IWETH__factory";
 export { IWXBTRFLY__factory } from "./factories/IWXBTRFLY__factory";
 export { IYearnVault__factory } from "./factories/IYearnVault__factory";
 export { PendleGovernanceManager__factory } from "./factories/PendleGovernanceManager__factory";
-export { PermissionsV2__factory } from "./factories/PermissionsV2__factory";
+export { PendleJoeSwapHelperUpg__factory } from "./factories/PendleJoeSwapHelperUpg__factory";
+export { PermissionsV2Upg__factory } from "./factories/PermissionsV2Upg__factory";
 export { RewardManager__factory } from "./factories/RewardManager__factory";
 export { SCYBase__factory } from "./factories/SCYBase__factory";
 export { SCYBaseWithRewards__factory } from "./factories/SCYBaseWithRewards__factory";

package/contracts/core/misc/BoringOwnable.sol

@@ -1,62 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
-
-// Audit on 5-Jan-2021 by Keno and BoringCrypto
-// Source: https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/access/Ownable.sol + Claimable.sol
-// Edited by BoringCrypto
-
-contract BoringOwnableData {
-    address public owner;
-    address public pendingOwner;
-}
-
-contract BoringOwnable is BoringOwnableData {
-    event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
-
-    /// @notice Only allows the `owner` to execute the function.
-    modifier onlyOwner() {
-        require(msg.sender == owner, "Ownable: caller is not the owner");
-        _;
-    }
-
-    constructor(address _owner) {
-        owner = _owner;
-    }
-
-    /// @notice Transfers ownership to `newOwner`. Either directly or claimable by the new pending owner.
-    /// Can only be invoked by the current `owner`.
-    /// @param newOwner Address of the new owner.
-    /// @param direct True if `newOwner` should be set immediately. False if `newOwner` needs to use `claimOwnership`.
-    /// @param renounce Allows the `newOwner` to be `address(0)` if `direct` and `renounce` is True. Has no effect otherwise.
-    function transferOwnership(
-        address newOwner,
-        bool direct,
-        bool renounce
-    ) public onlyOwner {
-        if (direct) {
-            // Checks
-            require(newOwner != address(0) || renounce, "Ownable: zero address");
-
-            // Effects
-            emit OwnershipTransferred(owner, newOwner);
-            owner = newOwner;
-            pendingOwner = address(0);
-        } else {
-            // Effects
-            pendingOwner = newOwner;
-        }
-    }
-
-    /// @notice Needs to be called by `pendingOwner` to claim ownership.
-    function claimOwnership() public {
-        address _pendingOwner = pendingOwner;
-
-        // Checks
-        require(msg.sender == _pendingOwner, "Ownable: caller != pending owner");
-
-        // Effects
-        emit OwnershipTransferred(owner, _pendingOwner);
-        owner = _pendingOwner;
-        pendingOwner = address(0);
-    }
-}

package/contracts/core/misc/BoringOwnableUpg.sol

@@ -1,64 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
-
-import "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol";
-
-/// Modified by the Pendle team, needs to audit
-
-contract BoringOwnableUpgData {
-    address public owner;
-    address public pendingOwner;
-}
-
-contract BoringOwnableUpg is BoringOwnableUpgData, Initializable {
-    event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
-
-    function __BoringOwnable_init() internal onlyInitializing {
-        owner = msg.sender;
-    }
-
-    /// @notice Transfers ownership to `newOwner`. Either directly or claimable by the new pending owner.
-    /// Can only be invoked by the current `owner`.
-    /// @param newOwner Address of the new owner.
-    /// @param direct True if `newOwner` should be set immediately. False if `newOwner` needs to use `claimOwnership`.
-    /// @param renounce Allows the `newOwner` to be `address(0)` if `direct` and `renounce` is True. Has no effect otherwise.
-    function transferOwnership(
-        address newOwner,
-        bool direct,
-        bool renounce
-    ) public onlyOwner {
-        if (direct) {
-            // Checks
-            require(newOwner != address(0) || renounce, "Ownable: zero address");
-
-            // Effects
-            emit OwnershipTransferred(owner, newOwner);
-            owner = newOwner;
-            pendingOwner = address(0);
-        } else {
-            // Effects
-            pendingOwner = newOwner;
-        }
-    }
-
-    /// @notice Needs to be called by `pendingOwner` to claim ownership.
-    function claimOwnership() public {
-        address _pendingOwner = pendingOwner;
-
-        // Checks
-        require(msg.sender == _pendingOwner, "Ownable: caller != pending owner");
-
-        // Effects
-        emit OwnershipTransferred(owner, _pendingOwner);
-        owner = _pendingOwner;
-        pendingOwner = address(0);
-    }
-
-    /// @notice Only allows the `owner` to execute the function.
-    modifier onlyOwner() {
-        require(msg.sender == owner, "Ownable: caller is not the owner");
-        _;
-    }
-
-    uint256[48] private __gap;
-}

package/contracts/libraries/math/FixedPoint.sol

@@ -1,205 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// 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.9;
-
-import "./LogExpMath.sol";
-
-/* solhint-disable private-vars-leading-underscore, reason-string */
-
-library FixedPoint {
-    uint256 internal constant ONE = 1e18; // 18 decimal places
-    int256 internal constant ONE_INT = 1e18; // 18 decimal places
-
-    uint256 internal constant MAX_POW_RELATIVE_ERROR = 10000; // 10^(-14)
-
-    function subMax0(uint256 a, uint256 b) internal pure returns (uint256) {
-        return (a >= b ? a - b : 0);
-    }
-
-    function subNoNeg(int256 a, int256 b) internal pure returns (int256) {
-        require(a >= b, "NEGATIVE");
-        return a - b;
-    }
-
-    function subNoNeg(int256 a, uint256 b) internal pure returns (int256) {
-        int256 _b = Int(b);
-        require(a >= _b, "NEGATIVE");
-        return a - _b;
-    }
-
-    function mulDown(uint256 a, uint256 b) internal pure returns (uint256) {
-        uint256 product = a * b;
-        return product / ONE;
-    }
-
-    function mulDown(int256 a, int256 b) internal pure returns (int256) {
-        int256 product = a * b;
-        return product / ONE_INT;
-    }
-
-    function mulDown(int256 a, uint256 b) internal pure returns (int256) {
-        return mulDown(a, Int(b));
-    }
-
-    function mulDown(uint256 a, int256 b) internal pure returns (int256) {
-        return mulDown(Int(a), b);
-    }
-
-    function mulUp(uint256 a, uint256 b) internal pure returns (uint256) {
-        uint256 product = a * b;
-
-        if (product == 0) {
-            return 0;
-        } else {
-            // The traditional divUp formula is:
-            // divUp(x, y) := (x + y - 1) / y
-            // To avoid intermediate overflow in the addition, we distribute the division and get:
-            // divUp(x, y) := (x - 1) / y + 1
-            // Note that this requires x != 0, which we already tested for.
-
-            return ((product - 1) / ONE) + 1;
-        }
-    }
-
-    function divDown(uint256 a, uint256 b) internal pure returns (uint256) {
-        if (a == 0) {
-            return 0;
-        } else {
-            uint256 aInflated = a * ONE;
-            return aInflated / b;
-        }
-    }
-
-    function divDown(int256 a, int256 b) internal pure returns (int256) {
-        if (a == 0) {
-            return 0;
-        } else {
-            int256 aInflated = a * ONE_INT;
-            return aInflated / b;
-        }
-    }
-
-    function divDown(uint256 a, int256 b) internal pure returns (int256) {
-        return divDown(Int(a), b);
-    }
-
-    function divDown(int256 a, uint256 b) internal pure returns (int256) {
-        return divDown(a, Int(b));
-    }
-
-    function divUp(uint256 a, uint256 b) internal pure returns (uint256) {
-        if (a == 0) {
-            return 0;
-        } else {
-            uint256 aInflated = a * ONE;
-            // The traditional divUp formula is:
-            // divUp(x, y) := (x + y - 1) / y
-            // To avoid intermediate overflow in the addition, we distribute the division and get:
-            // divUp(x, y) := (x - 1) / y + 1
-            // Note that this requires x != 0, which we already tested for.
-
-            return ((aInflated - 1) / b) + 1;
-        }
-    }
-
-    /**
-     * @dev Returns x^y, assuming both are fixed point numbers, rounding down. The result is guaranteed to not be above
-     * the true value (that is, the error function expected - actual is always positive).
-     */
-    function powDown(uint256 x, uint256 y) internal pure returns (uint256) {
-        uint256 raw = LogExpMath.pow(x, y);
-        uint256 maxError = mulUp(raw, MAX_POW_RELATIVE_ERROR) + 1;
-
-        if (raw < maxError) {
-            return 0;
-        } else {
-            return raw - maxError;
-        }
-    }
-
-    /**
-     * @dev Returns x^y, assuming both are fixed point numbers, rounding up. The result is guaranteed to not be below
-     * the true value (that is, the error function expected - actual is always negative).
-     */
-    function powUp(uint256 x, uint256 y) internal pure returns (uint256) {
-        uint256 raw = LogExpMath.pow(x, y);
-        uint256 maxError = mulUp(raw, MAX_POW_RELATIVE_ERROR) + 1;
-
-        return raw + maxError;
-    }
-
-    /**
-     * @dev Returns the complement of a value (1 - x), capped to 0 if x is larger than 1.
-     *
-     * Useful when computing the complement for values with some level of relative error, as it strips this error and
-     * prevents intermediate negative values.
-     */
-    function complement(uint256 x) internal pure returns (uint256) {
-        return (x < ONE) ? (ONE - x) : 0;
-    }
-
-    function abs(int256 x) internal pure returns (uint256) {
-        return uint256(x > 0 ? x : -x);
-    }
-
-    function neg(int256 x) internal pure returns (int256) {
-        return -x;
-    }
-
-    function neg(uint256 x) internal pure returns (int256) {
-        return -Int(x);
-    }
-
-    function max(uint256 x, uint256 y) internal pure returns (uint256) {
-        return (x > y ? x : y);
-    }
-
-    function max(int256 x, int256 y) internal pure returns (int256) {
-        return (x > y ? x : y);
-    }
-
-    function min(uint256 x, uint256 y) internal pure returns (uint256) {
-        return (x < y ? x : y);
-    }
-
-    function min(int256 x, int256 y) internal pure returns (int256) {
-        return (x < y ? x : y);
-    }
-
-    function Uint(int256 x) internal pure returns (uint256) {
-        require(x >= 0);
-        return uint256(x);
-    }
-
-    function Int(uint256 x) internal pure returns (int256) {
-        require(x <= uint256(type(int256).max));
-        return int256(x);
-    }
-
-    function Int128(int256 x) internal pure returns (int128) {
-        require(x <= type(int128).max);
-        return int128(x);
-    }
-
-    function Uint32(uint256 x) internal pure returns (uint32) {
-        require(x <= type(uint32).max);
-        return uint32(x);
-    }
-
-    function Uint112(uint256 x) internal pure returns (uint112) {
-        require(0 <= x && x <= type(uint112).max);
-        return uint112(x);
-    }
-}