refactor(l1,levm): simplify vm database trait.

crates/blockchain/blockchain.rs

@@ -5,7 +5,6 @@ pub mod mempool;
 pub mod payload;
 mod smoke_test;
 pub mod tracing;
-pub mod vm;
 
 use ::tracing::{debug, info};
 use constants::{MAX_INITCODE_SIZE, MAX_TRANSACTION_DATA_SIZE, POST_OSAKA_GAS_LIMIT_CAP};
@@ -29,8 +28,9 @@ use ethrex_rlp::encode::RLPEncode;
 use ethrex_storage::{
     AccountUpdatesList, Store, UpdateBatch, error::StoreError, hash_address, hash_key,
 };
-use ethrex_vm::backends::levm::db::DatabaseLogger;
-use ethrex_vm::{BlockExecutionResult, DynVmDatabase, Evm, EvmError};
+pub use ethrex_vm::backends::levm::db as vm; // re-export VM adapters module for downstream users
+use ethrex_vm::backends::levm::db::{DatabaseLogger, StoreVmDatabase};
+use ethrex_vm::{BlockExecutionResult, Evm, EvmError};
 use mempool::Mempool;
 use payload::PayloadOrTask;
 use std::collections::{BTreeMap, HashMap};
@@ -40,8 +40,6 @@ use std::time::Instant;
 use tokio::sync::Mutex as TokioMutex;
 use tokio_util::sync::CancellationToken;
 
-use vm::StoreVmDatabase;
-
 #[cfg(feature = "metrics")]
 use ethrex_metrics::metrics_blocks::METRICS_BLOCKS;
 
@@ -217,8 +215,7 @@ impl Blockchain {
 
         for block in blocks {
             let parent_hash = block.header.parent_hash;
-            let vm_db: DynVmDatabase =
-                Box::new(StoreVmDatabase::new(self.storage.clone(), parent_hash));
+            let vm_db = StoreVmDatabase::new(self.storage.clone(), parent_hash);
             let logger = Arc::new(DatabaseLogger::new(Arc::new(Mutex::new(Box::new(vm_db)))));
             let mut vm = match self.options.r#type {
                 BlockchainType::L1 => Evm::new_from_db_for_l1(logger.clone()),
@@ -918,9 +915,10 @@ impl Blockchain {
     }
 
     pub fn new_evm(&self, vm_db: StoreVmDatabase) -> Result<Evm, EvmError> {
+        let store = Arc::new(vm_db);
         let evm = match self.options.r#type {
-            BlockchainType::L1 => Evm::new_for_l1(vm_db),
-            BlockchainType::L2(fee_config) => Evm::new_for_l2(vm_db, fee_config)?,
+            BlockchainType::L1 => Evm::new_from_db_for_l1(store),
+            BlockchainType::L2(fee_config) => Evm::new_from_db_for_l2(store, fee_config),
         };
         Ok(evm)
     }

crates/blockchain/payload.rs

@@ -18,7 +18,7 @@ use ethrex_common::{
     },
 };
 
-use ethrex_vm::{Evm, EvmError};
+use ethrex_vm::{Evm, EvmError, backends::levm::db::StoreVmDatabase};
 
 use ethrex_rlp::encode::RLPEncode;
 use ethrex_storage::{Store, error::StoreError};
@@ -38,7 +38,6 @@ use crate::{
     constants::{GAS_LIMIT_BOUND_DIVISOR, MIN_GAS_LIMIT, TX_GAS_COST},
     error::{ChainError, InvalidBlockError},
     mempool::PendingTxFilter,
-    vm::StoreVmDatabase,
 };
 
 use thiserror::Error;
