upgrade to 0.8.24, gas improvements

Author: mtabasco

contracts/SSVNetwork.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "./interfaces/ISSVNetwork.sol";
 

contracts/SSVNetworkViews.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "./interfaces/ISSVViews.sol";
 import "./libraries/Types.sol";
@@ -67,7 +67,7 @@ contract SSVNetworkViews is UUPSUpgradeable, Ownable2StepUpgradeable, ISSVViews
     ) external view override returns (uint64[] memory whitelistedOperatorIds) {
         return ssvNetwork.getWhitelistedOperators(operatorIds, whitelistedAddress);
     }
-    function isWhitelistingContract(address contractAddress) external view returns (bool isWhitelistingContract) {
+    function isWhitelistingContract(address contractAddress) external view returns (bool) {
         return ssvNetwork.isWhitelistingContract(contractAddress);
     }
 

contracts/SSVProxy.sol

@@ -1,10 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import {SSVModules, SSVStorage, StorageData} from "./libraries/SSVStorage.sol";
 
 abstract contract SSVProxy {
-
     function _delegate(address implementation) internal {
         assembly {
             // Copy msg.data. We take full control of memory in this inline assembly

contracts/interfaces/ISSVClusters.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "./ISSVNetworkCore.sol";
 

contracts/interfaces/ISSVDAO.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "./ISSVNetworkCore.sol";
 

contracts/interfaces/ISSVNetwork.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "./ISSVNetworkCore.sol";
 import "./ISSVOperators.sol";

contracts/interfaces/ISSVNetworkCore.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 interface ISSVNetworkCore {
     /***********/

contracts/interfaces/ISSVOperators.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "./ISSVNetworkCore.sol";
 

contracts/interfaces/ISSVOperatorsWhitelist.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "./ISSVNetworkCore.sol";
 import "./external/ISSVWhitelistingContract.sol";

contracts/interfaces/ISSVViews.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "./ISSVNetworkCore.sol";
 

contracts/interfaces/external/ISSVWhitelistingContract.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 interface ISSVWhitelistingContract {
     /// @notice Checks if the caller is whitelisted

contracts/libraries/ClusterLib.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../interfaces/ISSVNetworkCore.sol";
 import "./SSVStorage.sol";

contracts/libraries/CoreLib.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "./SSVStorage.sol";
 
@@ -55,7 +55,6 @@ library CoreLib {
         return size > 0;
     }
 
-
     function setModuleContract(SSVModules moduleId, address moduleAddress) internal {
         if (!isContract(moduleAddress)) revert ISSVNetworkCore.TargetModuleDoesNotExist();
 

contracts/libraries/OperatorLib.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../interfaces/ISSVNetworkCore.sol";
 import "../interfaces/external/ISSVWhitelistingContract.sol";
@@ -66,16 +66,13 @@ library OperatorLib {
             if (operator.whitelisted) {
                 address whitelistedAddress = s.operatorsWhitelist[operatorId];
                 if (whitelistedAddress != address(0)) {
-                    // Check if the whitelisted address is a custom contract and use its logic to check if msg.sender is whitelisted
-                    if (isWhitelistingContract(whitelistedAddress)) {
+                    // Legacy address whitelists (EOAs or generic contracts)
+                    if (whitelistedAddress != msg.sender) {
+                        // Check if msg.sender is whitelisted via whitelisting contract
+                        // No need to check isWhitelistingContract() as its verified when registering it
                         if (!ISSVWhitelistingContract(whitelistedAddress).isWhitelisted(msg.sender, operatorId)) {
                             revert ISSVNetworkCore.CallerNotWhitelisted();
                         }
-                    } else {
-                        // Legacy address whitelists (EOAs or generic contracts)
-                        if (whitelistedAddress != msg.sender) {
-                            revert ISSVNetworkCore.CallerNotWhitelisted();
-                        }
                     }
                 } else {
                     // Handle bitmap-based whitelisting

contracts/libraries/ProtocolLib.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../interfaces/ISSVNetworkCore.sol";
 import "./Types.sol";

contracts/libraries/SSVStorage.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../interfaces/ISSVNetworkCore.sol";
 import "@openzeppelin/contracts/utils/Counters.sol";

contracts/libraries/SSVStorageProtocol.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 /// @title SSV Network Storage Protocol
 /// @notice Represents the operational settings and parameters required by the SSV Network
@@ -33,7 +33,7 @@ struct StorageProtocol {
 }
 
 library SSVStorageProtocol {
-    uint256 constant private SSV_STORAGE_POSITION = uint256(keccak256("ssv.network.storage.protocol")) - 1;
+    uint256 private constant SSV_STORAGE_POSITION = uint256(keccak256("ssv.network.storage.protocol")) - 1;
 
     function load() internal pure returns (StorageProtocol storage sd) {
         uint256 position = SSV_STORAGE_POSITION;

contracts/libraries/Types.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 uint256 constant DEDUCTED_DIGITS = 10_000_000;
 

contracts/libraries/ValidatorLib.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../interfaces/ISSVNetworkCore.sol";
 import "./SSVStorage.sol";
@@ -42,8 +42,8 @@ library ValidatorLib {
     }
 
     function validateCorrectState(bytes32 validatorData, bytes32 hashedOperatorIds) internal pure returns (bool) {
-            // All bits set to 1 except LSB
-            // Clear LSB of stored validator data and compare
-            return (validatorData & ~bytes32(uint256(1))) == hashedOperatorIds;
+        // All bits set to 1 except LSB
+        // Clear LSB of stored validator data and compare
+        return (validatorData & ~bytes32(uint256(1))) == hashedOperatorIds;
     }
 }

contracts/modules/SSVClusters.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../interfaces/ISSVClusters.sol";
 import "../libraries/ClusterLib.sol";
@@ -151,13 +151,7 @@ contract SSVClusters is ISSVClusters {
 
         if (cluster.active) {
             StorageProtocol storage sp = SSVStorageProtocol.load();
-            (uint64 clusterIndex, ) = OperatorLib.updateClusterOperators(
-                operatorIds,
-                false,
-                validatorsRemoved,
-                s,
-                sp
-            );
+            (uint64 clusterIndex, ) = OperatorLib.updateClusterOperators(operatorIds, false, validatorsRemoved, s, sp);
 
             cluster.updateClusterData(clusterIndex, sp.currentNetworkFeeIndex());
 

contracts/modules/SSVDAO.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../interfaces/ISSVDAO.sol";
 import "../libraries/Types.sol";

contracts/modules/SSVOperators.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../interfaces/ISSVOperators.sol";
 import "../libraries/Types.sol";

contracts/modules/SSVOperatorsWhitelist.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import {ISSVOperatorsWhitelist} from "../interfaces/ISSVOperatorsWhitelist.sol";
 import {ISSVWhitelistingContract} from "../interfaces/external/ISSVWhitelistingContract.sol";

contracts/modules/SSVViews.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../interfaces/ISSVViews.sol";
 import "../libraries/Types.sol";

contracts/test/SSVNetworkBasicUpgrade.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../SSVNetwork.sol";
 

contracts/test/SSVNetworkReinitializable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../SSVNetwork.sol";
 import {SSVStorageT as SSVStorageUpgrade} from "./libraries/SSVStorageT.sol";

contracts/test/SSVNetworkUpgrade.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "./interfaces/ISSVNetworkT.sol";
 
@@ -131,7 +131,7 @@ contract SSVNetworkUpgrade is
             abi.encodeWithSignature("removeOperator(uint64)", operatorId)
         );
     }
-    
+
     function declareOperatorFee(uint64 operatorId, uint256 fee) external override {
         _delegateCall(
             SSVStorage.load().ssvContracts[SSVModules.SSV_OPERATORS],

contracts/test/SSVNetworkValidatorsPerOperator.sol

@@ -1,11 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../SSVNetwork.sol";
 
-
 contract SSVNetworkValidatorsPerOperatorUpgrade is SSVNetwork {
-
     function initializev2(uint32 validatorsPerOperatorLimit_) external reinitializer(_getInitializedVersion() + 1) {
         SSVStorageProtocol.load().validatorsPerOperatorLimit = validatorsPerOperatorLimit_;
     }

contracts/test/interfaces/ISSVNetworkT.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../../interfaces/ISSVNetworkCore.sol";
 import "../../interfaces/ISSVOperators.sol";

contracts/test/libraries/CoreLibT.sol

@@ -1,10 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../../libraries/SSVStorage.sol";
 
 library CoreLibT {
-
     function getVersion() internal pure returns (string memory) {
         return "v1.1.0";
     }
@@ -14,4 +13,4 @@ library CoreLibT {
             revert ISSVNetworkCore.TokenTransferFailed();
         }
     }
-}
+}

contracts/test/libraries/SSVStorageT.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../../interfaces/ISSVNetworkCore.sol";
 import "../../libraries/Types.sol";

contracts/test/mocks/MockWhitelistingContract.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../../interfaces/external/ISSVWhitelistingContract.sol";
 import "@openzeppelin/contracts/utils/introspection/ERC165.sol";

contracts/test/modules/SSVOperatorsUpdate.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../../interfaces/ISSVOperators.sol";
 import "../../libraries/Types.sol";

contracts/upgrades/stage/goerli/SSVNetworkValidatorsPerOperator.sol

@@ -1,11 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../../../SSVNetwork.sol";
 
-
 contract SSVNetworkValidatorsPerOperator is SSVNetwork {
-
     function initializev2(uint32 validatorsPerOperatorLimit_) external reinitializer(_getInitializedVersion() + 1) {
         SSVStorageProtocol.load().validatorsPerOperatorLimit = validatorsPerOperatorLimit_;
     }

contracts/upgrades/stage/holesky/SSVNetworkUpgradeValidatorsPerOperator.sol

@@ -1,11 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.18;
+pragma solidity 0.8.24;
 
 import "../../../SSVNetwork.sol";
 
-
 contract SSVNetworkUpgradeValidatorsPerOperator is SSVNetwork {
-
     function initializev2(uint32 validatorsPerOperatorLimit_) external reinitializer(_getInitializedVersion() + 1) {
         SSVStorageProtocol.load().validatorsPerOperatorLimit = validatorsPerOperatorLimit_;
     }

hardhat.config.ts

@@ -30,6 +30,9 @@ const config: HardhatUserConfig = {
       },
       {
         version: '0.8.18',
+      },
+      {
+        version: '0.8.24',
         settings: {
           optimizer: {
             enabled: true,
@@ -48,10 +51,11 @@ const config: HardhatUserConfig = {
     hardhat: {
       forking: {
         enabled: process.env.FORK_TESTING_ENABLED ? true : false,
-        url: "https://mainnet.infura.io/v3/1810bc4fb927499990638f8451a455e4",
+        url: process.env.MAINNET_ETH_NODE_URL,
         blockNumber: 19621100,
       },
       allowUnlimitedContractSize: true,
+      gas: 5000000,
     },
   },
   etherscan: {