per_slot_processing modified

Author: shane-moore

consensus/state_processing/src/per_epoch_processing.rs

@@ -18,6 +18,7 @@ pub mod capella;
 pub mod effective_balance_updates;
 pub mod epoch_processing_summary;
 pub mod errors;
+pub mod gloas;
 pub mod historical_roots_update;
 pub mod justification_and_finalization_state;
 pub mod registry_updates;

consensus/state_processing/src/per_epoch_processing/altair.rs

@@ -6,21 +6,20 @@ use crate::epoch_cache::initialize_epoch_cache;
 use crate::per_epoch_processing::single_pass::{SinglePassConfig, process_epoch_single_pass};
 use crate::per_epoch_processing::{
     capella::process_historical_summaries_update,
+    gloas::process_builder_pending_payments,
     historical_roots_update::process_historical_roots_update,
     resets::{process_eth1_data_reset, process_randao_mixes_reset, process_slashings_reset},
 };
 pub use inactivity_updates::process_inactivity_updates_slow;
 pub use justification_and_finalization::process_justification_and_finalization;
 pub use participation_flag_updates::process_participation_flag_updates;
-pub use process_builder_pending_payments::process_builder_pending_payments;
 pub use rewards_and_penalties::process_rewards_and_penalties_slow;
 pub use sync_committee_updates::process_sync_committee_updates;
 use types::{BeaconState, ChainSpec, EthSpec, RelativeEpoch};
 
 pub mod inactivity_updates;
 pub mod justification_and_finalization;
 pub mod participation_flag_updates;
-pub mod process_builder_pending_payments;
 pub mod rewards_and_penalties;
 pub mod sync_committee_updates;
 
@@ -79,7 +78,7 @@ pub fn process_epoch<E: EthSpec>(
 
     process_sync_committee_updates(state, spec)?;
 
-    if state.fork_name_unchecked().gloas_enabled() {
+    if state.builder_pending_payments().is_ok() {
         process_builder_pending_payments(state, spec)?;
     }
 

consensus/state_processing/src/per_epoch_processing/gloas.rs

@@ -0,0 +1,3 @@
+pub use process_builder_pending_payments::process_builder_pending_payments;
+
+mod process_builder_pending_payments;

consensus/state_processing/src/per_epoch_processing/altair/process_builder_pending_payments.rs renamed to consensus/state_processing/src/per_epoch_processing/gloas/process_builder_pending_payments.rs

@@ -1,11 +1,11 @@
-use super::Error;
+use crate::EpochProcessingError;
 use safe_arith::SafeArith;
 use types::{BeaconState, BuilderPendingPayment, ChainSpec, EthSpec, Vector};
 
 pub fn process_builder_pending_payments<E: EthSpec>(
     state: &mut BeaconState<E>,
     spec: &ChainSpec,
-) -> Result<(), Error> {
+) -> Result<(), EpochProcessingError> {
     let quorum = get_builder_payment_quorum_threshold(state, spec)?;
 
     // Collect qualifying payments
@@ -18,9 +18,8 @@ pub fn process_builder_pending_payments<E: EthSpec>(
         .collect::<Vec<_>>();
 
     // Update `builder_pending_withdrawals` with qualifying `builder_pending_payments`
-    qualifying_payments
-        .into_iter()
-        .try_for_each(|payment| -> Result<(), Error> {
+    qualifying_payments.into_iter().try_for_each(
+        |payment| -> Result<(), EpochProcessingError> {
             let exit_queue_epoch =
                 state.compute_exit_epoch_and_update_churn(payment.withdrawal.amount, spec)?;
             let withdrawable_epoch =
@@ -30,7 +29,8 @@ pub fn process_builder_pending_payments<E: EthSpec>(
             withdrawal.withdrawable_epoch = withdrawable_epoch;
             state.builder_pending_withdrawals_mut()?.push(withdrawal)?;
             Ok(())
-        })?;
+        },
+    )?;
 
     // Move remaining `builder_pending_payments` to start of list and set the rest to default
     let new_payments = state
@@ -49,7 +49,7 @@ pub fn process_builder_pending_payments<E: EthSpec>(
 pub fn get_builder_payment_quorum_threshold<E: EthSpec>(
     state: &BeaconState<E>,
     spec: &ChainSpec,
-) -> Result<u64, Error> {
+) -> Result<u64, EpochProcessingError> {
     let total_active_balance = state.get_total_active_balance()?;
 
     let quorum = total_active_balance
@@ -58,5 +58,5 @@ pub fn get_builder_payment_quorum_threshold<E: EthSpec>(
 
     quorum
         .safe_div(spec.builder_payment_threshold_denominator)
-        .map_err(Error::from)
+        .map_err(EpochProcessingError::from)
 }

consensus/state_processing/src/per_slot_processing.rs

@@ -13,6 +13,7 @@ pub enum Error {
     EpochProcessingError(EpochProcessingError),
     ArithError(ArithError),
     InconsistentStateFork(InconsistentFork),
+    BitfieldError(ssz::BitfieldError),
 }
 
 impl From<ArithError> for Error {
@@ -21,6 +22,12 @@ impl From<ArithError> for Error {
     }
 }
 
+impl From<ssz::BitfieldError> for Error {
+    fn from(e: ssz::BitfieldError) -> Self {
+        Self::BitfieldError(e)
+    }
+}
+
 /// Advances a state forward by one slot, performing per-epoch processing if required.
 ///
 /// If the root of the supplied `state` is known, then it can be passed as `state_root`. If
@@ -49,6 +56,18 @@ pub fn per_slot_processing<E: EthSpec>(
 
     state.slot_mut().safe_add_assign(1)?;
 
+    // Unset the next payload availability
+    if state.fork_name_unchecked().gloas_enabled() {
+        let next_slot_index = state
+            .slot()
+            .as_usize()
+            .safe_add(1)?
+            .safe_rem(E::slots_per_historical_root())?;
+        state
+            .execution_payload_availability_mut()?
+            .set(next_slot_index, false)?;
+    }
+
     // Process fork upgrades here. Note that multiple upgrades can potentially run
     // in sequence if they are scheduled in the same Epoch (common in testnets)
     if state.slot().safe_rem(E::slots_per_epoch())? == 0 {