@pendle/core-v2 6.1.1 → 6.1.2

package/contracts/offchain-helpers/PendleGovernanceProxy.sol

@@ -13,30 +13,34 @@ import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
 contract PendleGovernanceProxy is AccessControlUpgradeable, UUPSUpgradeable, IPGovernanceProxy {
     bytes32 public constant GUARDIAN = keccak256("GUARDIAN");
 
-    bytes32 public constant ALICE = keccak256("ALICE");
-    bytes32 public constant BOB = keccak256("BOB");
-    bytes32 public constant CHARLIE = keccak256("CHARLIE");
-
-    mapping(bytes4 => bytes32) public allowedSelectors;
+    mapping(bytes4 => bytes32) public __deprecated_allowedSelectors;
+
+    // Only the [ADMIN] (governance) of PendleGovernanceProxy can modify one address to be
+    // a selector admin of some selectors.
+    //
+    // A [selector admin] of a selector can grant/revoke scoped access of that selector
+    // to/from ANY caller and ANY target.
+    //
+    // For example: [0xdeployer] is a selector admin of `updateSupplyCap(uint256)`, he can
+    // grant/revoke the scoped access of, say [0xalice] to call `updateSupplyCap(uint256)`
+    // on ANY target contract (in this case, SYs).
+    //
+    // Changes on execution:
+    // - aggregate(Call[]): is now callable by [ADMIN] only
+    // - aggregateWithScopedAccess(Call[]): new function to let anyone with scoped access
+    // to execute calls
+
+    mapping(address caller => mapping(bytes4 selector => bool isAdmin)) public isSelectorAdminOf;
+    mapping(address caller => mapping(bytes4 selector => mapping(address target => bool isAllowed)))
+        public hasScopedAccess;
 
     modifier onlyGuardian() {
-        require(hasRole(GUARDIAN, msg.sender) || hasRole(DEFAULT_ADMIN_ROLE, msg.sender), "n/a");
+        require(hasRole(GUARDIAN, msg.sender) || hasRole(DEFAULT_ADMIN_ROLE, msg.sender), "PGP: n/a");
         _;
     }
 
     modifier onlyAdmin() {
-        require(hasRole(DEFAULT_ADMIN_ROLE, msg.sender), "n/a");
-        _;
-    }
-
-    modifier onlyHaveSomeRole() {
-        require(
-            hasRole(ALICE, msg.sender) ||
-                hasRole(BOB, msg.sender) ||
-                hasRole(CHARLIE, msg.sender) ||
-                hasRole(DEFAULT_ADMIN_ROLE, msg.sender),
-            "n/a"
-        );
+        require(hasRole(DEFAULT_ADMIN_ROLE, msg.sender), "PGP: n/a");
         _;
     }
 
@@ -44,14 +48,42 @@ contract PendleGovernanceProxy is AccessControlUpgradeable, UUPSUpgradeable, IPG
         _disableInitializers();
     }
 
