feat(l2): commit blocks in batches #2397
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,6 +33,7 @@ use crate::l2::L2Options; | |
| use ::{ | ||
| ethrex_common::Address, | ||
| ethrex_l2::utils::config::{read_env_file_by_config, ConfigMode}, | ||
| ethrex_storage_l2::{EngineTypeL2, StoreL2}, | ||
| secp256k1::SecretKey, | ||
| }; | ||
|
|
||
|
|
@@ -94,6 +95,27 @@ pub async fn init_store(data_dir: &str, network: &str) -> Store { | |
| store | ||
| } | ||
|
|
||
| #[cfg(feature = "l2")] | ||
| pub async fn init_l2_store(data_dir: &str) -> StoreL2 { | ||
| let path = PathBuf::from(data_dir); | ||
| if path.ends_with("memory") { | ||
| StoreL2::new(data_dir, EngineTypeL2::InMemory).expect("Failed to create StoreL2") | ||
| } else { | ||
| cfg_if::cfg_if! { | ||
| if #[cfg(feature = "redb")] { | ||
| let engine_type = EngineTypeL2::RedB; | ||
| } else if #[cfg(feature = "libmdbx")] { | ||
| let engine_type = EngineTypeL2::Libmdbx; | ||
| } else { | ||
| let engine_type = EngineTypeL2::InMemory; | ||
|
There was a problem hiding this comment. why do you specify in memory if you're going to panic in the next line? There was a problem hiding this comment. That was a legacy from |
||
| error!("No database specified. The feature flag `redb` or `libmdbx` should've been set while building."); | ||
| panic!("Specify the desired database engine."); | ||
| } | ||
| } | ||
| StoreL2::new(data_dir, engine_type).expect("Failed to create StoreL2") | ||
| } | ||
| } | ||
|
|
||
| pub fn init_blockchain(evm_engine: EvmEngine, store: Store) -> Arc<Blockchain> { | ||
| Blockchain::new(evm_engine, store).into() | ||
| } | ||
|
|
@@ -109,6 +131,7 @@ pub async fn init_rpc_api( | |
| blockchain: Arc<Blockchain>, | ||
| cancel_token: CancellationToken, | ||
| tracker: TaskTracker, | ||
| #[cfg(feature = "l2")] l2_store: StoreL2, | ||
| ) { | ||
| let enr_seq = std::time::SystemTime::now() | ||
| .duration_since(std::time::UNIX_EPOCH) | ||
|
|
@@ -146,6 +169,8 @@ pub async fn init_rpc_api( | |
| get_valid_delegation_addresses(l2_opts), | ||
| #[cfg(feature = "l2")] | ||
| get_sponsor_pk(l2_opts), | ||
| #[cfg(feature = "l2")] | ||
| l2_store, | ||
| ) | ||
| .into_future(); | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| use crate::{ | ||
| cli::{self as ethrex_cli, Options}, | ||
| initializers::{ | ||
| get_local_p2p_node, get_network, get_signer, init_blockchain, init_l2_store, init_metrics, | ||
| init_network, init_rpc_api, init_store, | ||
| }, | ||
| utils::{self, set_datadir, store_known_peers}, | ||
| DEFAULT_L2_DATADIR, | ||
|
|
@@ -121,12 +121,14 @@ impl Command { | |
| match self { | ||
| Command::Init { opts } => { | ||
| let data_dir = set_datadir(&opts.node_opts.datadir); | ||
| let l2_store_dir = data_dir.clone() + "/l2_store"; | ||
|
|
||
| let network = get_network(&opts.node_opts); | ||
|
|
||
| let l1_store = init_store(&data_dir, &network).await; | ||
|
There was a problem hiding this comment. I think this is not the L1 store. There was a problem hiding this comment. Agree, I think I would keep the There was a problem hiding this comment. Renamed to |
||
| let l2_store = init_l2_store(&l2_store_dir).await; | ||
|
|
||
| let blockchain = init_blockchain(opts.node_opts.evm, l1_store.clone()); | ||
|
|
||
| let signer = get_signer(&data_dir); | ||
|
|
||
|
|
@@ -145,10 +147,11 @@ impl Command { | |
| &signer, | ||
| peer_table.clone(), | ||
| local_p2p_node, | ||
| l1_store.clone(), | ||
| blockchain.clone(), | ||
| cancel_token.clone(), | ||
| tracker.clone(), | ||
| l2_store.clone(), | ||
| ) | ||
| .await; | ||
|
|
||
|
|
@@ -165,7 +168,7 @@ impl Command { | |
| local_p2p_node, | ||
| signer, | ||
| peer_table.clone(), | ||
| l1_store.clone(), | ||
| tracker.clone(), | ||
| blockchain.clone(), | ||
| ) | ||
|
|
@@ -174,7 +177,8 @@ impl Command { | |
| info!("P2P is disabled"); | ||
| } | ||
|
|
||
| let l2_sequencer = | ||
| ethrex_l2::start_l2(l1_store, l2_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("BatchCommitted(bytes32)"); | ||
|
|
||
| loop { | ||
| // Wait for a block | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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-l2 = { workspace = true, features = ["libmdbx"] } | ||
|
|
||
| serde_json.workspace = true | ||
| serde.workspace = true | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,22 +49,22 @@ impl Command { | |
| let on_chain_proposer_address = cfg.contracts.on_chain_proposer; | ||
| match self { | ||
| Command::LatestBlocks => { | ||
| let last_committed_batch = | ||
| EthClient::get_last_committed_batch(ð_client, on_chain_proposer_address) | ||
| .await?; | ||
|
|
||
| let last_verified_batch = | ||
| EthClient::get_last_verified_batch(ð_client, on_chain_proposer_address) | ||
ManuelBilbao marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| .await?; | ||
|
|
||
| println!( | ||
| "latestCommittedBatch: {}", | ||
| format!("{last_committed_batch}").bright_cyan() | ||
| ); | ||
|
|
||
| println!( | ||
| "latestVerifiedBatch: {}", | ||
| format!("{last_verified_batch}").bright_cyan() | ||
| ); | ||
| } | ||
| Command::BlockNumber { l2, l1 } => { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't this import
ethrex-storage-l2when thel2feature is unset?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For this, I defined the
rollup_storage_libmdbxandrollup_storage_redbfeature flags in 0e45d8d. I'm not happy with this approach, but if you have a better idea, I'd be glad to change it.