refactor(l1): multiplex p2p requests

Cargo.toml

@@ -113,8 +113,8 @@ url = { version = "2.5.4", features = ["serde"] }
 kzg-rs = "0.2.6"
 libsql = "0.9.10"
 futures = "0.3.31"
-spawned-concurrency = "0.4.0"
-spawned-rt = "0.4.0"
+spawned-concurrency = "0.4.1"
+spawned-rt = "0.4.1"
 lambdaworks-crypto = "0.11.0"
 tui-logger = { version = "0.17.3", features = ["tracing-support"] }
 crossbeam = "0.8.4"

cmd/ethrex/ethrex.rs

@@ -4,7 +4,7 @@ use ethrex::{
     initializers::{init_l1, init_tracing},
     utils::{NodeConfigFile, get_client_version, store_node_config_file},
 };
-use ethrex_p2p::{discv4::peer_table::PeerTableHandle, types::NodeRecord};
+use ethrex_p2p::{discv4::peer_table::PeerTable, types::NodeRecord};
 use std::{path::Path, sync::Arc, time::Duration};
 use tokio::{
     signal::unix::{SignalKind, signal},
@@ -35,7 +35,7 @@ pub static malloc_conf: &[u8] = b"prof:true,prof_active:true,lg_prof_sample:19\0
 async fn server_shutdown(
     datadir: &Path,
     cancel_token: &CancellationToken,
-    peer_table: PeerTableHandle,
+    peer_table: PeerTable,
     local_node_record: Arc<Mutex<NodeRecord>>,
 ) {
     info!("Server shut down started...");

cmd/ethrex/initializers.rs

@@ -12,7 +12,7 @@ use ethrex_config::networks::Network;
 
 use ethrex_metrics::profiling::{FunctionProfilingLayer, initialize_block_processing_profile};
 use ethrex_p2p::{
-    discv4::peer_table::{PeerTable, PeerTableHandle},
+    discv4::peer_table::PeerTable,
     network::P2PContext,
     peer_handler::PeerHandler,
     rlpx::l2::l2_connection::P2PBasedContext,
@@ -390,7 +390,7 @@ pub async fn init_l1(
 ) -> eyre::Result<(
     PathBuf,
     CancellationToken,
-    PeerTableHandle,
+    PeerTable,
     Arc<Mutex<NodeRecord>>,
 )> {
     let datadir = &opts.datadir;

cmd/ethrex/l2/initializers.rs

@@ -11,7 +11,7 @@ use ethrex_blockchain::{Blockchain, BlockchainType};
 use ethrex_common::{Address, types::DEFAULT_BUILDER_GAS_CEIL};
 use ethrex_l2::SequencerConfig;
 use ethrex_p2p::{
-    discv4::peer_table::{PeerTable, PeerTableHandle},
+    discv4::peer_table::PeerTable,
     peer_handler::PeerHandler,
     rlpx::l2::l2_connection::P2PBasedContext,
     sync_manager::SyncManager,
@@ -31,7 +31,7 @@ use tui_logger::{LevelFilter, TuiTracingSubscriberLayer};
 async fn init_rpc_api(
     opts: &L1Options,
     l2_opts: &L2Options,
-    peer_table: PeerTableHandle,
+    peer_table: PeerTable,
     local_p2p_node: Node,
     local_node_record: NodeRecord,
     store: Store,

cmd/ethrex/utils.rs

@@ -3,7 +3,7 @@ use bytes::Bytes;
 use directories::ProjectDirs;
 use ethrex_common::types::{Block, Genesis};
 use ethrex_p2p::{
-    discv4::peer_table::PeerTableHandle,
+    discv4::peer_table::PeerTable,
     sync::SyncMode,
     types::{Node, NodeRecord},
 };
@@ -26,7 +26,7 @@ pub struct NodeConfigFile {
 }
 
 impl NodeConfigFile {
-    pub async fn new(mut peer_table: PeerTableHandle, node_record: NodeRecord) -> Self {
+    pub async fn new(mut peer_table: PeerTable, node_record: NodeRecord) -> Self {
         let connected_peers = peer_table.get_connected_nodes().await.unwrap_or(Vec::new());
 
         NodeConfigFile {