refactor(l1): move mempool from Store to Blockchain

cmd/ethrex/ethrex.rs

@@ -261,7 +261,7 @@ async fn main() {
         peer_table.clone(),
         sync_mode,
         cancel_token.clone(),
-        blockchain,
+        blockchain.clone(),
     );
 
     // TODO: Check every module starts properly.
@@ -312,7 +312,7 @@ async fn main() {
             let rpc_api = ethrex_rpc::start_api(
                 http_socket_addr,
                 authrpc_socket_addr,
-                store.clone(),
+                blockchain.clone(),
                 jwt_secret_clone,
                 local_p2p_node,
                 local_node_record,
@@ -348,7 +348,7 @@ async fn main() {
                 error!("Cannot run with DEV_MODE if the `l2` feature is enabled.");
                 panic!("Run without the --dev argument.");
             }
-            let l2_proposer = ethrex_l2::start_proposer(store).into_future();
+            let l2_proposer = ethrex_l2::start_proposer(blockchain.clone()).into_future();
             tracker.spawn(l2_proposer);
         } else if #[cfg(feature = "dev")] {
             use ethrex_dev;
@@ -385,7 +385,7 @@ async fn main() {
                 bootnodes,
                 signer,
                 peer_table.clone(),
-                store,
+                blockchain,
             )
             .await.expect("Network starts");
             tracker.spawn(ethrex_p2p::periodically_show_peer_stats(peer_table.clone()));

crates/blockchain/Cargo.toml

@@ -24,6 +24,7 @@ ethrex-metrics = { path = "./metrics", default-features = false }
 [dev-dependencies]
 serde_json.workspace = true
 hex = "0.4.3"
+hex-literal.workspace = true
 
 [lib]
 path = "./blockchain.rs"

crates/blockchain/blockchain.rs

@@ -14,6 +14,7 @@ use ethrex_common::types::{
     BlockHeader, BlockNumber, ChainConfig, EIP4844Transaction, Receipt, Transaction,
 };
 use ethrex_common::H256;
+use mempool::Mempool;
 use std::{ops::Div, time::Instant};
 
 use ethrex_storage::error::StoreError;
@@ -31,20 +32,23 @@ use tracing::{error, info, warn};
 pub struct Blockchain {
     pub vm: EVM,
     pub storage: Store,
+    pub mempool: Mempool,
 }
 
 impl Blockchain {
     pub fn new(evm: EVM, store: Store) -> Self {
         Self {
             vm: evm,
             storage: store,
+            mempool: Mempool::new(),
         }
     }
 
     pub fn default_with_store(store: Store) -> Self {
         Self {
             vm: Default::default(),
             storage: store,
+            mempool: Mempool::new(),
         }
     }