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

2026-03-18 20:32:45 +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/signature_sets.rs
+++ b/consensus/state_processing/src/per_block_processing/signature_sets.rs
@@ -390,7 +390,7 @@ where
    let domain = match state {
        BeaconState::Base(_)
        | BeaconState::Altair(_)
-        | BeaconState::Merge(_)
+        | BeaconState::Bellatrix(_)
        | BeaconState::Capella(_) => spec.get_domain(
            exit.epoch,
            Domain::VoluntaryExit,