@pendle/core-v2 6.1.0 → 6.1.2

package/build/artifacts/contracts/oracles/PtYtLpOracle/PendlePYLpOracle.sol/PendlePYLpOracle.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/oracles/PtYtLpOracle/PendlePYOracleLib.sol/PendlePYOracleLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/oracles/PtYtLpOracle/chainlink/PendleChainlinkOracle.sol/PendleChainlinkOracle.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/oracles/PtYtLpOracle/chainlink/PendleChainlinkOracleFactory.sol/PendleChainlinkOracleFactory.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/oracles/PtYtLpOracle/chainlink/PendleChainlinkOracleWithQuote.sol/PendleChainlinkOracleWithQuote.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/oracles/PtYtLpOracle/samples/BoringLpSeller.sol/BoringLpSeller.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/oracles/PtYtLpOracle/samples/BoringPYUsdChainlinkAssetOracle.sol/BoringPYUsdChainlinkAssetOracle.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/oracles/PtYtLpOracle/samples/BoringPYUsdChainlinkSYOracle.sol/BoringPYUsdChainlinkSYOracle.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/oracles/PtYtLpOracle/samples/BoringPtSeller.sol/BoringPtSeller.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/oracles/internal/PendleBoringOneracle.sol/PendleBoringOneracle.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/oracles/internal/PendleBoringSolvBTCOneracle.sol/PendleBoringSolvBTCOneracle.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/oracles/internal/PendleLpLinearDiscountOracle.sol/LPExpiry.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/oracles/internal/PendleLpLinearDiscountOracle.sol/PendleLpLinearDiscountOracle.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/oracles/internal/PendleLpLinearDiscountOracleFactory.sol/PendleLpLinearDiscountOracleFactory.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/oracles/internal/PendleRedStoneRateOracleAdapter.sol/PendleRedStoneRateOracleAdapter.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/oracles/internal/PendleSparkLinearDiscountOracle.sol/PTExpiry.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../build-info/2218938186019a357c2b5431b307c8f9.json"
 }

package/build/artifacts/contracts/oracles/internal/PendleSparkLinearDiscountOracle.sol/PendleSparkLinearDiscountOracle.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../build-info/2218938186019a357c2b5431b307c8f9.json"
 }

package/build/artifacts/contracts/oracles/internal/PendleSparkLinearDiscountOracleFactory.sol/PendleSparkLinearDiscountOracleFactory.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../build-info/2218938186019a357c2b5431b307c8f9.json"
 }

package/build/artifacts/contracts/router/ActionStorageV4.sol/ActionStorageV4.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/PendleRouterV4.sol/PendleRouterV4.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/Reflector.sol/Reflector.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/RouterStorage.sol/RouterStorage.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/base/ActionBase.sol/ActionBase.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/base/ActionDelegateBase.sol/ActionDelegateBase.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/base/CallbackHelper.sol/CallbackHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/math/ApproxStateLib.sol/ApproxStateLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/math/MarketApproxEstimateLib.sol/MarketApproxEstimateLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/math/MarketApproxLibOnchain.sol/MarketApproxPtInLibOnchain.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/math/MarketApproxLibOnchain.sol/MarketApproxPtOutLibOnchain.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/math/MarketApproxLibV2.sol/MarketApproxPtInLibV2.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/math/MarketApproxLibV2.sol/MarketApproxPtOutLibV2.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/df3be05f70ae2389fe0a72ca1be9de65.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/IPSwapAggregator.sol/IPSwapAggregator.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/OKXScaleHelper.sol/IOKXDexRouter.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/OKXScaleHelper.sol/OKXScaleHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/ParaswapScaleHelper.sol/IAugustusV6.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/ParaswapScaleHelper.sol/ParaswapScaleHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/PendleSwap.sol/IKyberScalingHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/PendleSwap.sol/IOdosRouterV2.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/PendleSwap.sol/PendleSwap.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/180ee41ddd188bb00eb103d1b74d2d9c.json"
 }

package/contracts/interfaces/IPGovernanceProxy.sol

