fix compilation errors, rename capella -> shanghai, cleanup some rebase issues

2026-03-10 04:01:51 +00:00 · 2022-04-05 16:55:42 -04:00
parent 809b52715e
commit fe6fc55449
38 changed files with 218 additions and 311 deletions
--- a/consensus/state_processing/src/per_block_processing/process_operations.rs
+++ b/consensus/state_processing/src/per_block_processing/process_operations.rs
@@ -232,7 +232,7 @@ pub fn process_attestations<'a, T: EthSpec, Payload: ExecPayload<T>>(
        }
        BeaconBlockBodyRef::Altair(_)
        | BeaconBlockBodyRef::Merge(_)
-        | BeaconBlockBodyRef::Shanghai(_) => {
+        | BeaconBlockBodyRef::Capella(_) => {
            altair::process_attestations(
                state,
                block_body.attestations(),