feat: Extract block_reverter into separate crate

Cargo.toml

@@ -12,6 +12,7 @@ members = [
     "core/bin/genesis_generator",
     # Node services
     "core/node/node_framework",
+    "core/node/block_reverter",
     "core/node/commitment_generator",
     # Libraries
     "core/lib/db_connection",
@@ -223,4 +224,5 @@ zksync_crypto_primitives = { path = "core/lib/crypto_primitives" }
 zksync_node_framework = { path = "core/node/node_framework" }
 zksync_eth_watch = { path = "core/node/eth_watch" }
 zksync_shared_metrics = { path = "core/node/shared_metrics" }
+zksync_block_reverter = { path = "core/node/block_reverter"}
 zksync_commitment_generator = { path = "core/node/commitment_generator" }

core/bin/block_reverter/Cargo.toml

@@ -15,7 +15,7 @@ zksync_config.workspace = true
 zksync_env_config.workspace = true
 zksync_dal.workspace = true
 zksync_types.workspace = true
-zksync_core.workspace = true
+zksync_block_reverter.workspace = true
 vlog.workspace = true
 
 anyhow.workspace = true

core/bin/block_reverter/src/main.rs

@@ -1,12 +1,12 @@
 use anyhow::Context as _;
 use clap::{Parser, Subcommand};
 use tokio::io::{self, AsyncReadExt};
+use zksync_block_reverter::{
+    BlockReverter, BlockReverterEthConfig, BlockReverterFlags, L1ExecutedBatchesRevert, NodeRole,
+};
 use zksync_config::{
     configs::ObservabilityConfig, ContractsConfig, DBConfig, EthConfig, PostgresConfig,
 };
-use zksync_core::block_reverter::{
-    BlockReverter, BlockReverterEthConfig, BlockReverterFlags, L1ExecutedBatchesRevert, NodeRole,
-};
 use zksync_dal::{ConnectionPool, Core};
 use zksync_env_config::FromEnv;
 use zksync_types::{Address, L1BatchNumber, U256};

core/bin/external_node/Cargo.toml

@@ -30,6 +30,7 @@ prometheus_exporter.workspace = true
 zksync_health_check.workspace = true
 zksync_web3_decl.workspace = true
 zksync_types.workspace = true
+zksync_block_reverter.workspace = true
 vlog.workspace = true
 
 zksync_concurrency.workspace = true

core/bin/external_node/src/main.rs

@@ -8,6 +8,7 @@ use tokio::{
     sync::{watch, RwLock},
     task::{self, JoinHandle},
 };
+use zksync_block_reverter::{BlockReverter, BlockReverterFlags, L1ExecutedBatchesRevert, NodeRole};
 use zksync_commitment_generator::CommitmentGenerator;
 use zksync_concurrency::{ctx, scope};
 use zksync_config::configs::{
@@ -21,7 +22,6 @@ use zksync_core::{
         tx_sender::{proxy::TxProxy, ApiContracts, TxSenderBuilder},
         web3::{mempool_cache::MempoolCache, ApiBuilder, Namespace},
     },
-    block_reverter::{BlockReverter, BlockReverterFlags, L1ExecutedBatchesRevert, NodeRole},
     consensus,
     consistency_checker::ConsistencyChecker,
     db_pruner::{

core/lib/zksync_core/src/lib.rs

@@ -98,7 +98,6 @@ use crate::{
 
 pub mod api_server;
 pub mod basic_witness_input_producer;
-pub mod block_reverter;
 pub mod consensus;
 pub mod consistency_checker;
 pub mod db_pruner;

core/node/block_reverter/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "zksync_block_reverter"
+version = "0.1.0"
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+[dependencies]
+zksync_types.workspace = true
+zksync_dal.workspace = true
+zksync_config.workspace = true
+zksync_contracts.workspace = true
+zksync_storage.workspace = true
+zksync_eth_signer.workspace = true
+zksync_state.workspace = true
+zksync_merkle_tree.workspace = true
+
+tokio = { workspace = true, features = ["time"] }
+bitflags.workspace = true
+serde.workspace = true
+tracing.workspace = true

core/node/block_reverter/README.md

@@ -0,0 +1,3 @@
+# zkSync Era Block reverter
+
+This crate contains functionality for zkSync state rollback.

core/node/node_framework/Cargo.toml

@@ -29,6 +29,7 @@ zksync_utils.workspace = true
 zksync_circuit_breaker.workspace = true
 zksync_concurrency.workspace = true
 zksync_eth_watch.workspace = true
+zksync_block_reverter.workspace = true
 zksync_commitment_generator.workspace = true
 
 tracing.workspace = true