refactor(l1,l2,levm): add evm cli arg instead of flag

.github/workflows/ci_l1.yaml

@@ -197,6 +197,7 @@ jobs:
         run: |
           docker load --input /tmp/ethrex_image.tar
 
+      # By default ethrex uses revm as evm backend.
       - name: Run Hive Simulation
         run: chmod +x hive && ./hive --client ethrex --sim ${{ matrix.simulation }} --sim.limit "${{ matrix.test_pattern }}" --sim.parallelism 4
 

.github/workflows/ci_levm.yaml

@@ -87,7 +87,10 @@ jobs:
           name: results_levm_trigger.md
 
       - name: Rename result (1)
-        run: cp results.md results_levm.md
+        run: |
+          cp results.md results_levm.md
+          echo "RESULTS:"
+          cat results_levm.md
 
       - name: Download results (main)
         uses: actions/download-artifact@v4
@@ -97,12 +100,17 @@ jobs:
         continue-on-error: true
 
       - name: Rename result (2)
-        run: cp results.md results_levm_main.md
+        run: |
+          cp results.md results_levm_main.md
+          echo "RESULTS:"
+          cat results_levm_main.md
 
       - name: Create diff message
         run: |
           bash .github/scripts/hive_levm_revm_diff.sh results_levm_main.md results_levm.md >> diff.md
           cat diff.md >> $GITHUB_STEP_SUMMARY
+          echo "SUMMARY:"
+          cat diff.md
 
       - name: Check Regression
         run: |

.github/workflows/common_hive_reports.yaml

@@ -38,7 +38,6 @@ jobs:
 
     steps:
       - name: Pull image
-        if: ${{ inputs.evm == 'revm' }}
         run: |
           docker pull ghcr.io/lambdaclass/ethrex:latest
           docker tag ghcr.io/lambdaclass/ethrex:latest ethrex:latest
@@ -53,18 +52,14 @@ jobs:
         with:
           ref: main
 
-      - name: Build Image with LEVM
-        if: ${{ inputs.evm == 'levm' }}
-        run: cd crates/vm/levm && make build-image-levm
-
       - name: Setup Go
         uses: actions/setup-go@v5
 
       - name: Setup Hive
         run: make setup-hive
 
       - name: Run Hive Simulation
-        run: cd hive && ./hive --client ethrex --sim ${{ matrix.test.simulation }} --sim.parallelism 16
+        run: cd hive && ./hive --client ethrex --sim ${{ matrix.test.simulation }} --ethrex.flags "--evm ${{ inputs.evm }}" --sim.parallelism 16
         continue-on-error: true
 
       - name: Upload results

.github/workflows/flamegraph_reporter.yaml

@@ -252,6 +252,7 @@ jobs:
           ethrex_l2 config create default --default
           ethrex_l2 config set default
 
+      # By default ethrex uses revm as evm backend.
       - id: generate-flamegraph-ethrex
         name: Generate Flamegraph data for Ethrex
         shell: bash

Makefile

@@ -66,18 +66,19 @@ stop-localnet-silent:
 	@kurtosis enclave stop $(ENCLAVE) >/dev/null 2>&1 || true
 	@kurtosis enclave rm $(ENCLAVE) --force >/dev/null 2>&1 || true
 
-HIVE_REVISION := b0b0f98bd24676239722e3aa7885e29ef856d804
+HIVE_REVISION := feb4333db7fe9f6dc161326ebb11957d4306d2f9
 # Shallow clones can't specify a single revision, but at least we avoid working
 # the whole history by making it shallow since a given date (one day before our
 # target revision).
 HIVE_SHALLOW_SINCE := 2024-09-02
 QUIET ?= false
+
 hive:
 	if [ "$(QUIET)" = "true" ]; then \
-		git clone --quiet --single-branch --branch master --shallow-since=$(HIVE_SHALLOW_SINCE) https://github.com/lambdaclass/hive && \
+		git clone --quiet --single-branch --branch master --shallow-since=$(HIVE_SHALLOW_SINCE) https://github.com/lambdaclass/hive ; \
 		cd hive && git checkout --quiet --detach $(HIVE_REVISION) && go build .; \
 	else \
