refactor(core): further decouple LEVM and rEVM implementations. (#2179)

**Motivation**
Separate code from LEVM and rEVM implementations and try not to expose
rEVM specific logic outside of vm crate.

**Description**
- Moved levm specific code to `backends/levm/...`
- Moved revm specific coed to `backens/revm/...`

Author: mpaulucci

cmd/ef_tests/state/runner/revm_runner.rs

@@ -15,8 +15,8 @@ use ethrex_levm::{
 };
 use ethrex_storage::{error::StoreError, AccountUpdate};
 use ethrex_vm::{
-    backends::{self},
-    db::{EvmState, StoreWrapper},
+    backends::{self, revm::db::EvmState},
+    db::StoreWrapper,
     fork_to_spec_id, RevmAddress, RevmU256,
 };
 use revm::{

cmd/ef_tests/state/utils.rs

@@ -4,7 +4,10 @@ use crate::{
 };
 use ethrex_common::{types::Genesis, H256, U256};
 use ethrex_storage::{EngineType, Store};
-use ethrex_vm::db::{evm_state, EvmState, StoreWrapper};
+use ethrex_vm::{
+    backends::revm::db::{evm_state, EvmState},
+    db::StoreWrapper,
+};
 use spinoff::Spinner;
 
 /// Loads initial state, used for REVM as it contains EvmState.

crates/blockchain/blockchain.rs

@@ -33,7 +33,7 @@ use tracing::{error, info, warn};
 
 #[derive(Debug)]
 pub struct Blockchain {
-    evm_engine: EvmEngine,
+    pub evm_engine: EvmEngine,
     storage: Store,
     pub mempool: Mempool,
 }

crates/l2/proposer/prover_server.rs

@@ -18,8 +18,8 @@ use ethrex_l2_sdk::calldata::{encode_calldata, Value};
 use ethrex_rpc::clients::eth::{eth_sender::Overrides, EthClient, WrappedTransaction};
 use ethrex_storage::Store;
 use ethrex_vm::{
+    backends::revm::execution_db::{ExecutionDB, ToExecDB},
     db::StoreWrapper,
-    execution_db::{ExecutionDB, ToExecDB},
     EvmError,
 };
 use secp256k1::SecretKey;

crates/l2/prover/bench/src/cache.rs

@@ -4,7 +4,7 @@ use std::{
 };
 
 use ethrex_common::types::{Block, BlockHeader};
-use ethrex_vm::execution_db::ExecutionDB;
+use ethrex_vm::backends::revm::execution_db::ExecutionDB;
 
 use serde::{Deserialize, Serialize};
 

crates/l2/prover/bench/src/rpc/db.rs

@@ -261,7 +261,10 @@ impl ToExecDB for RpcDB {
     fn to_exec_db(
         &self,
         block: &Block,
-    ) -> Result<ethrex_vm::execution_db::ExecutionDB, ethrex_vm::errors::ExecutionDBError> {
+    ) -> Result<
+        ethrex_vm::backends::revm::execution_db::ExecutionDB,
+        ethrex_vm::errors::ExecutionDBError,
+    > {
         // TODO: Simplify this function and potentially merge with the implementation for
         // StoreWrapper.
 

crates/l2/prover/tests/perf_zkvm.rs

@@ -7,7 +7,7 @@ use tracing::info;
 
 use ethrex_prover_lib::prover::{Prover, Risc0Prover, Sp1Prover};
 use ethrex_storage::{EngineType, Store};
-use ethrex_vm::{db::StoreWrapper, execution_db::ToExecDB};
+use ethrex_vm::{backends::revm::execution_db::ToExecDB, db::StoreWrapper};
 use zkvm_interface::io::ProgramInput;
 
 #[tokio::test]

crates/l2/prover/zkvm/interface/risc0/src/main.rs

@@ -1,7 +1,7 @@
 use risc0_zkvm::guest::env;
 
 use ethrex_blockchain::{validate_block, validate_gas_used};
-use ethrex_vm::{backends::revm::REVM, db::EvmState};
+use ethrex_vm::{backends::revm::db::EvmState, backends::revm::REVM};
 
 use zkvm_interface::{
     io::{ProgramInput, ProgramOutput},

crates/l2/prover/zkvm/interface/sp1/Cargo.lock

@@ -1,7 +1,7 @@
 #![no_main]
 
 use ethrex_blockchain::{validate_block, validate_gas_used};
-use ethrex_vm::{backends::revm::REVM, db::EvmState};
+use ethrex_vm::{backends::revm::db::EvmState, backends::revm::REVM};
 use zkvm_interface::{
     io::{ProgramInput, ProgramOutput},
     trie::{update_tries, verify_db},

crates/l2/prover/zkvm/interface/sp1/src/main.rs

@@ -20,7 +20,7 @@ pub mod io {
         types::{Block, BlockHeader},
         H256,
     };
-    use ethrex_vm::execution_db::ExecutionDB;
+    use ethrex_vm::backends::revm::execution_db::ExecutionDB;
     use serde::{de::DeserializeOwned, Deserialize, Serialize};
     use serde_with::{serde_as, DeserializeAs, SerializeAs};
 
@@ -84,7 +84,7 @@ pub mod trie {
     use ethrex_rlp::{decode::RLPDecode, encode::RLPEncode, error::RLPDecodeError};
     use ethrex_storage::{hash_address, hash_key, AccountUpdate};
     use ethrex_trie::{Trie, TrieError};
-    use ethrex_vm::execution_db::ExecutionDB;
+    use ethrex_vm::backends::revm::execution_db::ExecutionDB;
     use thiserror::Error;
 
     #[derive(Debug, Error)]

crates/l2/prover/zkvm/interface/src/lib.rs

@@ -387,7 +387,7 @@ pub fn block_number_has_all_proofs(block_number: u64) -> Result<bool, SaveStateE
 mod tests {
     use ethrex_blockchain::Blockchain;
     use ethrex_storage::{EngineType, Store};
-    use ethrex_vm::execution_db::ExecutionDB;
+    use ethrex_vm::backends::revm::execution_db::ExecutionDB;
     use risc0_zkvm::sha::Digest;
     use sp1_recursion_gnark_ffi::PlonkBn254Proof;
     use sp1_sdk::{client::ProverClientBuilder, HashableKey, Prover, SP1Proof, SP1PublicValues};

crates/l2/utils/prover/save_state.rs

@@ -5,7 +5,7 @@ use ethrex_blockchain::Blockchain;
 use ethrex_common::types::{Block, Genesis};
 use ethrex_rlp::{decode::RLPDecode, encode::RLPEncode};
 use ethrex_storage::{EngineType, Store};
-use ethrex_vm::{db::StoreWrapper, execution_db::ToExecDB};
+use ethrex_vm::{backends::revm::execution_db::ToExecDB, db::StoreWrapper};
 use tracing::info;
 use zkvm_interface::io::ProgramInput;
 

crates/l2/utils/test_data_io.rs

@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 #[cfg(feature = "based")]
 use crate::utils::RpcRequest;
 use crate::{
@@ -9,6 +11,7 @@ use crate::{
     utils::RpcErr,
     RpcApiContext, RpcHandler,
 };
+use ethrex_blockchain::Blockchain;
 use ethrex_common::{
     types::{AccessListEntry, BlockHash, BlockHeader, BlockNumber, GenericTransaction, TxKind},
     H256, U256,
@@ -17,7 +20,10 @@ use ethrex_common::{
 use ethrex_rlp::encode::RLPEncode;
 use ethrex_storage::Store;
 
-use ethrex_vm::{db::evm_state, ExecutionResult, SpecId};
+use ethrex_vm::{
+    backends::{revm::execution_result::ExecutionResult, Evm},
+    SpecId,
+};
 use serde::Serialize;
 
 use serde_json::Value;
@@ -106,7 +112,13 @@ impl RpcHandler for CallRequest {
             _ => return Ok(Value::Null),
         };
         // Run transaction
-        let result = simulate_tx(&self.transaction, &header, context.storage, SpecId::CANCUN)?;
+        let result = simulate_tx(
+            &self.transaction,
+            &header,
+            context.storage,
+            context.blockchain,
+            SpecId::CANCUN,
+        )?;
         serde_json::to_value(format!("0x{:#x}", result.output()))
             .map_err(|error| RpcErr::Internal(error.to_string()))
     }
@@ -320,38 +332,16 @@ impl RpcHandler for CreateAccessListRequest {
             // Block not found
             _ => return Ok(Value::Null),
         };
+
+        let mut vm = Evm::new(
+            context.blockchain.evm_engine,
+            context.storage.clone(),
+            header.compute_block_hash(),
+        );
+
         // Run transaction and obtain access list
-        let (gas_used, access_list, error) = match ethrex_vm::create_access_list(
-            &self.transaction,
-            &header,
-            &mut evm_state(context.storage, header.compute_block_hash()),
-            SpecId::CANCUN,
-        )? {
-            (
-                ExecutionResult::Success {
-                    reason: _,
-                    gas_used,
-                    gas_refunded: _,
-                    logs: _,
-                    output: _,
-                },
-                access_list,
-            ) => (gas_used, access_list, None),
-            (
-                ExecutionResult::Revert {
-                    gas_used,
-                    output: _,
-                },
-                access_list,
-            ) => (
-                gas_used,
-                access_list,
-                Some("Transaction Reverted".to_string()),
-            ),
-            (ExecutionResult::Halt { reason, gas_used }, access_list) => {
-                (gas_used, access_list, Some(reason))
-            }
-        };
+        let (gas_used, access_list, error) =
+            vm.create_access_list(&self.transaction, &header, SpecId::CANCUN)?;
         let result = AccessListResult {
             access_list: access_list
                 .into_iter()
@@ -431,6 +421,7 @@ impl RpcHandler for EstimateGasRequest {
     }
     fn handle(&self, context: RpcApiContext) -> Result<Value, RpcErr> {
         let storage = &context.storage;
+        let blockchain = &context.blockchain;
         let block = self.block.clone().unwrap_or_default();
         info!("Requested estimate on block: {}", block);
         let block_header = match block.resolve_block_header(storage)? {
@@ -464,6 +455,7 @@ impl RpcHandler for EstimateGasRequest {
                     &value_transfer_transaction,
                     &block_header,
                     storage.clone(),
+                    blockchain.clone(),
                     spec_id,
                 );
                 if let Ok(ExecutionResult::Success { .. }) = result {
@@ -491,7 +483,13 @@ impl RpcHandler for EstimateGasRequest {
         // Check whether the execution is possible
         let mut transaction = transaction.clone();
         transaction.gas = Some(highest_gas_limit);
-        let result = simulate_tx(&transaction, &block_header, storage.clone(), spec_id)?;
+        let result = simulate_tx(
+            &transaction,
+            &block_header,
+            storage.clone(),
+            blockchain.clone(),
+            spec_id,
+        )?;
 
         let gas_used = result.gas_used();
         let gas_refunded = result.gas_refunded();
@@ -514,7 +512,13 @@ impl RpcHandler for EstimateGasRequest {
             }
             transaction.gas = Some(middle_gas_limit);
 
-            let result = simulate_tx(&transaction, &block_header, storage.clone(), spec_id);
+            let result = simulate_tx(
+                &transaction,
+                &block_header,
+                storage.clone(),
+                blockchain.clone(),
+                spec_id,
+            );
             if let Ok(ExecutionResult::Success { .. }) = result {
                 highest_gas_limit = middle_gas_limit;
             } else {
@@ -547,14 +551,16 @@ fn simulate_tx(
     transaction: &GenericTransaction,
     block_header: &BlockHeader,
     storage: Store,
+    blockchain: Arc<Blockchain>,
     spec_id: SpecId,
 ) -> Result<ExecutionResult, RpcErr> {
-    match ethrex_vm::simulate_tx_from_generic(
-        transaction,
-        block_header,
-        &mut evm_state(storage, block_header.compute_block_hash()),
-        spec_id,
-    )? {
+    let mut vm = Evm::new(
+        blockchain.evm_engine,
+        storage.clone(),
+        block_header.compute_block_hash(),
+    );
+
+    match vm.simulate_tx_from_generic(transaction, block_header, spec_id)? {
         ExecutionResult::Revert {
             gas_used: _,
             output,

crates/networking/rpc/eth/transaction.rs

@@ -1,7 +1,7 @@
 [package]
 name = "ethrex-vm"
-version.workspace = true
-edition.workspace = true
+version = "0.1.0"
+edition = "2021"
 
 [dependencies]
 ethrex-common.workspace = true
@@ -11,18 +11,18 @@ ethrex-trie.workspace = true
 ethrex-rlp.workspace = true
 
 revm = { version = "19.0.0", features = [
-  "serde",
-  "std",
-  "serde-json",
-  "optional_no_base_fee",
-  "optional_block_gas_limit",
+    "serde",
+    "std",
+    "serde-json",
+    "optional_no_base_fee",
+    "optional_block_gas_limit",
 ], default-features = false }
 
 # These dependencies must be kept up to date with the corresponding revm version, otherwise errors may pop up because of trait implementation mismatches
 revm-inspectors = { version = "0.15.0" }
 derive_more = { version = "1.0.0", features = ["full"] }
 revm-primitives = { version = "15.2.0", features = [
-  "std",
+    "std",
 ], default-features = false }
 bytes.workspace = true
 thiserror.workspace = true
@@ -44,6 +44,3 @@ default = []
 l2 = []
 c-kzg = ["revm/c-kzg", "ethrex-levm/c-kzg", "ethrex-common/c-kzg"]
 blst = ["revm/blst"]
-
-[profile.test]
-opt-level = 3