chore(l1): standarize revm/levm behaviour when importing blocks. (#2452)

**Description**
- standarize revm/levm behaviour when importing blocks
- Remove fork choice when importing blocks.
- Move block importing out of blockchain module

Author: mpaulucci

cmd/ethrex/cli.rs

@@ -5,6 +5,7 @@ use std::{
 };
 
 use clap::{ArgAction, Parser as ClapParser, Subcommand as ClapSubcommand};
+use ethrex_blockchain::fork_choice::apply_fork_choice;
 use ethrex_p2p::{sync::SyncMode, types::Node};
 use ethrex_vm::EvmEngine;
 use tracing::{info, warn, Level};
@@ -55,7 +56,7 @@ pub struct Options {
     )]
     pub datadir: String,
     #[arg(
-        long = "force", 
+        long = "force",
         help = "Force remove the database",
         long_help = "Delete the database without confirmation.",
         action = clap::ArgAction::SetTrue,
@@ -298,7 +299,7 @@ pub async fn import_blocks(path: &str, data_dir: &str, network: &str, evm: EvmEn
 
     let store = init_store(&data_dir, network).await;
 
-    let blockchain = init_blockchain(evm, store);
+    let blockchain = init_blockchain(evm, store.clone());
 
     let path_metadata = metadata(path).expect("Failed to read path");
     let blocks = if path_metadata.is_dir() {
@@ -317,5 +318,32 @@ pub async fn import_blocks(path: &str, data_dir: &str, network: &str, evm: EvmEn
         info!("Importing blocks from chain file: {path}");
         utils::read_chain_file(path)
     };
-    blockchain.import_blocks(&blocks).await;
+
+    let size = blocks.len();
+
+    for block in &blocks {
+        let hash = block.hash();
+
+        info!(
+            "Adding block {} with hash {:#x}.",
+            block.header.number, hash
+        );
+
+        if let Err(error) = blockchain.add_block(block).await {
+            warn!(
+                "Failed to add block {} with hash {:#x}: {}.",
+                block.header.number, hash, error
+            );
+            return;
+        }
+    }
+
+    if let Some(last_block) = blocks.last() {
+        let hash = last_block.hash();
+        if let Err(error) = apply_fork_choice(&store, hash, hash, hash).await {
+            warn!("Failed to apply fork choice: {}", error);
+        }
+    }
+
+    info!("Added {size} blocks to blockchain");
 }

crates/blockchain/blockchain.rs

@@ -26,8 +26,7 @@ use std::{ops::Div, time::Instant};
 use ethrex_storage::error::StoreError;
 use ethrex_storage::{AccountUpdate, Store};
 use ethrex_vm::{BlockExecutionResult, Evm, EvmEngine};
-use fork_choice::apply_fork_choice;
-use tracing::{error, info, warn};
+use tracing::info;
 
 //TODO: Implement a struct Chain or BlockChain to encapsulate
 //functionality and canonical chain state and config
@@ -315,60 +314,6 @@ impl Blockchain {
         Ok(())
     }
 
-    //TODO: Forkchoice Update shouldn't be part of this function
-    pub async fn import_blocks(&self, blocks: &[Block]) {
-        let size = blocks.len();
-        for block in blocks {
-            let hash = block.hash();
-            info!(
-                "Adding block {} with hash {:#x}.",
-                block.header.number, hash
-            );
-            if let Err(error) = self.add_block(block).await {
-                warn!(
-                    "Failed to add block {} with hash {:#x}: {}.",
-                    block.header.number, hash, error
-                );
-            }
-            if self
-                .storage
-                .update_latest_block_number(block.header.number)
-                .await
-                .is_err()
-            {
-                error!("Fatal: added block {} but could not update the block number -- aborting block import", block.header.number);
-                break;
-            };
-            if self
-                .storage
-                .set_canonical_block(block.header.number, hash)
-                .await
-                .is_err()
-            {
-                error!(
-                    "Fatal: added block {} but could not set it as canonical -- aborting block import",
-                    block.header.number
-                );
-                break;
-            };
-        }
-        if let Some(last_block) = blocks.last() {
-            let hash = last_block.hash();
-            match self.evm_engine {
-                EvmEngine::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(&self.storage, hash, hash, hash).await;
-                }
-                EvmEngine::REVM => {
-                    apply_fork_choice(&self.storage, hash, hash, hash)
-                        .await
-                        .unwrap();
-                }
-            }
-        }
-        info!("Added {size} blocks to blockchain");
-    }
-
     /// Add a blob transaction and its blobs bundle to the mempool checking that the transaction is valid
     #[cfg(feature = "c-kzg")]
     pub async fn add_blob_transaction_to_pool(