feat(l2): multiple provers at the same time

cmd/ethrex_l2/src/commands/prove.rs

@@ -1,5 +1,8 @@
 use clap::Args;
-use ethrex_l2::utils::test_data_io::{generate_program_input, read_chain_file, read_genesis_file};
+use ethrex_l2::utils::{
+    prover::proving_systems::ProverType,
+    test_data_io::{generate_program_input, read_chain_file, read_genesis_file},
+};
 use ethrex_prover_lib::prover::create_prover;
 
 #[derive(Args)]
@@ -30,7 +33,7 @@ impl Command {
         let chain = read_chain_file(&self.chain);
         let program_input = generate_program_input(genesis, chain, self.block_number)?;
 
-        let mut prover = create_prover(ethrex_l2::proposer::prover_server::ProverType::RISC0);
+        let mut prover = create_prover(ProverType::RISC0);
         prover.prove(program_input).expect("proving failed");
         println!(
             "Total gas consumption: {}",

crates/blockchain/metrics/Cargo.toml

@@ -6,23 +6,21 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tokio.workspace = true
-tracing.workspace = true
+tokio = { workspace = true, optional = true }
+tracing = { workspace = true, optional = true }
 thiserror.workspace = true
 serde_json.workspace = true
 serde.workspace = true
 
 ethrex-core = { path = "../../common", default-features = false }
 
-prometheus = "0.13.4"
-
-# TODO: remove?
-axum = "0.7.9"
+prometheus = { version = "0.13.4", optional = true }
+axum = { version = "0.8.1", optional = true }
 
 
 [lib]
 path = "./mod.rs"
 
 [features]
 default = ["api"]
-api = []
+api = ["dep:axum", "dep:prometheus", "dep:tokio", "dep:tracing"]

crates/l2/Cargo.toml

@@ -27,7 +27,10 @@ secp256k1.workspace = true
 keccak-hash.workspace = true
 envy = "0.4.2"
 thiserror.workspace = true
+directories = "5.0.1"
+
 zkvm_interface = { path = "./prover/zkvm/interface/", default-features = false }
+
 # risc0
 risc0-zkvm = { version = "1.2.0" }
 # sp1

crates/l2/Makefile

@@ -1,11 +1,10 @@
+.PHONY: help init down clean restart cli update-cli-contracts init-local-l1 init-l1 down-local-l1 restart-local-l1 rm-db-l1 clean-contract-deps restart-contract-deps deploy-l1 init-l2 down-l2 restart-l2 init-prover rm-db-l2 purge_prover_state ci_test test
 .DEFAULT_GOAL := help
 
 L2_GENESIS_FILE_PATH=../../test_data/genesis-l2.json
 L1_GENESIS_FILE_PATH=../../test_data/genesis-l1.json
 
 # Basic
-.PHONY: help init down clean restart
-
 help: ## 📚 Show help for each of the Makefile recipes
 	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
@@ -18,8 +17,6 @@ clean: clean-contract-deps ## 🧹 Cleans the localnet
 restart: restart-local-l1 deploy-l1 restart-l2 ## 🔄 Restarts the localnet
 
 # CLI
-.PHONY: cli update-cli-contracts
-
 cli: ## 🛠️ Installs the L2 Lambda ethrex CLI
 	cargo install --path ${ethrex_PATH}/cmd/ethrex_l2/ --force
 
@@ -60,8 +57,6 @@ L2_AUTH_PORT=8552
 L2_PROMETHEUS_METRICS_PORT = 3702
 
 # Local L1
-.PHONY: init-local-l1 init-l1 down-local-l1 restart-local-l1 rm-db-l1
-
 init-local-l1: ## 🚀 Initializes an L1 Lambda ethrex Client with Docker (Used with make init)
 	docker compose -f ${ethrex_DEV_DOCKER_COMPOSE_PATH} -f ${ethrex_METRICS_OVERRIDES_L1_DOCKER_COMPOSE_PATH} up -d
 
@@ -94,8 +89,6 @@ rm-db-l1: ## 🛑 Removes the DB used by the L1
 	cargo run --release --manifest-path ../../Cargo.toml --bin ethrex -- removedb --datadir ${ethrex_L1_DEV_LIBMDBX}
 
 # Contracts
-PHONY: clean-contract-deps restart-contract-deps deploy-l1
-
 clean-contract-deps: ## 🧹 Cleans the dependencies for the L1 contracts.
 	rm -rf contracts/solc_out
 	rm -rf contracts/lib
@@ -106,8 +99,6 @@ deploy-l1: ## 📜 Deploys the L1 contracts
 	DEPLOYER_CONTRACTS_PATH=contracts cargo run --release --bin ethrex_l2_l1_deployer --manifest-path ${ethrex_L2_CONTRACTS_PATH}/Cargo.toml
 
 # L2
-PHONY: init-l2 down-l2 restart-l2 init-prover rm-db-l2
-
 init-l2: init-metrics ## 🚀 Initializes an L2 Lambda ethrex Client
 	cargo run --release --manifest-path ../../Cargo.toml --bin ethrex --features "l2,metrics" -- \
 	--network ${L2_GENESIS_FILE_PATH} \
@@ -148,8 +139,6 @@ rm-db-l2: ## 🛑 Removes the DB used by the L2
 	cargo run --release --manifest-path ../../Cargo.toml --bin ethrex -- removedb --datadir ${ethrex_L2_DEV_LIBMDBX}
 
 # Testing
-PHONY: ci_test test
-
 ci_test: ## 🚧 Runs the L2's integration test, used by the github's CI
 	docker compose -f ${ethrex_L2_DOCKER_COMPOSE_PATH} down
 	docker compose -f ${ethrex_L2_DOCKER_COMPOSE_PATH} up -d --build
@@ -158,3 +147,26 @@ ci_test: ## 🚧 Runs the L2's integration test, used by the github's CI
 
 test: ## 🚧 Runs the L2's integration test, run `make init` and in a new terminal make test
 	BRIDGE_ADDRESS=$$(grep 'L1_WATCHER_BRIDGE_ADDRESS' .env | cut -d= -f2) ON_CHAIN_PROPOSER_ADDRESS=$$(grep 'COMMITTER_ON_CHAIN_PROPOSER_ADDRESS' .env | cut -d= -f2) cargo test --release testito -- --nocapture
+
+
+# Purge L2's state
+UNAME_S:=$(shell uname -s)
+# This directory is set by crates/l2/utils/prover/save_state.rs -> const DEFAULT_DATADIR
+PROJECT_NAME:=ethrex_l2_state
+
+ifeq ($(UNAME_S),Linux)
+    PROJECT_PATH := $(HOME)/.local/share/${PROJECT_NAME}
+else ifeq ($(UNAME_S),Darwin)
+    PROJECT_PATH := $(HOME)/Library/Application\ Support/${PROJECT_NAME}
+else
+    $(error Unsupported platform: $(UNAME_S))
+endif
+
+purge_prover_state: ## 🧹 Removes the L2 state, only use to start fresh.
+	@echo "Are you sure you want to delete the directory: $(PROJECT_PATH) ? [y/n]"
+	@read answer; \
+	if [ "$$answer" != "y" ]; then \
+		echo "Operation canceled."; \
+	fi; \
+	rm -rf $(PROJECT_PATH); \
+	echo "Directory deleted."

crates/l2/contracts/deployer.rs

@@ -81,10 +81,8 @@ async fn main() -> Result<(), DeployError> {
     )
     .await?;
 
-    let sp1_contract_verifier_address = match sp1_verifier_address {
-        Some(address) => address,
-        None => setup_result.sp1_contract_verifier_address,
-    };
+    let sp1_contract_verifier_address =
+        sp1_verifier_address.unwrap_or(setup_result.sp1_contract_verifier_address);
 
     initialize_contracts(
         setup_result.deployer_address,

crates/l2/proposer/errors.rs

@@ -1,6 +1,7 @@
 use std::sync::mpsc::SendError;
 
 use crate::utils::config::errors::ConfigError;
+use crate::utils::prover::errors::SaveStateError;
 use ethereum_types::FromStrRadixErr;
 use ethrex_core::types::{BlobsBundleError, FakeExponentialError};
 use ethrex_dev::utils::engine_client::errors::EngineClientError;
@@ -22,6 +23,8 @@ pub enum L1WatcherError {
     FailedToRetrieveChainConfig(String),
     #[error("L1Watcher failed to get config: {0}")]
     FailedToGetConfig(#[from] ConfigError),
+    #[error("{0}")]
+    Custom(String),
 }
 
 #[derive(Debug, thiserror::Error)]
@@ -32,9 +35,9 @@ pub enum ProverServerError {
     EthClientError(#[from] EthClientError),
     #[error("ProverServer failed to send transaction: {0}")]
     FailedToVerifyProofOnChain(String),
-    #[error("ProverServer failed retrieve block from storage: {0}")]
-    FailedToRetrieveBlockFromStorage(#[from] StoreError),
-    #[error("ProverServer failed retrieve block from storaga, data is None.")]
+    #[error("ProverServer failed to access Store: {0}")]
+    FailedAccessingStore(#[from] StoreError),
+    #[error("ProverServer failed to retrieve block from storaga, data is None.")]
     StorageDataIsNone,
     #[error("ProverServer failed to create ProverInputs: {0}")]
     FailedToCreateProverInputs(#[from] EvmError),
@@ -44,6 +47,12 @@ pub enum ProverServerError {
     JoinError(#[from] JoinError),
     #[error("ProverServer failed: {0}")]
     Custom(String),
+    #[error("ProverServer failed to write to TcpStream: {0}")]
+    WriteError(String),
+    #[error("ProverServer failed to get data from Store: {0}")]
+    ItemNotFoundInStore(String),
+    #[error("ProverServer encountered a SaveStateError: {0}")]
+    SaveStateError(#[from] SaveStateError),
     #[error("Failed to encode calldata: {0}")]
     CalldataEncodeError(#[from] CalldataEncodeError),
 }

crates/l2/proposer/l1_watcher.rs

@@ -227,11 +227,9 @@ impl L1Watcher {
 
             let gas_price = self.l2_client.get_gas_price().await?;
             // Avoid panicking when using as_u64()
-            let gas_price = if gas_price > u64::MAX.into() {
-                u64::MAX
-            } else {
-                gas_price.as_u64()
-            };
+            let gas_price: u64 = gas_price
+                .try_into()
+                .map_err(|_| L1WatcherError::Custom("Failed at gas_price.try_into()".to_owned()))?;
 
             let mut mint_transaction = self
                 .eth_client