Pectra upgrade

mainnet-contracts/script/GenerateBLSKeysAndRegisterValidators.s.sol

@@ -103,8 +103,7 @@ contract GenerateBLSKeysAndRegisterValidators is Script {
                 signature: stdJson.readBytes(registrationJson, ".signature"),
                 depositDataRoot: stdJson.readBytes32(registrationJson, ".deposit_data_root"),
                 blsEncryptedPrivKeyShares: blsEncryptedPrivKeyShares,
-                blsPubKeySet: stdJson.readBytes(registrationJson, ".bls_pub_key_set"),
-                raveEvidence: ""
+                blsPubKeySet: stdJson.readBytes(registrationJson, ".bls_pub_key_set")
             });
 
             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[](3);
 
         // Dao selectors
         bytes4[] memory selectors = new bytes4[](7);
@@ -181,6 +182,16 @@ contract SetupAccess is BaseScript {
             ROLE_ID_OPERATIONS_PAYMASTER
         );
 
+        // ValidatorExitor selectors
+        bytes4[] memory validatorExitorSelectors = new bytes4[](1);
+        validatorExitorSelectors[0] = PufferModuleManager.triggerValidatorsExit.selector;
+
+        calldatas[2] = abi.encodeWithSelector(
+            AccessManager.setTargetFunctionRole.selector,
+            pufferDeployment.moduleManager,
+            validatorExitorSelectors,
+            ROLE_ID_VALIDATOR_EXITOR
+        );
         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";
@@ -195,6 +195,32 @@ contract PufferModule is Initializable, AccessManagedUpgradeable {
         return EIGEN_DELEGATION_MANAGER.undelegate(address(this));
     }
 
+    /**
+     * @notice Triggers the validators exit for the given pubkeys
+     * @param pubkeys The pubkeys of the validators to exit
+     * @dev Only callable by the PufferModuleManager
+     * @dev According to EIP-7002 there is a fee for each validator exit 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 is refunded
+     *      to the caller from the EigenPod
+     */
+    function triggerValidatorsExit(bytes[] calldata pubkeys) 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: 0 // This means full exit. Only value supported for 0x01 validators
+             });
+        }
+        uint256 oldBalance = address(this).balance - msg.value;
+        $.eigenPod.requestWithdrawal{ value: msg.value }(requests);
+        uint256 excessAmount = address(this).balance - oldBalance;
+        if (excessAmount > 0) {
+            Address.sendValue(payable(PUFFER_MODULE_MANAGER), excessAmount);
+        }
+    }
+
     /**
      * @notice Sets the rewards claimer to `claimer` for the PufferModule
      */

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,28 @@ contract PufferModuleManager is IPufferModuleManager, AccessManagedUpgradeable,
         emit PufferModuleUndelegated(moduleName);
     }
 
+    /**
+     * @notice Triggers the validators exit for the given pubkeys
+     * @param moduleName The name of the Puffer module
+     * @param pubkeys The pubkeys of the validators to exit
+     * @dev Restricted to the VALIDATOR_EXITOR
+     * @dev According to EIP-7002 there is a fee for each validator exit 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 is refunded
+     *      to the caller from the EigenPod
+     */
+    function triggerValidatorsExit(bytes32 moduleName, bytes[] calldata pubkeys) external payable virtual restricted {
+        address moduleAddress = IPufferProtocol(PUFFER_PROTOCOL).getModuleAddress(moduleName);
+
+        uint256 oldBalance = address(this).balance - msg.value;
+        PufferModule(payable(moduleAddress)).triggerValidatorsExit{ value: msg.value }(pubkeys);
+        uint256 excessAmount = address(this).balance - oldBalance;
+        if (excessAmount > 0) {
+            Address.sendValue(payable(msg.sender), excessAmount);
+        }
+
+        emit ValidatorsExitTriggered(moduleName, pubkeys);
+    }
+
     /**
      * @notice Calls the callRegisterOperatorToAVS function on the target restaking operator
      * @param restakingOperator is the address of the restaking operator

mainnet-contracts/src/PufferProtocol.sol

@@ -56,14 +56,9 @@ contract PufferProtocol is IPufferProtocol, AccessManagedUpgradeable, UUPSUpgrad
     uint256 internal constant _BLS_PUB_KEY_LENGTH = 48;
 
     /**
-     * @dev ETH Amount required to be deposited as a bond if the node operator uses SGX
+     * @dev ETH Amount required to be deposited as a bond
      */
