From 9b9ae82b2f0db02f2d66701080d6240834ce1b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Altu=C4=9F=20Bakan?= <mail@alt.ug>
Date: Mon, 24 Jul 2023 21:13:37 +0200
Subject: [PATCH] feat: report different request errors (#3857)

---
 crates/net/network/src/transactions.rs | 31 +++++++++++++++++++-------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/crates/net/network/src/transactions.rs b/crates/net/network/src/transactions.rs
index 51d023d072..8c1db9a03b 100644
--- a/crates/net/network/src/transactions.rs
+++ b/crates/net/network/src/transactions.rs
@@ -12,7 +12,10 @@ use reth_eth_wire::{
     EthVersion, GetPooledTransactions, NewPooledTransactionHashes, NewPooledTransactionHashes66,
     NewPooledTransactionHashes68, PooledTransactions, Transactions,
 };
-use reth_interfaces::{p2p::error::RequestResult, sync::SyncStateProvider};
+use reth_interfaces::{
+    p2p::error::{RequestError, RequestResult},
+    sync::SyncStateProvider,
+};
 use reth_metrics::common::mpsc::UnboundedMeteredReceiver;
 use reth_network_api::{Peers, ReputationChangeKind};
 use reth_primitives::{
@@ -472,10 +475,22 @@ where
         }
     }
 
-    fn report_bad_message(&self, peer_id: PeerId) {
-        trace!(target: "net::tx", ?peer_id, "Penalizing peer for bad transaction");
+    fn report_peer(&self, peer_id: PeerId, kind: ReputationChangeKind) {
+        trace!(target: "net::tx", ?peer_id, ?kind);
+        self.network.reputation_change(peer_id, kind);
         self.metrics.reported_bad_transactions.increment(1);
-        self.network.reputation_change(peer_id, ReputationChangeKind::BadTransactions);
+    }
+
+    fn on_request_error(&self, peer_id: PeerId, req_err: RequestError) {
+        let kind = match req_err {
+            RequestError::UnsupportedCapability => ReputationChangeKind::BadProtocol,
+            RequestError::Timeout => ReputationChangeKind::Timeout,
+            RequestError::ChannelClosed | RequestError::ConnectionDropped => {
+                ReputationChangeKind::Dropped
+            }
+            RequestError::BadResponse => ReputationChangeKind::BadTransactions,
+        };
+        self.report_peer(peer_id, kind);
     }
 
     fn report_already_seen(&self, peer_id: PeerId) {
@@ -492,7 +507,7 @@ where
     fn on_bad_import(&mut self, hash: TxHash) {
         if let Some(peers) = self.transactions_by_peers.remove(&hash) {
             for peer_id in peers {
-                self.report_bad_message(peer_id);
+                self.report_peer(peer_id, ReputationChangeKind::BadTransactions);
             }
         }
     }
@@ -537,11 +552,11 @@ where
                 Poll::Ready(Ok(Ok(txs))) => {
                     this.import_transactions(req.peer_id, txs.0, TransactionSource::Response);
                 }
-                Poll::Ready(Ok(Err(_))) => {
-                    this.report_bad_message(req.peer_id);
+                Poll::Ready(Ok(Err(req_err))) => {
+                    this.on_request_error(req.peer_id, req_err);
                 }
                 Poll::Ready(Err(_)) => {
-                    this.report_bad_message(req.peer_id);
+                    this.on_request_error(req.peer_id, RequestError::ConnectionDropped)
                 }
             }
         }