-		git clone --single-branch --branch master --shallow-since=$(HIVE_SHALLOW_SINCE) https://github.com/lambdaclass/hive && \
+		git clone --single-branch --branch master --shallow-since=$(HIVE_SHALLOW_SINCE) https://github.com/lambdaclass/hive ; \
 		cd hive && git checkout --detach $(HIVE_REVISION) && go build .; \
 	fi
 
@@ -106,6 +107,9 @@ SIM_LOG_LEVEL ?= 4
 run-hive: build-image setup-hive ## 🧪 Run Hive testing suite
 	cd hive && ./hive --client ethrex --sim $(SIMULATION) --sim.limit "$(TEST_PATTERN)"
 
+run-hive-levm: build-image setup-hive ## 🧪 Run Hive testing suite with LEVM
+	cd hive && ./hive --client ethrex --ethrex.flags "--evm levm" --sim $(SIMULATION) --sim.limit "$(TEST_PATTERN)"
+
 run-hive-all: build-image setup-hive ## 🧪 Run all Hive testing suites
 	cd hive && ./hive --client ethrex --sim ".*" --sim.parallelism 4
 
@@ -115,6 +119,16 @@ run-hive-debug: build-image setup-hive ## 🐞 Run Hive testing suite in debug m
 clean-hive-logs: ## 🧹 Clean Hive logs
 	rm -rf ./hive/workspace/logs
 
+SIM_PARALLELISM := 48
+EVM_BACKEND := revm
+# `make run-hive-report SIM_PARALLELISM=24 EVM_BACKEND="levm"`
+run-hive-report: build-image setup-hive clean-hive-logs ## 🐝 Run Hive and Build report
+	cd hive && ./hive --ethrex.flags "--evm $(EVM_BACKEND)" --sim ethereum/rpc-compat --client ethrex --sim.limit "$(TEST_PATTERN)" --sim.parallelism $(SIM_PARALLELISM) || exit 0
+	cd hive && ./hive --ethrex.flags "--evm $(EVM_BACKEND)" --sim devp2p --client ethrex --sim.limit "$(TEST_PATTERN)" --sim.parallelism $(SIM_PARALLELISM) || exit 0
+	cd hive && ./hive --ethrex.flags "--evm $(EVM_BACKEND)" --sim ethereum/engine --client ethrex --sim.limit "$(TEST_PATTERN)" --sim.parallelism $(SIM_PARALLELISM) || exit 0
+	cd hive && ./hive --ethrex.flags "--evm $(EVM_BACKEND)" --sim ethereum/sync --client ethrex --sim.limit "$(TEST_PATTERN)" --sim.parallelism $(SIM_PARALLELISM) || exit 0
+	cargo run --release -p hive_report
+
 loc:
 	cargo run -p loc
 
@@ -152,17 +166,18 @@ install-cli: ## 🛠️ Installs the ethrex-l2 cli
 
 start-node-with-flamegraph: rm-test-db ## 🚀🔥 Starts an ethrex client used for testing
 	@if [ -z "$$L" ]; then \
-		LEVM=""; \
+		LEVM="revm"; \
 		echo "Running the test-node without the LEVM feature"; \
 		echo "If you want to use levm, run the target with an L at the end: make <target> L=1"; \
 	else \
-		LEVM=",levm"; \
+		LEVM="levm"; \
 		echo "Running the test-node with the LEVM feature"; \
 	fi; \
-	sudo CARGO_PROFILE_RELEASE_DEBUG=true cargo flamegraph \
+	sudo -E CARGO_PROFILE_RELEASE_DEBUG=true cargo flamegraph \
 	--bin ethrex \
-	--features "dev$$LEVM" \
+	--features "dev" \
 	--  \
+	--evm $$LEVM \
 	--network test_data/genesis-l2.json \
 	--http.port 1729 \
 	--datadir test_ethrex
@@ -176,14 +191,10 @@ load-node: install-cli ## 🚧 Runs a load-test. Run make start-node-with-flameg
 		CONTRACT_INTERACTION="-c"; \
 		echo "Running the load-test with contract interaction"; \
 	fi; \
-	ethrex_l2 test load --path test_data/private_keys.txt -i 100 -v  --value 1 $$CONTRACT_INTERACTION
+	ethrex_l2 test load --path test_data/private_keys.txt -i 1000 -v  --value 100000 $$CONTRACT_INTERACTION
 
 rm-test-db:  ## 🛑 Removes the DB used by the ethrex client used for testing
 	sudo cargo run --release --bin ethrex -- removedb --datadir test_ethrex
 
