Skip to content

merge queue: embarking unstable (b8072c5) and #8804 together #8810

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
mergify wants to merge 2 commits into from
Closed

merge queue: embarking unstable (b8072c5) and #8804 together #8810

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
faa7c4d
fix: auto-populate ENR UDP port from discovery listen port
selfuryon Feb 12, 2026
1a9c59f
Merge of #8804
mergify[bot] Feb 12, 2026
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
16 changes: 14 additions & 2 deletions beacon_node/lighthouse_network/src/discovery/enr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,23 @@ pub fn build_enr<E: EthSpec>(
builder.ip6(*ip);
}

if let Some(udp4_port) = config.enr_udp4_port {
// If the ENR port is not set, and we are listening over that ip version, use the listening
// discovery port instead.
if let Some(udp4_port) = config.enr_udp4_port.or_else(|| {
config
.listen_addrs()
.v4()
.and_then(|v4_addr| v4_addr.disc_port.try_into().ok())
}) {
builder.udp4(udp4_port.get());
}

if let Some(udp6_port) = config.enr_udp6_port {
if let Some(udp6_port) = config.enr_udp6_port.or_else(|| {
config
.listen_addrs()
.v6()
.and_then(|v6_addr| v6_addr.disc_port.try_into().ok())
}) {
builder.udp6(udp6_port.get());
}

Expand Down