-    uint256 internal constant _ENCLAVE_VALIDATOR_BOND = 1 ether;
-
-    /**
-     * @dev ETH Amount required to be deposited as a bond if the node operator doesn't use SGX
-     */
-    uint256 internal constant _NO_ENCLAVE_VALIDATOR_BOND = 2 ether;
+    uint256 internal constant VALIDATOR_BOND = 2 ether;
 
     /**
      * @dev Default "PUFFER_MODULE_0" module
@@ -198,14 +193,12 @@ contract PufferProtocol is IPufferProtocol, AccessManagedUpgradeable, UUPSUpgrad
 
         _checkValidatorRegistrationInputs({ $: $, data: data, moduleName: moduleName });
 
-        uint256 validatorBondInETH = data.raveEvidence.length > 0 ? _ENCLAVE_VALIDATOR_BOND : _NO_ENCLAVE_VALIDATOR_BOND;
-
         // If the node operator is paying for the bond in ETH and wants to transfer VT from their wallet, the ETH amount they send must be equal the bond amount
-        if (vtPermit.amount != 0 && pufETHPermit.amount == 0 && msg.value != validatorBondInETH) {
+        if (vtPermit.amount != 0 && pufETHPermit.amount == 0 && msg.value != VALIDATOR_BOND) {
             revert InvalidETHAmount();
         }
 
-        uint256 vtPayment = pufETHPermit.amount == 0 ? msg.value - validatorBondInETH : msg.value;
+        uint256 vtPayment = pufETHPermit.amount == 0 ? msg.value - VALIDATOR_BOND : msg.value;
 
         uint256 receivedVtAmount;
         // If the VT permit amount is zero, that means that the user is paying for VT with ETH
@@ -228,10 +221,10 @@ contract PufferProtocol is IPufferProtocol, AccessManagedUpgradeable, UUPSUpgrad
         // If the pufETH permit amount is zero, that means that the user is paying the bond with ETH
         if (pufETHPermit.amount == 0) {
             // Mint pufETH by depositing ETH and store the bond amount
-            bondAmount = PUFFER_VAULT.depositETH{ value: validatorBondInETH }(address(this));
+            bondAmount = PUFFER_VAULT.depositETH{ value: VALIDATOR_BOND }(address(this));
         } else {
             // Calculate the pufETH amount that we need to transfer from the user
-            bondAmount = PUFFER_VAULT.convertToShares(validatorBondInETH);
+            bondAmount = PUFFER_VAULT.convertToShares(VALIDATOR_BOND);
             _callPermit(address(PUFFER_VAULT), pufETHPermit);
 
             // slither-disable-next-line unchecked-transfer
@@ -251,11 +244,7 @@ contract PufferProtocol is IPufferProtocol, AccessManagedUpgradeable, UUPSUpgrad
      * @inheritdoc IPufferProtocol
      * @dev Restricted to Puffer Paymaster
      */
-    function provisionNode(
-        bytes[] calldata guardianEnclaveSignatures,
-        bytes calldata validatorSignature,
-        bytes32 depositRootHash
-    ) external restricted {
+    function provisionNode(bytes calldata validatorSignature, bytes32 depositRootHash) external restricted {
         if (depositRootHash != BEACON_DEPOSIT_CONTRACT.get_deposit_root()) {
             revert InvalidDepositRootHash();
         }
@@ -275,7 +264,6 @@ contract PufferProtocol is IPufferProtocol, AccessManagedUpgradeable, UUPSUpgrad
             $: $,
             moduleName: moduleName,
             index: index,
-            guardianEnclaveSignatures: guardianEnclaveSignatures,
             validatorSignature: validatorSignature
         });
 
