refactor(l1): improve error handling in RLPx modules

Cargo.toml

@@ -62,3 +62,4 @@ jsonwebtoken = "9.3.0"
 rand = "0.8.5"
 cfg-if = "1.0.0"
 reqwest = { version = "0.12.7", features = ["json"] }
+snap = "1.1.1"

crates/common/rlp/Cargo.toml

@@ -10,6 +10,7 @@ bytes.workspace = true
 hex.workspace = true
 lazy_static.workspace = true
 ethereum-types.workspace = true
+snap.workspace = true
 
 [dev-dependencies]
 hex-literal.workspace = true

crates/common/rlp/error.rs

@@ -13,6 +13,8 @@ pub enum RLPDecodeError {
     UnexpectedList,
     #[error("UnexpectedString")]
     UnexpectedString,
+    #[error("InvalidCompression")]
+    InvalidCompression(#[from] snap::Error),
     #[error("{0}")]
     Custom(String),
 }
@@ -21,7 +23,7 @@ pub enum RLPDecodeError {
 #[derive(Debug, Error)]
 pub enum RLPEncodeError {
     #[error("InvalidCompression")]
-    InvalidCompression,
+    InvalidCompression(#[from] snap::Error),
     #[error("{0}")]
     Custom(String),
 }

crates/networking/p2p/net.rs

@@ -24,7 +24,7 @@ use tokio::{
     sync::Mutex,
     try_join,
 };
-use tracing::{debug, info};
+use tracing::{debug, error, info};
 use types::{Endpoint, Node};
 
 pub mod bootnode;
@@ -774,8 +774,12 @@ async fn handle_peer_as_initiator(
         .connect(SocketAddr::new(node.ip, node.tcp_port))
         .await
         .unwrap();
-    let conn = RLPxConnection::initiator(signer, msg, stream, storage).await;
-    handle_peer(conn, table).await;
+    match RLPxConnection::initiator(signer, msg, stream, storage).await {
+        Ok(conn) => handle_peer(conn, table).await,
+        Err(e) => {
+            error!("Error: {e}, Could not start connection with {node:?}");
+        }
+    }
 }
 
 async fn handle_peer(mut conn: RLPxConnection<TcpStream>, table: Arc<Mutex<KademliaTable>>) {
@@ -785,9 +789,13 @@ async fn handle_peer(mut conn: RLPxConnection<TcpStream>, table: Arc<Mutex<Kadem
             Err(e) => info!("Error during RLPx connection: ({e})"),
         },
         Err(e) => {
-            // Discard peer from kademlia table
-            info!("Handshake failed, discarding peer: ({e})");
-            table.lock().await.replace_peer(conn.get_remote_node_id());
+            if let Ok(node_id) = conn.get_remote_node_id() {
+                // Discard peer from kademlia table
+                info!("Handshake failed: ({e}), discarding peer {node_id}");
+                table.lock().await.replace_peer(node_id);
+            } else {
+                info!("Handshake failed: ({e}), unknown peer");
+            }
         }
     }
 }