@@ -2,6 +2,12 @@
 pragma solidity ^0.8.0;
 
 interface IPGovernanceProxy {
+    event ModifyScopedAccess(address indexed caller, bytes4 indexed selector, address indexed target, bool access);
+
+    event ModifySelectorAdmin(address indexed addr, bytes4 indexed selector, bool isAdmin);
+
+    event SetAllowedSelectors(bytes4[] selectors, bytes32 indexed role); // Deprecated
+
     struct Call {
         address target;
         uint256 value;
@@ -12,13 +18,18 @@ interface IPGovernanceProxy {
 
     function aggregate(Call[] calldata calls) external payable returns (bytes[] memory rtnData);
 
-    event SetAllowedSelectors(bytes4[] selectors, bytes32 indexed role);
+    function aggregateWithScopedAccess(Call[] calldata calls) external payable returns (bytes[] memory rtnData);
 
-    function ALICE() external view returns (bytes32);
+    function isSelectorAdminOf(address addr, bytes4 selector) external view returns (bool);
 
-    function BOB() external view returns (bytes32);
+    function hasScopedAccess(address caller, bytes4 selector, address target) external view returns (bool);
 
-    function CHARLIE() external view returns (bytes32);
+    function modifySelectorAdmin(address addr, bytes4[] memory selectors, bool[] memory isAdmins) external;
 
-    function allowedSelectors(bytes4 selector) external view returns (bytes32);
+    function modifyScopedAccess(
+        address caller,
+        address[] memory targets,
+        bytes4 selector,
+        bool[] memory accesses
+    ) external;
 }

package/contracts/offchain-helpers/{LimitBackendHelper.sol → LimitBackendHelperV2.sol}

@@ -9,7 +9,7 @@ import "../interfaces/IWETH.sol";
 import "../core/libraries/Errors.sol";
 import "./BytesLib.sol";
 
-contract LimitBackendHelper is TokenHelper {
+contract LimitBackendHelperV2 is TokenHelper {
     address private immutable WNATIVE;
     address private immutable original;
 
@@ -48,62 +48,48 @@ contract LimitBackendHelper is TokenHelper {
     }
 
     /// @notice to be delegatecall from LimitRouter
-    function mintSyFromTokens(
+    function mintSyFromTokensV2(
         address YT,
         address[] calldata makers,
         address[] calldata tokens,
         uint256[] calldata amounts
-    ) external returns (uint256[] memory minted) {
+    ) external returns (uint256[] memory minted, bytes[] memory error) {
         uint256 length = makers.length;
 
         address SY = IPYieldToken(YT).SY();
         minted = new uint256[](length);
+        error = new bytes[](length);
 
         for (uint256 i = 0; i < length; i++) {
             (, bytes memory result) = original.delegatecall(
-                abi.encodeWithSignature(
-                    "mintSyFromTokenRevert(address,address,address,uint256)",
-                    makers[i],
-                    SY,
-                    tokens[i],
-                    amounts[i]
-                )
+                abi.encodeCall(this.mintSyFromTokenRevert, (makers[i], SY, tokens[i], amounts[i]))
             );
-            minted[i] = parseMinted(result);
+            (minted[i], error[i]) = parseMinted(result);
         }
     }
 
-    function parseMinted(bytes memory result) internal pure returns (uint256 minted) {
-        if (result.length < 4) return type(uint256).max;
+    function parseMinted(bytes memory result) internal pure returns (uint256 minted, bytes memory error) {
+        assert(result.length >= 4 && bytes4(result) == Errors.SimulationResults.selector);
+        (bool success, bytes memory data) = abi.decode(BytesLib.slice(result, 4, result.length - 4), (bool, bytes));
 
-        bytes4 top = bytes4(BytesLib.slice(result, 0, 4));
-        if (top == bytes4(0x1934afc8)) {
-            // selector of SimulationResults
-            (, bytes memory beta) = abi.decode(BytesLib.slice(result, 4, result.length - 4), (bool, bytes));
-            minted = abi.decode(beta, (uint256));
+        if (success) {
+            minted = abi.decode(data, (uint256));
         } else {
             minted = type(uint256).max;
+            error = data;
         }
     }
 
-    function mintSyFromTokenRevert(
-        address maker,
-        address SY,
-        address token,
-        uint256 makingAmount
-    ) public returns (uint256) {
+    function mintSyFromTokenRevert(address maker, address SY, address token, uint256 makingAmount) public {
         _transferIn(token, maker, makingAmount);
         if (token == WNATIVE && !IStandardizedYield(SY).isValidTokenIn(WNATIVE)) {
             _wrap_unwrap_ETH(WNATIVE, NATIVE, makingAmount);
             token = NATIVE;
         }
         _safeApproveInf(token, SY);
-        uint256 minted = IStandardizedYield(SY).deposit{value: token == NATIVE ? makingAmount : 0}(
-            address(this),
-            token,
-            makingAmount,
-            0
+        (bool success, bytes memory result) = SY.call{value: token == NATIVE ? makingAmount : 0}(
+            abi.encodeCall(IStandardizedYield.deposit, (address(this), token, makingAmount, 0))
         );
-        revert Errors.SimulationResults(true, abi.encode(minted));
+        revert Errors.SimulationResults(success, result);
     }
 }

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/1-offchain-helper.json

@@ -4,5 +4,6 @@
     "implicitSwapfeeContract": "0x43D03031FAb845065e9CEfE89Dd122d63F72011F",
     "simulateHelper": "0x2b3EC64160F658fFe7061769415Ff080fca80BbA",
     "supplyCapReader": "0x438C7dBA7d355aA0c77459AF38B2E62f9f9EccBf",
-    "balanceReader": "0x2085F50305f656f96b22ECBfe0A4f5e786Ff0438"
-}
+    "balanceReader": "0x2085F50305f656f96b22ECBfe0A4f5e786Ff0438",
+    "limitBackendHelperV2": "0x05f6bAF4189e46aC0C728bb3fE2fCba247441100"
+}

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/deployments/10-offchain-helper.json

@@ -3,5 +3,6 @@
     "pendleMulticallV2": "0x539fd510fE352CC81822a222F821c340133Ed41C",
     "simulateHelper": "0x2b3EC64160F658fFe7061769415Ff080fca80BbA",
     "supplyCapReader": "0x438C7dBA7d355aA0c77459AF38B2E62f9f9EccBf",
-    "balanceReader": "0x2085F50305f656f96b22ECBfe0A4f5e786Ff0438"
-}
+    "balanceReader": "0x2085F50305f656f96b22ECBfe0A4f5e786Ff0438",
+    "limitBackendHelperV2": "0x05f6bAF4189e46aC0C728bb3fE2fCba247441100"
+}

package/deployments/146-offchain-helper.json

@@ -3,5 +3,6 @@
     "implicitSwapfeeContract": "0x82Fae57b2A79D893D88488A7D8BdF2AC6bd2C463",
     "simulateHelper": "0xc23Dd2807e51dd1D317e1321CBeEb9ace98531EE",
     "supplyCapReader": "0x251CfB4E84CefecA6c1e6a4D8a0cb9c524e7484f",
-    "balanceReader": "0x2085F50305f656f96b22ECBfe0A4f5e786Ff0438"
-}
+    "balanceReader": "0x2085F50305f656f96b22ECBfe0A4f5e786Ff0438",
+    "limitBackendHelperV2": "0x05f6bAF4189e46aC0C728bb3fE2fCba247441100"
+}

package/deployments/42161-offchain-helper.json

@@ -4,5 +4,6 @@
     "implicitSwapfeeContract": "0x704478Dd72FD7F9B83d1F1e0fc18C14B54F034d0",
     "simulateHelper": "0x2b3EC64160F658fFe7061769415Ff080fca80BbA",
     "supplyCapReader": "0x438C7dBA7d355aA0c77459AF38B2E62f9f9EccBf",
-    "balanceReader": "0x2085F50305f656f96b22ECBfe0A4f5e786Ff0438"
-}
+    "balanceReader": "0x2085F50305f656f96b22ECBfe0A4f5e786Ff0438",
+    "limitBackendHelperV2": "0x05f6bAF4189e46aC0C728bb3fE2fCba247441100"
+}

