Upgrade consensus-spec-tests to v1.5.0-beta.2

- Update`eth2_libp2p` & move blob count validations of received requests to `eth2_libp2p`
- Add `POST /eth/v2/beacon/pool/attestations` endpoint

Co-authored-by: Povilas Liubauskas <[email protected]>

Author: Tumas

Cargo.lock

@@ -365,8 +365,8 @@ jwt-simple = { version = '0.12', default-features = false, features = ['pure-rus
 kzg = { git = 'https://github.com/grandinetech/rust-kzg.git' }
 lazy_static = '1'
 libmdbx = { git = 'https://github.com/paradigmxyz/reth.git', package = 'reth-libmdbx', rev = 'c228fe15808c3acbf18dc3af1a03ef5cbdcda07a' }
-libp2p = { version = '0.54', default-features = false, features = ['metrics', 'dns', 'ecdsa', 'identify', 'macros', 'noise', 'plaintext', 'secp256k1', 'serde', 'tcp', 'tokio', 'yamux', 'quic', 'upnp'] }
-libp2p-mplex = '0.42'
+libp2p = { version = '0.55', default-features = false, features = ['metrics', 'dns', 'ecdsa', 'identify', 'macros', 'noise', 'plaintext', 'secp256k1', 'serde', 'tcp', 'tokio', 'yamux', 'quic', 'upnp'] }
+libp2p-mplex = '0.43'
 log = '0.4'
 lru = '0.12'
 mediatype = '0.19'

Cargo.toml

@@ -456,11 +456,20 @@ impl<P: Preset, W: Wait> BlockProducer<P, W> {
             .controller
             .preprocessed_state_at_current_slot()?;
 
-        let outcome = match unphased::validate_voluntary_exit(
-            &self.producer_context.chain_config,
-            &state,
-            exit,
-        ) {
+        let result = match state.as_ref() {
+            BeaconState::Phase0(_)
+            | BeaconState::Altair(_)
+            | BeaconState::Bellatrix(_)
+            | BeaconState::Capella(_)
+            | BeaconState::Deneb(_) => {
+                unphased::validate_voluntary_exit(&self.producer_context.chain_config, &state, exit)
+            }
+            BeaconState::Electra(state) => {
+                electra::validate_voluntary_exit(&self.producer_context.chain_config, state, exit)
+            }
+        };
+
+        let outcome = match result {
             Ok(()) => {
                 voluntary_exits.push(exit);
                 PoolAdditionOutcome::Accept

block_producer/src/block_producer.rs

@@ -56,10 +56,16 @@ pub trait Eth1Storage {
         &self,
         config: &Config,
         metrics: Option<&Arc<Metrics>>,
-        state_at_slot: &impl BeaconState<P>,
+        state_at_slot: &CombinedBeaconState<P>,
     ) -> Result<Eth1Data> {
         let _timer = metrics.map(|metrics| metrics.eth1_vote_times.start_timer());
 
+        if let Some(state) = state_at_slot.post_electra() {
+            if state.eth1_deposit_index() == state.deposit_requests_start_index() {
+                return Ok(state.eth1_data());
+            }
+        }
+
         let eth1_data = state_at_slot.eth1_data();
         let period_start = voting_period_start_time(config, state_at_slot);
 

block_producer/src/eth1_storage.rs

@@ -78,8 +78,8 @@ mod tests {
 
     #[duplicate_item(
         glob                                                                              function_name                 preset;
-        ["consensus-spec-tests/tests/mainnet/fulu/networking/get_custody_columns/*/*"] [get_custody_groups_mainnet] [Mainnet];
-        ["consensus-spec-tests/tests/minimal/fulu/networking/get_custody_columns/*/*"] [get_custody_groups_minimal] [Minimal];
+        ["consensus-spec-tests/tests/mainnet/fulu/networking/get_custody_groups/*/*"] [get_custody_groups_mainnet] [Mainnet];
+        ["consensus-spec-tests/tests/minimal/fulu/networking/get_custody_groups/*/*"] [get_custody_groups_minimal] [Minimal];
     )]
     #[test_resources(glob)]
     fn function_name(case: Case) {

consensus-spec-tests

@@ -255,8 +255,7 @@ impl<P: Preset> Context<P> {
     }
 
     pub fn on_blob_sidecar(&mut self, blob_sidecar: BlobSidecar<P>) -> Option<P2pMessage<P>> {
-        let subnet_id = misc::compute_subnet_for_blob_sidecar(self.config(), &blob_sidecar)
-            .expect("cannot compute subnet_id for given blob_sidecar");
+        let subnet_id = misc::compute_subnet_for_blob_sidecar(self.config(), &blob_sidecar);
 
         self.controller().on_gossip_blob_sidecar(
             Arc::new(blob_sidecar),

eip_7594/src/lib.rs

@@ -108,6 +108,7 @@ pub enum MutatorMessage<P: Preset, W> {
         wait_group: W,
         result: Result<BlobSidecarAction<P>>,
         origin: BlobSidecarOrigin,
+        blob_identifier: BlobIdentifier,
         block_seen: bool,
         submission_time: Instant,
     },
@@ -170,7 +171,7 @@ pub enum P2pMessage<P: Preset> {
     Accept(GossipId),
     Ignore(GossipId),
     PublishBlobSidecar(Arc<BlobSidecar<P>>),
-    Reject(GossipId, MutatorRejectionReason),
+    Reject(Option<GossipId>, MutatorRejectionReason),
     BlockNeeded(H256, Option<PeerId>),
     BlobsNeeded(Vec<BlobIdentifier>, Slot, Option<PeerId>),
     FinalizedCheckpoint(Checkpoint),

eth2_libp2p

@@ -12,7 +12,7 @@ use serde::Serialize;
 use strum::IntoStaticStr;
 use types::{
     combined::{SignedAggregateAndProof, SignedBeaconBlock},
-    deneb::containers::BlobSidecar,
+    deneb::containers::{BlobIdentifier, BlobSidecar},
     phase0::primitives::ValidatorIndex,
     preset::Preset,
 };
@@ -118,7 +118,10 @@ pub enum MutatorRejectionReason {
     InvalidAggregateAndProof,
     InvalidAttestation,
     InvalidBlock,
-    InvalidBlobSidecar,
+    #[strum(serialize = "invalid_blob_sidecar")]
+    InvalidBlobSidecar {
+        blob_identifier: BlobIdentifier,
+    },
 }
 
 #[derive(Clone, Copy, Debug)]