Rename Merge to Bellatrix (#5601)

* Rename Merge to Bellatrix * Remove tree-hash-cache which got readded from the rebase
2026-03-10 12:11:59 +00:00 · 2024-04-26 06:19:41 +10:00
parent 320345695d
commit 13f94ef0f3
104 changed files with 808 additions and 714 deletions
--- a/consensus/state_processing/src/per_block_processing/process_operations.rs
+++ b/consensus/state_processing/src/per_block_processing/process_operations.rs
@@ -273,7 +273,7 @@ pub fn process_attestations<E: EthSpec, Payload: AbstractExecPayload<E>>(
            )?;
        }
        BeaconBlockBodyRef::Altair(_)
-        | BeaconBlockBodyRef::Merge(_)
+        | BeaconBlockBodyRef::Bellatrix(_)
        | BeaconBlockBodyRef::Capella(_)
        | BeaconBlockBodyRef::Deneb(_)
        | BeaconBlockBodyRef::Electra(_) => {