feat: New roles for Restaker, Bug Fixes

foundry.toml

@@ -5,16 +5,9 @@ libs = ['lib']
 fs_permissions = [
     { access = "read-write", path = "./out" },
     { access = "read-write", path = "./release" },
-    { access = "read", path = "./test" },
     { access = "read-write", path = "./deployment" },
     { access = "read-write", path = "./operations" },
-    { access = "read", path = "./script/el-exits/val-consolidations" },
-    { access = "read", path = "./script/operator-management" },
-    { access = "read-write", path = "./script/operations/auto-compound" },
-    { access = "read-write", path = "./script/operations/consolidations" },
-    { access = "read-write", path = "./script/operations/exits" },
-    { access = "read-write", path = "./script/operations/utils" },
-    { access = "read", path = "./script/operations/data" },
+    { access = "read-write", path = "./script/operations" },
     { access = "read", path = "./" },
     { access = "read-write", path = "./script/upgrades" },
 ]

script/operations/steth-management/ClaimStEthWithdrawals.s.sol

@@ -4,12 +4,13 @@ pragma solidity ^0.8.27;
 import "forge-std/Script.sol";
 import "forge-std/console2.sol";
 import {Deployed} from "../../deploys/Deployed.s.sol";
+import {Utils} from "../../utils/utils.sol";
 import {EtherFiRestaker} from "../../../src/EtherFiRestaker.sol";
 import {ILidoWithdrawalQueue} from "../../../src/interfaces/ILiquifier.sol";
 
 // forge script script/operations/steth-management/ClaimStEthWithdrawals.s.sol --fork-url $MAINNET_RPC_URL -vvvv
 
