Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra-engine-api

consensus/state_processing/src/per_block_processing/block_signature_verifier.rs

@@ -4,7 +4,6 @@ use super::signature_sets::{Error as SignatureSetError, *};
 use crate::per_block_processing::errors::{AttestationInvalid, BlockOperationError};
 use crate::{ConsensusContext, ContextError};
 use bls::{verify_signature_sets, PublicKey, PublicKeyBytes, SignatureSet};
-use rayon::prelude::*;
 use std::borrow::Cow;
 use types::{
     AbstractExecPayload, BeaconState, BeaconStateError, ChainSpec, EthSpec, Hash256,
@@ -411,15 +410,10 @@ impl<'a> ParallelSignatureSets<'a> {
     /// It is not possible to know exactly _which_ signature is invalid here, just that
     /// _at least one_ was invalid.
     ///
-    /// Uses `rayon` to do a map-reduce of Vitalik's method across multiple cores.
+    /// Blst library spreads the signature verification work across multiple available cores, so
+    /// this function is already parallelized.
     #[must_use]
     pub fn verify(self) -> bool {
-        let num_sets = self.sets.len();
-        let num_chunks = std::cmp::max(1, num_sets / rayon::current_num_threads());
-        self.sets
-            .into_par_iter()
-            .chunks(num_chunks)
-            .map(|chunk| verify_signature_sets(chunk.iter()))
-            .reduce(|| true, |current, this| current && this)
+        verify_signature_sets(self.sets.iter())
     }
 }

consensus/state_processing/src/per_block_processing/process_operations.rs

@@ -39,7 +39,7 @@ pub fn process_operations<E: EthSpec, Payload: AbstractExecPayload<E>>(
         process_bls_to_execution_changes(state, bls_to_execution_changes, verify_signatures, spec)?;
     }
 
-    if state.fork_name_unchecked() >= ForkName::Electra {
+    if state.fork_name_unchecked().electra_enabled() {
         let requests = block_body.execution_payload()?.withdrawal_requests()?;
         if let Some(requests) = requests {
             process_execution_layer_withdrawal_requests(state, &requests, spec)?;