Skip to content
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

Jump to bottom

Update to latest discovery #6486

Merged
merged 6 commits into from
Nov 18, 2024
Merged

Update to latest discovery #6486

merged 6 commits into from
Nov 18, 2024

Conversation

AgeManning
Copy link
Member

This update brings a few changes.

Specifically:

  • More accessibility for NAT'd peers to find and discover peers
  • Improved enr-auto-updates for dual-stack nodes

@AgeManning AgeManning added the ready-for-review The code is ready for review label Oct 14, 2024
@AgeManning AgeManning requested a review from jxs October 14, 2024 08:40
@AgeManning AgeManning marked this pull request as ready for review October 14, 2024 08:40
pawanjay176
pawanjay176 approved these changes Oct 16, 2024
View reviewed changes
Copy link
Member

@pawanjay176 pawanjay176 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good, but I can't test it as I don't have an ipv6 connection at home.
Have you tested auto-enr with ipv6?

@AgeManning
Copy link
Member Author

Yeah. I've been testing with ipv6 using discv5-cli.

There are probably some other changes we might need to introduce for ipv6 however. I've not quite got to them yet.

@michaelsproul michaelsproul added the v6.0.0 New major release for hierarchical state diffs label Oct 21, 2024
@AgeManning
Copy link
Member Author

I've made a new commit. Moves to a whole new discovery.

I think this current version should be fine to support ipv6 and potentially dual-stack by default

pawanjay176
pawanjay176 reviewed Oct 30, 2024
View reviewed changes
beacon_node/lighthouse_network/src/config.rs
.query_peer_timeout(Duration::from_secs(2))
.query_timeout(Duration::from_secs(30))
.request_retries(1)
.enr_peer_update_min(10)
.query_parallelism(5)
.query_parallelism(8)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this bumped?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some simulations or experiments were saying discovery can run faster just by increasing the parallelism.

I was looking through the configs, and while I was there, figured I'd increase. Happy to leave it as is, if its a concern.

Its just that I've been meaning to mess with it for a while, so figure in the update, might as well do it here.

@michaelsproul
Copy link
Member

michaelsproul commented Nov 1, 2024 •
edited
Loading

I've pushed a commit to minimise the update to Cargo.lock, seeing as there's something nasty lurking in the dep tree that we haven't found yet. See:

@michaelsproul michaelsproul added ready-for-merge This PR is ready to merge. and removed ready-for-review The code is ready for review labels Nov 18, 2024
@michaelsproul
Copy link
Member

@mergify queue

@mergify Mergify
Copy link

mergify bot commented Nov 18, 2024 •
edited
Loading

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 8cebc87

mergify bot added a commit that referenced this pull request Nov 18, 2024
@mergify
Merge of #6486
d1dd668
@mergify mergify bot mentioned this pull request Nov 18, 2024
Closed
5 tasks
@mergify mergify bot merged commit 8cebc87 into sigp:unstable Nov 18, 2024
29 checks passed
chong-he pushed a commit to chong-he/lighthouse that referenced this pull request Nov 26, 2024
@AgeManning @chong-he
Update to latest discovery (sigp#6486)
716590a 
* Upgrade discv5 to v0.8

* Rename some logs

* Improve the NAT reporting with new discv5 metrics

* Merge branch 'unstable' into discv5-v8

* Limited Cargo.lock update

* Update yanked futures-* crates
@jimmygchen jimmygchen mentioned this pull request Dec 10, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pawanjay176 pawanjay176 pawanjay176 approved these changes

@jxs jxs jxs approved these changes

Assignees
No one assigned
Labels
ready-for-merge This PR is ready to merge. v6.0.0 New major release for hierarchical state diffs
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@AgeManning @michaelsproul @jxs @pawanjay176