Block processing electra (#5741)

* Attestation superstruct changes for EIP 7549 (#5644) * update * experiment * superstruct changes * revert * superstruct changes * fix tests * indexed attestation * indexed attestation superstruct * updated TODOs * `superstruct` the `AttesterSlashing` (#5636) * `superstruct` Attester Fork Variants * Push a little further * Deal with Encode / Decode of AttesterSlashing * not so sure about this.. * Stop Encode/Decode Bounds from Propagating Out * Tons of Changes.. * More Conversions to AttestationRef * Add AsReference trait (#15) * Add AsReference trait * Fix some snafus * Got it Compiling! :D * Got Tests Building * Get beacon chain tests compiling --------- Co-authored-by: Michael Sproul <micsproul@gmail.com> * Merge remote-tracking branch 'upstream/unstable' into electra_attestation_changes * Make EF Tests Fork-Agnostic (#5713) * Finish EF Test Fork Agnostic (#5714) * Superstruct `AggregateAndProof` (#5715) * Upgrade `superstruct` to `0.8.0` * superstruct `AggregateAndProof` * Merge remote-tracking branch 'sigp/unstable' into electra_attestation_changes * cargo fmt * Merge pull request #5726 from realbigsean/electra_attestation_changes Merge unstable into Electra attestation changes * process withdrawals updates * cleanup withdrawals processing * update `process_operations` deposit length check * add apply_deposit changes * add execution layer withdrawal request processing * process deposit receipts * add consolidation processing * update process operations function * exit updates * clean up * update slash_validator * EIP7549 `get_attestation_indices` (#5657) * get attesting indices electra impl * fmt * get tests to pass * fmt * fix some beacon chain tests * fmt * fix slasher test * fmt got me again * fix more tests * fix tests * Some small changes (#5739) * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * cargo fmt (#5740) * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * fix attestation verification * Sketch op pool changes * fix get attesting indices (#5742) * fix get attesting indices * better errors * fix compile * only get committee index once * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Ef test fixes (#5753) * attestation related ef test fixes * delete commented out stuff * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Fix Aggregation Pool for Electra (#5754) * Fix Aggregation Pool for Electra * Remove Outdated Interface * fix ssz (#5755) * Get `electra_op_pool` up to date (#5756) * fix get attesting indices (#5742) * fix get attesting indices * better errors * fix compile * only get committee index once * Ef test fixes (#5753) * attestation related ef test fixes * delete commented out stuff * Fix Aggregation Pool for Electra (#5754) * Fix Aggregation Pool for Electra * Remove Outdated Interface * fix ssz (#5755) --------- Co-authored-by: realbigsean <sean@sigmaprime.io> * Revert "Get `electra_op_pool` up to date (#5756)" (#5757) This reverts commit ab9e58aa3d. * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into electra_op_pool * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Compute on chain aggregate impl (#5752) * add compute_on_chain_agg impl to op pool changes * fmt * get op pool tests to pass * update the naive agg pool interface (#5760) * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Fix bugs in cross-committee aggregation * Add comment to max cover optimisation * Fix assert * Merge pull request #5749 from sigp/electra_op_pool Optimise Electra op pool aggregation * don't fail on empty consolidations * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * update committee offset * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * only increment the state deposit index on old deposit flow * Fix Electra Fork Choice Tests (#5764) * Fix Electra Fork Choice Tests (#5764) * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Fix Consolidation Sigs & Withdrawals * Merge pull request #5766 from ethDreamer/two_fixes Fix Consolidation Sigs & Withdrawals * Subscribe to the correct subnets for electra attestations (#5782) * subscribe to the correct att subnets for electra * subscribe to the correct att subnets for electra * cargo fmt * Subscribe to the correct subnets for electra attestations (#5782) * subscribe to the correct att subnets for electra * subscribe to the correct att subnets for electra * cargo fmt * fix slashing handling * Fix Bug In Block Processing with 0x02 Credentials * Merge remote-tracking branch 'upstream/unstable' * Send unagg attestation based on fork * Publish all aggregates * just one more check bro plz.. * Merge pull request #5832 from ethDreamer/electra_attestation_changes_merge_unstable Merge `unstable` into `electra_attestation_changes` * Merge pull request #5835 from realbigsean/fix-validator-logic Fix validator logic * Merge pull request #5816 from realbigsean/electra-attestation-slashing-handling Electra slashing handling * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Electra attestation changes rm decode impl (#5856) * Remove Crappy Decode impl for Attestation * Remove Inefficient Attestation Decode impl * Implement Schema Upgrade / Downgrade * Update beacon_node/beacon_chain/src/schema_change/migration_schema_v20.rs Co-authored-by: Michael Sproul <micsproul@gmail.com> --------- Co-authored-by: Michael Sproul <micsproul@gmail.com> * Fix failing attestation tests and misc electra attestation cleanup (#5810) * - get attestation related beacon chain tests to pass - observed attestations are now keyed off of data + committee index - rename op pool attestationref to compactattestationref - remove unwraps in agg pool and use options instead - cherry pick some changes from ef-tests-electra * cargo fmt * fix failing test * Revert dockerfile changes * make committee_index return option * function args shouldnt be a ref to attestation ref * fmt * fix dup imports --------- Co-authored-by: realbigsean <seananderson33@GMAIL.com> * fix some todos (#5817) * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes * add consolidations to merkle calc for inclusion proof * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Remove Duplicate KZG Commitment Merkle Proof Code (#5874) * Remove Duplicate KZG Commitment Merkle Proof Code * s/tree_lists/fields/ * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * fix compile * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Fix slasher tests (#5906) * Fix electra tests * Add electra attestations to double vote tests * Update superstruct to 0.8 * Merge remote-tracking branch 'origin/unstable' into electra_attestation_changes * Small cleanup in slasher tests * Clean up Electra observed aggregates (#5929) * Use consistent key in observed_attestations * Remove unwraps from observed aggregates * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes * De-dup attestation constructor logic * Remove unwraps in Attestation construction * Dedup match_attestation_data * Remove outdated TODO * Use ForkName Ord in fork-choice tests * Use ForkName Ord in BeaconBlockBody * Make to_electra not fallible * Remove TestRandom impl for IndexedAttestation * Remove IndexedAttestation faulty Decode impl * Drop TestRandom impl * Add PendingAttestationInElectra * Indexed att on disk (#35) * indexed att on disk * fix lints * Update slasher/src/migrate.rs Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com> --------- Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com> * add electra fork enabled fn to ForkName impl (#36) * add electra fork enabled fn to ForkName impl * remove inadvertent file * Update common/eth2/src/types.rs Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com> * Dedup attestation constructor logic in attester cache * Use if let Ok for committee_bits * Dedup Attestation constructor code * Diff reduction in tests * Fix beacon_chain tests * Diff reduction * Use Ord for ForkName in pubsub * Resolve into_attestation_and_indices todo * Remove stale TODO * Fix beacon_chain tests * Test spec invariant * Use electra_enabled in pubsub * Remove get_indexed_attestation_from_signed_aggregate * Use ok_or instead of if let else * committees are sorted * remove dup method `get_indexed_attestation_from_committees` * Merge pull request #5940 from dapplion/electra_attestation_changes_lionreview Electra attestations #5712 review * update default persisted op pool deserialization * ensure aggregate and proof uses serde untagged on ref * Fork aware ssz static attestation tests * Electra attestation changes from Lions review (#5971) * dedup/cleanup and remove unneeded hashset use * remove irrelevant TODOs * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Electra attestation changes sean review (#5972) * instantiate empty bitlist in unreachable code * clean up error conversion * fork enabled bool cleanup * remove a couple todos * return bools instead of options in `aggregate` and use the result * delete commented out code * use map macros in simple transformations * remove signers_disjoint_from * get ef tests compiling * get ef tests compiling * update intentionally excluded files * Avoid changing slasher schema for Electra * Delete slasher schema v4 * Fix clippy * Fix compilation of beacon_chain tests * Update database.rs * Update per_block_processing.rs * Add electra lightclient types * Update slasher/src/database.rs * fix imports * Merge pull request #5980 from dapplion/electra-lightclient Add electra lightclient types * Merge pull request #5975 from michaelsproul/electra-slasher-no-migration Avoid changing slasher schema for Electra * Update beacon_node/beacon_chain/src/attestation_verification.rs * Update beacon_node/beacon_chain/src/attestation_verification.rs * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes * Merge branch 'electra_attestation_changes' of https://github.com/realbigsean/lighthouse into block-processing-electra * fork enabled electra
2026-03-23 06:44:35 +00:00 · 2024-06-26 06:29:27 -07:00
parent c52c598f69
commit 858b01f4e3
22 changed files with 799 additions and 78 deletions
--- a/consensus/types/src/beacon_state.rs
+++ b/consensus/types/src/beacon_state.rs
@@ -159,6 +159,8 @@ pub enum Error {
    IndexNotSupported(usize),
    InvalidFlagIndex(usize),
    MerkleTreeError(merkle_proof::MerkleTreeError),
+    PartialWithdrawalCountInvalid(usize),
+    NonExecutionAddresWithdrawalCredential,
    NoCommitteeFound(CommitteeIndex),
    InvalidCommitteeIndex(CommitteeIndex),
    InvalidSelectionProof {
@@ -1475,6 +1477,14 @@ impl<E: EthSpec> BeaconState<E> {
        }
    }

+    /// Get the balance of a single validator.
+    pub fn get_balance(&self, validator_index: usize) -> Result<u64, Error> {
+        self.balances()
+            .get(validator_index)
+            .ok_or(Error::BalancesOutOfBounds(validator_index))
+            .copied()
+    }
+
    /// Get a mutable reference to the balance of a single validator.
    pub fn get_balance_mut(&mut self, validator_index: usize) -> Result<&mut u64, Error> {
        self.balances_mut()
@@ -2105,11 +2115,12 @@ impl<E: EthSpec> BeaconState<E> {
        &self,
        validator_index: usize,
        spec: &ChainSpec,
+        current_fork: ForkName,
    ) -> Result<u64, Error> {
        let max_effective_balance = self
            .validators()
            .get(validator_index)
-            .map(|validator| validator.get_validator_max_effective_balance(spec))
+            .map(|validator| validator.get_validator_max_effective_balance(spec, current_fork))
            .ok_or(Error::UnknownValidator(validator_index))?;
        Ok(std::cmp::min(
            *self
--- a/consensus/types/src/chain_spec.rs
+++ b/consensus/types/src/chain_spec.rs
@@ -387,6 +387,19 @@ impl ChainSpec {
        }
    }

+    /// For a given `BeaconState`, return the whistleblower reward quotient associated with its variant.
+    pub fn whistleblower_reward_quotient_for_state<E: EthSpec>(
+        &self,
+        state: &BeaconState<E>,
+    ) -> u64 {
+        let fork_name = state.fork_name_unchecked();
+        if fork_name >= ForkName::Electra {
+            self.whistleblower_reward_quotient_electra
+        } else {
+            self.whistleblower_reward_quotient
+        }
+    }
+
    /// Returns a full `Fork` struct for a given epoch.
    pub fn fork_at_epoch(&self, epoch: Epoch) -> Fork {
        let current_fork_name = self.fork_name_at_epoch(epoch);
--- a/consensus/types/src/consolidation.rs
+++ b/consensus/types/src/consolidation.rs
@@ -1,5 +1,5 @@
-use crate::test_utils::TestRandom;
 use crate::Epoch;
+use crate::{test_utils::TestRandom, SignedRoot};
 use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
@@ -27,6 +27,8 @@ pub struct Consolidation {
    pub epoch: Epoch,
 }

+impl SignedRoot for Consolidation {}
+
 #[cfg(test)]
 mod tests {
    use super::*;
--- a/consensus/types/src/payload.rs
+++ b/consensus/types/src/payload.rs
@@ -39,6 +39,15 @@ pub trait ExecPayload<E: EthSpec>: Debug + Clone + PartialEq + Hash + TreeHash +
    /// fork-specific fields
    fn withdrawals_root(&self) -> Result<Hash256, Error>;
    fn blob_gas_used(&self) -> Result<u64, Error>;
+    fn withdrawal_requests(
+        &self,
+    ) -> Result<
+        Option<VariableList<ExecutionLayerWithdrawalRequest, E::MaxWithdrawalRequestsPerPayload>>,
+        Error,
+    >;
+    fn deposit_receipts(
+        &self,
+    ) -> Result<Option<VariableList<DepositReceipt, E::MaxDepositReceiptsPerPayload>>, Error>;

    /// Is this a default payload with 0x0 roots for transactions and withdrawals?
    fn is_default_with_zero_roots(&self) -> bool;
@@ -278,6 +287,35 @@ impl<E: EthSpec> ExecPayload<E> for FullPayload<E> {
        }
    }

+    fn withdrawal_requests(
+        &self,
+    ) -> Result<
+        Option<VariableList<ExecutionLayerWithdrawalRequest, E::MaxWithdrawalRequestsPerPayload>>,
+        Error,
+    > {
+        match self {
+            FullPayload::Bellatrix(_) | FullPayload::Capella(_) | FullPayload::Deneb(_) => {
+                Err(Error::IncorrectStateVariant)
+            }
+            FullPayload::Electra(inner) => {
+                Ok(Some(inner.execution_payload.withdrawal_requests.clone()))
+            }
+        }
+    }
+
+    fn deposit_receipts(
+        &self,
+    ) -> Result<Option<VariableList<DepositReceipt, E::MaxDepositReceiptsPerPayload>>, Error> {
+        match self {
+            FullPayload::Bellatrix(_) | FullPayload::Capella(_) | FullPayload::Deneb(_) => {
+                Err(Error::IncorrectStateVariant)
+            }
+            FullPayload::Electra(inner) => {
+                Ok(Some(inner.execution_payload.deposit_receipts.clone()))
+            }
+        }
+    }
+
    fn is_default_with_zero_roots<'a>(&'a self) -> bool {
        map_full_payload_ref!(&'a _, self.to_ref(), move |payload, cons| {
            cons(payload);
@@ -410,6 +448,35 @@ impl<'b, E: EthSpec> ExecPayload<E> for FullPayloadRef<'b, E> {
        }
    }

+    fn withdrawal_requests(
+        &self,
+    ) -> Result<
+        Option<VariableList<ExecutionLayerWithdrawalRequest, E::MaxWithdrawalRequestsPerPayload>>,
+        Error,
+    > {
+        match self {
+            FullPayloadRef::Bellatrix(_)
+            | FullPayloadRef::Capella(_)
+            | FullPayloadRef::Deneb(_) => Err(Error::IncorrectStateVariant),
+            FullPayloadRef::Electra(inner) => {
+                Ok(Some(inner.execution_payload.withdrawal_requests.clone()))
+            }
+        }
+    }
+
+    fn deposit_receipts(
+        &self,
+    ) -> Result<Option<VariableList<DepositReceipt, E::MaxDepositReceiptsPerPayload>>, Error> {
+        match self {
+            FullPayloadRef::Bellatrix(_)
+            | FullPayloadRef::Capella(_)
+            | FullPayloadRef::Deneb(_) => Err(Error::IncorrectStateVariant),
+            FullPayloadRef::Electra(inner) => {
+                Ok(Some(inner.execution_payload.deposit_receipts.clone()))
+            }
+        }
+    }
+
    fn is_default_with_zero_roots<'a>(&'a self) -> bool {
        map_full_payload_ref!(&'a _, self, move |payload, cons| {
            cons(payload);
@@ -590,6 +657,21 @@ impl<E: EthSpec> ExecPayload<E> for BlindedPayload<E> {
        }
    }

+    fn withdrawal_requests(
+        &self,
+    ) -> Result<
+        Option<VariableList<ExecutionLayerWithdrawalRequest, E::MaxWithdrawalRequestsPerPayload>>,
+        Error,
+    > {
+        Ok(None)
+    }
+
+    fn deposit_receipts(
+        &self,
+    ) -> Result<Option<VariableList<DepositReceipt, E::MaxDepositReceiptsPerPayload>>, Error> {
+        Ok(None)
+    }
+
    fn is_default_with_zero_roots(&self) -> bool {
        self.to_ref().is_default_with_zero_roots()
    }
@@ -691,6 +773,21 @@ impl<'b, E: EthSpec> ExecPayload<E> for BlindedPayloadRef<'b, E> {
        }
    }

+    fn withdrawal_requests(
+        &self,
+    ) -> Result<
+        Option<VariableList<ExecutionLayerWithdrawalRequest, E::MaxWithdrawalRequestsPerPayload>>,
+        Error,
+    > {
+        Ok(None)
+    }
+
+    fn deposit_receipts(
+        &self,
+    ) -> Result<Option<VariableList<DepositReceipt, E::MaxDepositReceiptsPerPayload>>, Error> {
+        Ok(None)
+    }
+
    fn is_default_with_zero_roots<'a>(&'a self) -> bool {
        map_blinded_payload_ref!(&'b _, self, move |payload, cons| {
            cons(payload);
@@ -717,7 +814,9 @@ macro_rules! impl_exec_payload_common {
     $is_default_with_empty_roots:block,
     $f:block,
     $g:block,
-     $h:block) => {
+     $h:block,
+     $i:block,
+     $j:block) => {
        impl<E: EthSpec> ExecPayload<E> for $wrapper_type<E> {
            fn block_type() -> BlockType {
                BlockType::$block_type_variant
@@ -780,6 +879,23 @@ macro_rules! impl_exec_payload_common {
                let h = $h;
                h(self)
            }
+
+            fn withdrawal_requests(
+                &self,
+            ) -> Result<
+                Option<VariableList<ExecutionLayerWithdrawalRequest, E::MaxWithdrawalRequestsPerPayload>>,
+                Error,
+            > {
+                let i = $i;
+                i(self)
+            }
+
+            fn deposit_receipts(
+                &self,
+            ) -> Result<Option<VariableList<DepositReceipt, E::MaxDepositReceiptsPerPayload>>, Error> {
+                let j = $j;
+                j(self)
+            }
        }

        impl<E: EthSpec> From<$wrapped_type<E>> for $wrapper_type<E> {
@@ -825,7 +941,9 @@ macro_rules! impl_exec_payload_for_fork {
                        wrapper_ref_type.blob_gas_used()
                    };
                c
-            }
+            },
+            { |_| { Ok(None) } },
+            { |_| { Ok(None) } }
        );

        impl<E: EthSpec> TryInto<$wrapper_type_header<E>> for BlindedPayload<E> {
@@ -912,6 +1030,35 @@ macro_rules! impl_exec_payload_for_fork {
                        wrapper_ref_type.blob_gas_used()
                    };
                c
+            },
+            {
+                let c: for<'a> fn(
+                    &'a $wrapper_type_full<E>,
+                ) -> Result<
+                    Option<
+                        VariableList<
+                            ExecutionLayerWithdrawalRequest,
+                            E::MaxWithdrawalRequestsPerPayload,
+                        >,
+                    >,
+                    Error,
+                > = |payload: &$wrapper_type_full<E>| {
+                    let wrapper_ref_type = FullPayloadRef::$fork_variant(&payload);
+                    wrapper_ref_type.withdrawal_requests()
+                };
+                c
+            },
+            {
+                let c: for<'a> fn(
+                    &'a $wrapper_type_full<E>,
+                ) -> Result<
+                    Option<VariableList<DepositReceipt, E::MaxDepositReceiptsPerPayload>>,
+                    Error,
+                > = |payload: &$wrapper_type_full<E>| {
+                    let wrapper_ref_type = FullPayloadRef::$fork_variant(&payload);
+                    wrapper_ref_type.deposit_receipts()
+                };
+                c
            }
        );

--- a/consensus/types/src/validator.rs
+++ b/consensus/types/src/validator.rs
@@ -130,9 +130,9 @@ impl Validator {
        is_compounding_withdrawal_credential(self.withdrawal_credentials, spec)
    }

-    /// Get the eth1 withdrawal address if this validator has one initialized.
-    pub fn get_eth1_withdrawal_address(&self, spec: &ChainSpec) -> Option<Address> {
-        self.has_eth1_withdrawal_credential(spec)
+    /// Get the execution withdrawal address if this validator has one initialized.
+    pub fn get_execution_withdrawal_address(&self, spec: &ChainSpec) -> Option<Address> {
+        self.has_execution_withdrawal_credential(spec)
            .then(|| {
                self.withdrawal_credentials
                    .as_bytes()
@@ -203,7 +203,7 @@ impl Validator {
        current_fork: ForkName,
    ) -> bool {
        if current_fork.electra_enabled() {
-            self.is_partially_withdrawable_validator_electra(balance, spec)
+            self.is_partially_withdrawable_validator_electra(balance, spec, current_fork)
        } else {
            self.is_partially_withdrawable_validator_capella(balance, spec)
        }
@@ -223,8 +223,9 @@ impl Validator {
        &self,
        balance: u64,
        spec: &ChainSpec,
+        current_fork: ForkName,
    ) -> bool {
-        let max_effective_balance = self.get_validator_max_effective_balance(spec);
+        let max_effective_balance = self.get_validator_max_effective_balance(spec, current_fork);
        let has_max_effective_balance = self.effective_balance == max_effective_balance;
        let has_excess_balance = balance > max_effective_balance;
        self.has_execution_withdrawal_credential(spec)
@@ -239,11 +240,19 @@ impl Validator {
    }

    /// Returns the max effective balance for a validator in gwei.
-    pub fn get_validator_max_effective_balance(&self, spec: &ChainSpec) -> u64 {
-        if self.has_compounding_withdrawal_credential(spec) {
-            spec.max_effective_balance_electra
+    pub fn get_validator_max_effective_balance(
+        &self,
+        spec: &ChainSpec,
+        current_fork: ForkName,
+    ) -> u64 {
+        if current_fork >= ForkName::Electra {
+            if self.has_compounding_withdrawal_credential(spec) {
+                spec.max_effective_balance_electra
+            } else {
+                spec.min_activation_balance
+            }
        } else {
-            spec.min_activation_balance
+            spec.max_effective_balance
        }
    }
 }