Make fork preparation time configurable (#118)

* making fork preparation time configurable * linting
RealityETH · Dec 11, 2023 · 168025b · 168025b
1 parent dbf131d
commit 168025b
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 19 deletions.
diff --git a/contracts/ForkingManager.sol b/contracts/ForkingManager.sol
@@ -41,7 +41,7 @@ contract ForkingManager is IForkingManager, ForkableStructure {
     DisputeData public disputeData;
     NewImplementations public proposedImplementations;
     uint256 public executionTimeForProposal;
-    uint256 public constant FORK_PREPARATION_TIME = 1 weeks;
+    uint256 public forkPreparationTime;
 
     /// @inheritdoc IForkingManager
     function initialize(
@@ -51,7 +51,8 @@ contract ForkingManager is IForkingManager, ForkableStructure {
         address _parentContract,
         address _globalExitRoot,
         uint256 _arbitrationFee,
-        address _chainIdManager
+        address _chainIdManager,
+        uint256 _forkPreparationTime
     ) external initializer {
         zkEVM = _zkEVM;
         bridge = _bridge;
@@ -61,6 +62,7 @@ contract ForkingManager is IForkingManager, ForkableStructure {
         arbitrationFee = _arbitrationFee;
         chainIdManager = _chainIdManager;
         executionTimeForProposal = 0;
+        forkPreparationTime = _forkPreparationTime;
         ForkableStructure.initialize(address(this), _parentContract);
     }
 
@@ -97,7 +99,7 @@ contract ForkingManager is IForkingManager, ForkableStructure {
         disputeData = _disputeData;
         proposedImplementations = _newImplementations;
         // solhint-disable-next-line not-rely-on-time
-        executionTimeForProposal = (block.timestamp + FORK_PREPARATION_TIME);
+        executionTimeForProposal = (block.timestamp + forkPreparationTime);
     }
 
     /**
@@ -206,7 +208,8 @@ contract ForkingManager is IForkingManager, ForkableStructure {
             address(this),
             newInstances.globalExitRoot.one,
             arbitrationFee,
-            chainIdManager
+            chainIdManager,
+            forkPreparationTime
         );
 
         //Initialize the global exit root contracts
@@ -319,7 +322,8 @@ contract ForkingManager is IForkingManager, ForkableStructure {
             address(this),
             newInstances.globalExitRoot.two,
             arbitrationFee,
-            chainIdManager
+            chainIdManager,
+            forkPreparationTime
         );
 
         //Initialize the global exit root contracts

diff --git a/contracts/interfaces/IForkingManager.sol b/contracts/interfaces/IForkingManager.sol
@@ -67,7 +67,8 @@ interface IForkingManager is IForkableStructure {
         address _parentContract,
         address _globalExitRoot,
         uint256 _arbitrationFee,
-        address _chainIdManager
+        address _chainIdManager,
+        uint256 _executionTimeForProposal
     ) external;
 
     function initiateFork(

diff --git a/test/ForkingManager.t.sol b/test/ForkingManager.t.sol
@@ -32,6 +32,7 @@ contract ForkingManagerTest is Test {
     address public forkonomicTokenImplementation;
     address public globalExitRootImplementation;
     address public chainIdManagerAddress;
+    uint256 public forkPreparationTime = 1000;
     bytes32 internal constant _IMPLEMENTATION_SLOT =
         0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc;
 
@@ -186,7 +187,8 @@ contract ForkingManagerTest is Test {
             address(0x0),
             address(globalExitRoot),
             arbitrationFee,
-            chainIdManagerAddress
+            chainIdManagerAddress,
+            forkPreparationTime
         );
         forkonomicToken.initialize(
             address(forkmanager),
@@ -235,7 +237,7 @@ contract ForkingManagerTest is Test {
         assertFalse(forkmanager.isForkingExecuted());
         assertFalse(forkmanager.canFork());
 
-        vm.warp(block.timestamp + forkmanager.FORK_PREPARATION_TIME() + 1);
+        vm.warp(block.timestamp + forkmanager.forkPreparationTime() + 1);
         forkmanager.executeFork1();
         forkmanager.executeFork2();
 
@@ -313,7 +315,7 @@ contract ForkingManagerTest is Test {
                 forkID: newForkID
             })
         );
-        vm.warp(block.timestamp + forkmanager.FORK_PREPARATION_TIME() + 1);
+        vm.warp(block.timestamp + forkmanager.forkPreparationTime() + 1);
         forkmanager.executeFork1();
         forkmanager.executeFork2();
 
@@ -463,7 +465,7 @@ contract ForkingManagerTest is Test {
         IForkingManager.NewImplementations memory noNewImplementations;
         // Call the initiateFork function to create a new fork
         forkmanager.initiateFork(disputeData, noNewImplementations);
-        vm.warp(block.timestamp + forkmanager.FORK_PREPARATION_TIME() + 1);
+        vm.warp(block.timestamp + forkmanager.forkPreparationTime() + 1);
         forkmanager.executeFork1();
         forkmanager.executeFork2();
 
@@ -626,7 +628,7 @@ contract ForkingManagerTest is Test {
                 forkID: newForkID
             })
         );
-        skip(forkmanager.FORK_PREPARATION_TIME() + 1);
+        skip(forkmanager.forkPreparationTime() + 1);
         forkmanager.executeFork1();
         forkmanager.executeFork2();
 
@@ -644,7 +646,7 @@ contract ForkingManagerTest is Test {
         assertEq(receivedIsL1, isL1);
         assertEq(
             receivedExecutionTime,
-            testTimestamp + forkmanager.FORK_PREPARATION_TIME()
+            testTimestamp + forkmanager.forkPreparationTime()
         );
     }
 
@@ -676,7 +678,7 @@ contract ForkingManagerTest is Test {
 
         vm.expectRevert("ForkingManager: fork not ready");
         forkmanager.executeFork1();
-        vm.warp(testTimestamp + forkmanager.FORK_PREPARATION_TIME() + 1);
+        vm.warp(testTimestamp + forkmanager.forkPreparationTime() + 1);
         forkmanager.executeFork1();
     }
 
@@ -701,7 +703,7 @@ contract ForkingManagerTest is Test {
                 forkID: newForkID
             })
         );
-        skip(forkmanager.FORK_PREPARATION_TIME() + 1);
+        skip(forkmanager.forkPreparationTime() + 1);
         forkmanager.executeFork1();
         forkmanager.executeFork2();
         vm.expectRevert("No changes after forking");

diff --git a/test/L1GlobalChainInfoPublisher.t.sol b/test/L1GlobalChainInfoPublisher.t.sol
@@ -61,6 +61,7 @@ contract L1GlobalChainInfoPublisherTest is Test {
     address public forkonomicTokenImplementation;
     address public globalExitRootImplementation;
     address public chainIdManagerAddress;
+    uint256 public forkPreparationTime = 1000;
     bytes32 internal constant _IMPLEMENTATION_SLOT =
         0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc;
 
@@ -224,7 +225,8 @@ contract L1GlobalChainInfoPublisherTest is Test {
             address(0x0),
             address(globalExitRoot),
             arbitrationFee,
-            chainIdManagerAddress
+            chainIdManagerAddress,
+            forkPreparationTime
         );
         forkonomicToken.initialize(
             address(forkmanager),
@@ -291,7 +293,7 @@ contract L1GlobalChainInfoPublisherTest is Test {
                 forkID: newForkID
             })
         );
-        skip(forkmanager.FORK_PREPARATION_TIME() + 1);
+        skip(forkmanager.forkPreparationTime() + 1);
         forkmanager.executeFork1();
         forkmanager.executeFork2();
 
@@ -357,7 +359,7 @@ contract L1GlobalChainInfoPublisherTest is Test {
 
         // Call the initiateFork function to create a new fork
         forkmanager2.initiateFork(disputeData2, newImplementations2);
-        skip(forkmanager.FORK_PREPARATION_TIME() + 1);
+        skip(forkmanager.forkPreparationTime() + 1);
         forkmanager2.executeFork1();
         forkmanager2.executeFork2();
 

diff --git a/test/L1GlobalForkRequester.t.sol b/test/L1GlobalForkRequester.t.sol
@@ -38,6 +38,7 @@ contract L1GlobalForkRequesterTest is Test {
     address public forkonomicTokenImplementation;
     address public globalExitRootImplementation;
     address public chainIdManager;
+    uint256 public forkPreparationTime = 1000;
     bytes32 internal constant _IMPLEMENTATION_SLOT =
         0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc;
 
@@ -188,7 +189,8 @@ contract L1GlobalForkRequesterTest is Test {
             address(0x0),
             address(globalExitRoot),
             arbitrationFee,
-            chainIdManager
+            chainIdManager,
+            forkPreparationTime
         );
         forkonomicToken.initialize(
             address(forkmanager),
@@ -362,7 +364,7 @@ contract L1GlobalForkRequesterTest is Test {
         );
 
         // Execute the other guy's fork
-        skip(forkmanager.FORK_PREPARATION_TIME() + 1);
+        skip(forkmanager.forkPreparationTime() + 1);
         forkmanager.executeFork1();
         forkmanager.executeFork2();