Feat/eth migration

.solhint.json

@@ -14,7 +14,7 @@
     "ordering": "warn",
     "mark-callable-contracts": "off",
     "max-line-length": [
-      "error",
+      "warn",
       120
     ],
     "compiler-version": "off",

contracts/SSVNetwork.sol

@@ -23,10 +23,12 @@ import {SSVModules} from "./libraries/SSVStorage.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
 
 contract SSVNetwork is
     UUPSUpgradeable,
     Ownable2StepUpgradeable,
+    ReentrancyGuardUpgradeable,
     ISSVNetwork,
     ISSVOperators,
     ISSVOperatorsWhitelist,
@@ -55,6 +57,7 @@ contract SSVNetwork is
     ) external override initializer onlyProxy {
         __UUPSUpgradeable_init();
         __Ownable_init_unchained();
+        __ReentrancyGuard_init();
         __SSVNetwork_init_unchained(
             token_,
             ssvOperators_,
@@ -129,7 +132,11 @@ contract SSVNetwork is
         _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_OPERATORS]);
     }
 
-    function removeOperator(uint64 operatorId) external override {
+    function removeOperator(uint64 operatorId) external override nonReentrant {
+        _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_OPERATORS]);
+    }
+
+    function migrateOperatorToETH(uint64 operatorId) external override {
         _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_OPERATORS]);
     }
 
@@ -158,7 +165,7 @@ contract SSVNetwork is
         _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_OPERATORS]);
     }
 
-    function setOperatorsPublicUnchecked(uint64[] calldata operatorIds) external {
+    function setOperatorsPublicUnchecked(uint64[] calldata operatorIds) external override {
         _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_OPERATORS]);
     }
 
@@ -182,11 +189,23 @@ contract SSVNetwork is
         _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_OPERATORS]);
     }
 
-    function withdrawOperatorEarnings(uint64 operatorId, uint256 amount) external override {
+    function withdrawOperatorEarnings(uint64 operatorId, uint256 amount) external override nonReentrant {
+        _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_OPERATORS]);
+    }
+
+    function withdrawAllOperatorEarnings(uint64 operatorId) external override nonReentrant {
+        _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_OPERATORS]);
+    }
+
+    function withdrawAllVersionOperatorEarnings(uint64 operatorId) external override nonReentrant {
+        _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_OPERATORS]);
+    }
+
+    function withdrawOperatorEarningsSSV(uint64 operatorId, uint256 amount) external override nonReentrant {
         _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_OPERATORS]);
     }
 
-    function withdrawAllOperatorEarnings(uint64 operatorId) external override {
+    function withdrawAllOperatorEarningsSSV(uint64 operatorId) external override nonReentrant {
         _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_OPERATORS]);
     }
 
@@ -208,7 +227,7 @@ contract SSVNetwork is
         bytes calldata sharesData,
         uint256 amount,
         ISSVNetworkCore.Cluster memory cluster
-    ) external override {
+    ) external payable override {
         _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_CLUSTERS]);
     }
 
@@ -218,7 +237,7 @@ contract SSVNetwork is
         bytes[] calldata sharesData,
         uint256 amount,
         ISSVNetworkCore.Cluster memory cluster
-    ) external override {
+    ) external payable override {
         _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_CLUSTERS]);
     }
 
@@ -242,15 +261,23 @@ contract SSVNetwork is
         address clusterOwner,
         uint64[] calldata operatorIds,
         ISSVNetworkCore.Cluster memory cluster
-    ) external {
+    ) external override nonReentrant {
+        _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_CLUSTERS]);
+    }
+
+    function liquidateSSV(
+        address clusterOwner,
+        uint64[] calldata operatorIds,
+        ISSVNetworkCore.Cluster memory cluster
+    ) external override nonReentrant {
         _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_CLUSTERS]);
     }
 
     function reactivate(
         uint64[] calldata operatorIds,
         uint256 amount,
         ISSVNetworkCore.Cluster memory cluster
-    ) external override {
+    ) external payable override {
         _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_CLUSTERS]);
     }
 
