Skip to content

Commit b571e36

Browse files
committed
Use SUPPORTED_SNAP_CAPABILITIES for snap client peer selection
The three snap client functions (request_account_range, request_byte_codes, request_storage_ranges) used SUPPORTED_ETH_CAPABILITIES to select peers. This selects peers that support eth/68 or eth/69 but may not support snap/1, causing unnecessary timeouts and peer score degradation. The healing modules already use SUPPORTED_SNAP_CAPABILITIES correctly.
1 parent cc6893b commit b571e36

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

crates/networking/p2p/peer_handler.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::{
1010
HashOrNumber,
1111
},
1212
message::Message as RLPxMessage,
13-
p2p::{Capability, SUPPORTED_ETH_CAPABILITIES},
13+
p2p::{Capability, SUPPORTED_ETH_CAPABILITIES, SUPPORTED_SNAP_CAPABILITIES},
1414
snap::{
1515
AccountRange, AccountRangeUnit, ByteCodes, GetAccountRange, GetByteCodes,
1616
GetStorageRanges, GetTrieNodes, StorageRanges, TrieNodes,
@@ -737,7 +737,7 @@ impl PeerHandler {
737737

738738
let Some((peer_id, connection)) = self
739739
.peer_table
740-
.get_best_peer(&SUPPORTED_ETH_CAPABILITIES)
740+
.get_best_peer(&SUPPORTED_SNAP_CAPABILITIES)
741741
.await
742742
.inspect_err(|err| warn!(%err, "Error requesting a peer for account range"))
743743
.unwrap_or(None)
@@ -1024,7 +1024,7 @@ impl PeerHandler {
10241024

10251025
let Some((peer_id, mut connection)) = self
10261026
.peer_table
1027-
.get_best_peer(&SUPPORTED_ETH_CAPABILITIES)
1027+
.get_best_peer(&SUPPORTED_SNAP_CAPABILITIES)
10281028
.await
10291029
.inspect_err(|err| warn!(%err, "Error requesting a peer for bytecodes"))
10301030
.unwrap_or(None)
@@ -1550,7 +1550,7 @@ impl PeerHandler {
15501550

15511551
let Some((peer_id, connection)) = self
15521552
.peer_table
1553-
.get_best_peer(&SUPPORTED_ETH_CAPABILITIES)
1553+
.get_best_peer(&SUPPORTED_SNAP_CAPABILITIES)
15541554
.await
15551555
.inspect_err(|err| warn!(%err, "Error requesting a peer for storage ranges"))
15561556
.unwrap_or(None)

0 commit comments

Comments
 (0)