@@ -237,8 +236,8 @@ impl PayloadBuildContext {
 
         let vm_db = StoreVmDatabase::new(storage.clone(), payload.header.parent_hash);
         let vm = match blockchain_type {
-            BlockchainType::L1 => Evm::new_for_l1(vm_db),
-            BlockchainType::L2(fee_config) => Evm::new_for_l2(vm_db, fee_config)?,
+            BlockchainType::L1 => Evm::new_from_db_for_l1(Arc::new(vm_db)),
+            BlockchainType::L2(fee_config) => Evm::new_from_db_for_l2(Arc::new(vm_db), fee_config),
         };
 
         Ok(PayloadBuildContext {

crates/blockchain/tracing.rs

@@ -5,9 +5,9 @@ use std::{
 
 use ethrex_common::{H256, tracing::CallTrace, types::Block};
 use ethrex_storage::Store;
-use ethrex_vm::{Evm, EvmError};
+use ethrex_vm::{Evm, EvmError, backends::levm::db::StoreVmDatabase};
 
-use crate::{Blockchain, error::ChainError, vm::StoreVmDatabase};
+use crate::{Blockchain, error::ChainError};
 
 impl Blockchain {
     /// Outputs the call trace for the given transaction

crates/l2/common/Cargo.toml

@@ -12,6 +12,7 @@ ethrex-rlp.workspace = true
 ethrex-storage.workspace = true
 ethrex-trie.workspace = true
 ethrex-vm.workspace = true
+ethrex-levm.workspace = true
 bytes.workspace = true
 thiserror.workspace = true
 serde.workspace = true

crates/l2/common/src/state_diff.rs

@@ -6,10 +6,11 @@ use ethrex_common::types::{
     AccountInfo, AccountState, AccountUpdate, BlockHeader, PrivilegedL2Transaction, TxKind,
     code_hash,
 };
+use ethrex_levm::db::Database as LevmDatabase;
 use ethrex_rlp::decode::RLPDecode;
 use ethrex_storage::{error::StoreError, hash_address};
 use ethrex_trie::{Trie, TrieError};
-use ethrex_vm::{EvmError, VmDatabase};
+use ethrex_vm::EvmError;
 use serde::{Deserialize, Serialize};
 
 use crate::{l1_messages::L1Message, privileged_transactions::PrivilegedTransactionLog};
@@ -536,16 +537,15 @@ impl Decoder {
 /// Calculates nonce_diff between current and previous block.
 pub fn get_nonce_diff(
     account_update: &AccountUpdate,
-    db: &impl VmDatabase,
+    db: &impl LevmDatabase,
 ) -> Result<u16, StateDiffError> {
     // Get previous account_state either from store or cache
-    let account_state = db.get_account_state(account_update.address)?;
+    let account_state = db
+        .get_account_state(account_update.address)
+        .map_err(EvmError::from)?;
 
     // Get previous nonce
-    let prev_nonce = match account_state {
-        Some(state) => state.nonce,
-        None => 0,
-    };
+    let prev_nonce = account_state.nonce;
 
     // Get current nonce
     let new_nonce = if let Some(info) = account_update.info.clone() {
@@ -567,7 +567,7 @@ pub fn get_nonce_diff(
 /// Prepare the state diff for the block.
 pub fn prepare_state_diff(
     last_header: BlockHeader,
-    db: &impl VmDatabase,
+    db: &impl LevmDatabase,
     l1messages: &[L1Message],
     privileged_transactions: &[PrivilegedL2Transaction],
     account_updates: Vec<AccountUpdate>,

crates/l2/prover/src/guest_program/src/execution.rs

@@ -18,8 +18,9 @@ use ethrex_common::{
 };
 #[cfg(feature = "l2")]
 use ethrex_l2_common::l1_messages::L1Message;
-use ethrex_vm::{Evm, EvmError, GuestProgramStateWrapper, VmDatabase};
+use ethrex_vm::{Evm, EvmError, GuestProgramStateWrapper};
 use std::collections::{BTreeMap, HashMap};
+use std::sync::Arc;
 
 #[cfg(feature = "l2")]
 use ethrex_common::types::{
@@ -328,12 +329,12 @@ fn execute_stateless(
 
         // Execute block
         #[cfg(feature = "l2")]
-        let mut vm = Evm::new_for_l2(
-            wrapped_db.clone(),
+        let mut vm = Evm::new_from_db_for_l2(
+            Arc::new(wrapped_db.clone()),
             fee_config.ok_or_else(|| StatelessExecutionError::FeeConfigNotFound)?,
-        )?;
+        );
         #[cfg(not(feature = "l2"))]
-        let mut vm = Evm::new_for_l1(wrapped_db.clone());
+        let mut vm = Evm::new_from_db_for_l1(Arc::new(wrapped_db.clone()));
         let result = vm
             .execute_block(block)
             .map_err(StatelessExecutionError::EvmError)?;