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

2026-04-17 04:48:21 +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/verify_attestation.rs
+++ b/consensus/state_processing/src/per_block_processing/verify_attestation.rs
@@ -35,7 +35,7 @@ pub fn verify_attestation_for_block_inclusion<'ctxt, E: EthSpec>(
    match state {
        BeaconState::Base(_)
        | BeaconState::Altair(_)
-        | BeaconState::Merge(_)
+        | BeaconState::Bellatrix(_)
        | BeaconState::Capella(_) => {
            verify!(
                state.slot() <= data.slot.safe_add(E::slots_per_epoch())?,