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 <povilas@grandine.io>
grandinetech · Feb 12, 2025 · 45d22e4 · 45d22e4
1 parent ef2a76a
commit 45d22e4
Show file tree

Hide file tree

Showing 32 changed files with 905 additions and 617 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -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'

diff --git a/block_producer/src/block_producer.rs b/block_producer/src/block_producer.rs
@@ -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

diff --git a/block_producer/src/eth1_storage.rs b/block_producer/src/eth1_storage.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);
 

diff --git a/consensus-spec-tests b/consensus-spec-tests
diff --git a/eip_7594/src/lib.rs b/eip_7594/src/lib.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) {

diff --git a/eth2_libp2p b/eth2_libp2p
diff --git a/fork_choice_control/src/helpers.rs b/fork_choice_control/src/helpers.rs
@@ -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),

diff --git a/fork_choice_control/src/messages.rs b/fork_choice_control/src/messages.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),

diff --git a/fork_choice_control/src/misc.rs b/fork_choice_control/src/misc.rs
@@ -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)]

diff --git a/fork_choice_control/src/mutator.rs b/fork_choice_control/src/mutator.rs
@@ -233,14 +233,16 @@ where
                 MutatorMessage::BlobSidecar {
                     wait_group,
                     result,
-                    block_seen,
                     origin,
+                    blob_identifier,
+                    block_seen,
                     submission_time,
                 } => self.handle_blob_sidecar(
                     wait_group,
                     result,
-                    block_seen,
                     origin,
+                    blob_identifier,
+                    block_seen,
                     submission_time,
                 ),
                 MutatorMessage::CheckpointState {
@@ -645,7 +647,7 @@ where
 
                 let (gossip_id, sender) = origin.split();
 
-                if let Some(gossip_id) = gossip_id {
+                if gossip_id.is_some() {
                     P2pMessage::Reject(gossip_id, MutatorRejectionReason::InvalidBlock)
                         .send(&self.p2p_tx);
                 }
@@ -798,7 +800,7 @@ where
 
                 let (gossip_id, sender) = origin.split();
 
-                if let Some(gossip_id) = gossip_id {
+                if gossip_id.is_some() {
                     P2pMessage::Reject(gossip_id, MutatorRejectionReason::InvalidAggregateAndProof)
                         .send(&self.p2p_tx);
                 }
@@ -943,7 +945,7 @@ where
                 let attestation = error.attestation();
                 let (gossip_id, sender) = attestation.origin.split();
 
-                if let Some(gossip_id) = gossip_id {
+                if gossip_id.is_some() {
                     P2pMessage::Reject(gossip_id, MutatorRejectionReason::InvalidAttestation)
                         .send(&self.p2p_tx);
                 }
@@ -1065,8 +1067,9 @@ where
         &mut self,
         wait_group: W,
         result: Result<BlobSidecarAction<P>>,
-        block_seen: bool,
         origin: BlobSidecarOrigin,
+        blob_identifier: BlobIdentifier,
+        block_seen: bool,
         submission_time: Instant,
     ) {
         match result {
@@ -1149,10 +1152,11 @@ where
 
                 let (gossip_id, sender) = origin.split();
 
-                if let Some(gossip_id) = gossip_id {
-                    P2pMessage::Reject(gossip_id, MutatorRejectionReason::InvalidBlobSidecar)
-                        .send(&self.p2p_tx);
-                }
+                P2pMessage::Reject(
+                    gossip_id,
+                    MutatorRejectionReason::InvalidBlobSidecar { blob_identifier },
+                )
+                .send(&self.p2p_tx);
 
                 reply_to_http_api(sender, Err(error));
             }
@@ -1454,7 +1458,7 @@ where
         let unfinalized_states_in_memory = self.store.store_config().unfinalized_states_in_memory;
         let head_slot = self.store.head().slot();
 
-        if misc::is_epoch_start::<P>(head_slot) {
+        if misc::is_epoch_start::<P>(block.message().slot()) {
             info!("unloading old beacon states (head slot: {head_slot})");
 
             self.store_mut()
+3 −4		gossipsub/Cargo.toml
+1 −1		gossipsub/src/backoff.rs
+45 −17		gossipsub/src/behaviour.rs
+1 −0		gossipsub/src/behaviour/tests.rs
+7 −0		gossipsub/src/gossip_promises.rs
+5 −13		gossipsub/src/handler.rs
+32 −0		gossipsub/src/metrics.rs
+1 −1		gossipsub/src/peer_score.rs
+6 −18		src/config.rs
+10 −0		src/discovery/enr.rs
+1 −1		src/discovery/mod.rs
+2 −3		src/discovery/subnet_predicate.rs
+0 −1		src/lib.rs
+31 −3		src/peer_manager/mod.rs
+4 −5		src/peer_manager/network_behaviour.rs
+1 −1		src/peer_manager/peerdb.rs
+20 −2		src/peer_manager/peerdb/peer_info.rs
+61 −43		src/rpc/codec.rs
+2 −2		src/rpc/config.rs
+44 −5		src/rpc/handler.rs
+4 −3		src/rpc/methods.rs
+6 −5		src/rpc/mod.rs
+12 −35		src/rpc/protocol.rs
+17 −7		src/rpc/rate_limiter.rs
+16 −4		src/rpc/self_limiter.rs
+11 −12		src/service/gossip_cache.rs
+15 −16		src/service/mod.rs
+12 −5		src/service/utils.rs
+1 −1		src/types/mod.rs
+18 −15		src/types/topics.rs
+9 −32		tests/rpc_tests.rs