refactor: fixed time machine + beacon chain addresses

Author: 0xClandestine

src/test/integration/IntegrationDeployer.t.sol

@@ -67,8 +67,8 @@ abstract contract IntegrationDeployer is ExistingDeploymentParser {
     mapping(address => bool) public tokensNotTested;
 
     // Mock Contracts to deploy
-    TimeMachine public timeMachine;
-    BeaconChainMock public beaconChain;
+    TimeMachine public constant timeMachine = TimeMachine(address(0x000000000000000074696D65206D616368696e65)); // bytes("time machine")
+    BeaconChainMock public constant beaconChain = BeaconChainMock(address(0x0000000000000000626561636f6e636861696e6D6f636b)); // bytes("beacon chain")
 
     // Admin Addresses
     address constant pauser = address(555);
@@ -211,8 +211,10 @@ abstract contract IntegrationDeployer is ExistingDeploymentParser {
         BEACON_GENESIS_TIME = GENESIS_TIME_LOCAL;
         cheats.warp(BEACON_GENESIS_TIME);
         cheats.roll(10_000);
-        timeMachine = new TimeMachine();
-        beaconChain = new BeaconChainMock(eigenPodManager, BEACON_GENESIS_TIME);
+
+        vm.etch(address(timeMachine), type(TimeMachine).runtimeCode);
+        vm.etch(address(beaconChain), type(BeaconChainMock).runtimeCode);
+        beaconChain.initialize(eigenPodManager, BEACON_GENESIS_TIME);
     }
 
     /// Parse existing contracts from mainnet
@@ -251,8 +253,9 @@ abstract contract IntegrationDeployer is ExistingDeploymentParser {
 
         // Create time machine and mock beacon chain
         BEACON_GENESIS_TIME = GENESIS_TIME_MAINNET;
-        timeMachine = new TimeMachine();
-        beaconChain = new BeaconChainMock(eigenPodManager, BEACON_GENESIS_TIME);
+        vm.etch(address(timeMachine), type(TimeMachine).runtimeCode);
+        vm.etch(address(beaconChain), type(BeaconChainMock).runtimeCode);
+        beaconChain.initialize(eigenPodManager, BEACON_GENESIS_TIME);
 
         // Since we haven't done the slashing upgrade on mainnet yet, upgrade mainnet contracts
         // prior to test. `isUpgraded` is true by default, but is set to false in `UpgradeTest.t.sol`

src/test/integration/mocks/BeaconChainMock.t.sol

@@ -75,11 +75,11 @@ contract BeaconChainMock is Logger {
     // see https://eth2book.info/capella/part3/containers/blocks/#beaconblock
     uint constant BEACON_BLOCK_FIELDS = 5;
 
-    uint immutable BLOCKROOT_PROOF_LEN = 32 * BeaconChainProofs.BEACON_BLOCK_HEADER_TREE_HEIGHT;
-    uint immutable VAL_FIELDS_PROOF_LEN = 32 * ((BeaconChainProofs.VALIDATOR_TREE_HEIGHT + 1) + BeaconChainProofs.BEACON_STATE_TREE_HEIGHT);
-    uint immutable BALANCE_CONTAINER_PROOF_LEN =
+    uint constant BLOCKROOT_PROOF_LEN = 32 * BeaconChainProofs.BEACON_BLOCK_HEADER_TREE_HEIGHT;
+    uint constant VAL_FIELDS_PROOF_LEN = 32 * ((BeaconChainProofs.VALIDATOR_TREE_HEIGHT + 1) + BeaconChainProofs.BEACON_STATE_TREE_HEIGHT);
+    uint constant BALANCE_CONTAINER_PROOF_LEN =
         32 * (BeaconChainProofs.BEACON_BLOCK_HEADER_TREE_HEIGHT + BeaconChainProofs.BEACON_STATE_TREE_HEIGHT);
-    uint immutable BALANCE_PROOF_LEN = 32 * (BeaconChainProofs.BALANCE_TREE_HEIGHT + 1);
+    uint constant BALANCE_PROOF_LEN = 32 * (BeaconChainProofs.BALANCE_TREE_HEIGHT + 1);
 
     uint64 genesisTime;
     uint64 public nextTimestamp;
@@ -128,7 +128,7 @@ contract BeaconChainMock is Logger {
 
     bytes32[] zeroNodes;
 
-    constructor(EigenPodManager _eigenPodManager, uint64 _genesisTime) {
+    function initialize(EigenPodManager _eigenPodManager, uint64 _genesisTime) public {
         genesisTime = _genesisTime;
         eigenPodManager = _eigenPodManager;
 

src/test/integration/users/AVS.t.sol

@@ -9,7 +9,6 @@ import "src/contracts/strategies/StrategyFactory.sol";
 
 import "src/test/mocks/ERC20Mock.sol";
 import "src/test/integration/users/User.t.sol";
-import "src/test/integration/TimeMachine.t.sol";
 import "src/test/utils/Logger.t.sol";
 
 import "src/test/utils/ArrayLib.sol";
@@ -20,21 +19,20 @@ interface IAVSDeployer {
     function allocationManager() external view returns (AllocationManager);
     function strategyFactory() external view returns (StrategyFactory);
     function permissionController() external view returns (PermissionController);
-    function timeMachine() external view returns (TimeMachine);
 }
 
 contract AVS is Logger, IAllocationManagerTypes, IAVSRegistrar {
     using print for *;
     using ArrayLib for *;
 
     IStrategy constant beaconChainETHStrategy = IStrategy(0xbeaC0eeEeeeeEEeEeEEEEeeEEeEeeeEeeEEBEaC0);
+    TimeMachine constant timeMachine = TimeMachine(address(0x000000000000000074696D65206D616368696e65));
 
     // TODO: fix later for same reason as User.t.sol
     AllocationManager immutable allocationManager;
     PermissionController immutable permissionController;
     DelegationManager immutable delegationManager;
     StrategyFactory immutable strategyFactory;
-    TimeMachine immutable timeMachine;
     string _NAME;
 
     uint32 totalOperatorSets;
@@ -45,7 +43,6 @@ contract AVS is Logger, IAllocationManagerTypes, IAVSRegistrar {
         permissionController = deployer.permissionController();
         delegationManager = deployer.delegationManager();
         strategyFactory = deployer.strategyFactory();
-        timeMachine = deployer.timeMachine();
         _NAME = name;
         cheats.label(address(this), NAME_COLORED());
     }

src/test/unit/EigenPodUnit.t.sol

@@ -53,7 +53,8 @@ contract EigenPodUnitTests is EigenLayerUnitTestSetup, EigenPodPausingConstants,
         ethPOSDepositMock = new ETHPOSDepositMock();
         cheats.warp(GENESIS_TIME_LOCAL);
         timeMachine = new TimeMachine();
-        beaconChain = new BeaconChainMock(EigenPodManager(address(eigenPodManagerMock)), GENESIS_TIME_LOCAL);
+        beaconChain = new BeaconChainMock();
+        beaconChain.initialize(EigenPodManager(address(eigenPodManagerMock)), GENESIS_TIME_LOCAL);
 
         // Deploy EigenPod
         podImplementation = new EigenPod(ethPOSDepositMock, IEigenPodManager(address(eigenPodManagerMock)), GENESIS_TIME_LOCAL, "v9.9.9");