26Q2 - Security Upgrades

.github/workflows/run-forge-tests.yaml

@@ -30,6 +30,7 @@ jobs:
         run: forge test -vvv
         env:
           MAINNET_RPC_URL: ${{ secrets.MAINNET_RPC_URL }}
+          OP_RPC_URL: ${{ secrets.OP_RPC_URL }}
           SCROLL_RPC_URL: ${{ secrets.SCROLL_RPC_URL }}
           HISTORICAL_PROOF_812_WITHDRAWAL_RPC_URL: ${{ secrets.HISTORICAL_PROOF_812_WITHDRAWAL_RPC_URL }}
           HISTORICAL_PROOF_RPC_URL: ${{ secrets.HISTORICAL_PROOF_RPC_URL }}

.gitignore

@@ -19,6 +19,9 @@ typechain-types
 .vscode/
 release/logs/txns/*
 
+# Lock files
+foundry.lock
+
 # Hardhat files
 cache
 artifacts

script/DeployHoodiContracts.s.sol

@@ -45,8 +45,7 @@ contract DeployHoodiContracts is Script {
             liquidityPoolProxy,
             etherFiNodesManagerProxy,
             eigenPodManagerProxy,
-            delegationManagerProxy,
-            roleRegistryProxy
+            delegationManagerProxy
         );
         console.log("EtherFiNode deployed at:", address(newNode));
 

script/V3PreludeTransactions.sol

@@ -65,11 +65,11 @@ contract V3PreludeTransactions is Script {
     //--------------------------------------------------------------------------------------
     bytes32 ETHERFI_NODE_EIGENLAYER_ADMIN_ROLE = EtherFiNode(payable(etherFiNodeImpl)).ETHERFI_NODE_EIGENLAYER_ADMIN_ROLE();
     bytes32 ETHERFI_NODE_CALL_FORWARDER_ROLE = EtherFiNode(payable(etherFiNodeImpl)).ETHERFI_NODE_CALL_FORWARDER_ROLE();
-    bytes32 STAKING_MANAGER_NODE_CREATOR_ROLE = StakingManager(payable(stakingManagerImpl)).STAKING_MANAGER_NODE_CREATOR_ROLE();
-    bytes32 ETHERFI_NODES_MANAGER_ADMIN_ROLE = EtherFiNodesManager(payable(etherFiNodesManagerImpl)).ETHERFI_NODES_MANAGER_ADMIN_ROLE();
-    bytes32 ETHERFI_NODES_MANAGER_CALL_FORWARDER_ROLE = EtherFiNodesManager(payable(etherFiNodesManagerImpl)).ETHERFI_NODES_MANAGER_CALL_FORWARDER_ROLE();
-    bytes32 ETHERFI_NODES_MANAGER_EIGENLAYER_ADMIN_ROLE = EtherFiNodesManager(payable(etherFiNodesManagerImpl)).ETHERFI_NODES_MANAGER_EIGENLAYER_ADMIN_ROLE();
-    bytes32 LIQUIDITY_POOL_VALIDATOR_APPROVER_ROLE = LiquidityPool(payable(liquidityPoolImpl)).LIQUIDITY_POOL_VALIDATOR_APPROVER_ROLE();
+    bytes32 STAKING_MANAGER_NODE_CREATOR_ROLE = StakingManager(payable(stakingManagerImpl)).EXECUTOR_OPERATIONS_ROLE();
+    bytes32 ETHERFI_NODES_MANAGER_ADMIN_ROLE = EtherFiNodesManager(payable(etherFiNodesManagerImpl)).OPERATION_TIMELOCK_ROLE();
+    bytes32 ETHERFI_NODES_MANAGER_CALL_FORWARDER_ROLE = EtherFiNodesManager(payable(etherFiNodesManagerImpl)).EIGENPOD_OPERATIONS_ROLE();
+    bytes32 ETHERFI_NODES_MANAGER_EIGENLAYER_ADMIN_ROLE = EtherFiNodesManager(payable(etherFiNodesManagerImpl)).HOUSEKEEPING_OPERATIONS_ROLE();
+    bytes32 LIQUIDITY_POOL_VALIDATOR_APPROVER_ROLE = LiquidityPool(payable(liquidityPoolImpl)).EXECUTOR_OPERATIONS_ROLE();
 
     function run() public {
 

script/VerifyV3Upgrade.s.sol

@@ -123,18 +123,8 @@ contract VerifyV3Upgrade is Script {
             "EtherFiNodesManager has correct RoleRegistry"
         );
 
-        // Check a sample EtherFiNode implementation has correct RoleRegistry
-        console2.log("Checking EtherFiNode implementation RoleRegistry...");
-        address beacon = stakingManager.getEtherFiNodeBeacon();
-        address etherFiNodeImpl = getImplementation(beacon);
-        if (etherFiNodeImpl != address(0)) {
-            // Create a temporary instance to check the roleRegistry
-            EtherFiNode nodeImpl = EtherFiNode(payable(etherFiNodeImpl));
-            checkCondition(
-                address(nodeImpl.roleRegistry()) == address(roleRegistry),
-                "EtherFiNode implementation has correct RoleRegistry"
-            );
-        }
+        // EtherFiNode no longer holds a direct roleRegistry reference after the roles refactor;
+        // role checks now live on EtherFiNodesManager via the shared RolesLibrary.
 
         // Check LiquidityPool has correct RoleRegistry
         console2.log("Checking LiquidityPool RoleRegistry...");
@@ -192,7 +182,7 @@ contract VerifyV3Upgrade is Script {
             protocolUpgrader != address(0),
             "Protocol upgrader (RoleRegistry owner) is set"
         );
-        try roleRegistry.onlyProtocolUpgrader(protocolUpgrader) {
+        try roleRegistry.onlyUpgradeTimelock(protocolUpgrader) {
             checkCondition(true, "Protocol upgrader is owner");
         } catch {
             checkCondition(false, "Protocol upgrader is not owner");
@@ -274,62 +264,38 @@ contract VerifyV3Upgrade is Script {
     }
 
     function verifyRoleAssignments() internal {
-        // Define expected roles based on prelude.t.sol
+        // After role consolidation, all per-contract roles map to one of the 8 tier roles:
+        //   UPGRADE_TIMELOCK_ROLE, OPERATION_TIMELOCK_ROLE, OPERATION_MULTISIG_ROLE,
+        //   GUARDIAN_ROLE, ORACLE_OPERATIONS_ROLE..EIGENPOD_OPERATIONS_ROLE. Verify the consolidated constants exist.
 
-        // StakingManager roles
-        bytes32 STAKING_MANAGER_NODE_CREATOR_ROLE = keccak256(
-            "STAKING_MANAGER_NODE_CREATOR_ROLE"
-        );
-        console2.log("Checking StakingManager roles...");
-
-        // At least check that the role exists in the system
+        console2.log("Checking consolidated role constants...");
         checkCondition(
-            STAKING_MANAGER_NODE_CREATOR_ROLE ==
-                stakingManager.STAKING_MANAGER_NODE_CREATOR_ROLE(),
-            "STAKING_MANAGER_NODE_CREATOR_ROLE constant matches"
+            keccak256("OPERATION_TIMELOCK_ROLE") == roleRegistry.OPERATION_TIMELOCK_ROLE(),
+            "OPERATION_TIMELOCK_ROLE constant matches"
         );
-
-        // EtherFiNodesManager roles
-        bytes32 ETHERFI_NODES_MANAGER_ADMIN_ROLE = keccak256(
-            "ETHERFI_NODES_MANAGER_ADMIN_ROLE"
-        );
-        bytes32 ETHERFI_NODES_MANAGER_EIGENLAYER_ADMIN_ROLE = keccak256(
-            "ETHERFI_NODES_MANAGER_EIGENLAYER_ADMIN_ROLE"
-        );
-        bytes32 ETHERFI_NODES_MANAGER_CALL_FORWARDER_ROLE = keccak256(
-            "ETHERFI_NODES_MANAGER_CALL_FORWARDER_ROLE"
+        checkCondition(
+            keccak256("OPERATION_MULTISIG_ROLE") == roleRegistry.OPERATION_MULTISIG_ROLE(),
+            "OPERATION_MULTISIG_ROLE constant matches"
         );
-
-        console2.log("Checking EtherFiNodesManager roles...");
         checkCondition(
-            ETHERFI_NODES_MANAGER_ADMIN_ROLE ==
-                etherFiNodesManager.ETHERFI_NODES_MANAGER_ADMIN_ROLE(),
-            "ETHERFI_NODES_MANAGER_ADMIN_ROLE constant matches"
+            keccak256("GUARDIAN_ROLE") == roleRegistry.GUARDIAN_ROLE(),
+            "GUARDIAN_ROLE constant matches"
         );
         checkCondition(
-            ETHERFI_NODES_MANAGER_EIGENLAYER_ADMIN_ROLE ==
-                etherFiNodesManager
-                    .ETHERFI_NODES_MANAGER_EIGENLAYER_ADMIN_ROLE(),
-            "ETHERFI_NODES_MANAGER_EIGENLAYER_ADMIN_ROLE constant matches"
+            keccak256("ORACLE_OPERATIONS_ROLE") == roleRegistry.ORACLE_OPERATIONS_ROLE(),
+            "ORACLE_OPERATIONS_ROLE constant matches"
         );
         checkCondition(
-            ETHERFI_NODES_MANAGER_CALL_FORWARDER_ROLE ==
-                etherFiNodesManager.ETHERFI_NODES_MANAGER_CALL_FORWARDER_ROLE(),
-            "ETHERFI_NODES_MANAGER_CALL_FORWARDER_ROLE constant matches"
+            keccak256("HOUSEKEEPING_OPERATIONS_ROLE") == roleRegistry.HOUSEKEEPING_OPERATIONS_ROLE(),
+            "HOUSEKEEPING_OPERATIONS_ROLE constant matches"
         );
-
-        // Check protocol pauser/unpauser roles exist
-        bytes32 PROTOCOL_PAUSER = keccak256("PROTOCOL_PAUSER");
-        bytes32 PROTOCOL_UNPAUSER = keccak256("PROTOCOL_UNPAUSER");
-
-        console2.log("Checking protocol pause roles...");
         checkCondition(
-            PROTOCOL_PAUSER == roleRegistry.PROTOCOL_PAUSER(),
-            "PROTOCOL_PAUSER constant matches"
+            keccak256("EXECUTOR_OPERATIONS_ROLE") == roleRegistry.EXECUTOR_OPERATIONS_ROLE(),
+            "EXECUTOR_OPERATIONS_ROLE constant matches"
         );
         checkCondition(
-            PROTOCOL_UNPAUSER == roleRegistry.PROTOCOL_UNPAUSER(),
-            "PROTOCOL_UNPAUSER constant matches"
+            keccak256("EIGENPOD_OPERATIONS_ROLE") == roleRegistry.EIGENPOD_OPERATIONS_ROLE(),
+            "EIGENPOD_OPERATIONS_ROLE constant matches"
         );
     }
 

script/deploys/DeployCumulativeMerkleRewardsDistributor.sol

@@ -34,7 +34,7 @@ contract DeployCumulativeMerkleRewardsDistributor is Script {
         bytes memory initializerData =  abi.encodeWithSelector(CumulativeMerkleRewardsDistributor.initialize.selector);
         CumulativeMerkleRewardsDistributor cumulativeMerkleRewardsDistributorImplementation = new CumulativeMerkleRewardsDistributor(roleRegistryProxyAddress);
         UUPSProxy cumulativeMerkleRewardsDistributorProxy = new UUPSProxy(address(cumulativeMerkleRewardsDistributorImplementation), initializerData);
-        CumulativeMerkleRewardsDistributor cumulativeMerkleInstance = CumulativeMerkleRewardsDistributor(address(cumulativeMerkleRewardsDistributorProxy));
+        CumulativeMerkleRewardsDistributor cumulativeMerkleInstance = CumulativeMerkleRewardsDistributor(payable(address(cumulativeMerkleRewardsDistributorProxy)));
         //cumulativeMerkleInstance.grantRole(keccak256("CUMULATIVE_MERKLE_REWARDS_DISTRIBUTOR_ADMIN_ROLE"), msg.sender);
         cumulativeMerkleInstance.transferOwnership(address(timelockAddress));
 

script/deploys/Deployed.s.sol

@@ -70,6 +70,7 @@ contract Deployed {
     // Utilities
     address public constant EIGENLAYER_POD_MANAGER = 0x91E677b07F7AF907ec9a428aafA9fc14a0d3A338;
     address public constant EIGENLAYER_DELEGATION_MANAGER = 0x39053D51B77DC0d36036Fc1fCc8Cb819df8Ef37A;
+    address public constant EIGENLAYER_STRATEGY_MANAGER = 0x858646372CC42E1A627fcE94aa7A7033e7CF075A;
     address public constant EIGENLAYER_REWARDS_COORDINATOR = 0x7750d328b314EfFa365A0402CcfD489B80B0adda;
     address public constant LIDO_WITHDRAWAL_QUEUE = 0x889edC2eDab5f40e902b864aD4d7AdE8E412F9B1;
 

script/el-exits/ELExitsTransactions.s.sol

@@ -71,20 +71,16 @@ contract ElExitsTransactions is Script {
     //--------------------------------------------------------------------------------------
 
     bytes32 ETHERFI_NODES_MANAGER_EL_TRIGGER_EXIT_ROLE =
-        EtherFiNodesManager(payable(etherFiNodesManagerImpl))
-            .ETHERFI_NODES_MANAGER_EL_TRIGGER_EXIT_ROLE();
+        RoleRegistry(roleRegistry).EXECUTOR_OPERATIONS_ROLE();
 
     bytes32 ETHERFI_NODES_MANAGER_POD_PROVER_ROLE =
-        EtherFiNodesManager(payable(etherFiNodesManagerImpl))
-            .ETHERFI_NODES_MANAGER_POD_PROVER_ROLE();
+        RoleRegistry(roleRegistry).EIGENPOD_OPERATIONS_ROLE();
 
     bytes32 STAKING_MANAGER_ADMIN_ROLE =
-        StakingManager(payable(stakingManagerImpl))
-            .STAKING_MANAGER_ADMIN_ROLE();
+        RoleRegistry(roleRegistry).OPERATION_MULTISIG_ROLE();
 
     bytes32 ETHERFI_RATE_LIMITER_ADMIN_ROLE =
-        EtherFiRateLimiter(payable(etherFiRateLimiterImpl))
-            .ETHERFI_RATE_LIMITER_ADMIN_ROLE();
+        RoleRegistry(roleRegistry).OPERATION_MULTISIG_ROLE();
 
     //--------------------------------------------------------------------------------------
     //------------------------------- SELECTORS ---------------------------------------
@@ -95,8 +91,8 @@ contract ElExitsTransactions is Script {
     // cast sig "updateAllowedForwardedEigenpodCalls(bytes4,bool)"
     bytes4 UPDATE_ALLOWED_FORWARDED_EIGENPOD_CALLS_SELECTOR = 0x4cba6c74;
 
-    uint256 MIN_DELAY_OPERATING_TIMELOCK = 28800; // 8 hours
-    uint256 MIN_DELAY_TIMELOCK = 259200; // 72 hours
+    uint256 minDelay_OPERATING_TIMELOCK = 28800; // 8 hours
+    uint256 minDelay_TIMELOCK = 259200; // 72 hours
 
     // External calls selectors
     bytes4 UPDATE_ALLOWED_FORWARDED_EXTERNAL_CALLS_SELECTOR_ONE = 0x9a15bf92; // claim(uint256,bytes32[],bytes)
@@ -325,7 +321,7 @@ contract ElExitsTransactions is Script {
             data,
             bytes32(0), // predecessor
             timelockSalt,
-            MIN_DELAY_TIMELOCK // minDelay
+            minDelay_TIMELOCK // minDelay
         );
         console2.log("====== Schedule Execute El Exit Transactions Tx:");
         console2.logBytes(scheduleCalldata);
@@ -348,10 +344,10 @@ contract ElExitsTransactions is Script {
         // uncomment to run against fork
         // console2.log("=== SCHEDULING BATCH ===");
         // console2.log("Current timestamp:", block.timestamp);
-        // etherFiTimelock.scheduleBatch(targets, values, data, bytes32(0), timelockSalt, MIN_DELAY_TIMELOCK);
+        // etherFiTimelock.scheduleBatch(targets, values, data, bytes32(0), timelockSalt, minDelay_TIMELOCK);
 
         // console2.log("=== FAST FORWARDING TIME ===");
-        // vm.warp(block.timestamp + MIN_DELAY_TIMELOCK + 1); // +1 to ensure it's past the delay
+        // vm.warp(block.timestamp + minDelay_TIMELOCK + 1); // +1 to ensure it's past the delay
         // console2.log("New timestamp:", block.timestamp);
         // etherFiTimelock.executeBatch(targets, values, data, bytes32(0), timelockSalt);
     }
@@ -496,7 +492,7 @@ contract ElExitsTransactions is Script {
             data,
             bytes32(0), // predecessor
             timelockSalt,
-            MIN_DELAY_OPERATING_TIMELOCK // minDelay
+            minDelay_OPERATING_TIMELOCK // minDelay
         );
         console2.log("====== Schedule Clean Up Old Whitelist Mappings In EtherFiNodesManager Tx:");
         console2.logBytes(scheduleCalldata);
@@ -518,10 +514,10 @@ contract ElExitsTransactions is Script {
         // uncomment to run against fork
         // console2.log("=== SCHEDULING BATCH ===");
         // console2.log("Current timestamp:", block.timestamp);
-        // etherFiOperatingTimelock.scheduleBatch(targets, values, data, bytes32(0), timelockSalt, MIN_DELAY_OPERATING_TIMELOCK);
+        // etherFiOperatingTimelock.scheduleBatch(targets, values, data, bytes32(0), timelockSalt, minDelay_OPERATING_TIMELOCK);
 
         // console2.log("=== FAST FORWARDING TIME ===");
-        // vm.warp(block.timestamp + MIN_DELAY_OPERATING_TIMELOCK + 1); // +1 to ensure it's past the delay
+        // vm.warp(block.timestamp + minDelay_OPERATING_TIMELOCK + 1); // +1 to ensure it's past the delay
         // console2.log("New timestamp:", block.timestamp);
         // etherFiOperatingTimelock.executeBatch(targets, values, data, bytes32(0), timelockSalt);
     }
@@ -577,7 +573,7 @@ contract ElExitsTransactions is Script {
             data,
             bytes32(0), // predecessor
             timelockSalt,
-            MIN_DELAY_OPERATING_TIMELOCK // minDelay
+            minDelay_OPERATING_TIMELOCK // minDelay
         );
         console2.log("====== Schedule New Mappings In EtherFiNodesManager Tx:");
         console2.logBytes(scheduleCalldata);
@@ -600,10 +596,10 @@ contract ElExitsTransactions is Script {
         // uncomment to run against fork
         // console2.log("=== SCHEDULING BATCH ===");
         // console2.log("Current timestamp:", block.timestamp);
-        // etherFiOperatingTimelock.scheduleBatch(targets, values, data, bytes32(0), timelockSalt, MIN_DELAY_OPERATING_TIMELOCK);
+        // etherFiOperatingTimelock.scheduleBatch(targets, values, data, bytes32(0), timelockSalt, minDelay_OPERATING_TIMELOCK);
 
         // // console2.log("=== FAST FORWARDING TIME ===");
-        // vm.warp(block.timestamp + MIN_DELAY_OPERATING_TIMELOCK + 1); // +1 to ensure it's past the delay
+        // vm.warp(block.timestamp + minDelay_OPERATING_TIMELOCK + 1); // +1 to ensure it's past the delay
         // console2.log("New timestamp:", block.timestamp);
         // etherFiOperatingTimelock.executeBatch(targets, values, data, bytes32(0), timelockSalt);
     }
@@ -739,7 +735,7 @@ contract ElExitsTransactions is Script {
             data,
             bytes32(0), // predecessor
             timelockSalt,
-            MIN_DELAY_OPERATING_TIMELOCK // minDelay
+            minDelay_OPERATING_TIMELOCK // minDelay
         );
         console2.log("====== Schedule Rollback New Mappings In EtherFiNodesManager Tx:");
         console2.logBytes(scheduleCalldata);
@@ -762,10 +758,10 @@ contract ElExitsTransactions is Script {
         // uncomment to run against fork
         // console2.log("=== SCHEDULING BATCH ===");
         // console2.log("Current timestamp:", block.timestamp);
-        // etherFiOperatingTimelock.scheduleBatch(targets, values, data, bytes32(0), timelockSalt, MIN_DELAY_OPERATING_TIMELOCK);
+        // etherFiOperatingTimelock.scheduleBatch(targets, values, data, bytes32(0), timelockSalt, minDelay_OPERATING_TIMELOCK);
 
         // console2.log("=== FAST FORWARDING TIME ===");
-        // vm.warp(block.timestamp + MIN_DELAY_OPERATING_TIMELOCK + 1); // +1 to ensure it's past the delay
+        // vm.warp(block.timestamp + minDelay_OPERATING_TIMELOCK + 1); // +1 to ensure it's past the delay
         // console2.log("New timestamp:", block.timestamp);
         // etherFiOperatingTimelock.executeBatch(targets, values, data, bytes32(0), timelockSalt);
     }
@@ -816,7 +812,7 @@ contract ElExitsTransactions is Script {
             data,
             bytes32(0), // predecessor
             timelockSalt,
-            MIN_DELAY_TIMELOCK // minDelay
+            minDelay_TIMELOCK // minDelay
         );
         console2.log("====== Rollback Schedule Tx:");
         console2.logBytes(scheduleCalldata);
@@ -840,10 +836,10 @@ contract ElExitsTransactions is Script {
         // uncomment to run against fork
         // console2.log("=== SCHEDULING BATCH ===");
         // console2.log("Current timestamp:", block.timestamp);
-        // etherFiTimelock.scheduleBatch(targets, values, data, bytes32(0), timelockSalt, MIN_DELAY_TIMELOCK);
+        // etherFiTimelock.scheduleBatch(targets, values, data, bytes32(0), timelockSalt, minDelay_TIMELOCK);
 
         // console2.log("=== FAST FORWARDING TIME ===");
-        // vm.warp(block.timestamp + MIN_DELAY_TIMELOCK + 1); // +1 to ensure it's past the delay
+        // vm.warp(block.timestamp + minDelay_TIMELOCK + 1); // +1 to ensure it's past the delay
         // console2.log("New timestamp:", block.timestamp);
         // etherFiTimelock.executeBatch(targets, values, data, bytes32(0), timelockSalt);
     }
@@ -988,7 +984,7 @@ contract ElExitsTransactions is Script {
             data,
             bytes32(0), // predecessor
             timelockSalt,
-            MIN_DELAY_OPERATING_TIMELOCK // minDelay
+            minDelay_OPERATING_TIMELOCK // minDelay
         );
         console2.log("====== Schedule Rollback Cleaned Up Old Whitelist Mappings In EtherFiNodesManager Tx:");
         console2.logBytes(scheduleCalldata);
@@ -1012,10 +1008,10 @@ contract ElExitsTransactions is Script {
         // uncomment to run against fork
         // console2.log("=== SCHEDULING BATCH ===");
         // console2.log("Current timestamp:", block.timestamp);
-        // etherFiOperatingTimelock.scheduleBatch(targets, values, data, bytes32(0), timelockSalt, MIN_DELAY_OPERATING_TIMELOCK);
+        // etherFiOperatingTimelock.scheduleBatch(targets, values, data, bytes32(0), timelockSalt, minDelay_OPERATING_TIMELOCK);
 
         // console2.log("=== FAST FORWARDING TIME ===");
-        // vm.warp(block.timestamp + MIN_DELAY_OPERATING_TIMELOCK + 1); // +1 to ensure it's past the delay
+        // vm.warp(block.timestamp + minDelay_OPERATING_TIMELOCK + 1); // +1 to ensure it's past the delay
         // console2.log("New timestamp:", block.timestamp);
         // etherFiOperatingTimelock.executeBatch(targets, values, data, bytes32(0), timelockSalt);
     }