@@ -259,15 +286,23 @@ contract SSVNetwork is
         uint64[] calldata operatorIds,
         uint256 amount,
         ISSVNetworkCore.Cluster memory cluster
-    ) external override {
+    ) external payable override {
         _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_CLUSTERS]);
     }
 
     function withdraw(
         uint64[] calldata operatorIds,
         uint256 amount,
         ISSVNetworkCore.Cluster memory cluster
-    ) external override {
+    ) external override nonReentrant {
+        _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_CLUSTERS]);
+    }
+
+    function migrateClusterToETH(uint64[] calldata operatorIds, ISSVNetworkCore.Cluster memory cluster)
+        external
+        payable
+        override
+    {
         _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_CLUSTERS]);
     }
 
@@ -283,7 +318,15 @@ contract SSVNetwork is
         _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_DAO]);
     }
 
-    function withdrawNetworkEarnings(uint256 amount) external override onlyOwner {
+    function updateNetworkFeeSSV(uint256 fee) external override onlyOwner {
+        _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_DAO]);
+    }
+
+    function withdrawNetworkEarnings(uint256 amount) external override onlyOwner nonReentrant {
+        _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_DAO]);
+    }
+
+    function withdrawNetworkSSVEarnings(uint256 amount) external override onlyOwner nonReentrant {
         _delegate(SSVStorage.load().ssvContracts[SSVModules.SSV_DAO]);
     }
 

contracts/SSVNetworkViews.sol

@@ -51,6 +51,10 @@ contract SSVNetworkViews is UUPSUpgradeable, Ownable2StepUpgradeable, ISSVViews
         return ssvNetwork.getOperatorFee(operatorId);
     }
 
+    function getOperatorFeeSSV(uint64 operatorId) external view override returns (uint256) {
+        return ssvNetwork.getOperatorFeeSSV(operatorId);
+    }
+
     function getOperatorDeclaredFee(uint64 operatorId) external view override returns (bool, uint256, uint64, uint64) {
         return ssvNetwork.getOperatorDeclaredFee(operatorId);
     }
@@ -61,6 +65,12 @@ contract SSVNetworkViews is UUPSUpgradeable, Ownable2StepUpgradeable, ISSVViews
         return ssvNetwork.getOperatorById(operatorId);
     }
 
+    function getOperatorByIdSSV(
+        uint64 operatorId
+    ) external view override returns (address, uint256, uint32, address, bool, bool) {
+        return ssvNetwork.getOperatorByIdSSV(operatorId);
+    }
+
     function getWhitelistedOperators(
         uint64[] calldata operatorIds,
         address whitelistedAddress
@@ -92,6 +102,14 @@ contract SSVNetworkViews is UUPSUpgradeable, Ownable2StepUpgradeable, ISSVViews
         return ssvNetwork.isLiquidatable(clusterOwner, operatorIds, cluster);
     }
 
+    function isLiquidatableSSV(
+        address clusterOwner,
+        uint64[] calldata operatorIds,
+        Cluster memory cluster
+    ) external view override returns (bool) {
+        return ssvNetwork.isLiquidatableSSV(clusterOwner, operatorIds, cluster);
+    }
+
     function isLiquidated(
         address clusterOwner,
         uint64[] calldata operatorIds,
@@ -104,10 +122,18 @@ contract SSVNetworkViews is UUPSUpgradeable, Ownable2StepUpgradeable, ISSVViews
         address clusterOwner,
         uint64[] calldata operatorIds,
         Cluster memory cluster
-    ) external view returns (uint256) {
+    ) external view override returns (uint256) {
         return ssvNetwork.getBurnRate(clusterOwner, operatorIds, cluster);
     }
 
