Sets global exit root duing forking process

contracts/ForkableGlobalExitRoot.sol

@@ -13,42 +13,21 @@ contract ForkableGlobalExitRoot is
     ForkableStructure,
     PolygonZkEVMGlobalExitRoot
 {
-    /// @dev Initializting function
-    /// @param _forkmanager The address of the forkmanager
-    /// @param _parentContract The address of the parent contract
-    /// @param _rollupAddress The address of the rollup contract
-    /// @param _bridgeAddress The address of the bridge contract
+    /// @inheritdoc IForkableGlobalExitRoot
     function initialize(
         address _forkmanager,
         address _parentContract,
         address _rollupAddress,
-        address _bridgeAddress
+        address _bridgeAddress,
+        bytes32 _lastMainnetExitRoot,
+        bytes32 _lastRollupExitRoot
     ) public initializer {
         ForkableStructure.initialize(_forkmanager, _parentContract);
-        PolygonZkEVMGlobalExitRoot.initialize(_rollupAddress, _bridgeAddress);
-    }
-
-    /// @dev Overrites the other initialize functions from ForkableStructure and PolygonZkEVMGlobalExitRoot
-    /// @notice If we would not do it, it would throw the following error:
-    /// "Derived contract must override function "initialize". Two or more base classes
-    /// define function with same name and parameter types."
-    function initialize(
-        address forkmanager,
-        address parentContract
-    )
-        public
-        virtual
-        override(ForkableStructure, PolygonZkEVMGlobalExitRoot)
-        onlyInitializing
-    {
-        revert(
-            string(
-                abi.encode(
-                    "illicit call to initialize with arguments:",
-                    forkmanager,
-                    parentContract
-                )
-            )
+        PolygonZkEVMGlobalExitRoot.initialize(
+            _rollupAddress,
+            _bridgeAddress,
+            _lastMainnetExitRoot,
+            _lastRollupExitRoot
         );
     }
 

contracts/ForkingManager.sol

@@ -283,7 +283,9 @@ contract ForkingManager is IForkingManager, ForkableStructure {
             newInstances.forkingManager.one,
             globalExitRoot,
             newInstances.zkEVM.one,
-            newInstances.bridge.one
+            newInstances.bridge.one,
+            IForkableGlobalExitRoot(globalExitRoot).lastMainnetExitRoot(),
+            IForkableGlobalExitRoot(globalExitRoot).lastRollupExitRoot()
         );
     }
 
@@ -396,7 +398,9 @@ contract ForkingManager is IForkingManager, ForkableStructure {
             newInstances.forkingManager.two,
             globalExitRoot,
             newInstances.zkEVM.two,
-            newInstances.bridge.two
+            newInstances.bridge.two,
+            IForkableGlobalExitRoot(globalExitRoot).lastMainnetExitRoot(),
+            IForkableGlobalExitRoot(globalExitRoot).lastRollupExitRoot()
         );
     }
 }

contracts/interfaces/IForkableGlobalExitRoot.sol

