Pectra upgrade

mainnet-contracts/script/DeployPufferModuleImplementation.s.sol

@@ -26,7 +26,7 @@ contract DeployPufferModuleImplementation is DeployerHelper {
         vm.startBroadcast();
 
         PufferModule newImpl = new PufferModule({
-            protocol: PufferProtocol(_getPufferProtocol()),
+            protocol: PufferProtocol(payable(_getPufferProtocol())),
             eigenPodManager: _getEigenPodManager(),
             delegationManager: IDelegationManager(_getDelegationManager()),
             moduleManager: PufferModuleManager(payable(_getPufferModuleManager())),
@@ -51,7 +51,7 @@ contract DeployPufferModuleImplementation is DeployerHelper {
         vm.startPrank(_getPaymaster());
 
         PufferModule newImpl = new PufferModule({
-            protocol: PufferProtocol(_getPufferProtocol()),
+            protocol: PufferProtocol(payable(_getPufferProtocol())),
             eigenPodManager: _getEigenPodManager(),
             delegationManager: IDelegationManager(_getDelegationManager()),
             moduleManager: PufferModuleManager(payable(_getPufferModuleManager())),

mainnet-contracts/script/GenerateBLSKeysAndRegisterValidators.s.sol

@@ -41,12 +41,12 @@ contract GenerateBLSKeysAndRegisterValidators is Script {
         if (block.chainid == 17000) {
             // Holesky
             protocolAddress = 0xE00c79408B9De5BaD2FDEbB1688997a68eC988CD;
-            pufferProtocol = PufferProtocol(protocolAddress);
+            pufferProtocol = PufferProtocol(payable(protocolAddress));
             forkVersion = "0x01017000";
         } else if (block.chainid == 1) {
             // Mainnet
             protocolAddress = 0xf7b6B32492c2e13799D921E84202450131bd238B;
-            pufferProtocol = PufferProtocol(protocolAddress);
+            pufferProtocol = PufferProtocol(payable(protocolAddress));
             forkVersion = "0x00000000";
         }
 
@@ -102,9 +102,7 @@ contract GenerateBLSKeysAndRegisterValidators is Script {
                 blsPubKey: stdJson.readBytes(registrationJson, ".bls_pub_key"),
                 signature: stdJson.readBytes(registrationJson, ".signature"),
                 depositDataRoot: stdJson.readBytes32(registrationJson, ".deposit_data_root"),
-                blsEncryptedPrivKeyShares: blsEncryptedPrivKeyShares,
-                blsPubKeySet: stdJson.readBytes(registrationJson, ".bls_pub_key_set"),
-                raveEvidence: ""
+                numBatches: 1
             });
 
             Permit memory pufETHPermit = _signPermit({

mainnet-contracts/script/Roles.sol

@@ -13,6 +13,7 @@ uint64 constant ROLE_ID_OPERATIONS_PAYMASTER = 23;
 uint64 constant ROLE_ID_OPERATIONS_COORDINATOR = 24;
 uint64 constant ROLE_ID_WITHDRAWAL_FINALIZER = 25;
 uint64 constant ROLE_ID_REVENUE_DEPOSITOR = 26;
+uint64 constant ROLE_ID_VALIDATOR_EXITOR = 27;
 
 // Role assigned to validator ticket price setter
 uint64 constant ROLE_ID_VT_PRICER = 25;

mainnet-contracts/script/SetupAccess.s.sol

@@ -28,7 +28,8 @@ import {
     ROLE_ID_PUFFER_PROTOCOL,
     ROLE_ID_DAO,
     ROLE_ID_OPERATIONS_COORDINATOR,
-    ROLE_ID_VT_PRICER
+    ROLE_ID_VT_PRICER,
+    ROLE_ID_VALIDATOR_EXITOR
 } from "../script/Roles.sol";
 
 contract SetupAccess is BaseScript {
@@ -153,7 +154,7 @@ contract SetupAccess is BaseScript {
     }
 
     function _setupPufferModuleManagerAccess() internal view returns (bytes[] memory) {
-        bytes[] memory calldatas = new bytes[](2);
+        bytes[] memory calldatas = new bytes[](4);
 
         // Dao selectors
         bytes4[] memory selectors = new bytes4[](7);
@@ -181,6 +182,23 @@ contract SetupAccess is BaseScript {
             ROLE_ID_OPERATIONS_PAYMASTER
         );
 
+        // ValidatorExitor selectors
+        bytes4[] memory requestWithdrawalSelector = new bytes4[](1);
+        requestWithdrawalSelector[0] = PufferModuleManager.requestWithdrawal.selector;
+
+        calldatas[2] = abi.encodeWithSelector(
+            AccessManager.setTargetFunctionRole.selector,
+            pufferDeployment.moduleManager,
+            requestWithdrawalSelector,
+            ROLE_ID_VALIDATOR_EXITOR
+        );
+
+        calldatas[3] = abi.encodeWithSelector(
+            AccessManager.setTargetFunctionRole.selector,
+            pufferDeployment.moduleManager,
+            requestWithdrawalSelector,
+            ROLE_ID_PUFFER_PROTOCOL
+        );
         return calldatas;
     }
 

mainnet-contracts/src/GuardianModule.sol

@@ -17,6 +17,7 @@ import { StoppedValidatorInfo } from "./struct/StoppedValidatorInfo.sol";
  * @title Guardian module
  * @author Puffer Finance
  * @dev This contract is responsible for storing enclave keys and validation of guardian's EOA/Enclave signatures
+ * * @dev Some of these functions are no longer used since enclaves have been deprecated
  * @custom:security-contact security@puffer.fi
  */
 contract GuardianModule is AccessManaged, IGuardianModule {
@@ -38,6 +39,7 @@ contract GuardianModule is AccessManaged, IGuardianModule {
 
     /**
      * @notice Enclave Verifier smart contract
+     * @dev DEPRECATED
      */
     IEnclaveVerifier public immutable ENCLAVE_VERIFIER;
 
@@ -53,11 +55,13 @@ contract GuardianModule is AccessManaged, IGuardianModule {
 
     /**
      * @dev MRSIGNER value for SGX
+     * @dev DEPRECATED
      */
     bytes32 internal _mrsigner;
 
     /**
      * @dev MRENCLAVE value for SGX
+     * @dev DEPRECATED
      */
     bytes32 internal _mrenclave;
 
@@ -77,6 +81,7 @@ contract GuardianModule is AccessManaged, IGuardianModule {
 
     /**
      * @dev Mapping of a Guardian's EOA to enclave data
+     * @dev DEPRECATED
      */
     mapping(address guardian => GuardianData data) internal _guardianEnclaves;
 
@@ -139,6 +144,7 @@ contract GuardianModule is AccessManaged, IGuardianModule {
 
     /**
      * @inheritdoc IGuardianModule
+     * @dev DEPRECATED
      */
     function validateProvisionNode(
         uint256 pufferModuleIndex,
@@ -220,6 +226,7 @@ contract GuardianModule is AccessManaged, IGuardianModule {
 
     /**
      * @inheritdoc IGuardianModule
+     * @dev DEPRECATED
      */
     function validateGuardiansEnclaveSignatures(bytes[] calldata enclaveSignatures, bytes32 signedMessageHash)
         public
@@ -240,6 +247,7 @@ contract GuardianModule is AccessManaged, IGuardianModule {
     /**
      * @inheritdoc IGuardianModule
      * @dev Restricted to the DAO
+     * @dev DEPRECATED
      */
     function setGuardianEnclaveMeasurements(bytes32 newMrEnclave, bytes32 newMrSigner) external restricted {
         emit MrEnclaveChanged(_mrenclave, newMrEnclave);
@@ -298,6 +306,7 @@ contract GuardianModule is AccessManaged, IGuardianModule {
 
     /**
      * @inheritdoc IGuardianModule
+     * @dev DEPRECATED
      */
     function rotateGuardianKey(uint256 blockNumber, bytes calldata pubKey, RaveEvidence calldata evidence) external {
         address guardian = msg.sender;
@@ -341,13 +350,15 @@ contract GuardianModule is AccessManaged, IGuardianModule {
 
     /**
      * @inheritdoc IGuardianModule
+     * @dev DEPRECATED
      */
     function getGuardiansEnclaveAddress(address guardian) external view returns (address) {
         return _guardianEnclaves[guardian].enclaveAddress;
     }
 
     /**
      * @inheritdoc IGuardianModule
+     * @dev DEPRECATED
      */
     function getGuardiansEnclaveAddresses() public view returns (address[] memory) {
         uint256 guardiansLength = _guardians.length();
@@ -367,6 +378,7 @@ contract GuardianModule is AccessManaged, IGuardianModule {
 
     /**
      * @inheritdoc IGuardianModule
+     * @dev DEPRECATED
      */
     function getGuardiansEnclavePubkeys() external view returns (bytes[] memory) {
         uint256 guardiansLength = _guardians.length();
@@ -381,13 +393,15 @@ contract GuardianModule is AccessManaged, IGuardianModule {
 
     /**
      * @inheritdoc IGuardianModule
+     * @dev DEPRECATED
      */
     function getMrenclave() external view returns (bytes32) {
         return _mrenclave;
     }
 
     /**
      * @inheritdoc IGuardianModule
+     * @dev DEPRECATED
      */
     function getMrsigner() external view returns (bytes32) {
         return _mrsigner;

mainnet-contracts/src/PufferModule.sol

@@ -8,7 +8,7 @@ import { IEigenPodManager } from "../src/interface/Eigenlayer-Slashing/IEigenPod
 import { ISignatureUtils } from "../src/interface/Eigenlayer-Slashing/ISignatureUtils.sol";
 import { IStrategy } from "../src/interface/Eigenlayer-Slashing/IStrategy.sol";
 import { IPufferProtocol } from "./interface/IPufferProtocol.sol";
-import { IEigenPod } from "../src/interface/Eigenlayer-Slashing/IEigenPod.sol";
+import { IEigenPod, IEigenPodTypes } from "../src/interface/Eigenlayer-Slashing/IEigenPod.sol";
 import { PufferModuleManager } from "./PufferModuleManager.sol";
 import { Unauthorized } from "./Errors.sol";
 import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
@@ -96,18 +96,6 @@ contract PufferModule is Initializable, AccessManagedUpgradeable {
 
     receive() external payable { }
 
-    /**
-     * @notice Starts the validator
-     */
-    function callStake(bytes calldata pubKey, bytes calldata signature, bytes32 depositDataRoot)
-        external
-        payable
-        onlyPufferProtocol
-    {
-        // EigenPod is deployed in this call
-        EIGEN_POD_MANAGER.stake{ value: 32 ether }(pubKey, signature, depositDataRoot);
-    }
-
     /**
      * @notice Sets the proof submitter on the EigenPod
      */
@@ -195,6 +183,56 @@ contract PufferModule is Initializable, AccessManagedUpgradeable {
         return EIGEN_DELEGATION_MANAGER.undelegate(address(this));
     }
 
+    /**
+     * @notice Requests a consolidation for the given validators. This consolidation consists on merging one validator into another one
+     * @param srcPubkeys The pubkeys of the validators to consolidate from
+     * @param targetPubkeys The pubkeys of the validators to consolidate to
+     * @dev Only callable by the PufferProtocol
+     * @dev According to EIP-7251 there is a fee for each validator consolidation request (See https://eips.ethereum.org/EIPS/eip-7251#fee-calculation)
+     *      The fee is paid in the msg.value of this function. Since the fee is not fixed and might change, the excess amount is refunded
+     *      to the caller from the EigenPod
+     */
+    function requestConsolidation(bytes[] calldata srcPubkeys, bytes[] calldata targetPubkeys)
+        external
+        payable
+        virtual
+        onlyPufferProtocol
+    {
+        ModuleStorage storage $ = _getPufferModuleStorage();
+
+        IEigenPod.ConsolidationRequest[] memory requests = new IEigenPodTypes.ConsolidationRequest[](srcPubkeys.length);
+        for (uint256 i = 0; i < srcPubkeys.length; i++) {
+            requests[i] =
+                IEigenPodTypes.ConsolidationRequest({ srcPubkey: srcPubkeys[i], targetPubkey: targetPubkeys[i] });
+        }
+        $.eigenPod.requestConsolidation{ value: msg.value }(requests);
+    }
+
+    /**
+     * @notice Requests a withdrawal for the given validators. This withdrawal can be total or partial.
+     *         If the amount is 0, the withdrawal is total and the validator will be fully exited.
+     *         If it is a partial withdrawal, the validator should not be below 32 ETH or the request will be ignored.
+     * @param pubkeys The pubkeys of the validators to withdraw
+     * @param gweiAmounts The amounts of the validators to withdraw, in Gwei
+     * @dev Only callable by the PufferModuleManager
+     * @dev According to EIP-7002 there is a fee for each validator withdrawal request (See https://eips.ethereum.org/assets/eip-7002/fee_analysis)
+     *      The fee is paid in the msg.value of this function. Since the fee is not fixed and might change, the excess amount will be kept in the PufferModule
+     */
+    function requestWithdrawal(bytes[] calldata pubkeys, uint64[] calldata gweiAmounts)
+        external
+        payable
+        virtual
+        onlyPufferModuleManager
+    {
+        ModuleStorage storage $ = _getPufferModuleStorage();
+
+        IEigenPodTypes.WithdrawalRequest[] memory requests = new IEigenPodTypes.WithdrawalRequest[](pubkeys.length);
+        for (uint256 i = 0; i < pubkeys.length; i++) {
+            requests[i] = IEigenPodTypes.WithdrawalRequest({ pubkey: pubkeys[i], amountGwei: gweiAmounts[i] });
+        }
+        $.eigenPod.requestWithdrawal{ value: msg.value }(requests);
+    }
+
     /**
      * @notice Sets the rewards claimer to `claimer` for the PufferModule
      */
@@ -208,7 +246,7 @@ contract PufferModule is Initializable, AccessManagedUpgradeable {
     function getWithdrawalCredentials() public view returns (bytes memory) {
         // Withdrawal credentials for EigenLayer modules are EigenPods
         ModuleStorage storage $ = _getPufferModuleStorage();
-        return abi.encodePacked(bytes1(uint8(1)), bytes11(0), $.eigenPod);
+        return abi.encodePacked(bytes1(uint8(2)), bytes11(0), $.eigenPod);
     }
 
     /**

mainnet-contracts/src/PufferModuleManager.sol

@@ -9,6 +9,7 @@ import { PufferVaultV5 } from "./PufferVaultV5.sol";
 import { RestakingOperator } from "./RestakingOperator.sol";
 import { IPufferModuleManager } from "./interface/IPufferModuleManager.sol";
 import { BeaconProxy } from "@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol";
+import { Address } from "@openzeppelin/contracts/utils/Address.sol";
 import { Create2 } from "@openzeppelin/contracts/utils/Create2.sol";
 import { AccessManagedUpgradeable } from
     "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
@@ -26,6 +27,9 @@ import { PufferModule } from "./PufferModule.sol";
  * @custom:security-contact security@puffer.fi
  */
 contract PufferModuleManager is IPufferModuleManager, AccessManagedUpgradeable, UUPSUpgradeable {
+    using Address for address;
+    using Address for address payable;
+
     address public immutable PUFFER_MODULE_BEACON;
     address public immutable RESTAKING_OPERATOR_BEACON;
     address public immutable PUFFER_PROTOCOL;
@@ -239,6 +243,54 @@ contract PufferModuleManager is IPufferModuleManager, AccessManagedUpgradeable,
         emit PufferModuleUndelegated(moduleName);
     }
 
+    /**
+     * @notice Upgrades the given validators to consolidating (0x02)
+     * @param moduleName The name of the module
+     * @param pubkeys The pubkeys of the validators to upgrade
+     * @dev The function does not check that the pubkeys belong to the module
+     * @dev Restricted to the DAO
+     * @dev According to EIP-7251 there is a fee for each validator consolidation request (See https://eips.ethereum.org/EIPS/eip-7251#fee-calculation)
+     *      The fee is paid in the msg.value of this function. Since the fee is not fixed and might change, the excess amount is refunded
+     *      to the caller from the EigenPod
+     */
+    function upgradeToConsolidating(bytes32 moduleName, bytes[] calldata pubkeys) external payable virtual restricted {
+        address moduleAddress = IPufferProtocol(PUFFER_PROTOCOL).getModuleAddress(moduleName);
+
+        PufferModule(payable(moduleAddress)).requestConsolidation{ value: msg.value }(pubkeys, pubkeys);
+
+        emit PufferModuleUpgradedToConsolidating(moduleName, pubkeys);
+    }
+
+    /**
+     * @notice Requests a withdrawal for the given validators. This withdrawal can be total or partial.
+     *         If the amount is 0, the withdrawal is total and the validator will be fully exited.
+     *         If it is a partial withdrawal, the validator should not be below 32 ETH or the request will be ignored.
+     * @param moduleName The name of the module
+     * @param pubkeys The pubkeys of the validators to withdraw
+     * @param gweiAmounts The amounts of the validators to withdraw, in Gwei
+     * @dev Restricted to the VALIDATOR_EXITOR role and the PufferProtocol
+     * @dev According to EIP-7002 there is a fee for each validator withdrawal request (See https://eips.ethereum.org/assets/eip-7002/fee_analysis)
+     *      The fee is paid in the msg.value of this function. Since the fee is not fixed and might change, the excess amount will be kept in the PufferModule
+     */
+    function requestWithdrawal(bytes32 moduleName, bytes[] calldata pubkeys, uint64[] calldata gweiAmounts)
+        external
+        payable
+        virtual
+        restricted
+    {
+        if (pubkeys.length == 0) {
+            revert InputArrayLengthZero();
+        }
+        if (pubkeys.length != gweiAmounts.length) {
+            revert InputArrayLengthMismatch();
+        }
+        address moduleAddress = IPufferProtocol(PUFFER_PROTOCOL).getModuleAddress(moduleName);
+
+        PufferModule(payable(moduleAddress)).requestWithdrawal{ value: msg.value }(pubkeys, gweiAmounts);
+
+        emit WithdrawalRequested(moduleName, pubkeys, gweiAmounts);
+    }
+
     /**
      * @notice Calls the callRegisterOperatorToAVS function on the target restaking operator
      * @param restakingOperator is the address of the restaking operator