Skip to content

[Merged by Bors] - Improve Lighthouse Connectivity Via ENR TCP Update #4057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AgeManning wants to merge 7 commits into from
Closed

[Merged by Bors] - Improve Lighthouse Connectivity Via ENR TCP Update #4057

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
068e4ba
Update ENR TCP port on external port discovery
AgeManning Mar 7, 2023
049b820
Merge latest unstable
AgeManning Mar 17, 2023
27532b2
Handle ipv6 explicitly
AgeManning Mar 17, 2023
ef45a2d
Upgrade to latest discv5
AgeManning Mar 20, 2023
c401f0b
Update book with NATing info
AgeManning Mar 20, 2023
0cf0eb8
Update boot_node/src/server.rs
AgeManning Mar 21, 2023
88654c0
Small fixes and fmt
AgeManning Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions beacon_node/lighthouse_network/src/discovery/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,12 @@ pub struct Discovery<TSpec: EthSpec> {
/// always false.
pub started: bool,

/// This keeps track of whether an external UDP port change should also indicate an internal
/// TCP port change. As we cannot detect our external TCP port, we assume that the external UDP
/// port is also our external TCP port. This assumption only holds if the user has not
/// explicitly set their ENR TCP port via the CLI config.
update_tcp_port: bool,

/// Logger for the discovery behaviour.
log: slog::Logger,
}
Expand Down Expand Up @@ -290,6 +296,8 @@ impl<TSpec: EthSpec> Discovery<TSpec> {
}
}

let update_tcp_port = config.enr_tcp_port.is_none();

Ok(Self {
cached_enrs: LruCache::new(50),
network_globals,
Expand All @@ -299,6 +307,7 @@ impl<TSpec: EthSpec> Discovery<TSpec> {
discv5,
event_stream,
started: !config.disable_discovery,
update_tcp_port,
log,
enr_dir,
})
Expand Down Expand Up @@ -1009,6 +1018,10 @@ impl<TSpec: EthSpec> NetworkBehaviour for Discovery<TSpec> {
metrics::check_nat();
// Discv5 will have updated our local ENR. We save the updated version
// to disk.
if self.update_tcp_port {
// Update the TCP port in the ENR
self.discv5.update_local_enr_socket(socket_addr, true);
}
let enr = self.discv5.local_enr();
enr::save_enr_to_disk(Path::new(&self.enr_dir), &enr, &self.log);
// update network globals
Expand Down