Remove merge transition code #8761
Open
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
Remove merge transition code that is no longer needed. The merge (Ethereum's transition from proof-of-work to proof-of-stake) occurred in September 2022. All related transition logic, readiness checks, and terminal difficulty validation can now be safely removed.
This PR represents the squashed and rebased version of the work at commit
ca6a1b66791e29b9ab47b6faa67424ede0281a06.Changes
This PR removes approximately 2,100 net lines of code across 39 files, including:
get_terminal_pow_block_hash(),get_pow_block_at_total_difficulty(), and related terminal block hash validation logic from execution layerbellatrix_readiness.rsfrom merge transition readiness validation to just genesis execution payload consistency checksotb_verification_service.rs(369 lines) and related optimistic import logic specific to the merge transitionbellatrix.rs(212 lines),capella.rs(156 lines), and other integration testsFiles Changed
Key modifications:
beacon_node/beacon_chain/src/otb_verification_service.rs- deletedbeacon_node/beacon_chain/src/bellatrix_readiness.rs- simplified to genesis checks onlybeacon_node/execution_layer/src/lib.rs- removed terminal difficulty methodsbeacon_node/client/src/notifier.rs- removed merge readiness loggingbeacon_node/operation_pool/src/lib.rs- cleaned up transition-specific logicTesting