@@ -612,20 +600,14 @@ contract PufferProtocol is IPufferProtocol, AccessManagedUpgradeable, UUPSUpgrad
     /**
      * @notice Returns necessary information to make Guardian's life easier
      */
-    function getPayload(bytes32 moduleName, bool usingEnclave)
-        external
-        view
-        returns (bytes[] memory, bytes memory, uint256, uint256)
-    {
+    function getPayload(bytes32 moduleName) external view returns (bytes memory, uint256, uint256) {
         ProtocolStorage storage $ = _getPufferProtocolStorage();
 
-        bytes[] memory pubKeys = GUARDIAN_MODULE.getGuardiansEnclavePubkeys();
         bytes memory withdrawalCredentials = getWithdrawalCredentials(address($.modules[moduleName]));
         uint256 threshold = GUARDIAN_MODULE.getThreshold();
-        uint256 validatorBond = usingEnclave ? _ENCLAVE_VALIDATOR_BOND : _NO_ENCLAVE_VALIDATOR_BOND;
-        uint256 ethAmount = validatorBond + ($.minimumVtAmount * PUFFER_ORACLE.getValidatorTicketPrice()) / 1 ether;
+        uint256 ethAmount = VALIDATOR_BOND + ($.minimumVtAmount * PUFFER_ORACLE.getValidatorTicketPrice()) / 1 ether;
 
-        return (pubKeys, withdrawalCredentials, threshold, ethAmount);
+        return (withdrawalCredentials, threshold, ethAmount);
     }
 
     /**
@@ -669,7 +651,7 @@ contract PufferProtocol is IPufferProtocol, AccessManagedUpgradeable, UUPSUpgrad
             ++$.moduleLimits[moduleName].numberOfRegisteredValidators;
         }
         emit NumberOfRegisteredValidatorsChanged(moduleName, $.moduleLimits[moduleName].numberOfRegisteredValidators);
-        emit ValidatorKeyRegistered(data.blsPubKey, pufferModuleIndex, moduleName, (data.raveEvidence.length > 0));
+        emit ValidatorKeyRegistered(data.blsPubKey, pufferModuleIndex, moduleName);
     }
 
     function _setValidatorLimitPerModule(bytes32 moduleName, uint128 limit) internal {
@@ -770,7 +752,6 @@ contract PufferProtocol is IPufferProtocol, AccessManagedUpgradeable, UUPSUpgrad
         ProtocolStorage storage $,
         bytes32 moduleName,
         uint256 index,
-        bytes[] calldata guardianEnclaveSignatures,
         bytes calldata validatorSignature
     ) internal {
         bytes memory validatorPubKey = $.validators[moduleName][index].pubKey;
@@ -780,16 +761,6 @@ contract PufferProtocol is IPufferProtocol, AccessManagedUpgradeable, UUPSUpgrad
         bytes32 depositDataRoot =
             LibBeaconchainContract.getDepositDataRoot(validatorPubKey, validatorSignature, withdrawalCredentials);
 
-        // Check the signatures (reverts if invalid)
-        GUARDIAN_MODULE.validateProvisionNode({
-            pufferModuleIndex: index,
-            pubKey: validatorPubKey,
-            signature: validatorSignature,
-            depositDataRoot: depositDataRoot,
-            withdrawalCredentials: withdrawalCredentials,
-            guardianEnclaveSignatures: guardianEnclaveSignatures
-        });
-
         PufferModule module = $.modules[moduleName];
 
         // Transfer 32 ETH to the module