-contract ClaimStEthWithdrawals is Script, Deployed {
+contract ClaimStEthWithdrawals is Script, Deployed, Utils {
 
     EtherFiRestaker constant etherFiRestaker = EtherFiRestaker(payable(ETHERFI_RESTAKER));
 
@@ -80,12 +81,27 @@ contract ClaimStEthWithdrawals is Script, Deployed {
             hints
         );
 
+        // 6. Write Safe transaction JSON automatically for claimable requests
+        address safeAddress = vm.envOr("SAFE_ADDRESS", ETHERFI_OPERATING_ADMIN);
+        string memory outputFile = vm.envOr("OUTPUT_FILE", string("claim-steth-withdrawals.json"));
+        writeSafeJson(
+            "script/operations/steth-management",
+            outputFile,
+            safeAddress,
+            address(etherFiRestaker),
+            0,
+            callData,
+            block.chainid
+        );
+
         console2.log("");
         console2.log("=== stEthClaimWithdrawals calldata ===");
         console2.log("Target:", address(etherFiRestaker));
         console2.logBytes(callData);
+        console2.log("Safe JSON file:", outputFile);
+        console2.log("Safe address:", safeAddress);
 
-        // 6. Simulate on fork as operating admin
+        // 7. Simulate on fork as operating admin
         console2.log("");
         console2.log("=== Simulating on fork ===");
         uint256 lpBalanceBefore = LIQUIDITY_POOL.balance;

script/upgrades/reaudit-fixes/transactions-reaudit-fixes.s.sol

@@ -204,7 +204,7 @@ contract ReauditFixesTransactions is Utils {
 
         EtherFiNode newEtherFiNodeImplementation = new EtherFiNode(address(LIQUIDITY_POOL), address(ETHERFI_NODES_MANAGER), address(EIGENLAYER_POD_MANAGER), address(EIGENLAYER_DELEGATION_MANAGER), address(ROLE_REGISTRY));
         EtherFiRedemptionManager newEtherFiRedemptionManagerImplementation = new EtherFiRedemptionManager(address(LIQUIDITY_POOL), address(EETH), address(WEETH), address(TREASURY), address(ROLE_REGISTRY), address(ETHERFI_RESTAKER), address(0x0));
-        EtherFiRestaker newEtherFiRestakerImplementation = new EtherFiRestaker(address(EIGENLAYER_REWARDS_COORDINATOR), address(ETHERFI_REDEMPTION_MANAGER));
+        EtherFiRestaker newEtherFiRestakerImplementation = new EtherFiRestaker(address(EIGENLAYER_REWARDS_COORDINATOR), address(ETHERFI_REDEMPTION_MANAGER), address(ROLE_REGISTRY), address(ETHERFI_RATE_LIMITER));
         EtherFiRewardsRouter newEtherFiRewardsRouterImplementation = new EtherFiRewardsRouter(address(LIQUIDITY_POOL), address(TREASURY), address(ROLE_REGISTRY));
         Liquifier newLiquifierImplementation = new Liquifier();
         WithdrawRequestNFT newWithdrawRequestNFTImplementation = new WithdrawRequestNFT(address(WITHDRAW_REQUEST_NFT_BUYBACK_SAFE));

script/upgrades/restaker-roles/deploy.s.sol

@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.27;
+
+import "forge-std/Script.sol";
+import {EtherFiRestaker} from "../../../src/EtherFiRestaker.sol";
+import {EtherFiRedemptionManager} from "../../../src/EtherFiRedemptionManager.sol";
+import {LiquidRefer} from "../../../src/helpers/LiquidRefer.sol";
+import {Utils} from "../../utils/utils.sol";
+
+/**
+ * @title DeployEtherFiRestakerAndRedemptionManagerWithRoles
+ * @notice Deploys the new EtherFiRestaker implementation with per-function RoleRegistry roles
+ *
+ * Constructor now takes a third arg: _roleRegistry
+ *
+ * Command:
+ * forge script script/upgrades/restaker-roles/deploy.s.sol --fork-url $MAINNET_RPC_URL -vvvv
+ */
+contract DeployEtherFiRestakerAndRedemptionManagerWithRoles is Utils {
+    address public etherFiRestakerImpl;
+    address public redemptionManagerImpl;
+    address public liquidReferImpl;
+
+    // Salt derived from a short description of this change. to update this post final audit
+    bytes32 commitHashSalt = keccak256("restaker-roles-v2");
+
+    function run() public {
+        console2.log("================================================");
+        console2.log("=== Deploying EtherFiRestaker + EtherFiRedemptionManager (roles upgrade) ==");
+        console2.log("================================================");
+
+        vm.startBroadcast();
+
+        {
+            string memory contractName = "EtherFiRestaker";
+            bytes memory constructorArgs = abi.encode(
+                EIGENLAYER_REWARDS_COORDINATOR,
+                ETHERFI_REDEMPTION_MANAGER,
+                ROLE_REGISTRY,
+                ETHERFI_RATE_LIMITER
+            );
+            bytes memory bytecode = abi.encodePacked(
+                type(EtherFiRestaker).creationCode,
+                constructorArgs
+            );
+            etherFiRestakerImpl = deploy(contractName, constructorArgs, bytecode, commitHashSalt, true, mainnetCreate2Factory);
+        }
+        {
+            string memory contractName = "EtherFiRedemptionManager";
+            bytes memory constructorArgs = abi.encode(
+                LIQUIDITY_POOL,
+                EETH,
+                WEETH,
+                WITHDRAW_REQUEST_NFT_BUYBACK_SAFE,
+                ROLE_REGISTRY,
+                ETHERFI_RESTAKER,
+                PRIORITY_WITHDRAWAL_QUEUE
+            );
+            bytes memory bytecode = abi.encodePacked(
+                type(EtherFiRedemptionManager).creationCode,
+                constructorArgs
+            );
+            redemptionManagerImpl = deploy(contractName, constructorArgs, bytecode, commitHashSalt, true, mainnetCreate2Factory);
+        }
+        {
+            string memory contractName = "LiquidRefer";
+            bytes memory constructorArgs = "";
+            bytes memory bytecode = abi.encodePacked(
+                type(LiquidRefer).creationCode
+            );
+            liquidReferImpl = deploy(contractName, constructorArgs, bytecode, commitHashSalt, true, mainnetCreate2Factory);
+        }
+
+        vm.stopBroadcast();
+
+        console2.log("");
+        console2.log("=== Deployment Summary ===");
+        console2.log("EtherFiRedemptionManager Implementation:", redemptionManagerImpl);
+        console2.log("EtherFiRestaker Implementation:", etherFiRestakerImpl);
+        console2.log("LiquidRefer Implementation:", liquidReferImpl);
+    }
+}