configure batch number

RealityETH · Mar 18, 2024 · e6ab5ce · e6ab5ce
1 parent eabaf55
commit e6ab5ce
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 13 deletions.
diff --git a/contracts/ForkingManager.sol b/contracts/ForkingManager.sol
@@ -155,7 +155,8 @@ contract ForkingManager is IForkingManager, ForkableStructure {
                     trustedAggregatorTimeout: IPolygonZkEVM(zkEVM)
                         .trustedAggregatorTimeout(),
                     chainID: reservedChainIdForFork1,
-                    forkID: IPolygonZkEVM(zkEVM).forkID()
+                    forkID: IPolygonZkEVM(zkEVM).forkID(),
+                    lastVerifiedBatch: IPolygonZkEVM(zkEVM).lastVerifiedBatch()
                 });
             IForkableZkEVM(newInstances.zkEVM.one).initialize(
                 newInstances.forkingManager.one,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "@openzeppelin/contracts": "^4.9.5",
     "@openzeppelin/contracts-upgradeable": "^4.9.5",
     "@openzeppelin/hardhat-upgrades": "1.22.1",
-    "@RealityETH/zkevm-contracts": "github:RealityETH/zkevm-contracts#v3.0.0-RealityETH",
+    "@RealityETH/zkevm-contracts": "github:RealityETH/zkevm-contracts#2f2a60aacc63cb18c9078ec9a779966eb16ebc1f",
     "@types/sinon-chai": "^3.2.3",
     "circomlibjs": "0.1.1",
     "dotenv": "^8.6.0",

diff --git a/src/deployment/3_deployContracts.js b/src/deployment/3_deployContracts.js
@@ -524,6 +524,7 @@ async function main() {
                     trustedAggregatorTimeout,
                     chainID,
                     forkID,
+                    0,
                 ],
                 genesisRootHex,
                 trustedSequencerURL,

diff --git a/test/ForkableZkEVM.t.sol b/test/ForkableZkEVM.t.sol
@@ -71,7 +71,8 @@ contract ForkableZkEVMTest is Test {
                     trustedAggregator: trustedAggregator,
                     trustedAggregatorTimeout: trustedAggregatorTimeout,
                     chainID: chainID,
-                    forkID: forkID
+                    forkID: forkID,
+                    lastVerifiedBatch: 0
                 });
         forkableZkEVM.initialize(
             forkmanager,

diff --git a/test/ForkingManager.t.sol b/test/ForkingManager.t.sol
@@ -162,7 +162,8 @@ contract ForkingManagerTest is Test {
                     trustedAggregator: trustedAggregator,
                     trustedAggregatorTimeout: trustedAggregatorTimeout,
                     chainID: chainIdManager.getNextUsableChainId(),
-                    forkID: forkID
+                    forkID: forkID,
+                    lastVerifiedBatch: 0
                 });
         zkevm.initialize(
             address(forkmanager),

diff --git a/test/L1GlobalChainInfoPublisher.t.sol b/test/L1GlobalChainInfoPublisher.t.sol
@@ -178,7 +178,8 @@ contract L1GlobalChainInfoPublisherTest is Test {
                     trustedAggregator: trustedAggregator,
                     trustedAggregatorTimeout: trustedAggregatorTimeout,
                     chainID: chainIdManager.getNextUsableChainId(),
-                    forkID: forkID
+                    forkID: forkID,
+                    lastVerifiedBatch: 0
                 });
         zkevm.initialize(
             address(forkmanager),

diff --git a/test/L1GlobalForkRequester.t.sol b/test/L1GlobalForkRequester.t.sol
@@ -170,7 +170,8 @@ contract L1GlobalForkRequesterTest is Test {
                     trustedAggregator: trustedAggregator,
                     trustedAggregatorTimeout: trustedAggregatorTimeout,
                     chainID: chainID,
-                    forkID: forkID
+                    forkID: forkID,
+                    lastVerifiedBatch: 0
                 });
         zkevm.initialize(
             address(forkmanager),