Skip to content

Conversation

@ethDreamer
Copy link
Member

@ethDreamer ethDreamer commented Jun 26, 2025

Issue Addressed

Closes #7467.

This PR primarily addresses the P2P changes in fusaka-devnet-2. Specifically:

90% of this PR was absolutely hacked together as fast as possible during the Berlinterop as fast as I could while running between Glamsterdam debates. Luckily, it seems to work. But I was unable to be as careful in avoiding bugs as I usually am. I've cleaned up the things I remember wanting to come back and have a closer look at. But still working on this.

Progress:

@ethDreamer ethDreamer requested a review from jxs as a code owner June 26, 2025 21:52
@ethDreamer ethDreamer added work-in-progress PR is a work-in-progress fusaka-devnet-2 labels Jun 26, 2025
@jimmygchen jimmygchen self-assigned this Jul 2, 2025
Copy link
Member

@jimmygchen jimmygchen left a comment

Choose a reason for hiding this comment

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

Looks pretty good actually @ethDreamer !
I've made a PR #7722 for the cleanup and test fixes.

jimmygchen and others added 2 commits July 10, 2025 11:17
* Clean up and add more code comments on BPO forks.

* Fix tests.

* Fix tests.

* Fix moar tests.

* Fix moar tests.

* Ensure the same `ChainSpec` is used throughout the tests.

* Refactor `ForkContext` to avoid recomputing fork digests and using cached values.

* Fix failing tests due to mismatching chainspec and block slots.

* Review comments - adjust code style and add docs.

* make sure all forks are covered in tests

---------

Co-authored-by: Pawan Dhananjay <[email protected]>
@pawanjay176
Copy link
Member

pawanjay176 commented Jul 10, 2025

The sync failures are only on fulu. I'll be handling them in #7726

Gonna merge this one when the remaining checks pass

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.

LGTM

@pawanjay176 pawanjay176 added the ready-for-review The code is ready for review label Jul 10, 2025
@pawanjay176 pawanjay176 added ready-for-merge This PR is ready to merge. and removed work-in-progress PR is a work-in-progress ready-for-review The code is ready for review labels Jul 10, 2025
mergify bot added a commit that referenced this pull request Jul 10, 2025
@mergify
Copy link

mergify bot commented Jul 10, 2025

This pull request has been removed from the queue for the following reason: pull request dequeued.

Pull request #7655 has been dequeued. The pull request could not be merged. This could be related to an activated branch protection or ruleset rule that prevents us from merging. (details: 1 review requesting changes and 1 approving review by reviewers with write access.).

You can check the last failing draft PR here: #7730.

You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it.
If you do update this pull request, it will automatically be requeued once the queue conditions match again.
If you think this was a flaky issue instead, you can requeue the pull request, without updating it, by posting a @mergifyio requeue comment.

mergify bot added a commit that referenced this pull request Jul 10, 2025
@mergify mergify bot merged commit b43e0b4 into unstable Jul 10, 2025
44 of 48 checks passed
@mergify mergify bot deleted the fusaka-devnet-2 branch July 10, 2025 21:33
ethDreamer added a commit to ethDreamer/lighthouse that referenced this pull request Jul 28, 2025
Closes sigp#7467.

This PR primarily addresses [the P2P changes](ethereum/EIPs#9840) in [fusaka-devnet-2](https://fusaka-devnet-2.ethpandaops.io/). Specifically:

* [the new `nfd` parameter added to the `ENR`](ethereum/EIPs#9840)
* [the modified `compute_fork_digest()` changes for every BPO fork](ethereum/EIPs#9840)

90% of this PR was absolutely hacked together as fast as possible during the Berlinterop as fast as I could while running between Glamsterdam debates. Luckily, it seems to work. But I was unable to be as careful in avoiding bugs as I usually am. I've cleaned up the things *I remember* wanting to come back and have a closer look at. But still working on this.

Progress:
* [x] get it working on `fusaka-devnet-2`
* [ ] [*optional* disconnect from peers with incorrect `nfd` at the fork boundary](ethereum/consensus-specs#4407) - Can be addressed in a future PR if necessary
* [x] first pass clean-up
* [x] fix up all the broken tests
* [x] final self-review
* [x] more thorough review from people more familiar with affected code
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants