EIP-7688: Forward Compatible Consensus Data Structures

Cargo.toml

@@ -277,6 +277,13 @@ inherits = "release"
 debug = true
 
 [patch.crates-io]
+# FIXME(mac): EIP-7688 development patches
+ssz_types = { git = "https://github.com/sigp/ssz_types", branch = "progressive" }
+milhouse = { git = "https://github.com/sigp/milhouse", branch = "progressive-list" }
+ethereum_ssz = { git = "https://github.com/sigp/ethereum_ssz", branch = "progressive" }
+ethereum_ssz_derive = { git = "https://github.com/sigp/ethereum_ssz", branch = "progressive" }
+tree_hash = { git = "https://github.com/sigp/tree_hash", branch = "progressive" }
+tree_hash_derive = { git = "https://github.com/sigp/tree_hash", branch = "progressive" }
 # Temporary patch until the axum migration is complete
 warp = { git = "https://github.com/macladson/warp", rev = "6f5f21beab6a240e59470caaab56afd46d46b709" }
 

beacon_node/beacon_chain/src/attestation_verification.rs

@@ -48,6 +48,7 @@ use state_processing::{
     common::{
         attesting_indices_base,
         attesting_indices_electra::{self, get_committee_indices},
+        attesting_indices_gloas,
     },
     per_block_processing::errors::{AttestationValidationError, BlockOperationError},
     signature_sets::{
@@ -688,6 +689,16 @@ impl<'a, T: BeaconChainTypes> IndexedAggregatedAttestation<'a, T> {
                         signed_aggregate.message.selection_proof.clone(),
                         signed_aggregate.message.aggregate.data.clone(),
                     ),
+                    SignedAggregateAndProof::Gloas(signed_aggregate) => (
+                        signed_aggregate
+                            .message
+                            .aggregate
+                            .committee_index()
+                            .ok_or(Error::NotExactlyOneCommitteeBitSet(0))?,
+                        signed_aggregate.message.aggregator_index,
+                        signed_aggregate.message.selection_proof.clone(),
+                        signed_aggregate.message.aggregate.data.clone(),
+                    ),
                 };
                 let slot = data.slot;
 
@@ -724,6 +735,13 @@ impl<'a, T: BeaconChainTypes> IndexedAggregatedAttestation<'a, T> {
                         )
                         .map_err(|e| BeaconChainError::from(e).into())
                     }
+                    SignedAggregateAndProof::Gloas(signed_aggregate) => {
+                        attesting_indices_gloas::get_indexed_attestation(
+                            &committees,
+                            &signed_aggregate.message.aggregate,
+                        )
+                        .map_err(|e| BeaconChainError::from(e).into())
+                    }
                 }
             };
 
@@ -1562,6 +1580,20 @@ pub fn obtain_indexed_attestation_and_committees_per_slot<T: BeaconChainTypes>(
                         }
                     })
             }
+            AttestationRef::Gloas(att) => {
+                attesting_indices_gloas::get_indexed_attestation(&committees, att)
+                    .map(|attestation| (attestation, committees_per_slot))
+                    .map_err(|e| {
+                        if let BlockOperationError::BeaconStateError(NoCommitteeFound(index)) = e {
+                            Error::NoCommitteeForSlotAndIndex {
+                                slot: att.data.slot,
+                                index,
+                            }
+                        } else {
+                            Error::Invalid(e)
+                        }
+                    })
+            }
         }
     })
 }

beacon_node/beacon_chain/src/beacon_block_reward.rs

@@ -263,8 +263,9 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
             .safe_mul(WEIGHT_DENOMINATOR)?
             .safe_div(PROPOSER_WEIGHT)?;
 
-        let mut current_epoch_participation = state.current_epoch_participation()?.clone();
-        let mut previous_epoch_participation = state.previous_epoch_participation()?.clone();
+        let mut current_epoch_participation = state.current_epoch_participation()?.to_owned_list();
+        let mut previous_epoch_participation =
+            state.previous_epoch_participation()?.to_owned_list();
 
         for attestation in block.body().attestations() {
             let data = attestation.data();
@@ -289,7 +290,8 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                     };
 
                     let validator_participation = epoch_participation
-                        .get_mut(index)
+                        .as_mut()
+                        .into_get_mut(index)
                         .ok_or(BeaconStateError::ParticipationOutOfBounds(index))?;
 
                     if participation_flag_indices.contains(&flag_index)

beacon_node/beacon_chain/src/beacon_chain.rs

@@ -1259,7 +1259,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
         if header_from_payload != execution_payload_header {
             for txn in execution_payload.transactions() {
                 debug!(
-                    bytes = format!("0x{}", hex::encode(&**txn)),
+                    bytes = format!("0x{}", hex::encode(txn)),
                     "Reconstructed txn"
                 );
             }
@@ -1756,6 +1756,12 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                 att.committee_index()
                     .ok_or(Error::AttestationCommitteeIndexNotSet)?,
             ),
+            AttestationRef::Gloas(att) => self.get_aggregated_attestation_electra(
+                att.data.slot,
+                &att.data.tree_hash_root(),
+                att.committee_index()
+                    .ok_or(Error::AttestationCommitteeIndexNotSet)?,
+            ),
         }
     }
 
@@ -5823,6 +5829,9 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                     match slashing {
                         AttesterSlashing::Base(slashing) => base.push(slashing),
                         AttesterSlashing::Electra(slashing) => electra.push(slashing),
+                        // Gloas-typed slashings cannot be included in pre-Gloas blocks, and
+                        // Gloas blocks are produced via `complete_partial_beacon_block_gloas`.
+                        AttesterSlashing::Gloas(_) => (),
                     }
                     (base, electra)
                 },
@@ -5833,6 +5842,9 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                 match attestation {
                     Attestation::Base(attestation) => base.push(attestation),
                     Attestation::Electra(attestation) => electra.push(attestation),
+                    // Gloas-typed attestations cannot be included in pre-Gloas blocks, and
+                    // Gloas blocks are produced via `complete_partial_beacon_block_gloas`.
+                    Attestation::Gloas(_) => (),
                 }
                 (base, electra)
             },
@@ -6091,11 +6103,6 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                             blob_kzg_commitments: kzg_commitments
                                 .ok_or(BlockProductionError::InvalidPayloadFork)?,
                             execution_requests: maybe_requests
-                                .map(|r| ExecutionRequestsElectra {
-                                    deposits: r.deposits().clone(),
-                                    withdrawals: r.withdrawals().clone(),
-                                    consolidations: r.consolidations().clone(),
-                                })
                                 .ok_or(BlockProductionError::MissingExecutionRequests)?,
                         },
                     }),
@@ -6150,11 +6157,6 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                             blob_kzg_commitments: kzg_commitments
                                 .ok_or(BlockProductionError::InvalidPayloadFork)?,
                             execution_requests: maybe_requests
-                                .map(|r| ExecutionRequestsElectra {
-                                    deposits: r.deposits().clone(),
-                                    withdrawals: r.withdrawals().clone(),
-                                    consolidations: r.consolidations().clone(),
-                                })
                                 .ok_or(BlockProductionError::MissingExecutionRequests)?,
                         },
                     }),