+    function getBurnRateSSV(
+        address clusterOwner,
+        uint64[] calldata operatorIds,
+        Cluster memory cluster
+    ) external view override returns (uint256) {
+        return ssvNetwork.getBurnRateSSV(clusterOwner, operatorIds, cluster);
+    }
+
     /***********************************/
     /* Balance External View Functions */
     /***********************************/
@@ -116,6 +142,10 @@ contract SSVNetworkViews is UUPSUpgradeable, Ownable2StepUpgradeable, ISSVViews
         return ssvNetwork.getOperatorEarnings(id);
     }
 
+    function getOperatorEarningsSSV(uint64 id) external view override returns (uint256) {
+        return ssvNetwork.getOperatorEarningsSSV(id);
+    }
+
     function getBalance(
         address clusterOwner,
         uint64[] calldata operatorIds,
@@ -124,6 +154,14 @@ contract SSVNetworkViews is UUPSUpgradeable, Ownable2StepUpgradeable, ISSVViews
         return ssvNetwork.getBalance(clusterOwner, operatorIds, cluster);
     }
 
+    function getBalanceSSV(
+        address clusterOwner,
+        uint64[] calldata operatorIds,
+        Cluster memory cluster
+    ) external view override returns (uint256) {
+        return ssvNetwork.getBalanceSSV(clusterOwner, operatorIds, cluster);
+    }
+
     /*******************************/
     /* DAO External View Functions */
     /*******************************/
@@ -136,6 +174,14 @@ contract SSVNetworkViews is UUPSUpgradeable, Ownable2StepUpgradeable, ISSVViews
         return ssvNetwork.getNetworkEarnings();
     }
 
+    function getNetworkFeeSSV() external view override returns (uint256) {
+        return ssvNetwork.getNetworkFeeSSV();
+    }
+
+    function getNetworkEarningsSSV() external view override returns (uint256) {
+        return ssvNetwork.getNetworkEarningsSSV();
+    }
+
     function getOperatorFeeIncreaseLimit() external view override returns (uint64) {
         return ssvNetwork.getOperatorFeeIncreaseLimit();
     }
@@ -164,6 +210,10 @@ contract SSVNetworkViews is UUPSUpgradeable, Ownable2StepUpgradeable, ISSVViews
         return ssvNetwork.getNetworkValidatorsCount();
     }
 
+    function getClusterVersion(address owner, uint64[] calldata operatorIds) external view override returns (uint8) {
+        return ssvNetwork.getClusterVersion(owner, operatorIds);
+    }
+
     function getVersion() external view override returns (string memory) {
         return ssvNetwork.getVersion();
     }

contracts/interfaces/ISSVClusters.sol

@@ -16,7 +16,7 @@ interface ISSVClusters is ISSVNetworkCore {
         bytes calldata sharesData,
         uint256 amount,
         Cluster memory cluster
-    ) external;
+    ) external payable;
 
     /// @notice Registers new validators on the SSV Network
     /// @param publicKeys The public keys of the new validators
@@ -30,7 +30,7 @@ interface ISSVClusters is ISSVNetworkCore {
         bytes[] calldata sharesData,
         uint256 amount,
         Cluster memory cluster
-    ) external;
+    ) external payable;
 
     /// @notice Removes an existing validator from the SSV Network
     /// @param publicKey The public key of the validator to be removed
@@ -49,6 +49,11 @@ interface ISSVClusters is ISSVNetworkCore {
         Cluster memory cluster
     ) external;
 
+    /// @notice Migrates an SSV cluster to ETH, returning any SSV balance and accepting ETH top-up
+    /// @param operatorIds Array of operator IDs in the cluster
+    /// @param cluster Cluster data to migrate
+    function migrateClusterToETH(uint64[] calldata operatorIds, Cluster memory cluster) external payable;
+
     /**************************/
     /* Cluster External Functions */
     /**************************/
