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

fix(discv5): change default discv5 port (#11051)

Browse Source 
Co-authored-by: Oliver <onbjerg@users.noreply.github.com>
This commit is contained in:
Dan Cline
2024-09-19 21:23:32 -04:00
committed by GitHub
parent ec565304d7
commit 84db469f71
10 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/net/discv5/src/config.rs
View File

@ -30,8 +30,14 @@ pub const DEFAULT_DISCOVERY_V5_ADDR_IPV6: Ipv6Addr = Ipv6Addr::UNSPECIFIED;
/// The default port for discv5 via UDP.
///
/// Default is port 9000. See [`discv5::ListenConfig`] default.
pub const DEFAULT_DISCOVERY_V5_PORT: u16 = 9000;
/// Default is port 9200.
pub const DEFAULT_DISCOVERY_V5_PORT: u16 = 9200;
/// The default [`discv5::ListenConfig`].
///
/// This is different from the upstream default.
pub const DEFAULT_DISCOVERY_V5_LISTEN_CONFIG: ListenConfig =
ListenConfig::Ipv4 { ip: DEFAULT_DISCOVERY_V5_ADDR, port: DEFAULT_DISCOVERY_V5_PORT };
/// Default interval in seconds at which to run a lookup up query.
///
@ -222,8 +228,9 @@ impl ConfigBuilder {
discovered_peer_filter,
} = self;
let mut discv5_config = discv5_config
.unwrap_or_else(|| discv5::ConfigBuilder::new(ListenConfig::default()).build());
let mut discv5_config = discv5_config.unwrap_or_else(|| {
discv5::ConfigBuilder::new(DEFAULT_DISCOVERY_V5_LISTEN_CONFIG).build()
});
discv5_config.listen_config =
amend_listen_config_wrt_rlpx(&discv5_config.listen_config, tcp_socket.ip());
@ -528,7 +535,7 @@ mod test {
fn overwrite_ipv4_addr() {
let rlpx_addr: Ipv4Addr = "192.168.0.1".parse().unwrap();
let listen_config = ListenConfig::default();
let listen_config = DEFAULT_DISCOVERY_V5_LISTEN_CONFIG;
let amended_config = amend_listen_config_wrt_rlpx(&listen_config, rlpx_addr.into());
@ -543,7 +550,7 @@ mod test {
fn overwrite_ipv6_addr() {
let rlpx_addr: Ipv6Addr = "fe80::1".parse().unwrap();
let listen_config = ListenConfig::default();
let listen_config = DEFAULT_DISCOVERY_V5_LISTEN_CONFIG;
let amended_config = amend_listen_config_wrt_rlpx(&listen_config, rlpx_addr.into());

4
crates/net/discv5/src/lib.rs
View File

@ -40,7 +40,7 @@ pub use discv5::{self, IpMode};
pub use config::{
BootNode, Config, ConfigBuilder, DEFAULT_COUNT_BOOTSTRAP_LOOKUPS, DEFAULT_DISCOVERY_V5_ADDR,
DEFAULT_DISCOVERY_V5_ADDR_IPV6, DEFAULT_DISCOVERY_V5_PORT,
DEFAULT_DISCOVERY_V5_ADDR_IPV6, DEFAULT_DISCOVERY_V5_LISTEN_CONFIG, DEFAULT_DISCOVERY_V5_PORT,
DEFAULT_SECONDS_BOOTSTRAP_LOOKUP_INTERVAL, DEFAULT_SECONDS_LOOKUP_INTERVAL,
};
pub use enr::enr_to_discv4_id;
@ -666,7 +666,7 @@ mod test {
discv5::Discv5::new(
Enr::empty(&sk).unwrap(),
sk,
discv5::ConfigBuilder::new(ListenConfig::default()).build(),
discv5::ConfigBuilder::new(DEFAULT_DISCOVERY_V5_LISTEN_CONFIG).build(),
)
.unwrap(),
),