@@ -8,11 +8,20 @@ interface IForkableGlobalExitRoot is
     IForkableStructure,
     IPolygonZkEVMGlobalExitRoot
 {
+    /// @dev Initializting function
+    /// @param _forkmanager The address of the forkmanager
+    /// @param _parentContract The address of the parent contract
+    /// @param _rollupAddress The address of the rollup contract
+    /// @param _bridgeAddress The address of the bridge contract
+    /// @param _lastMainnetExitRoot The last exit root on mainnet
+    /// @param _lastRollupExitRoot The last exit root on rollup
     function initialize(
         address _forkmanager,
         address _parentContract,
         address _rollupAddress,
-        address _bridgeAddress
+        address _bridgeAddress,
+        bytes32 _lastMainnetExitRoot,
+        bytes32 _lastRollupExitRoot
     ) external;
 
     function createChildren(

test/ForkableGlobalExitRoot.t.sol

@@ -37,7 +37,9 @@ contract ForkableGlobalExitRootTest is Test {
             forkmanager,
             parentContract,
             rollupAddress,
-            bridgeAddress
+            bridgeAddress,
+            bytes32(0),
+            bytes32(0)
         );
     }
 

test/ForkingManager.t.sol

@@ -9,7 +9,7 @@ import {ForkableBridge} from "../contracts/ForkableBridge.sol";
 import {ForkableZkEVM} from "../contracts/ForkableZkEVM.sol";
 import {ForkonomicToken} from "../contracts/ForkonomicToken.sol";
 import {ForkableGlobalExitRoot} from "../contracts/ForkableGlobalExitRoot.sol";
-import {IBasePolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMGlobalExitRoot.sol";
+import {IPolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMGlobalExitRoot.sol";
 import {IForkingManager} from "../contracts/interfaces/IForkingManager.sol";
 import {IVerifierRollup} from "@RealityETH/zkevm-contracts/contracts/interfaces/IVerifierRollup.sol";
 import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
@@ -37,10 +37,8 @@ contract ForkingManagerTest is Test {
     bytes32 internal constant _IMPLEMENTATION_SLOT =
         0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc;
 
-    IBasePolygonZkEVMGlobalExitRoot public globalExitMock =
-        IBasePolygonZkEVMGlobalExitRoot(
-            0x1234567890123456789012345678901234567892
-        );
+    IPolygonZkEVMGlobalExitRoot public globalExitMock =
+        IPolygonZkEVMGlobalExitRoot(0x1234567890123456789012345678901234567892);
     bytes32 public genesisRoot =
         bytes32(
             0x827a9240c96ccb855e4943cc9bc49a50b1e91ba087007441a1ae5f9df8d1c57c
@@ -142,7 +140,9 @@ contract ForkingManagerTest is Test {
             address(forkmanager),
             address(0x0),
             address(zkevm),
-            address(bridge)
+            address(bridge),
+            bytes32(0),
+            bytes32(0)
         );
         bridge.initialize(
             address(forkmanager),
@@ -797,4 +797,62 @@ contract ForkingManagerTest is Test {
             })
         );
     }
+
+    function testSetsCorrectGlobalExitRoot() public {
+        // Set completely randcom exit hashes to make them non-zero
+        bytes32 lastMainnetExitRoot = keccak256(abi.encode(2));
+        bytes32 lastRollupExitRoot = keccak256(abi.encode(1));
+        vm.prank(address(bridge));
+        globalExitRoot.updateExitRoot(lastMainnetExitRoot);
+        vm.prank(address(zkevm));
+        globalExitRoot.updateExitRoot(lastRollupExitRoot);
+
+        // Mint and approve the arbitration fee for the test contract
+        forkonomicToken.approve(address(forkmanager), arbitrationFee);
+        vm.prank(address(this));
+        forkonomicToken.mint(address(this), arbitrationFee);
+
+        // Call the initiateFork function to create a new fork
+        uint256 testTimestamp = 12354234;
+        vm.warp(testTimestamp);
+        forkmanager.initiateFork(
+            disputeData,
+            IForkingManager.NewImplementations({
+                bridgeImplementation: newBridgeImplementation,
+                zkEVMImplementation: newZkevmImplementation,
+                forkonomicTokenImplementation: newForkonomicTokenImplementation,
+                forkingManagerImplementation: newForkmanagerImplementation,
+                globalExitRootImplementation: newGlobalExitRootImplementation,
+                verifier: newVerifierImplementation,
+                forkID: newForkID
+            })
+        );
+
+        vm.warp(testTimestamp + forkmanager.forkPreparationTime() + 1);
+        forkmanager.executeFork1();
+        (address child1, address child2) = globalExitRoot.getChildren();
+
+        assertEq(
+            IPolygonZkEVMGlobalExitRoot(globalExitRoot).lastMainnetExitRoot(),
+            IPolygonZkEVMGlobalExitRoot(child1).lastMainnetExitRoot()
+        );
+        assertEq(
+            IPolygonZkEVMGlobalExitRoot(globalExitRoot).lastRollupExitRoot(),
+            IPolygonZkEVMGlobalExitRoot(child1).lastRollupExitRoot(),
+            "lastRollupExitRoot not the same"
+        );
+        assertEq(
+            IPolygonZkEVMGlobalExitRoot(globalExitRoot).getLastGlobalExitRoot(),
+            IPolygonZkEVMGlobalExitRoot(child1).getLastGlobalExitRoot()
+        );
+        forkmanager.executeFork2();
+        assertEq(
+            IPolygonZkEVMGlobalExitRoot(globalExitRoot).lastMainnetExitRoot(),
+            IPolygonZkEVMGlobalExitRoot(child2).lastMainnetExitRoot()
+        );
+        assertEq(
+            IPolygonZkEVMGlobalExitRoot(globalExitRoot).lastRollupExitRoot(),
+            IPolygonZkEVMGlobalExitRoot(child2).lastRollupExitRoot()
+        );
+    }
 }

test/L1GlobalChainInfoPublisher.t.sol

@@ -181,7 +181,9 @@ contract L1GlobalChainInfoPublisherTest is Test {
             address(forkmanager),
             address(0x0),
             address(zkevm),
-            address(bridge)
+            address(bridge),
+            bytes32(0),
+            bytes32(0)
         );
         bridge.initialize(
             address(forkmanager),

test/L1GlobalForkRequester.t.sol

@@ -144,7 +144,9 @@ contract L1GlobalForkRequesterTest is Test {
             address(forkmanager),
             address(0x0),
             address(zkevm),
-            address(bridge)
+            address(bridge),
+            bytes32(0),
+            bytes32(0)
         );
         bridge.initialize(
             address(forkmanager),