package/deployments/5000-offchain-helper.json

@@ -4,5 +4,6 @@
     "implicitSwapfeeContract": "0xa87f7EeDD570943BcFFcE6D00B13D9a95ede8810",
     "simulateHelper": "0x2b3EC64160F658fFe7061769415Ff080fca80BbA",
     "supplyCapReader": "0x438C7dBA7d355aA0c77459AF38B2E62f9f9EccBf",
-    "balanceReader": "0x2085F50305f656f96b22ECBfe0A4f5e786Ff0438"
-}
+    "balanceReader": "0x2085F50305f656f96b22ECBfe0A4f5e786Ff0438",
+    "limitBackendHelperV2": "0x05f6bAF4189e46aC0C728bb3fE2fCba247441100"
+}

package/deployments/56-offchain-helper.json

@@ -4,5 +4,6 @@
     "implicitSwapfeeContract": "0xed18de5442297a4ec1ce59c7c7d9427adc2a012b",
     "simulateHelper": "0x2b3EC64160F658fFe7061769415Ff080fca80BbA",
     "supplyCapReader": "0x438C7dBA7d355aA0c77459AF38B2E62f9f9EccBf",
-    "balanceReader": "0x2085F50305f656f96b22ECBfe0A4f5e786Ff0438"
-}
+    "balanceReader": "0x2085F50305f656f96b22ECBfe0A4f5e786Ff0438",
+    "limitBackendHelperV2": "0x05f6bAF4189e46aC0C728bb3fE2fCba247441100"
+}

package/deployments/80094-offchain-helper.json

@@ -3,5 +3,6 @@
     "implicitSwapfeeContract": "0x82Fae57b2A79D893D88488A7D8BdF2AC6bd2C463",
     "simulateHelper": "0xc23Dd2807e51dd1D317e1321CBeEb9ace98531EE",
     "supplyCapReader": "0x251CfB4E84CefecA6c1e6a4D8a0cb9c524e7484f",
-    "balanceReader": "0x2085F50305f656f96b22ECBfe0A4f5e786Ff0438"
-}
+    "balanceReader": "0x2085F50305f656f96b22ECBfe0A4f5e786Ff0438",
+    "limitBackendHelperV2": "0x05f6bAF4189e46aC0C728bb3fE2fCba247441100"
+}