[Vaults] Immutably fix the node operator in the basic StakingVault

contracts/0.8.25/vaults/VaultBeaconChainDepositor.sol → contracts/0.8.25/vaults/BeaconChainDepositLogistics.sol

@@ -4,7 +4,7 @@
 // See contracts/COMPILERS.md
 pragma solidity 0.8.25;
 
-import {MemUtils} from "../../common/lib/MemUtils.sol";
+import {MemUtils} from "contracts/common/lib/MemUtils.sol";
 
 interface IDepositContract {
     function get_deposit_root() external view returns (bytes32 rootHash);
@@ -26,7 +26,7 @@ interface IDepositContract {
  *
  * This contract will be refactored to support custom deposit amounts for MAX_EB.
  */
-contract VaultBeaconChainDepositor {
+contract BeaconChainDepositLogistics {
     uint256 internal constant PUBLIC_KEY_LENGTH = 48;
     uint256 internal constant SIGNATURE_LENGTH = 96;
     uint256 internal constant DEPOSIT_SIZE = 32 ether;

contracts/0.8.25/vaults/Dashboard.sol

@@ -17,6 +17,7 @@ import {VaultHub} from "./VaultHub.sol";
  * in this single contract. It provides administrative functions for managing the staking vault,
  * including funding, withdrawing, depositing to the beacon chain, minting, burning, and rebalancing operations.
  * All these functions are only callable by the account with the DEFAULT_ADMIN_ROLE.
+ * TODO: need to add recover methods for ERC20, probably in a separate contract
  */
 contract Dashboard is AccessControlEnumerable {
     /// @notice Address of the implementation contract
@@ -48,30 +49,25 @@ contract Dashboard is AccessControlEnumerable {
 
     /**
      * @notice Initializes the contract with the default admin and `StakingVault` address.
-     * @param _defaultAdmin Address to be granted the `DEFAULT_ADMIN_ROLE`, i.e. the actual owner of the stVault
      * @param _stakingVault Address of the `StakingVault` contract.
      */
-    function initialize(address _defaultAdmin, address _stakingVault) external virtual {
-        _initialize(_defaultAdmin, _stakingVault);
+    function initialize(address _stakingVault) external virtual {
+        _initialize(_stakingVault);
     }
 
     /**
      * @dev Internal initialize function.
-     * @param _defaultAdmin Address to be granted the `DEFAULT_ADMIN_ROLE`
      * @param _stakingVault Address of the `StakingVault` contract.
      */
-    function _initialize(address _defaultAdmin, address _stakingVault) internal {
-        if (_defaultAdmin == address(0)) revert ZeroArgument("_defaultAdmin");
+    function _initialize(address _stakingVault) internal {
         if (_stakingVault == address(0)) revert ZeroArgument("_stakingVault");
         if (isInitialized) revert AlreadyInitialized();
         if (address(this) == _SELF) revert NonProxyCallsForbidden();
 
         isInitialized = true;
-
-        _grantRole(DEFAULT_ADMIN_ROLE, _defaultAdmin);
-
         stakingVault = IStakingVault(_stakingVault);
         vaultHub = VaultHub(stakingVault.vaultHub());
+        _grantRole(DEFAULT_ADMIN_ROLE, msg.sender);
 
         emit Initialized();
     }
@@ -167,20 +163,6 @@ contract Dashboard is AccessControlEnumerable {
         _requestValidatorExit(_validatorPublicKey);
     }
 
-    /**
-     * @notice Deposits validators to the beacon chain
-     * @param _numberOfDeposits Number of validator deposits
-     * @param _pubkeys Concatenated public keys of the validators
-     * @param _signatures Concatenated signatures of the validators
-     */
-    function depositToBeaconChain(
-        uint256 _numberOfDeposits,
-        bytes calldata _pubkeys,
-        bytes calldata _signatures
-    ) external virtual onlyRole(DEFAULT_ADMIN_ROLE) {
-        _depositToBeaconChain(_numberOfDeposits, _pubkeys, _signatures);
-    }
-
     /**
      * @notice Mints stETH tokens backed by the vault to a recipient.
      * @param _recipient Address of the recipient

contracts/0.8.25/vaults/Delegation.sol

@@ -53,23 +53,15 @@ contract Delegation is Dashboard, IReportReceiver {
      */
     bytes32 public constant STAKER_ROLE = keccak256("Vault.Delegation.StakerRole");
 
-    /** 
-     * @notice Role for the operator
-     * Operator can:
+    /**
+     * @notice Role for the node operator
+     * Node operator rewards claimer can:
      * - claim the performance due
      * - vote on performance fee changes
      * - vote on ownership transfer
-     * - set the Key Master role
      */
     bytes32 public constant OPERATOR_ROLE = keccak256("Vault.Delegation.OperatorRole");
 
-    /**
-     * @notice Role for the key master.
-     * Key master can:
-     * - deposit validators to the beacon chain
-     */
-    bytes32 public constant KEY_MASTER_ROLE = keccak256("Vault.Delegation.KeyMasterRole");
-
     /**
      * @notice Role for the token master.
      * Token master can:
@@ -78,15 +70,6 @@ contract Delegation is Dashboard, IReportReceiver {
      */
     bytes32 public constant TOKEN_MASTER_ROLE = keccak256("Vault.Delegation.TokenMasterRole");
 
-    /**
-     * @notice Role for the Lido DAO.
-     * This can be the Lido DAO agent, EasyTrack or any other DAO decision-making system.
-     * Lido DAO can:
-     * - set the operator role
-     * - vote on ownership transfer
-     */
-    bytes32 public constant LIDO_DAO_ROLE = keccak256("Vault.Delegation.LidoDAORole");
-
     // ==================== State Variables ====================
 
     /// @notice The last report for which the performance due was claimed
@@ -121,36 +104,16 @@ contract Delegation is Dashboard, IReportReceiver {
     /**
      * @notice Initializes the contract with the default admin and `StakingVault` address.
      * Sets up roles and role administrators.
-     * @param _defaultAdmin Address to be granted the `DEFAULT_ADMIN_ROLE`.
      * @param _stakingVault Address of the `StakingVault` contract.
+     * @dev This function is called by the `VaultFactory` contract
      */
-    function initialize(address _defaultAdmin, address _stakingVault) external override {
-        _initialize(_defaultAdmin, _stakingVault);
-
-        /**
-         * Granting `LIDO_DAO_ROLE` to the default admin is needed to set the initial Lido DAO address
-         * in the `createVault` function in the vault factory, so that we don't have to pass it
-         * to this initialize function and break the inherited function signature.
-         * This role will be revoked in the `createVault` function in the vault factory and
-         * will only remain on the Lido DAO address
-         */
-        _grantRole(LIDO_DAO_ROLE, _defaultAdmin);
-
-        /**
-         * Only Lido DAO can assign the Lido DAO role.
-         */
-        _setRoleAdmin(LIDO_DAO_ROLE, LIDO_DAO_ROLE);
-
-        /**
-         * The node operator in the vault must be approved by Lido DAO.
-         * The vault owner (`DEFAULT_ADMIN_ROLE`) cannot change the node operator.
-         */
-        _setRoleAdmin(OPERATOR_ROLE, LIDO_DAO_ROLE);
-
-        /**
-         * The operator role can change the key master role.
-         */
-        _setRoleAdmin(KEY_MASTER_ROLE, OPERATOR_ROLE);
+    function initialize(address _stakingVault) external override {
+        _initialize(_stakingVault);
+
+        // `OPERATOR_ROLE` is set to `msg.sender` to allow the `VaultFactory` to set the initial operator fee
+        // the role will be revoked from `VaultFactory`
+        _grantRole(OPERATOR_ROLE, msg.sender);
+        _setRoleAdmin(OPERATOR_ROLE, OPERATOR_ROLE);
     }
 
     // ==================== View Functions ====================
@@ -163,13 +126,13 @@ contract Delegation is Dashboard, IReportReceiver {
     function withdrawable() public view returns (uint256) {
         // Question: shouldn't we reserve both locked + dues, not max(locked, dues)?
         uint256 reserved = Math256.max(stakingVault.locked(), managementDue + performanceDue());
-        uint256 value = stakingVault.valuation();
+        uint256 valuation = stakingVault.valuation();
 
-        if (reserved > value) {
+        if (reserved > valuation) {
             return 0;
         }
 
-        return value - reserved;
+        return valuation - reserved;
     }
 
     /**
@@ -194,10 +157,9 @@ contract Delegation is Dashboard, IReportReceiver {
      * @return An array of role identifiers.
      */
     function ownershipTransferCommittee() public pure returns (bytes32[] memory) {
-        bytes32[] memory roles = new bytes32[](3);
+        bytes32[] memory roles = new bytes32[](2);
         roles[0] = MANAGER_ROLE;
         roles[1] = OPERATOR_ROLE;
-        roles[2] = LIDO_DAO_ROLE;
         return roles;
     }
 
@@ -240,7 +202,7 @@ contract Delegation is Dashboard, IReportReceiver {
      */
     function claimManagementDue(address _recipient, bool _liquid) external onlyRole(MANAGER_ROLE) {
         if (_recipient == address(0)) revert ZeroArgument("_recipient");
-        if (!stakingVault.isHealthy()) revert VaultNotHealthy();
+        if (!stakingVault.isBalanced()) revert VaultUnbalanced();
 
         uint256 due = managementDue;
 
@@ -298,20 +260,6 @@ contract Delegation is Dashboard, IReportReceiver {
         _withdraw(_recipient, _ether);
     }
 
-    /**
-     * @notice Deposits validators to the beacon chain.
-     * @param _numberOfDeposits Number of validator deposits.
-     * @param _pubkeys Concatenated public keys of the validators.
-     * @param _signatures Concatenated signatures of the validators.
-     */
-    function depositToBeaconChain(
-        uint256 _numberOfDeposits,
-        bytes calldata _pubkeys,
-        bytes calldata _signatures
-    ) external override onlyRole(KEY_MASTER_ROLE) {
-        _depositToBeaconChain(_numberOfDeposits, _pubkeys, _signatures);
-    }
-
     /**
      * @notice Claims the performance fee due.
      * @param _recipient Address of the recipient.
@@ -491,8 +439,8 @@ contract Delegation is Dashboard, IReportReceiver {
     /// @param requested The amount requested to withdraw.
     error InsufficientUnlockedAmount(uint256 unlocked, uint256 requested);
 
-    /// @notice Error when the vault is not healthy.
-    error VaultNotHealthy();
+    /// @notice Error when the vault is not balanced.
+    error VaultUnbalanced();
 
     /// @notice Hook can only be called by the staking vault.
     error OnlyStVaultCanCallOnReportHook();