@pendle/core-v2 5.5.0 → 5.6.0

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

@@ -3,8 +3,8 @@
   "contractName": "MarketApproxPtOutLibOnchain",
   "sourceName": "contracts/router/math/MarketApproxLibOnchain.sol",
   "abi": [],
-  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212207eecdd58f9c9504f0ee4fa0cdd4e8962c8952088847de274ffa8e2245e1d158264736f6c63430008170033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212207eecdd58f9c9504f0ee4fa0cdd4e8962c8952088847de274ffa8e2245e1d158264736f6c63430008170033",
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122058fdc410b4b575841c734f083b66e09fe250dc56257b5cb5e9b82e0618f7865264736f6c63430008170033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122058fdc410b4b575841c734f083b66e09fe250dc56257b5cb5e9b82e0618f7865264736f6c63430008170033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/7fa579b181813c7af64ef3c7fee573ab.json"
+  "buildInfo": "../../../../build-info/72388dcca8fd03931a3656e184e016ec.json"
 }

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

@@ -3,8 +3,8 @@
   "contractName": "MarketApproxPtInLibV2",
   "sourceName": "contracts/router/math/MarketApproxLibV2.sol",
   "abi": [],
-  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212206266cb8a9d26cfdec0daacc289ff5027055e0459d4fd3e5e0c05455ab230621f64736f6c63430008170033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212206266cb8a9d26cfdec0daacc289ff5027055e0459d4fd3e5e0c05455ab230621f64736f6c63430008170033",
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220eaa91b6e04a07d29a1951ac794985ee2a81a1d6380d2db556aef65197c71331364736f6c63430008170033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220eaa91b6e04a07d29a1951ac794985ee2a81a1d6380d2db556aef65197c71331364736f6c63430008170033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/7fa579b181813c7af64ef3c7fee573ab.json"
+  "buildInfo": "../../../../build-info/72388dcca8fd03931a3656e184e016ec.json"
 }

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

@@ -3,8 +3,8 @@
   "contractName": "MarketApproxPtOutLibV2",
   "sourceName": "contracts/router/math/MarketApproxLibV2.sol",
   "abi": [],
-  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220bd2aa2abb3abdf314b919e4c0916b8e25e2a0cb1591068840a9937ce807dbb2c64736f6c63430008170033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220bd2aa2abb3abdf314b919e4c0916b8e25e2a0cb1591068840a9937ce807dbb2c64736f6c63430008170033",
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212204d1223a9f4e93fb50232986ef86372b1e885c1f948787333716c75d5559641eb64736f6c63430008170033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212204d1223a9f4e93fb50232986ef86372b1e885c1f948787333716c75d5559641eb64736f6c63430008170033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/contracts/interfaces/IPGovernanceProxy.sol

@@ -11,4 +11,14 @@ interface IPGovernanceProxy {
     function pause(address[] calldata addrs) external;
 
     function aggregate(Call[] calldata calls) external payable returns (bytes[] memory rtnData);
+
+    event SetAllowedSelectors(bytes4[] selectors, bytes32 indexed role);
+
+    function ALICE() external view returns (bytes32);
+
+    function BOB() external view returns (bytes32);
+
+    function CHARLIE() external view returns (bytes32);
+
+    function allowedSelectors(bytes4 selector) external view returns (bytes32);
 }

package/contracts/interfaces/IPLimitRouter.sol

@@ -89,6 +89,9 @@ interface IPLimitRouter is IPLimitOrderType {
         address taker
     );
 