-flamegraph:
-	sudo -E CARGO_PROFILE_RELEASE_DEBUG=true cargo flamegraph --bin ethrex --features dev  --  --network test_data/genesis-l2.json --http.port 1729 >/dev/null &
+flamegraph: ## 🚧 Runs a load-test. Run make start-node-with-flamegraph and in a new terminal make flamegraph
 	bash scripts/flamegraph.sh
-
-test-load:
-	ethrex_l2 test load --path ./test_data/private_keys.txt -i 1000 -v  --value 10000000 --to 0xFCbaC0713ACf16708aB6BC977227041FA1BC618D

cmd/ef_tests/levm/Cargo.toml

@@ -4,11 +4,11 @@ version.workspace = true
 edition.workspace = true
 
 [dependencies]
-ethrex-blockchain = { workspace = true, features = ["levm"] }
+ethrex-blockchain = { workspace = true }
 ethrex-core.workspace = true
 ethrex-storage.workspace = true
 ethrex-rlp.workspace = true
-ethrex-vm = { workspace = true, features = ["levm"] }
+ethrex-vm = { workspace = true }
 ethrex-levm = { path = "../../../crates/vm/levm" }
 serde.workspace = true
 serde_json.workspace = true

cmd/ef_tests/levm/runner/levm_runner.rs

@@ -15,7 +15,7 @@ use ethrex_levm::{
     Environment,
 };
 use ethrex_storage::AccountUpdate;
-use ethrex_vm::{db::StoreWrapper, EvmState};
+use ethrex_vm::db::{EvmState, StoreWrapper};
 use keccak_hash::keccak;
 use std::{collections::HashMap, sync::Arc};
 

cmd/ef_tests/levm/runner/revm_runner.rs

@@ -17,7 +17,10 @@ use ethrex_levm::{
     Account, StorageSlot,
 };
 use ethrex_storage::{error::StoreError, AccountUpdate};
