feat(l2): commit blocks in batches (#2397)

**Motivation**

To reduce the number of times we go to the L1 to commit/verify blocks.

**Description**

- Modifies `l1_committer` to merge as many blocks as possible into a
single `StateDiff` before committing, limited by the blob size.
- Modifies `StateDiff` to now contain both the resulting
`AccountUpdates` from executing all blocks in the batch and the header
of the last block.
- Adapts contracts to use `batchNumbers` instead of `blockNumbers`.
- Adds a new RPC endpoint, `ethrex_getWithdrawalProof`, which returns
all necessary data to claim an L1 withdrawal for a given L2 withdrawal
transaction hash.
- Implements `apply_account_updates` for the `ExecutionDB` to prepare
the db for executing the next block in the batch.
- Adds a `L2/storage` with the following tables:
- `block_number` => `batch_number`: Maps block numbers to batches (used
by the endpoint to locate a withdrawal's batch).
- `batch_number` => `Vec<block_number>`: Lists all block numbers
included in a given batch.
- `batch_number` => `withdrawal_hashes`: Stores withdrawal hashes per
batch (used to construct merkle proofs).

Closes None

Created issues:
- #2563
- #2578 
- #2579 
- #2617

---------

Co-authored-by: Edgar <git@edgl.dev>
Co-authored-by: VolodymyrBg <aqdrgg19@gmail.com>
Co-authored-by: Tomás Paradelo <112426153+tomip01@users.noreply.github.com>
Co-authored-by: Javier Rodríguez Chatruc <49622509+jrchatruc@users.noreply.github.com>
Co-authored-by: Mauro Toscano <12560266+MauroToscano@users.noreply.github.com>
Co-authored-by: Martin Paulucci <martin.c.paulucci@gmail.com>
Co-authored-by: Jeremías Salomón <48994069+JereSalo@users.noreply.github.com>
Co-authored-by: Lucas Fiegl <iovoid@users.noreply.github.com>
Co-authored-by: Cypher Pepe <125112044+cypherpepe@users.noreply.github.com>

Author: 10 people

Cargo.lock

@@ -17,6 +17,7 @@ members = [
   "crates/l2/prover",
   "crates/l2/prover/bench",
   "crates/l2/sdk",
+  "crates/l2/storage",
   "crates/networking/p2p",
   "crates/networking/rpc",
   "crates/storage",
@@ -49,6 +50,7 @@ ethrex-rlp = { path = "./crates/common/rlp" }
 ethrex-l2 = { path = "./crates/l2" }
 ethrex-sdk = { path = "./crates/l2/sdk" }
 ethrex-prover = { path = "./crates/l2/prover" }
+ethrex-storage-rollup = { path = "./crates/l2/storage" }
 
 tracing = { version = "0.1", features = ["log"] }
 tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }

Cargo.toml

@@ -13,6 +13,7 @@ ethrex-p2p.workspace = true
 ethrex-storage.workspace = true
 ethrex-vm.workspace = true
 ethrex-rlp.workspace = true
+ethrex-storage-rollup = { workspace = true, optional = true }
 ethrex-l2 = { workspace = true, optional = true }
 
 bytes.workspace = true
@@ -63,12 +64,15 @@ libmdbx = ["ethrex-storage/libmdbx"]
 redb = ["dep:redb", "ethrex-storage/redb"]
 blst = ["ethrex-vm/blst"]
 l2 = [
-  "dep:ethrex-l2",
-  "ethrex-vm/l2",
-  "ethrex-blockchain/l2",
-  "ethrex-rpc/l2",
-  "dep:secp256k1",
+    "dep:ethrex-l2",
+    "ethrex-vm/l2",
+    "ethrex-blockchain/l2",
+    "ethrex-rpc/l2",
+    "dep:secp256k1",
+    "ethrex-storage-rollup"
 ]
+rollup_storage_libmdbx = ["ethrex-storage-rollup/libmdbx"]
+rollup_storage_redb = ["ethrex-storage-rollup/redb"]
 based = ["l2", "ethrex-rpc/based"]
 
 

cmd/ethrex/Cargo.toml

@@ -14,6 +14,8 @@ use tracing::info;
 
 #[cfg(any(feature = "l2", feature = "based"))]
 use ethrex::l2::L2Options;
+#[cfg(feature = "l2")]
+use ethrex_storage_rollup::StoreRollup;
 
 #[tokio::main]
 async fn main() -> eyre::Result<()> {
@@ -55,6 +57,8 @@ async fn main() -> eyre::Result<()> {
         blockchain.clone(),
         cancel_token.clone(),
         tracker.clone(),
+        #[cfg(feature = "l2")]
+        StoreRollup::default(),
     )
     .await;
 

cmd/ethrex/ethrex.rs

@@ -33,6 +33,7 @@ use crate::l2::L2Options;
 use ::{
     ethrex_common::Address,
     ethrex_l2::utils::config::{read_env_file_by_config, ConfigMode},
+    ethrex_storage_rollup::{EngineTypeRollup, StoreRollup},
     secp256k1::SecretKey,
 };
 
@@ -79,7 +80,6 @@ pub async fn init_store(data_dir: &str, network: &str) -> Store {
             } else if #[cfg(feature = "libmdbx")] {
                 let engine_type = EngineType::Libmdbx;
             } else {
-                let engine_type = EngineType::InMemory;
                 error!("No database specified. The feature flag `redb` or `libmdbx` should've been set while building.");
                 panic!("Specify the desired database engine.");
             }
@@ -94,6 +94,26 @@ pub async fn init_store(data_dir: &str, network: &str) -> Store {
     store
 }
 
+#[cfg(feature = "l2")]
+pub async fn init_rollup_store(data_dir: &str) -> StoreRollup {
+    cfg_if::cfg_if! {
+        if #[cfg(feature = "rollup_storage_redb")] {
+            let engine_type = EngineTypeRollup::RedB;
+        } else if #[cfg(feature = "rollup_storage_libmdbx")] {
+            let engine_type = EngineTypeRollup::Libmdbx;
+        } else {
+            let engine_type = EngineTypeRollup::InMemory;
+        }
+    }
+    let rollup_store =
+        StoreRollup::new(data_dir, engine_type).expect("Failed to create StoreRollup");
+    rollup_store
+        .init()
+        .await
+        .expect("Failed to init rollup store");
+    rollup_store
+}
+
 pub fn init_blockchain(evm_engine: EvmEngine, store: Store) -> Arc<Blockchain> {
     Blockchain::new(evm_engine, store).into()
 }