+    // event added on 2/1/2025
+    event LnFeeRateRootsSet(address[] YTs, uint256[] lnFeeRateRoots);
+
     // @dev actualMaking, actualTaking are in the SY form
     function fill(
         FillOrderParams[] memory params,
@@ -118,6 +121,8 @@ interface IPLimitRouter is IPLimitOrderType {
 
     function simulate(address target, bytes calldata data) external payable;
 
+    function WNATIVE() external view returns (address);
+
     function _checkSig(
         Order memory order,
         bytes memory signature

package/contracts/interfaces/IPMarketFactoryV3.sol

@@ -28,4 +28,6 @@ interface IPMarketFactoryV3 {
         int256 initialAnchor,
         uint80 lnFeeRateRoot
     ) external returns (address market);
+
+    function setOverriddenFee(address router, address market, uint80 newFee) external;
 }

package/contracts/limit/LimitRouterBase.sol

@@ -30,6 +30,8 @@ abstract contract LimitRouterBase is
     uint128 internal constant _ORDER_DOES_NOT_EXIST = 0;
     uint128 internal constant _ORDER_FILLED = 1;
     uint256 internal constant NEW_PRIME = 12421;
+    uint256 internal constant MAX_LN_FEE_RATE_ROOT = 48790164169432003; // ln(1.05)
+
     bytes private constant EMPTY_BYTES = abi.encode();
 
     address public feeRecipient;
@@ -37,7 +39,7 @@ abstract contract LimitRouterBase is
     // YT => lnFeeRateRoot // not to be accessed directly
     mapping(address => uint256) internal __lnFeeRateRoot;
 
-    address private immutable WNATIVE;
+    address public immutable WNATIVE;
 
     mapping(bytes32 => OrderStatus) internal _status;
 
@@ -486,19 +488,13 @@ abstract contract LimitRouterBase is
         uint256 len = YTs.length;
         require(len == lnFeeRateRoots.length, "LOP: length mismatch");
 
-        if (msg.sender == ownerHelper) {
-            _requireFeeNotSet(YTs);
-        }
-
         for (uint256 i = 0; i < len; i++) {
             require(lnFeeRateRoots[i] > 0, "LOP: zero fee not allowed");
+            require(lnFeeRateRoots[i] <= MAX_LN_FEE_RATE_ROOT, "LOP: fee too high");
+
             __lnFeeRateRoot[YTs[i]] = lnFeeRateRoots[i];
         }
-    }
 
-    function _requireFeeNotSet(address[] memory YTs) internal view {
-        for (uint256 i = 0; i < YTs.length; i++) {
-            require(__lnFeeRateRoot[YTs[i]] == 0, "LOP: fee already set");
-        }
+        emit LnFeeRateRootsSet(YTs, lnFeeRateRoots);
     }
 }

package/contracts/offchain-helpers/PendleGovernanceProxy.sol

@@ -13,13 +13,30 @@ 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;
+
     modifier onlyGuardian() {
-        require(hasRole(DEFAULT_ADMIN_ROLE, msg.sender) || hasRole(GUARDIAN, msg.sender), "not authorized");
+        require(hasRole(GUARDIAN, msg.sender) || hasRole(DEFAULT_ADMIN_ROLE, msg.sender), "n/a");
         _;
     }
 
     modifier onlyAdmin() {
-        require(hasRole(DEFAULT_ADMIN_ROLE, msg.sender), "not authorized");
+        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"
+        );
         _;
     }
 
@@ -27,6 +44,19 @@ 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);
+
+        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");
+            }
+        }
+
+        return _aggregate(calls);
+    }
+
     /*///////////////////////////////////////////////////////////////
                                 PAUSING
     //////////////////////////////////////////////////////////////*/
@@ -45,14 +75,19 @@ contract PendleGovernanceProxy is AccessControlUpgradeable, UUPSUpgradeable, IPG
                             ADMIN CALL
     //////////////////////////////////////////////////////////////*/
 
-    function aggregate(
-        IPGovernanceProxy.Call[] calldata calls
-    ) external payable onlyAdmin returns (bytes[] memory rtnData) {
+    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);
 
         Call calldata call;
-        for (uint256 i = 0; i < length; ) {
+        for (uint256 i = 0; i < length; i++) {
             call = calls[i];
 
             (bool success, bytes memory resp) = call.target.call{value: call.value}(call.callData);
@@ -63,10 +98,6 @@ contract PendleGovernanceProxy is AccessControlUpgradeable, UUPSUpgradeable, IPG
             }
 
             rtnData[i] = resp;
-
-            unchecked {
-                ++i;
-            }
         }
     }
 

package/deployments/1-core.json

@@ -49,7 +49,8 @@
     "gaugeController": "0x47D74516B33eD5D70ddE7119A40839f6Fcc24e57",
     "feeDistributor": "0xd7b34a6fDCb2A7ceD2115FF7f5fdD72aa6aA4dE2",
     "feeDistributorV2": "0x8C237520a8E14D658170A633D96F8e80764433b9",
