jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add trusted nodes configuration (#569)

Browse Source 
* Add preferred nodes to config

* Add preferred nodes on boot

* Add flag in config for trusted only mode

* Add preferred nodes configuration to config

* Fix comment

* Add preferred nodes to config file

* Rename preferred_nodes to trusted_nodes

* Change preferred to trusted

I renamed preferred_nodes to trusted_nodes in various places.
Seems I missed quite a bit of them.

* Pull trusted_only from config

* Rename DiscoveryConfig to PeersConfig

* Fix last commit

Now actually renamed DiscoveryConfig

* Rename trusted_only to connect_trusted_nodes_only

* Add helper function

* Use HashSet for boot_nodes and trusted_nodes

* Change trusted nodes functions in ConfigBuilder

* Move trusted peers from discv4 to network config

* Add trusted nodes to peers on Manager creation

* Use NodeRecord in trusted_nodes config

* Fix comment

* Move trusted_nodes config to PeersConfig

* Add trusted nodes directly to peers

* Move network_config to Config impl

* Move start_network to NetworkConfig impl
This commit is contained in:
Tomás
2022-12-28 17:48:11 -03:00
committed by GitHub
parent d9d0ba14c4
commit 76e76bb651
5 changed files with 94 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
crates/net/network/src/peers/manager.rs
View File

@ -9,9 +9,9 @@ use crate::{
use futures::StreamExt;
use reth_eth_wire::{errors::EthStreamError, DisconnectReason};
use reth_net_common::ban_list::BanList;
use reth_primitives::{ForkId, PeerId};
use reth_primitives::{ForkId, NodeRecord, PeerId};
use std::{
collections::{hash_map::Entry, HashMap, VecDeque},
collections::{hash_map::Entry, HashMap, HashSet, VecDeque},
fmt::Display,
net::{IpAddr, SocketAddr},
task::{Context, Poll},
@ -105,6 +105,8 @@ impl PeersManager {
ban_list,
ban_duration,
backoff_duration,
trusted_nodes,
..
} = config;
let (manager_tx, handle_rx) = mpsc::unbounded_channel();
let now = Instant::now();
@ -112,8 +114,14 @@ impl PeersManager {
// We use half of the interval to decrease the max duration to `150%` in worst case
let unban_interval = ban_duration.min(backoff_duration) / 2;
let mut peers = HashMap::with_capacity(trusted_nodes.len());
for NodeRecord { address, tcp_port, udp_port: _, id } in trusted_nodes {
peers.entry(id).or_insert_with(|| Peer::new(SocketAddr::from((address, tcp_port))));
}
Self {
peers: Default::default(),
peers,
manager_tx,
handle_rx: UnboundedReceiverStream::new(handle_rx),
queued_actions: Default::default(),
@ -794,6 +802,10 @@ pub struct PeersConfig {
/// How long to backoff peers that are we failed to connect to for non-fatal reasons, such as
/// [`DisconnectReason::TooManyPeers`].
pub backoff_duration: Duration,
/// Trusted nodes to connect to.
pub trusted_nodes: HashSet<NodeRecord>,
/// Connect to trusted nodes only?
pub connect_trusted_nodes_only: bool,
}
impl Default for PeersConfig {
@ -807,6 +819,8 @@ impl Default for PeersConfig {
ban_duration: Duration::from_secs(60 * 60 * 12),
// backoff peers for 1h
backoff_duration: Duration::from_secs(60 * 60),
trusted_nodes: Default::default(),
connect_trusted_nodes_only: false,
}
}
}
@ -840,9 +854,15 @@ impl PeersConfig {
self
}
/// How often to recheck free slots for outbound connections
pub fn with_slot_refill_interval(mut self, interval: Duration) -> Self {
self.refill_slots_interval = interval;
/// Nodes to always connect to.
pub fn with_trusted_nodes(mut self, nodes: HashSet<NodeRecord>) -> Self {
self.trusted_nodes = nodes;
self
}
/// Connect only to trusted nodes.
pub fn with_connect_trusted_nodes_only(mut self, trusted_only: bool) -> Self {
self.connect_trusted_nodes_only = trusted_only;
self
}
}