-    function aggregate(Call[] calldata calls) external payable onlyHaveSomeRole returns (bytes[] memory) {
-        bool isAdmin = hasRole(DEFAULT_ADMIN_ROLE, msg.sender);
+    function aggregate(Call[] calldata calls) external payable onlyAdmin returns (bytes[] memory) {
+        return _aggregate(calls);
+    }
 
-        if (!isAdmin) {
-            for (uint256 i = 0; i < calls.length; i++) {
-                bytes4 selector = bytes4(calls[i].callData[:4]);
-                require(hasRole(allowedSelectors[selector], msg.sender), "n/a");
-            }
+    /*///////////////////////////////////////////////////////////////
+                            SCOPED ACCESS
+    //////////////////////////////////////////////////////////////*/
+
+    function modifySelectorAdmin(address addr, bytes4[] memory selectors, bool[] memory isAdmins) external onlyAdmin {
+        require(selectors.length == isAdmins.length, "PGP: Array length mismatch");
+
+        for (uint256 i = 0; i < selectors.length; i++) {
+            isSelectorAdminOf[addr][selectors[i]] = isAdmins[i];
+            emit ModifySelectorAdmin(addr, selectors[i], isAdmins[i]);
+        }
+    }
+
+    function modifyScopedAccess(
+        address caller,
+        address[] memory targets,
+        bytes4 selector,
+        bool[] memory accesses
+    ) external {
+        require(targets.length == accesses.length, "PGP: Array length mismatch");
+        require(hasRole(DEFAULT_ADMIN_ROLE, msg.sender) || isSelectorAdminOf[msg.sender][selector], "PGP: n/a");
+
+        for (uint256 i = 0; i < targets.length; i++) {
+            hasScopedAccess[caller][selector][targets[i]] = accesses[i];
+            emit ModifyScopedAccess(caller, selector, targets[i], accesses[i]);
+        }
+    }
+
+    function aggregateWithScopedAccess(Call[] calldata calls) external payable returns (bytes[] memory) {
+        for (uint256 i = 0; i < calls.length; i++) {
+            bytes4 selector = bytes4(calls[i].callData[:4]);
+            require(hasScopedAccess[msg.sender][selector][calls[i].target], "PGP: n/a");
         }
 
         return _aggregate(calls);
@@ -75,13 +107,6 @@ contract PendleGovernanceProxy is AccessControlUpgradeable, UUPSUpgradeable, IPG
                             ADMIN CALL
     //////////////////////////////////////////////////////////////*/
 
-    function setAllowedSelectors(bytes4[] calldata selectors, bytes32 role) external onlyAdmin {
-        for (uint256 i = 0; i < selectors.length; i++) {
-            allowedSelectors[selectors[i]] = role;
-        }
-        emit SetAllowedSelectors(selectors, role);
-    }
-
     function _aggregate(Call[] calldata calls) internal returns (bytes[] memory rtnData) {
         uint256 length = calls.length;
         rtnData = new bytes[](length);

package/deployments/10-core.json

@@ -44,7 +44,7 @@
     "proxyAdmin": "0xA28c08f165116587D4F3E708743B4dEe155c5E64",
     "reflector": "0x73d5DBF81A4f3bFa7b335e6a2d4638D6017a4fA8",
     "vePendleAirdropDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
-    "externalRewardsDistributor": "0xae898a7d07f8e27f25e13d0f351a7401f9a5bf9d",
+    "externalRewardsDistributor": "0x33305665f69B4642D1275f4Ce81c23651674D21C",
     "commonDeploy": "0x2Ed473F528E5B320f850d17ADfe0e558f0298aA9",
     "syFactory": "0x466CeD3b33045Ea986B2f306C8D0aA8067961CF8",
     "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",
@@ -56,4 +56,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/typechain-types/ActionBase.ts

@@ -0,0 +1,81 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import {
+  BaseContract,
+  BigNumber,
+  BytesLike,
+  CallOverrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from "ethers";
+import { FunctionFragment, Result } from "@ethersproject/abi";
+import { Listener, Provider } from "@ethersproject/providers";
+import type {
+  TypedEventFilter,
+  TypedEvent,
+  TypedListener,
+  OnEvent,
+} from "./common";
+
+export interface ActionBaseInterface extends utils.Interface {
+  contractName: "ActionBase";
+  functions: {
+    "tracker()": FunctionFragment;
+  };
+
+  encodeFunctionData(functionFragment: "tracker", values?: undefined): string;
+
+  decodeFunctionResult(functionFragment: "tracker", data: BytesLike): Result;
+
+  events: {};
+}
+
+export interface ActionBase extends BaseContract {
+  contractName: "ActionBase";
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: ActionBaseInterface;
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>;
+
+  listeners<TEvent extends TypedEvent>(
+    eventFilter?: TypedEventFilter<TEvent>
+  ): Array<TypedListener<TEvent>>;
+  listeners(eventName?: string): Array<Listener>;
+  removeAllListeners<TEvent extends TypedEvent>(
+    eventFilter: TypedEventFilter<TEvent>
+  ): this;
+  removeAllListeners(eventName?: string): this;
+  off: OnEvent<this>;
+  on: OnEvent<this>;
+  once: OnEvent<this>;
+  removeListener: OnEvent<this>;
+
+  functions: {
+    tracker(overrides?: CallOverrides): Promise<[string]>;
+  };
+
+  tracker(overrides?: CallOverrides): Promise<string>;
+
+  callStatic: {
+    tracker(overrides?: CallOverrides): Promise<string>;
+  };
+
+  filters: {};
+
+  estimateGas: {
+    tracker(overrides?: CallOverrides): Promise<BigNumber>;
+  };
+
+  populateTransaction: {
+    tracker(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+  };
+}

package/typechain-types/ActionInputTracker.ts

@@ -0,0 +1,81 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import {
+  BaseContract,
+  BigNumber,
+  BytesLike,
+  CallOverrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from "ethers";
+import { FunctionFragment, Result } from "@ethersproject/abi";
+import { Listener, Provider } from "@ethersproject/providers";
+import type {
+  TypedEventFilter,
+  TypedEvent,
+  TypedListener,
+  OnEvent,
+} from "./common";
+
+export interface ActionInputTrackerInterface extends utils.Interface {
+  contractName: "ActionInputTracker";
+  functions: {
+    "tracker()": FunctionFragment;
+  };
+
+  encodeFunctionData(functionFragment: "tracker", values?: undefined): string;
+
+  decodeFunctionResult(functionFragment: "tracker", data: BytesLike): Result;
+
+  events: {};
+}
+
+export interface ActionInputTracker extends BaseContract {
+  contractName: "ActionInputTracker";
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: ActionInputTrackerInterface;
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>;
+
+  listeners<TEvent extends TypedEvent>(
+    eventFilter?: TypedEventFilter<TEvent>
+  ): Array<TypedListener<TEvent>>;
+  listeners(eventName?: string): Array<Listener>;
+  removeAllListeners<TEvent extends TypedEvent>(
+    eventFilter: TypedEventFilter<TEvent>
+  ): this;
+  removeAllListeners(eventName?: string): this;
+  off: OnEvent<this>;
+  on: OnEvent<this>;
+  once: OnEvent<this>;
+  removeListener: OnEvent<this>;
+
+  functions: {
+    tracker(overrides?: CallOverrides): Promise<[string]>;
+  };
+
+  tracker(overrides?: CallOverrides): Promise<string>;
+
+  callStatic: {
+    tracker(overrides?: CallOverrides): Promise<string>;
+  };
+
+  filters: {};
+
+  estimateGas: {
+    tracker(overrides?: CallOverrides): Promise<BigNumber>;
+  };
+
+  populateTransaction: {
+    tracker(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+  };
+}

package/typechain-types/BoringOwnableUpgradeable.ts

@@ -0,0 +1,203 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import {
+  BaseContract,
+  BigNumber,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from "ethers";
+import { FunctionFragment, Result, EventFragment } from "@ethersproject/abi";
+import { Listener, Provider } from "@ethersproject/providers";
+import type {
+  TypedEventFilter,
+  TypedEvent,
+  TypedListener,
+  OnEvent,
+} from "./common";
+
+export interface BoringOwnableUpgradeableInterface extends utils.Interface {
+  contractName: "BoringOwnableUpgradeable";
+  functions: {
+    "claimOwnership()": FunctionFragment;
+    "owner()": FunctionFragment;
+    "pendingOwner()": FunctionFragment;
+    "transferOwnership(address,bool,bool)": FunctionFragment;
+  };
+
+  encodeFunctionData(
+    functionFragment: "claimOwnership",
+    values?: undefined
+  ): string;
+  encodeFunctionData(functionFragment: "owner", values?: undefined): string;
+  encodeFunctionData(
+    functionFragment: "pendingOwner",
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "transferOwnership",
+    values: [string, boolean, boolean]
+  ): string;
+
+  decodeFunctionResult(
+    functionFragment: "claimOwnership",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "pendingOwner",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "transferOwnership",
+    data: BytesLike
+  ): Result;
+
+  events: {
+    "Initialized(uint8)": EventFragment;
+    "OwnershipTransferred(address,address)": EventFragment;
+  };
+
+  getEvent(nameOrSignatureOrTopic: "Initialized"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "OwnershipTransferred"): EventFragment;
+}
+
+export type InitializedEvent = TypedEvent<[number], { version: number }>;
+
+export type InitializedEventFilter = TypedEventFilter<InitializedEvent>;
+
+export type OwnershipTransferredEvent = TypedEvent<
+  [string, string],
+  { previousOwner: string; newOwner: string }
+>;
+
+export type OwnershipTransferredEventFilter =
+  TypedEventFilter<OwnershipTransferredEvent>;
+
+export interface BoringOwnableUpgradeable extends BaseContract {
+  contractName: "BoringOwnableUpgradeable";
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: BoringOwnableUpgradeableInterface;
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>;
+
+  listeners<TEvent extends TypedEvent>(
+    eventFilter?: TypedEventFilter<TEvent>
+  ): Array<TypedListener<TEvent>>;
+  listeners(eventName?: string): Array<Listener>;
+  removeAllListeners<TEvent extends TypedEvent>(
+    eventFilter: TypedEventFilter<TEvent>
+  ): this;
+  removeAllListeners(eventName?: string): this;
+  off: OnEvent<this>;
+  on: OnEvent<this>;
+  once: OnEvent<this>;
+  removeListener: OnEvent<this>;
+
+  functions: {
+    claimOwnership(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    owner(overrides?: CallOverrides): Promise<[string]>;
+
+    pendingOwner(overrides?: CallOverrides): Promise<[string]>;
+
+    transferOwnership(
+      newOwner: string,
+      direct: boolean,
+      renounce: boolean,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+  };
+
+  claimOwnership(
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  owner(overrides?: CallOverrides): Promise<string>;
+
+  pendingOwner(overrides?: CallOverrides): Promise<string>;
+
+  transferOwnership(
+    newOwner: string,
+    direct: boolean,
+    renounce: boolean,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  callStatic: {
+    claimOwnership(overrides?: CallOverrides): Promise<void>;
+
+    owner(overrides?: CallOverrides): Promise<string>;
+
+    pendingOwner(overrides?: CallOverrides): Promise<string>;
+
+    transferOwnership(
+      newOwner: string,
+      direct: boolean,
+      renounce: boolean,
+      overrides?: CallOverrides
+    ): Promise<void>;
+  };
+
+  filters: {
+    "Initialized(uint8)"(version?: null): InitializedEventFilter;
+    Initialized(version?: null): InitializedEventFilter;
+
+    "OwnershipTransferred(address,address)"(
+      previousOwner?: string | null,
+      newOwner?: string | null
+    ): OwnershipTransferredEventFilter;
+    OwnershipTransferred(
+      previousOwner?: string | null,
+      newOwner?: string | null
+    ): OwnershipTransferredEventFilter;
+  };
+
+  estimateGas: {
+    claimOwnership(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    owner(overrides?: CallOverrides): Promise<BigNumber>;
+
+    pendingOwner(overrides?: CallOverrides): Promise<BigNumber>;
+
+    transferOwnership(
+      newOwner: string,
+      direct: boolean,
+      renounce: boolean,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+  };
+
+  populateTransaction: {
+    claimOwnership(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    pendingOwner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    transferOwnership(
+      newOwner: string,
+      direct: boolean,
+      renounce: boolean,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+  };
+}