Revert "fcu before engine new payload (#10731)" (cf7d594)#10754
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR reverts the previously introduced “FCU before engine_newPayload” behavior (#10731) on top of current main, removing the pre-execution head-advancement logic and the associated MergeMiningCoordinator API surface and tests.
Changes:
- Remove pre-execution
updateHeadForExecutionhandling fromAbstractEngineNewPayload. - Remove the
MergeMiningCoordinator.updateHeadForExecutionAPI and its forwarding/implementation. - Delete tests that specifically asserted the reverted pre-execution head-advancement behavior.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayloadTest.java | Removes tests/imports tied to the reverted pre-execution head update behavior. |
| ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java | Removes the pre-execution head-advancement logic in engine_newPayload. |
| consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java | Removes tests validating updateHeadForExecution behavior. |
| consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java | Removes the forwarding override for the deleted updateHeadForExecution API. |
| consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeMiningCoordinator.java | Removes the updateHeadForExecution method from the interface. |
| consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinator.java | Removes the updateHeadForExecution implementation. |
matkt
force-pushed
the
revert-cf7d594-main
branch
from
00f5895 to
4330fdd
Compare
This reverts commit cf7d594. Signed-off-by: Karim Taam <karim.t2am@gmail.com>
matkt
force-pushed
the
revert-cf7d594-main
branch
from
4330fdd to
a12f475
Compare
fab-10
approved these changes
Jul 6, 2026
Signed-off-by: Karim Taam <karim.t2am@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
main.updateHeadForExecutionhandling inengine_newPayloadand the relatedMergeMiningCoordinatorAPI / tests.upstream/mainat2a0fa2e9dc7d5a9a0e91f89e763541397c0620e9.Conflict resolution:
git revertconflicted inAbstractEngineNewPayloadand its tests because #10600 was later reverted on main (#10737). Resolution keeps main without re-introducing the #10600 world-state SYNCING path—only the #10731 changes are removed.Test plan
./gradlew :consensus:merge:test --tests MergeCoordinatorTest./gradlew :ethereum:api:test --tests AbstractEngineNewPayloadTest