fix: modify less files

Author: pakim249CAL

script/configs/mainnet/mainnet-addresses.config.json

@@ -1,5 +1,5 @@
 {
-    "lastUpdated": "transfer-da-ownership",
+    "lastUpdated": "v0.4.3-mainnet-foundation-incentives",
     "addresses": {
         "avsDirectory": "0x135dda560e946695d6f155dacafc6f1f25c1f5af",
         "avsDirectoryImplementation": "0xdabdb3cd346b7d5f5779b0b614ede1cc9dcba5b7",
@@ -9,10 +9,6 @@
         "delayedWithdrawalRouterImplementation": "0x4bb6731b02314d40abbffbc4540f508874014226",
         "delegationManager": "0x39053D51B77DC0d36036Fc1fCc8Cb819df8Ef37A",
         "delegationManagerImplementation": "0x1784be6401339fc0fedf7e9379409f5c1bfe9dda",
-        "eigenDAProxyAdmin": "0x8247EF5705d3345516286B72bFE6D690197C2E99",
-        "eigenDAEjectionManager": "0x130d8EA0052B45554e4C99079B84df292149Bd5E",
-        "eigenDARegistryCoordinator:": "0x0BAAc79acD45A023E19345c352d8a7a83C4e5656",
-        "eigenDAServiceManager": "0x870679E138bCdf293b7Ff14dD44b70FC97e12fc0",
         "eigenLayerPauserReg": "0x0c431C66F4dE941d089625E5B423D00707977060",
         "eigenLayerProxyAdmin": "0x8b9566AdA63B64d1E1dcF1418b43fd1433b72444",
         "eigenPodBeacon": "0x5a2a4F2F3C18f09179B6703e63D9eDD165909073",
@@ -76,7 +72,6 @@
     },
     "parameters": {
         "communityMultisig": "0xFEA47018D632A77bA579846c840d5706705Dc598",
-        "eigenDAOpsMultisig": "0x002721B4790d97dC140a049936aA710152Ba92D5",
         "executorMultisig": "0x369e6F597e22EaB55fFb173C6d9cD234BD699111",
         "operationsMultisig": "0xBE1685C81aA44FF9FB319dD389addd9374383e90",
         "pauserMultisig": "0x5050389572f2d220ad927CcbeA0D406831012390",

script/releases/Env.sol

@@ -64,26 +64,6 @@ library Env {
         return _string("ZEUS_DEPLOY_TO_VERSION");
     }
 
-    function eigenDAOpsMultisig() internal view returns (address) {
-        return _envAddress("eigenDAOpsMultisig");
-    }
-
-    function eigenDAProxyAdmin() internal view returns (address) {
-        return _envAddress("eigenDAProxyAdmin");
-    }
-
-    function eigenDAEjectionManager() internal view returns (address) {
-        return _envAddress("eigenDAEjectionManager");
-    }
-
-    function eigenDARegistryCoordinator() internal view returns (address) {
-        return _envAddress("eigenDARegistryCoordinator");
-    }
-
-    function eigenDAServiceManager() internal view returns (address) {
-        return _envAddress("eigenDAServiceManager");
-    }
-
     function executorMultisig() internal view returns (address) {
         return _envAddress("executorMultisig");
     }

script/releases/transfer-da-ownership/1-queueTransferProxyAdmin.s.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.12;
 
 import "../Env.sol";
+import {TransferDAOwnershipConstants as C} from "./TransferDAOwnershipConstants.sol";
 
 import {MultisigBuilder} from "zeus-templates/templates/MultisigBuilder.sol";
 import "zeus-templates/utils/Encode.sol";
@@ -36,8 +37,8 @@ contract QueueTransferProxyAdmin is MultisigBuilder {
     /// @dev Get the calldata to be sent from the timelock to the executor
     function _getCalldataToExecutor() internal returns (bytes memory) {
         MultisigCall[] storage executorCalls = Encode.newMultisigCalls().append({
-            to: Env.eigenDAProxyAdmin(),
-            data: abi.encodeCall(Ownable.transferOwnership, (Env.eigenDAOpsMultisig()))
+            to: C.EIGEN_DA_PROXY_ADMIN,
+            data: abi.encodeCall(Ownable.transferOwnership, (C.EIGEN_DA_OPS_MULTISIG))
         });
 
         return Encode.gnosisSafe.execTransaction({

script/releases/transfer-da-ownership/2-transferOwnershipDAContracts.s.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.12;
 import "../Env.sol";
 
 import {MultisigBuilder} from "zeus-templates/templates/MultisigBuilder.sol";
+import {TransferDAOwnershipConstants as C} from "./TransferDAOwnershipConstants.sol";
 import "zeus-templates/utils/Encode.sol";
 
 import "@openzeppelin/contracts/access/Ownable.sol";
@@ -18,24 +19,24 @@ contract TransferOwnershipDAContracts is MultisigBuilder {
     using Env for *;
 
     function _runAsMultisig() internal override prank(Env.opsMultisig()) {
-        Ownable(Env.eigenDAEjectionManager()).transferOwnership(Env.eigenDAOpsMultisig());
-        Ownable(Env.eigenDARegistryCoordinator()).transferOwnership(Env.eigenDAOpsMultisig());
-        Ownable(Env.eigenDAServiceManager()).transferOwnership(Env.eigenDAOpsMultisig());
+        Ownable(C.EIGEN_DA_EJECTION_MANAGER).transferOwnership(C.EIGEN_DA_OPS_MULTISIG);
+        Ownable(C.EIGEN_DA_REGISTRY_COORDINATOR).transferOwnership(C.EIGEN_DA_OPS_MULTISIG);
+        Ownable(C.EIGEN_DA_SERVICE_MANAGER).transferOwnership(C.EIGEN_DA_OPS_MULTISIG);
     }
 
     function testScript() public virtual {
         _runAsMultisig();
 
         assertTrue(
-            Ownable(Env.eigenDAEjectionManager()).owner() == Env.eigenDAOpsMultisig(),
+            Ownable(C.EIGEN_DA_EJECTION_MANAGER).owner() == C.EIGEN_DA_OPS_MULTISIG,
             "eigenDAEjectionManager owner invalid"
         );
         assertTrue(
-            Ownable(Env.eigenDARegistryCoordinator()).owner() == Env.eigenDAOpsMultisig(),
+            Ownable(C.EIGEN_DA_REGISTRY_COORDINATOR).owner() == C.EIGEN_DA_OPS_MULTISIG,
             "eigenDARegistryCoordinator owner invalid"
         );
         assertTrue(
-            Ownable(Env.eigenDAServiceManager()).owner() == Env.eigenDAOpsMultisig(),
+            Ownable(C.EIGEN_DA_SERVICE_MANAGER).owner() == C.EIGEN_DA_OPS_MULTISIG,
             "eigenDAServiceManager owner invalid"
         );
     }

script/releases/transfer-da-ownership/3-executeTransferProxyAdmin.s.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.8.12;
 
 import "../Env.sol";
 import {QueueTransferProxyAdmin} from "./1-queueTransferProxyAdmin.s.sol";
+import {TransferDAOwnershipConstants as C} from "./TransferDAOwnershipConstants.sol";
 
 import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
@@ -52,5 +53,9 @@ contract ExecuteTransferProxyAdmin is QueueTransferProxyAdmin {
         execute();
 
         assertTrue(timelock.isOperationDone(txHash), "Transaction should be complete.");
+        assertTrue(
+            Ownable(C.EIGEN_DA_PROXY_ADMIN).owner() == C.EIGEN_DA_OPS_MULTISIG,
+            "eigenDAProxyAdmin owner invalid"
+        );
     }
 }

script/releases/transfer-da-ownership/TransferDAOwnershipConstants.sol

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.12;
+
+library TransferDAOwnershipConstants {
+    address internal constant EIGEN_DA_PROXY_ADMIN = 0x8247EF5705d3345516286B72bFE6D690197C2E99;
+    address internal constant EIGEN_DA_OPS_MULTISIG = 0x002721B4790d97dC140a049936aA710152Ba92D5;
+    address internal constant EIGEN_DA_EJECTION_MANAGER = 0x130d8EA0052B45554e4C99079B84df292149Bd5E;
+    address internal constant EIGEN_DA_REGISTRY_COORDINATOR = 0x0BAAc79acD45A023E19345c352d8a7a83C4e5656;
+    address internal constant EIGEN_DA_SERVICE_MANAGER = 0x870679E138bCdf293b7Ff14dD44b70FC97e12fc0;
+}