@@ -59,11 +64,17 @@ interface ISSVClusters is ISSVNetworkCore {
     /// @param cluster Cluster to be liquidated
     function liquidate(address owner, uint64[] memory operatorIds, Cluster memory cluster) external;
 
+    /// @notice Liquidates a cluster
+    /// @param owner The owner of the cluster
+    /// @param operatorIds Array of IDs of operators managing the cluster
+    /// @param cluster Cluster to be liquidated
+    function liquidateSSV(address owner, uint64[] memory operatorIds, Cluster memory cluster) external;
+
     /// @notice Reactivates a cluster
     /// @param operatorIds Array of IDs of operators managing the cluster
     /// @param amount Amount of SSV tokens to be deposited for reactivation
     /// @param cluster Cluster to be reactivated
-    function reactivate(uint64[] memory operatorIds, uint256 amount, Cluster memory cluster) external;
+    function reactivate(uint64[] memory operatorIds, uint256 amount, Cluster memory cluster) external payable;
 
     /******************************/
     /* Balance External Functions */
@@ -74,7 +85,12 @@ interface ISSVClusters is ISSVNetworkCore {
     /// @param operatorIds Array of IDs of operators managing the cluster
     /// @param amount Amount of SSV tokens to be deposited
     /// @param cluster Cluster where the deposit will be made
-    function deposit(address owner, uint64[] memory operatorIds, uint256 amount, Cluster memory cluster) external;
+    function deposit(
+        address owner,
+        uint64[] memory operatorIds,
+        uint256 amount,
+        Cluster memory cluster
+    ) external payable;
 
     /// @notice Withdraws tokens from a cluster
     /// @param operatorIds Array of IDs of operators managing the cluster
@@ -125,6 +141,22 @@ interface ISSVClusters is ISSVNetworkCore {
      */
     event ClusterReactivated(address indexed owner, uint64[] operatorIds, Cluster cluster);
 
+    /**
+     * @dev Emitted when a legacy SSV cluster is migrated to ETH.
+     * @param owner The owner of the migrated cluster.
+     * @param operatorIds The operator IDs managing the cluster.
+     * @param ethDeposited The amount of ETH supplied during migration.
+     * @param ssvRefunded The amount of SSV tokens refunded to the owner.
+     * @param cluster The migrated cluster data (ETH version).
+     */
+    event ClusterMigratedToETH(
+        address indexed owner,
+        uint64[] operatorIds,
+        uint256 ethDeposited,
+        uint256 ssvRefunded,
+        Cluster cluster
+    );
+
     /**
      * @dev Emitted when tokens are withdrawn from a cluster.
      * @param owner The owner of the cluster.

contracts/interfaces/ISSVDAO.sol

@@ -4,14 +4,22 @@ pragma solidity ^0.8.20;
 import {ISSVNetworkCore} from "./ISSVNetworkCore.sol";
 
 interface ISSVDAO is ISSVNetworkCore {
-    /// @notice Updates the network fee
-    /// @param fee The new network fee (SSV) to be set
+    /// @notice Updates the network fee (ETH post-migration)
+    /// @param fee The new network fee (ETH) to be set
     function updateNetworkFee(uint256 fee) external;
 
-    /// @notice Withdraws network earnings
-    /// @param amount The amount (SSV) to be withdrawn
+    /// @notice Updates the legacy network fee (SSV pre-migration)
+    /// @param fee The new network fee (SSV) to be set
+    function updateNetworkFeeSSV(uint256 fee) external;
+
+    /// @notice Withdraws network earnings (ETH post-migration)
+    /// @param amount The amount (ETH) to be withdrawn
     function withdrawNetworkEarnings(uint256 amount) external;
 
+    /// @notice Withdraws legacy network earnings (SSV pre-migration)
+    /// @param amount The amount (SSV) to be withdrawn
+    function withdrawNetworkSSVEarnings(uint256 amount) external;
+
     /// @notice Updates the limit on the percentage increase in operator fees
     /// @param percentage The new percentage limit
     function updateOperatorFeeIncreaseLimit(uint64 percentage) external;