@@ -109,6 +129,7 @@ pub async fn init_rpc_api(
     blockchain: Arc<Blockchain>,
     cancel_token: CancellationToken,
     tracker: TaskTracker,
+    #[cfg(feature = "l2")] rollup_store: StoreRollup,
 ) {
     let enr_seq = std::time::SystemTime::now()
         .duration_since(std::time::UNIX_EPOCH)
@@ -146,6 +167,8 @@ pub async fn init_rpc_api(
         get_valid_delegation_addresses(l2_opts),
         #[cfg(feature = "l2")]
         get_sponsor_pk(l2_opts),
+        #[cfg(feature = "l2")]
+        rollup_store,
     )
     .into_future();
 

cmd/ethrex/initializers.rs

@@ -2,7 +2,7 @@ use crate::{
     cli::{self as ethrex_cli, Options},
     initializers::{
         get_local_p2p_node, get_network, get_signer, init_blockchain, init_metrics, init_network,
-        init_rpc_api, init_store,
+        init_rollup_store, init_rpc_api, init_store,
     },
     utils::{self, set_datadir, store_known_peers},
     DEFAULT_L2_DATADIR,
@@ -121,10 +121,12 @@ impl Command {
         match self {
             Command::Init { opts } => {
                 let data_dir = set_datadir(&opts.node_opts.datadir);
+                let rollup_store_dir = data_dir.clone() + "/rollup_store";
 
                 let network = get_network(&opts.node_opts);
 
                 let store = init_store(&data_dir, &network).await;
+                let rollup_store = init_rollup_store(&rollup_store_dir).await;
 
                 let blockchain = init_blockchain(opts.node_opts.evm, store.clone());
 
@@ -149,6 +151,7 @@ impl Command {
                     blockchain.clone(),
                     cancel_token.clone(),
                     tracker.clone(),
+                    rollup_store.clone(),
                 )
                 .await;
 
@@ -174,7 +177,8 @@ impl Command {
                     info!("P2P is disabled");
                 }
 
-                let l2_sequencer = ethrex_l2::start_l2(store, blockchain).into_future();
+                let l2_sequencer =
+                    ethrex_l2::start_l2(store, rollup_store, blockchain).into_future();
 
                 tracker.spawn(l2_sequencer);
 
@@ -219,7 +223,7 @@ impl Command {
                     .checked_sub(U256::from(64))
                     .ok_or_eyre("Cannot get finalized block")?;
 
-                let event_signature = keccak("BlockCommitted(bytes32)");
+                let event_signature = keccak("BatchCommitted(bytes32)");
 
                 loop {
                     // Wait for a block

cmd/ethrex/l2.rs

@@ -11,6 +11,7 @@ ethrex-blockchain = { workspace = true, features = ["l2"] }
 ethrex-rlp.workspace = true
 ethrex-rpc.workspace = true
 ethrex-storage = { workspace = true, features = ["libmdbx"] }
+ethrex-storage-rollup = { workspace = true, features = ["libmdbx"] }
 
 serde_json.workspace = true
 serde.workspace = true

cmd/ethrex_l2/Cargo.toml

@@ -9,10 +9,10 @@ use std::str::FromStr;
 #[derive(Subcommand)]
 pub(crate) enum Command {
     #[clap(
-        about = "Get latestCommittedBlock and latestVerifiedBlock from the OnChainProposer.",
+        about = "Get latestCommittedBatch and latestVerifiedBatch from the OnChainProposer.",
         short_flag = 'l'
     )]
-    LatestBlocks,
+    LatestBatches,
     #[clap(about = "Get the current block_number.", alias = "bl")]
     BlockNumber {
         #[arg(long = "l2", required = false)]
@@ -48,23 +48,23 @@ impl Command {
         let rollup_client = EthClient::new(&cfg.network.l2_rpc_url);
         let on_chain_proposer_address = cfg.contracts.on_chain_proposer;
         match self {
-            Command::LatestBlocks => {
-                let last_committed_block =
-                    EthClient::get_last_committed_block(&eth_client, on_chain_proposer_address)
-                        .await?;
+            Command::LatestBatches => {
+                let last_committed_batch = eth_client
+                    .get_last_committed_batch(on_chain_proposer_address)
+                    .await?;
 
-                let last_verified_block =
-                    EthClient::get_last_verified_block(&eth_client, on_chain_proposer_address)
-                        .await?;
+                let last_verified_batch = eth_client
+                    .get_last_verified_batch(on_chain_proposer_address)
+                    .await?;
 
                 println!(
-                    "latestCommittedBlock: {}",
-                    format!("{last_committed_block}").bright_cyan()
+                    "latestCommittedBatch: {}",
+                    format!("{last_committed_batch}").bright_cyan()
                 );
 
                 println!(
-                    "latestVerifiedBlock:  {}",
-                    format!("{last_verified_block}").bright_cyan()
+                    "latestVerifiedBatch:  {}",
+                    format!("{last_verified_batch}").bright_cyan()
                 );
             }
             Command::BlockNumber { l2, l1 } => {