-    "multiTokenDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
+    "vePendleAirdropDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
+    "externalRewardsDistributor": "0xae898a7d07f8e27f25e13d0f351a7401f9a5bf9d",
     "sparkLinearDiscountOracleFactory": "0xA9A924A4BB95509F77868E086154C25e934F6171",
     "beta": {
         "PendleChainlinkOracleFactory": "0x2A73e899389cABa2a2f648BaBA35e67f5C00EFee"

package/deployments/10-core.json

@@ -46,7 +46,8 @@
     "vePendle": "0xd5C47D2383Fddc19596489280C0A33AC42b2bB18",
     "gaugeController": "0x6875e4A945E498FE1B90BbB13CFbAF0b68658C9C",
     "sparkLinearDiscountOracleFactory": "0xA9A924A4BB95509F77868E086154C25e934F6171",
-    "multiTokenDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
+    "vePendleAirdropDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
+    "externalRewardsDistributor": "0xae898a7d07f8e27f25e13d0f351a7401f9a5bf9d",
     "beta": {
         "PendleChainlinkOracleFactory": "0x2A73e899389cABa2a2f648BaBA35e67f5C00EFee"
     }

package/deployments/42161-core.json

@@ -48,7 +48,8 @@
     "arbMerkleDistribution": "0x23a102e78D1FF1645a3666691495174764a5FCAF",
     "linearDistributor": "0x83d85AEDD308261d847C3eb8d7146457bD8F38E8",
     "sparkLinearDiscountOracleFactory": "0xA9A924A4BB95509F77868E086154C25e934F6171",
-    "multiTokenDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
+    "vePendleAirdropDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
+    "externalRewardsDistributor": "0xae898a7d07f8e27f25e13d0f351a7401f9a5bf9d",
     "beta": {
         "PendleChainlinkOracleFactory": "0x2A73e899389cABa2a2f648BaBA35e67f5C00EFee"
     }

package/deployments/5000-core.json

@@ -44,7 +44,8 @@
     "vePendle": "0x30c6d4e892871220B5Ab66c10db577da96Fb974b",
     "gaugeController": "0x428f2f93afAc3F96B0DE59854038c585e06165C8",
     "sparkLinearDiscountOracleFactory": "0xA9A924A4BB95509F77868E086154C25e934F6171",
-    "multiTokenDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
+    "vePendleAirdropDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
+    "externalRewardsDistributor": "0xae898a7d07f8e27f25e13d0f351a7401f9a5bf9d",
     "beta": {
         "PendleChainlinkOracleFactory": "0x2A73e899389cABa2a2f648BaBA35e67f5C00EFee"
     }

package/deployments/56-core.json

@@ -46,7 +46,8 @@
     "vePendle": "0x8A09574b0401A856d89d1b583eE22E8cb0C5530B",
     "gaugeController": "0x704478Dd72FD7F9B83d1F1e0fc18C14B54F034d0",
     "sparkLinearDiscountOracleFactory": "0xA9A924A4BB95509F77868E086154C25e934F6171",
-    "multiTokenDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
+    "vePendleAirdropDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
+    "externalRewardsDistributor": "0xae898a7d07f8e27f25e13d0f351a7401f9a5bf9d",
     "beta": {
         "PendleChainlinkOracleFactory": "0x2A73e899389cABa2a2f648BaBA35e67f5C00EFee"
     }

package/deployments/8453-core.json

@@ -39,7 +39,8 @@
     "vePendle": "0x051dcd6a80f11fE68F77Fb0EBdE03853FA96B1fD",
     "gaugeController": "0x17F100fB4bE2707675c6439468d38249DD993d58",
     "sparkLinearDiscountOracleFactory": "0xA9A924A4BB95509F77868E086154C25e934F6171",
-    "multiTokenDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
+    "vePendleAirdropDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
+    "externalRewardsDistributor": "0xae898a7d07f8e27f25e13d0f351a7401f9a5bf9d",
     "beta": {
         "PendleChainlinkOracleFactory": "0x2A73e899389cABa2a2f648BaBA35e67f5C00EFee"
     }