-use ethrex_vm::{db::StoreWrapper, fork_to_spec_id, EvmState, RevmAddress, RevmU256};
+use ethrex_vm::{
+    db::{EvmState, StoreWrapper},
+    fork_to_spec_id, RevmAddress, RevmU256,
+};
 use revm::{
     db::State,
     inspectors::TracerEip3155 as RevmTracerEip3155,

cmd/ef_tests/levm/utils.rs

@@ -4,7 +4,7 @@ use crate::{
 };
 use ethrex_core::{types::Genesis, H256, U256};
 use ethrex_storage::{EngineType, Store};
-use ethrex_vm::{evm_state, EvmState};
+use ethrex_vm::db::{evm_state, EvmState};
 use spinoff::Spinner;
 
 pub fn load_initial_state(test: &EFTest) -> (EvmState, H256) {

cmd/ethrex/Cargo.toml

@@ -48,4 +48,3 @@ metrics = ["ethrex-blockchain/metrics", "ethrex-l2/metrics"]
 libmdbx = ["dep:libmdbx", "ethrex-storage/libmdbx"]
 redb = ["dep:redb", "ethrex-storage/redb"]
 l2 = ["dep:ethrex-l2", "ethrex-vm/l2"]
-levm = ["default", "ethrex-vm/levm", "ethrex-blockchain/levm"]

cmd/ethrex/cli.rs

@@ -1,5 +1,6 @@
 use clap::{Arg, ArgAction, Command};
 use ethrex_p2p::types::Node;
+use ethrex_vm::backends::EVM;
 use tracing::Level;
 
 pub fn cli() -> Command {
@@ -128,6 +129,7 @@ pub fn cli() -> Command {
                 .required(false)
                 .default_value("revm")
                 .value_name("EVM_BACKEND")
+                .value_parser(clap::value_parser!(EVM))
                 .help("Has to be `levm` or `revm`"),
         )
         .subcommand(

cmd/ethrex/ethrex.rs

@@ -10,6 +10,7 @@ use ethrex_p2p::{
 };
 use ethrex_rlp::decode::RLPDecode;
 use ethrex_storage::{EngineType, Store};
+use ethrex_vm::{backends::EVM, EVM_BACKEND};
 use k256::ecdsa::SigningKey;
 use local_ip_address::local_ip;
 use rand::rngs::OsRng;
@@ -150,6 +151,10 @@ async fn main() {
 
     let sync_mode = sync_mode(&matches);
 
+    let evm = matches.get_one::<EVM>("evm").unwrap_or(&EVM::REVM);
+    let evm = EVM_BACKEND.get_or_init(|| evm.clone());
+    info!("EVM_BACKEND set to: {:?}", evm);
+
     cfg_if::cfg_if! {
         if #[cfg(feature = "redb")] {
             let store = Store::new(&data_dir, EngineType::RedB).expect("Failed to create Store");
@@ -284,7 +289,14 @@ async fn main() {
             };
             let max_tries = 3;
             let url = format!("http://{authrpc_socket_addr}");
-            let block_producer_engine = ethrex_dev::block_producer::start_block_producer(url, authrpc_jwtsecret.into(), head_block_hash, max_tries, 1000, ethrex_core::Address::default());
+            let block_producer_engine = ethrex_dev::block_producer::start_block_producer(
+                url,
+                authrpc_jwtsecret.into(),
+                head_block_hash,
+                max_tries,
+                1000,
+                ethrex_core::Address::default(),
+            );
             tracker.spawn(block_producer_engine);
         } else {
             ethrex_p2p::start_network(
@@ -419,12 +431,13 @@ fn import_blocks(store: &Store, blocks: &Vec<Block>) {
     }
     if let Some(last_block) = blocks.last() {
         let hash = last_block.hash();
-        cfg_if::cfg_if! {
-            if #[cfg(feature = "levm")] {
+        match EVM_BACKEND.get() {
+            Some(EVM::LEVM) => {
                 // We are allowing this not to unwrap so that tests can run even if block execution results in the wrong root hash with LEVM.
                 let _ = apply_fork_choice(store, hash, hash, hash);
             }
-            else {
+            // This means we are using REVM as default
+            Some(EVM::REVM) | None => {
                 apply_fork_choice(store, hash, hash, hash).unwrap();
             }
         }

crates/blockchain/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ethrex-levm = { path = "../vm/levm", optional = true }
+ethrex-levm = { path = "../vm/levm" }
 thiserror.workspace = true
 sha3.workspace = true
 tracing.workspace = true
@@ -31,7 +31,6 @@ path = "./blockchain.rs"
 
 [features]
 default = ["c-kzg"]
-levm = ["default", "ethrex-vm/levm", "ethrex-levm"]
 libmdbx = ["ethrex-core/libmdbx", "ethrex-storage/default", "ethrex-vm/libmdbx"]
 c-kzg = ["ethrex-core/c-kzg"]
 metrics = ["ethrex-metrics/transactions"]

crates/blockchain/blockchain.rs

@@ -16,7 +16,10 @@ use ethrex_core::H256;
 
 use ethrex_storage::error::StoreError;
 use ethrex_storage::{AccountUpdate, Store};
-use ethrex_vm::{evm_state, execute_block, EvmState};
+use ethrex_vm::db::{evm_state, EvmState};
+
+use ethrex_vm::EVM_BACKEND;
+use ethrex_vm::{backends, backends::EVM};
 
 //TODO: Implement a struct Chain or BlockChain to encapsulate
 //functionality and canonical chain state and config
@@ -40,16 +43,14 @@ pub fn add_block(block: &Block, storage: &Store) -> Result<(), ChainError> {
     // Validate the block pre-execution
     validate_block(block, &parent_header, &state)?;
     let (receipts, account_updates): (Vec<Receipt>, Vec<AccountUpdate>) = {
-        // TODO: Consider refactoring both implementations so that they have the same signature
-        #[cfg(feature = "levm")]
-        {
-            execute_block(block, &mut state)?
-        }
-        #[cfg(not(feature = "levm"))]
-        {
-            let receipts = execute_block(block, &mut state)?;
-            let account_updates = ethrex_vm::get_state_transitions(&mut state);
-            (receipts, account_updates)
+        match EVM_BACKEND.get() {
+            Some(EVM::LEVM) => backends::levm::execute_block(block, &mut state)?,
+            // This means we are using REVM as default for tests
+            Some(EVM::REVM) | None => {
+                let receipts = backends::revm::execute_block(block, &mut state)?;
+                let account_updates = ethrex_vm::get_state_transitions(&mut state);
+                (receipts, account_updates)
+            }
         }
     };