Merge remote-tracking branch 'upstream/unstable' into electra_attestation_changes

2026-03-17 11:52:42 +00:00 · 2024-05-02 18:22:34 -05:00
parent e6c7f145dd ee974db0ba
commit 3a41e137d1
156 changed files with 3625 additions and 4082 deletions
--- a/consensus/state_processing/src/per_block_processing/process_operations.rs
+++ b/consensus/state_processing/src/per_block_processing/process_operations.rs
@@ -286,7 +286,7 @@ pub fn process_attestations<E: EthSpec, Payload: AbstractExecPayload<E>>(
            )?;
        }
        BeaconBlockBodyRef::Altair(_)
-        | BeaconBlockBodyRef::Merge(_)
+        | BeaconBlockBodyRef::Bellatrix(_)
        | BeaconBlockBodyRef::Capella(_)
        | BeaconBlockBodyRef::Deneb(_)
        | BeaconBlockBodyRef::Electra(_) => {