From 2585096de6fe83386cb428cdaf16167d5e631982 Mon Sep 17 00:00:00 2001 From: Eitan Seri-Levi Date: Thu, 30 Apr 2026 15:03:42 +0200 Subject: [PATCH] FMT --- beacon_node/beacon_chain/src/beacon_chain.rs | 35 +++++++-------- .../src/beacon_fork_choice_store.rs | 6 +-- .../src/block_production/gloas.rs | 11 +++-- .../src/inclusion_list_verification.rs | 6 +-- .../payload_bid_cache.rs | 1 - .../src/payload_bid_verification/tests.rs | 1 - .../gossip_verified_envelope.rs | 44 +++++++++++++++---- .../payload_notifier.rs | 3 +- beacon_node/beacon_chain/src/test_utils.rs | 8 ++-- .../src/scheduler/work_queue.rs | 3 +- .../src/engine_api/json_structures.rs | 12 ++--- beacon_node/execution_layer/src/lib.rs | 4 +- .../test_utils/execution_block_generator.rs | 11 +---- .../src/test_utils/mock_builder.rs | 4 +- .../http_api/src/publish_inclusion_lists.rs | 2 +- .../lighthouse_network/src/types/pubsub.rs | 5 ++- .../store/src/impls/execution_payload.rs | 4 +- common/eth2/src/types.rs | 7 ++- .../fork_choice/src/fork_choice_store.rs | 6 +-- consensus/proto_array/src/proto_array.rs | 12 +---- .../src/proto_array_fork_choice.rs | 2 +- .../src/per_block_processing.rs | 7 ++- .../state_processing/src/upgrade/heze.rs | 5 ++- consensus/types/src/block/beacon_block.rs | 1 - .../types/src/block/beacon_block_body.rs | 9 ++-- .../types/src/block/signed_beacon_block.rs | 9 ++-- consensus/types/src/builder/builder_bid.rs | 4 +- consensus/types/src/builder/mod.rs | 4 +- consensus/types/src/core/preset.rs | 1 - .../src/execution/execution_payload_bid.rs | 1 - .../src/execution/execution_payload_header.rs | 8 ++-- consensus/types/src/execution/mod.rs | 13 +++--- consensus/types/src/execution/payload.rs | 17 +++---- .../execution/signed_execution_payload_bid.rs | 4 +- .../light_client/light_client_bootstrap.rs | 4 +- consensus/types/src/state/beacon_state.rs | 16 +++---- .../types/src/state/inclusion_list_cache.rs | 29 ++++++------ .../lighthouse_validator_store/src/lib.rs | 12 ++--- validator_client/validator_store/src/lib.rs | 5 +-- 39 files changed, 157 insertions(+), 179 deletions(-) diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs index 2558236009..c5aa49ccfa 100644 --- a/beacon_node/beacon_chain/src/beacon_chain.rs +++ b/beacon_node/beacon_chain/src/beacon_chain.rs @@ -2318,7 +2318,7 @@ impl BeaconChain { Ok(Some(inclusion_list)) } - + /// Produce a `PayloadAttestationData` for a PTC validator to sign. /// /// This is used by PTC (Payload Timeliness Committee) validators to attest to the @@ -6526,23 +6526,22 @@ impl BeaconChain { }; // For Heze, fetch inclusion list transactions from the cache. - let inclusion_list_transactions = - if prepare_slot_fork.heze_enabled() { - let il_slot = prepare_slot.saturating_sub(1_u64); - let il_txs = self - .inclusion_list_cache - .read() - .get_inclusion_list_transactions(il_slot, false) - .unwrap_or_default(); - Some( - il_txs - .into_iter() - .map(|tx| tx.to_vec()) - .collect::>>(), - ) - } else { - None - }; + let inclusion_list_transactions = if prepare_slot_fork.heze_enabled() { + let il_slot = prepare_slot.saturating_sub(1_u64); + let il_txs = self + .inclusion_list_cache + .read() + .get_inclusion_list_transactions(il_slot, false) + .unwrap_or_default(); + Some( + il_txs + .into_iter() + .map(|tx| tx.to_vec()) + .collect::>>(), + ) + } else { + None + }; let payload_attributes = PayloadAttributes::new( self.slot_clock diff --git a/beacon_node/beacon_chain/src/beacon_fork_choice_store.rs b/beacon_node/beacon_chain/src/beacon_fork_choice_store.rs index af28375e7a..4e22fdcb1e 100644 --- a/beacon_node/beacon_chain/src/beacon_fork_choice_store.rs +++ b/beacon_node/beacon_chain/src/beacon_fork_choice_store.rs @@ -385,11 +385,7 @@ where self.equivocating_indices.extend(indices); } - fn record_payload_inclusion_list_satisfaction( - &mut self, - block_root: Hash256, - satisfied: bool, - ) { + fn record_payload_inclusion_list_satisfaction(&mut self, block_root: Hash256, satisfied: bool) { info!( %block_root, satisfied, diff --git a/beacon_node/beacon_chain/src/block_production/gloas.rs b/beacon_node/beacon_chain/src/block_production/gloas.rs index 6566951c4a..ea58630d4e 100644 --- a/beacon_node/beacon_chain/src/block_production/gloas.rs +++ b/beacon_node/beacon_chain/src/block_production/gloas.rs @@ -30,11 +30,10 @@ use types::{ BeaconBlock, BeaconBlockBodyGloas, BeaconBlockBodyHeze, BeaconBlockGloas, BeaconBlockHeze, BeaconState, BeaconStateError, BuilderIndex, ChainSpec, Deposit, Eth1Data, EthSpec, ExecutionBlockHash, ExecutionPayloadBidGloas, ExecutionPayloadBidHeze, - ExecutionPayloadEnvelope, ExecutionPayloadGloas, - ExecutionRequests, FullPayload, Graffiti, Hash256, PayloadAttestation, ProposerSlashing, - RelativeEpoch, SignedBeaconBlock, SignedBlsToExecutionChange, SignedExecutionPayloadBidGloas, - SignedExecutionPayloadBidHeze, SignedExecutionPayloadEnvelope, SignedVoluntaryExit, Slot, - SyncAggregate, Withdrawal, + ExecutionPayloadEnvelope, ExecutionPayloadGloas, ExecutionRequests, FullPayload, Graffiti, + Hash256, PayloadAttestation, ProposerSlashing, RelativeEpoch, SignedBeaconBlock, + SignedBlsToExecutionChange, SignedExecutionPayloadBidGloas, SignedExecutionPayloadBidHeze, + SignedExecutionPayloadEnvelope, SignedVoluntaryExit, Slot, SyncAggregate, Withdrawal, Withdrawals, }; @@ -548,7 +547,7 @@ impl BeaconChain { return Err(BlockProductionError::GloasNotImplemented( "complete_partial_beacon_block_gloas called with pre-Gloas state".to_owned(), )); - }, + } BeaconState::Gloas(_) => BeaconBlock::Gloas(BeaconBlockGloas { slot, proposer_index, diff --git a/beacon_node/beacon_chain/src/inclusion_list_verification.rs b/beacon_node/beacon_chain/src/inclusion_list_verification.rs index 4ef9cc58c8..f1e6a7189d 100644 --- a/beacon_node/beacon_chain/src/inclusion_list_verification.rs +++ b/beacon_node/beacon_chain/src/inclusion_list_verification.rs @@ -1,6 +1,5 @@ use crate::{ - BeaconChain, BeaconChainError, BeaconChainTypes, - validator_monitor::get_slot_delay_ms, + BeaconChain, BeaconChainError, BeaconChainTypes, validator_monitor::get_slot_delay_ms, }; use slot_clock::{SlotClock, timestamp_now}; @@ -122,8 +121,7 @@ impl GossipVerifiedInclusionList { } let slot_duration_ms = chain.spec.get_slot_duration().as_millis() as u64; - let inclusion_list_due_ms = - slot_duration_ms * chain.spec.inclusion_list_due_bps / 10000; + let inclusion_list_due_ms = slot_duration_ms * chain.spec.inclusion_list_due_bps / 10000; let il_delay_ms = get_slot_delay_ms(timestamp_now(), message_slot, &chain.slot_clock).as_millis() as u64; let is_timely = il_delay_ms <= inclusion_list_due_ms; diff --git a/beacon_node/beacon_chain/src/payload_bid_verification/payload_bid_cache.rs b/beacon_node/beacon_chain/src/payload_bid_verification/payload_bid_cache.rs index 0fc79840dd..bcf765dbf2 100644 --- a/beacon_node/beacon_chain/src/payload_bid_verification/payload_bid_cache.rs +++ b/beacon_node/beacon_chain/src/payload_bid_verification/payload_bid_cache.rs @@ -52,7 +52,6 @@ impl GossipVerifiedPayloadBidCache { if let Some(existing) = slot_map.get(&key) && existing.signed_bid.message.value >= bid.signed_bid.message.value - { return; } diff --git a/beacon_node/beacon_chain/src/payload_bid_verification/tests.rs b/beacon_node/beacon_chain/src/payload_bid_verification/tests.rs index 2c5195548f..2d1fefa2c3 100644 --- a/beacon_node/beacon_chain/src/payload_bid_verification/tests.rs +++ b/beacon_node/beacon_chain/src/payload_bid_verification/tests.rs @@ -705,7 +705,6 @@ fn two_builders_coexist_in_cache() { .expect("should have highest bid"); assert_eq!(highest.message.value, 1); assert_eq!(highest.message.builder_index, 1); - } #[test] diff --git a/beacon_node/beacon_chain/src/payload_envelope_verification/gossip_verified_envelope.rs b/beacon_node/beacon_chain/src/payload_envelope_verification/gossip_verified_envelope.rs index ec01339d1f..0b6e9607fb 100644 --- a/beacon_node/beacon_chain/src/payload_envelope_verification/gossip_verified_envelope.rs +++ b/beacon_node/beacon_chain/src/payload_envelope_verification/gossip_verified_envelope.rs @@ -6,8 +6,9 @@ use parking_lot::{Mutex, RwLock}; use store::DatabaseBlock; use tracing::debug; use types::{ - ChainSpec, EthSpec, ExecutionPayloadBidRef, ExecutionPayloadEnvelope, Hash256, SignedBeaconBlock, - SignedExecutionPayloadEnvelope, Slot, consts::gloas::BUILDER_INDEX_SELF_BUILD, + ChainSpec, EthSpec, ExecutionPayloadBidRef, ExecutionPayloadEnvelope, Hash256, + SignedBeaconBlock, SignedExecutionPayloadEnvelope, Slot, + consts::gloas::BUILDER_INDEX_SELF_BUILD, }; use crate::{ @@ -391,7 +392,15 @@ mod tests { let block = make_block(slot); let bid = make_bid(builder_index, block_hash); - assert!(verify_envelope_consistency::(&envelope, &block, ExecutionPayloadBidRef::Gloas(&bid), Slot::new(0)).is_ok()); + assert!( + verify_envelope_consistency::( + &envelope, + &block, + ExecutionPayloadBidRef::Gloas(&bid), + Slot::new(0) + ) + .is_ok() + ); } #[test] @@ -405,8 +414,12 @@ mod tests { let bid = make_bid(builder_index, block_hash); let latest_finalized_slot = Slot::new(10); - let result = - verify_envelope_consistency::(&envelope, &block, ExecutionPayloadBidRef::Gloas(&bid), latest_finalized_slot); + let result = verify_envelope_consistency::( + &envelope, + &block, + ExecutionPayloadBidRef::Gloas(&bid), + latest_finalized_slot, + ); assert!(matches!( result, Err(EnvelopeError::PriorToFinalization { .. }) @@ -422,7 +435,12 @@ mod tests { let block = make_block(Slot::new(20)); let bid = make_bid(builder_index, block_hash); - let result = verify_envelope_consistency::(&envelope, &block, ExecutionPayloadBidRef::Gloas(&bid), Slot::new(0)); + let result = verify_envelope_consistency::( + &envelope, + &block, + ExecutionPayloadBidRef::Gloas(&bid), + Slot::new(0), + ); assert!(matches!(result, Err(EnvelopeError::SlotMismatch { .. }))); } @@ -435,7 +453,12 @@ mod tests { let block = make_block(slot); let bid = make_bid(2, block_hash); - let result = verify_envelope_consistency::(&envelope, &block, ExecutionPayloadBidRef::Gloas(&bid), Slot::new(0)); + let result = verify_envelope_consistency::( + &envelope, + &block, + ExecutionPayloadBidRef::Gloas(&bid), + Slot::new(0), + ); assert!(matches!( result, Err(EnvelopeError::BuilderIndexMismatch { .. }) @@ -451,7 +474,12 @@ mod tests { let block = make_block(slot); let bid = make_bid(builder_index, ExecutionBlockHash::repeat_byte(0xff)); - let result = verify_envelope_consistency::(&envelope, &block, ExecutionPayloadBidRef::Gloas(&bid), Slot::new(0)); + let result = verify_envelope_consistency::( + &envelope, + &block, + ExecutionPayloadBidRef::Gloas(&bid), + Slot::new(0), + ); assert!(matches!( result, Err(EnvelopeError::BlockHashMismatch { .. }) diff --git a/beacon_node/beacon_chain/src/payload_envelope_verification/payload_notifier.rs b/beacon_node/beacon_chain/src/payload_envelope_verification/payload_notifier.rs index 759e28ac79..dc82a8d469 100644 --- a/beacon_node/beacon_chain/src/payload_envelope_verification/payload_notifier.rs +++ b/beacon_node/beacon_chain/src/payload_envelope_verification/payload_notifier.rs @@ -64,7 +64,8 @@ impl PayloadNotifier { } else { let parent_root = self.block.message().parent_root(); let request = Self::build_new_payload_request(&self.envelope, &self.block)?; - notify_new_payload_with_request(&self.chain, self.envelope.slot(), parent_root, request).await + notify_new_payload_with_request(&self.chain, self.envelope.slot(), parent_root, request) + .await } } diff --git a/beacon_node/beacon_chain/src/test_utils.rs b/beacon_node/beacon_chain/src/test_utils.rs index dcd7c6c6af..70cdd7a1ba 100644 --- a/beacon_node/beacon_chain/src/test_utils.rs +++ b/beacon_node/beacon_chain/src/test_utils.rs @@ -557,10 +557,10 @@ where genesis_time + spec.get_slot_duration().as_secs() * E::slots_per_epoch() * epoch.as_u64() }); - mock.server.execution_block_generator().heze_time = - spec.heze_fork_epoch.map(|epoch| { - genesis_time + spec.get_slot_duration().as_secs() * E::slots_per_epoch() * epoch.as_u64() - }); + mock.server.execution_block_generator().heze_time = spec.heze_fork_epoch.map(|epoch| { + genesis_time + + spec.get_slot_duration().as_secs() * E::slots_per_epoch() * epoch.as_u64() + }); mock.server.execution_block_generator().osaka_time = spec.fulu_fork_epoch.map(|epoch| { genesis_time + spec.get_slot_duration().as_secs() * E::slots_per_epoch() * epoch.as_u64() diff --git a/beacon_node/beacon_processor/src/scheduler/work_queue.rs b/beacon_node/beacon_processor/src/scheduler/work_queue.rs index 084b45bf18..d1b002623c 100644 --- a/beacon_node/beacon_processor/src/scheduler/work_queue.rs +++ b/beacon_node/beacon_processor/src/scheduler/work_queue.rs @@ -370,8 +370,7 @@ impl WorkQueues { FifoQueue::new(queue_lengths.lc_rpc_finality_update_queue); let lc_update_range_queue: FifoQueue> = FifoQueue::new(queue_lengths.lc_update_range_queue); - let gossip_inclusion_list_queue = - FifoQueue::new(queue_lengths.gossip_inclusion_list_queue); + let gossip_inclusion_list_queue = FifoQueue::new(queue_lengths.gossip_inclusion_list_queue); let api_request_p0_queue = FifoQueue::new(queue_lengths.api_request_p0_queue); let api_request_p1_queue = FifoQueue::new(queue_lengths.api_request_p1_queue); diff --git a/beacon_node/execution_layer/src/engine_api/json_structures.rs b/beacon_node/execution_layer/src/engine_api/json_structures.rs index 6be4be0ed5..ea4f707cdb 100644 --- a/beacon_node/execution_layer/src/engine_api/json_structures.rs +++ b/beacon_node/execution_layer/src/engine_api/json_structures.rs @@ -313,9 +313,7 @@ impl TryFrom> for JsonExecutionPayload { ExecutionPayload::Gloas(payload) => { Ok(JsonExecutionPayload::Gloas(payload.try_into()?)) } - ExecutionPayload::Heze(payload) => { - Ok(JsonExecutionPayload::Heze(payload.try_into()?)) - } + ExecutionPayload::Heze(payload) => Ok(JsonExecutionPayload::Heze(payload.try_into()?)), } } } @@ -519,9 +517,7 @@ impl TryFrom> for ExecutionPayload { JsonExecutionPayload::Gloas(payload) => { Ok(ExecutionPayload::Gloas(payload.try_into()?)) } - JsonExecutionPayload::Heze(payload) => { - Ok(ExecutionPayload::Heze(payload.try_into()?)) - } + JsonExecutionPayload::Heze(payload) => Ok(ExecutionPayload::Heze(payload.try_into()?)), } } } @@ -943,9 +939,7 @@ impl From for PayloadAttributes { inclusion_list_transactions: jpa .inclusion_list_transactions .into_iter() - .map(|s| { - hex::decode(s.strip_prefix("0x").unwrap_or(&s)).unwrap_or_default() - }) + .map(|s| hex::decode(s.strip_prefix("0x").unwrap_or(&s)).unwrap_or_default()) .collect(), }), } diff --git a/beacon_node/execution_layer/src/lib.rs b/beacon_node/execution_layer/src/lib.rs index 6ff9f61f39..5848c4500c 100644 --- a/beacon_node/execution_layer/src/lib.rs +++ b/beacon_node/execution_layer/src/lib.rs @@ -55,8 +55,8 @@ use types::{ }; use types::{ BeaconStateError, BlindedPayload, ChainSpec, Epoch, ExecPayload, ExecutionPayloadBellatrix, - ExecutionPayloadCapella, ExecutionPayloadElectra, - ExecutionPayloadFulu, FullPayload, ProposerPreparationData, Slot, + ExecutionPayloadCapella, ExecutionPayloadElectra, ExecutionPayloadFulu, FullPayload, + ProposerPreparationData, Slot, }; mod block_hash; diff --git a/beacon_node/execution_layer/src/test_utils/execution_block_generator.rs b/beacon_node/execution_layer/src/test_utils/execution_block_generator.rs index 368a5d9132..9a3fa258e4 100644 --- a/beacon_node/execution_layer/src/test_utils/execution_block_generator.rs +++ b/beacon_node/execution_layer/src/test_utils/execution_block_generator.rs @@ -1091,15 +1091,8 @@ mod test { const TERMINAL_BLOCK: u64 = 10; const DIFFICULTY_INCREMENT: u64 = 1; - let mut generator: ExecutionBlockGenerator = ExecutionBlockGenerator::new( - None, - None, - None, - None, - None, - None, - None, - ); + let mut generator: ExecutionBlockGenerator = + ExecutionBlockGenerator::new(None, None, None, None, None, None, None); generator.terminal_total_difficulty = Uint256::from(TERMINAL_DIFFICULTY); generator.terminal_block_number = TERMINAL_BLOCK; diff --git a/beacon_node/execution_layer/src/test_utils/mock_builder.rs b/beacon_node/execution_layer/src/test_utils/mock_builder.rs index c6c3e2142f..37651439a8 100644 --- a/beacon_node/execution_layer/src/test_utils/mock_builder.rs +++ b/beacon_node/execution_layer/src/test_utils/mock_builder.rs @@ -30,8 +30,8 @@ use tracing::{debug, error, info, warn}; use tree_hash::TreeHash; use types::ExecutionBlockHash; use types::builder::{ - BuilderBid, BuilderBidBellatrix, BuilderBidCapella, BuilderBidDeneb, - BuilderBidElectra, BuilderBidFulu, SignedBuilderBid, + BuilderBid, BuilderBidBellatrix, BuilderBidCapella, BuilderBidDeneb, BuilderBidElectra, + BuilderBidFulu, SignedBuilderBid, }; use types::{ Address, BeaconState, ChainSpec, Epoch, EthSpec, ExecPayload, ExecutionPayload, diff --git a/beacon_node/http_api/src/publish_inclusion_lists.rs b/beacon_node/http_api/src/publish_inclusion_lists.rs index e62df01e8e..5704ee5f1c 100644 --- a/beacon_node/http_api/src/publish_inclusion_lists.rs +++ b/beacon_node/http_api/src/publish_inclusion_lists.rs @@ -2,10 +2,10 @@ use std::{sync::Arc, time::Duration}; use beacon_chain::inclusion_list_verification::GossipInclusionListError; use beacon_chain::{BeaconChain, BeaconChainTypes}; -use slot_clock::timestamp_now; use eth2::types::Failure; use lighthouse_network::PubsubMessage; use network::NetworkMessage; +use slot_clock::timestamp_now; use tokio::sync::{mpsc::UnboundedSender, oneshot}; use tracing::{debug, error, info}; use types::SignedInclusionList; diff --git a/beacon_node/lighthouse_network/src/types/pubsub.rs b/beacon_node/lighthouse_network/src/types/pubsub.rs index 6fd0084b96..03dfb2c4f4 100644 --- a/beacon_node/lighthouse_network/src/types/pubsub.rs +++ b/beacon_node/lighthouse_network/src/types/pubsub.rs @@ -379,8 +379,9 @@ impl PubsubMessage { ))) } GossipKind::ExecutionPayloadBid => { - let execution_payload_bid = SignedExecutionPayloadBidGloas::from_ssz_bytes(data) - .map_err(|e| format!("{:?}", e))?; + let execution_payload_bid = + SignedExecutionPayloadBidGloas::from_ssz_bytes(data) + .map_err(|e| format!("{:?}", e))?; Ok(PubsubMessage::ExecutionPayloadBid(Box::new( execution_payload_bid, ))) diff --git a/beacon_node/store/src/impls/execution_payload.rs b/beacon_node/store/src/impls/execution_payload.rs index 27e043b148..8d0a596aeb 100644 --- a/beacon_node/store/src/impls/execution_payload.rs +++ b/beacon_node/store/src/impls/execution_payload.rs @@ -2,8 +2,8 @@ use crate::{DBColumn, Error, StoreItem}; use ssz::{Decode, Encode}; use types::{ EthSpec, ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella, - ExecutionPayloadDeneb, ExecutionPayloadHeze, ExecutionPayloadElectra, ExecutionPayloadFulu, - ExecutionPayloadGloas, + ExecutionPayloadDeneb, ExecutionPayloadElectra, ExecutionPayloadFulu, ExecutionPayloadGloas, + ExecutionPayloadHeze, }; macro_rules! impl_store_item { diff --git a/common/eth2/src/types.rs b/common/eth2/src/types.rs index 816143f6a6..bce603c96e 100644 --- a/common/eth2/src/types.rs +++ b/common/eth2/src/types.rs @@ -1179,7 +1179,8 @@ pub struct SseExtendedPayloadAttributesGeneric { pub type SseExtendedPayloadAttributes = SseExtendedPayloadAttributesGeneric; pub type VersionedSsePayloadAttributes = ForkVersionedResponse; -pub type VersionedSseExecutionPayloadBid = ForkVersionedResponse>; +pub type VersionedSseExecutionPayloadBid = + ForkVersionedResponse>; pub type VersionedSsePayloadAttestationMessage = ForkVersionedResponse; impl<'de> ContextDeserialize<'de, ForkName> for SsePayloadAttributes { @@ -2587,9 +2588,7 @@ mod test { ExecutionPayload::Electra(ExecutionPayloadElectra::::random_for_test( rng, )), - ExecutionPayload::Heze(ExecutionPayloadHeze::::random_for_test( - rng, - )), + ExecutionPayload::Heze(ExecutionPayloadHeze::::random_for_test(rng)), ExecutionPayload::Fulu(ExecutionPayloadFulu::::random_for_test(rng)), ExecutionPayload::Gloas(ExecutionPayloadGloas::::random_for_test( rng, diff --git a/consensus/fork_choice/src/fork_choice_store.rs b/consensus/fork_choice/src/fork_choice_store.rs index 60db0ad12b..c708d18ab1 100644 --- a/consensus/fork_choice/src/fork_choice_store.rs +++ b/consensus/fork_choice/src/fork_choice_store.rs @@ -97,9 +97,5 @@ pub trait ForkChoiceStore: Sized { fn is_payload_inclusion_list_satisfied(&self, block_root: &Hash256) -> bool; /// Records whether a block root satisfies the inclusion list. - fn record_payload_inclusion_list_satisfaction( - &mut self, - block_root: Hash256, - satisfied: bool, - ); + fn record_payload_inclusion_list_satisfaction(&mut self, block_root: Hash256, satisfied: bool); } diff --git a/consensus/proto_array/src/proto_array.rs b/consensus/proto_array/src/proto_array.rs index 5284b0e8aa..3bb9b3ff98 100644 --- a/consensus/proto_array/src/proto_array.rs +++ b/consensus/proto_array/src/proto_array.rs @@ -1512,11 +1512,7 @@ impl ProtoArray { ) -> Result { // If the block's inclusion list satisfaction has been recorded as false, // do not extend the payload. - if self - .payload_inclusion_list_satisfaction - .get(&fc_node.root) - == Some(&false) - { + if self.payload_inclusion_list_satisfaction.get(&fc_node.root) == Some(&false) { return Ok(false); } @@ -1626,11 +1622,7 @@ impl ProtoArray { return false; } - if self - .payload_inclusion_list_satisfaction - .get(&node.root()) - == Some(&false) - { + if self.payload_inclusion_list_satisfaction.get(&node.root()) == Some(&false) { info!( ?current_slot, source = "node_is_viable_for_head", diff --git a/consensus/proto_array/src/proto_array_fork_choice.rs b/consensus/proto_array/src/proto_array_fork_choice.rs index 9ab9f8460d..a7d2c10032 100644 --- a/consensus/proto_array/src/proto_array_fork_choice.rs +++ b/consensus/proto_array/src/proto_array_fork_choice.rs @@ -2,7 +2,7 @@ use crate::{ JustifiedBalances, error::Error, proto_array::{ - InvalidationOperation, Iter, NodeDelta, ProtoArray, ProtoNode, ProposerBoost, + InvalidationOperation, Iter, NodeDelta, ProposerBoost, ProtoArray, ProtoNode, calculate_committee_fraction, }, ssz_container::SszContainer, diff --git a/consensus/state_processing/src/per_block_processing.rs b/consensus/state_processing/src/per_block_processing.rs index be7e959abf..5b464fbfa5 100644 --- a/consensus/state_processing/src/per_block_processing.rs +++ b/consensus/state_processing/src/per_block_processing.rs @@ -798,8 +798,11 @@ pub fn process_execution_payload_bid }, }; - let payment_index = E::SlotsPerEpoch::to_usize() - .safe_add(bid.slot().as_usize().safe_rem(E::SlotsPerEpoch::to_usize())?)?; + let payment_index = E::SlotsPerEpoch::to_usize().safe_add( + bid.slot() + .as_usize() + .safe_rem(E::SlotsPerEpoch::to_usize())?, + )?; *state .builder_pending_payments_mut()? diff --git a/consensus/state_processing/src/upgrade/heze.rs b/consensus/state_processing/src/upgrade/heze.rs index ff601973fb..0f8f14ac95 100644 --- a/consensus/state_processing/src/upgrade/heze.rs +++ b/consensus/state_processing/src/upgrade/heze.rs @@ -79,7 +79,10 @@ pub fn upgrade_state_to_heze( slot: pre.latest_execution_payload_bid.slot, value: pre.latest_execution_payload_bid.value, execution_payment: pre.latest_execution_payload_bid.execution_payment, - blob_kzg_commitments: pre.latest_execution_payload_bid.blob_kzg_commitments.clone(), + blob_kzg_commitments: pre + .latest_execution_payload_bid + .blob_kzg_commitments + .clone(), execution_requests_root: pre.latest_execution_payload_bid.execution_requests_root, inclusion_list_bits: BitVector::new(), }, diff --git a/consensus/types/src/block/beacon_block.rs b/consensus/types/src/block/beacon_block.rs index fa1603e7ec..b2181d9ff8 100644 --- a/consensus/types/src/block/beacon_block.rs +++ b/consensus/types/src/block/beacon_block.rs @@ -266,7 +266,6 @@ impl<'a, E: EthSpec, Payload: AbstractExecPayload> BeaconBlockRef<'a, E, Payl BeaconBlockRef::Fulu { .. } => ForkName::Fulu, BeaconBlockRef::Gloas { .. } => ForkName::Gloas, BeaconBlockRef::Heze { .. } => ForkName::Heze, - } } diff --git a/consensus/types/src/block/beacon_block_body.rs b/consensus/types/src/block/beacon_block_body.rs index 1c4a86d729..93c82c5cfc 100644 --- a/consensus/types/src/block/beacon_block_body.rs +++ b/consensus/types/src/block/beacon_block_body.rs @@ -23,11 +23,10 @@ use crate::{ deposit::Deposit, execution::{ AbstractExecPayload, BlindedPayload, BlindedPayloadBellatrix, BlindedPayloadCapella, - BlindedPayloadDeneb, BlindedPayloadElectra, BlindedPayloadFulu, - Eth1Data, ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella, - ExecutionPayloadDeneb, ExecutionPayloadElectra, - ExecutionPayloadFulu, ExecutionPayloadGloas, ExecutionRequests, FullPayload, - FullPayloadBellatrix, FullPayloadCapella, FullPayloadDeneb, + BlindedPayloadDeneb, BlindedPayloadElectra, BlindedPayloadFulu, Eth1Data, ExecutionPayload, + ExecutionPayloadBellatrix, ExecutionPayloadCapella, ExecutionPayloadDeneb, + ExecutionPayloadElectra, ExecutionPayloadFulu, ExecutionPayloadGloas, ExecutionRequests, + FullPayload, FullPayloadBellatrix, FullPayloadCapella, FullPayloadDeneb, FullPayloadElectra, FullPayloadFulu, SignedBlsToExecutionChange, }, exit::SignedVoluntaryExit, diff --git a/consensus/types/src/block/signed_beacon_block.rs b/consensus/types/src/block/signed_beacon_block.rs index f33ee41aaf..a3bf50ea78 100644 --- a/consensus/types/src/block/signed_beacon_block.rs +++ b/consensus/types/src/block/signed_beacon_block.rs @@ -25,11 +25,10 @@ use crate::{ core::{ChainSpec, Domain, Epoch, EthSpec, Hash256, SignedRoot, SigningData, Slot}, execution::{ AbstractExecPayload, BlindedPayload, BlindedPayloadBellatrix, BlindedPayloadCapella, - BlindedPayloadDeneb, BlindedPayloadElectra, BlindedPayloadFulu, - ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella, - ExecutionPayloadDeneb, ExecutionPayloadElectra, - ExecutionPayloadFulu, FullPayload, FullPayloadBellatrix, FullPayloadCapella, - FullPayloadDeneb, FullPayloadElectra, FullPayloadFulu, + BlindedPayloadDeneb, BlindedPayloadElectra, BlindedPayloadFulu, ExecutionPayload, + ExecutionPayloadBellatrix, ExecutionPayloadCapella, ExecutionPayloadDeneb, + ExecutionPayloadElectra, ExecutionPayloadFulu, FullPayload, FullPayloadBellatrix, + FullPayloadCapella, FullPayloadDeneb, FullPayloadElectra, FullPayloadFulu, }, fork::{Fork, ForkName, ForkVersionDecode, InconsistentFork, map_fork_name}, kzg_ext::format_kzg_commitments, diff --git a/consensus/types/src/builder/builder_bid.rs b/consensus/types/src/builder/builder_bid.rs index c6f5b7c9bb..6c2544c7dc 100644 --- a/consensus/types/src/builder/builder_bid.rs +++ b/consensus/types/src/builder/builder_bid.rs @@ -12,8 +12,8 @@ use crate::{ core::{ChainSpec, EthSpec, SignedRoot, Uint256}, execution::{ ExecutionPayloadHeaderBellatrix, ExecutionPayloadHeaderCapella, - ExecutionPayloadHeaderDeneb, ExecutionPayloadHeaderHeze, ExecutionPayloadHeaderElectra, - ExecutionPayloadHeaderFulu, ExecutionPayloadHeaderRef, ExecutionPayloadHeaderRefMut, + ExecutionPayloadHeaderDeneb, ExecutionPayloadHeaderElectra, ExecutionPayloadHeaderFulu, + ExecutionPayloadHeaderHeze, ExecutionPayloadHeaderRef, ExecutionPayloadHeaderRefMut, ExecutionRequests, }, fork::{ForkName, ForkVersionDecode}, diff --git a/consensus/types/src/builder/mod.rs b/consensus/types/src/builder/mod.rs index 983dccc232..f5a1cc2c83 100644 --- a/consensus/types/src/builder/mod.rs +++ b/consensus/types/src/builder/mod.rs @@ -6,8 +6,8 @@ mod proposer_preferences; pub use builder::{Builder, BuilderIndex}; pub use builder_bid::{ - BuilderBid, BuilderBidBellatrix, BuilderBidCapella, BuilderBidDeneb, BuilderBidHeze, - BuilderBidElectra, BuilderBidFulu, SignedBuilderBid, + BuilderBid, BuilderBidBellatrix, BuilderBidCapella, BuilderBidDeneb, BuilderBidElectra, + BuilderBidFulu, BuilderBidHeze, SignedBuilderBid, }; pub use builder_pending_payment::BuilderPendingPayment; pub use builder_pending_withdrawal::BuilderPendingWithdrawal; diff --git a/consensus/types/src/core/preset.rs b/consensus/types/src/core/preset.rs index 8648ae2040..be31545864 100644 --- a/consensus/types/src/core/preset.rs +++ b/consensus/types/src/core/preset.rs @@ -374,7 +374,6 @@ impl GloasPreset { } } - #[cfg(test)] mod test { use super::*; diff --git a/consensus/types/src/execution/execution_payload_bid.rs b/consensus/types/src/execution/execution_payload_bid.rs index 4522a48791..da2071680b 100644 --- a/consensus/types/src/execution/execution_payload_bid.rs +++ b/consensus/types/src/execution/execution_payload_bid.rs @@ -95,7 +95,6 @@ impl SignedRoot for ExecutionPayloadBidGloas {} impl SignedRoot for ExecutionPayloadBidHeze {} impl<'a, E: EthSpec> SignedRoot for ExecutionPayloadBidRef<'a, E> {} - #[cfg(test)] mod tests { use super::*; diff --git a/consensus/types/src/execution/execution_payload_header.rs b/consensus/types/src/execution/execution_payload_header.rs index 0ca470dc85..8f46f6d323 100644 --- a/consensus/types/src/execution/execution_payload_header.rs +++ b/consensus/types/src/execution/execution_payload_header.rs @@ -14,8 +14,8 @@ use crate::{ core::{Address, EthSpec, ExecutionBlockHash, Hash256, Uint256}, execution::{ ExecutionPayloadBellatrix, ExecutionPayloadCapella, ExecutionPayloadDeneb, - ExecutionPayloadHeze, ExecutionPayloadElectra, ExecutionPayloadFulu, - ExecutionPayloadRef, Transactions, + ExecutionPayloadElectra, ExecutionPayloadFulu, ExecutionPayloadHeze, ExecutionPayloadRef, + Transactions, }, fork::ForkName, map_execution_payload_ref_into_execution_payload_header, @@ -561,9 +561,7 @@ impl TryFrom> for ExecutionPayloadHeaderHe type Error = BeaconStateError; fn try_from(header: ExecutionPayloadHeader) -> Result { match header { - ExecutionPayloadHeader::Heze(execution_payload_header) => { - Ok(execution_payload_header) - } + ExecutionPayloadHeader::Heze(execution_payload_header) => Ok(execution_payload_header), _ => Err(BeaconStateError::IncorrectStateVariant), } } diff --git a/consensus/types/src/execution/mod.rs b/consensus/types/src/execution/mod.rs index d3452546ba..1bed51cf18 100644 --- a/consensus/types/src/execution/mod.rs +++ b/consensus/types/src/execution/mod.rs @@ -23,14 +23,13 @@ pub use execution_payload::{ ExecutionPayloadRef, Transaction, Transactions, }; pub use execution_payload_bid::{ - ExecutionPayloadBid, ExecutionPayloadBidGloas, ExecutionPayloadBidHeze, - ExecutionPayloadBidRef, + ExecutionPayloadBid, ExecutionPayloadBidGloas, ExecutionPayloadBidHeze, ExecutionPayloadBidRef, }; pub use execution_payload_envelope::ExecutionPayloadEnvelope; pub use execution_payload_header::{ ExecutionPayloadHeader, ExecutionPayloadHeaderBellatrix, ExecutionPayloadHeaderCapella, - ExecutionPayloadHeaderDeneb, ExecutionPayloadHeaderHeze, ExecutionPayloadHeaderElectra, - ExecutionPayloadHeaderFulu, ExecutionPayloadHeaderRef, ExecutionPayloadHeaderRefMut, + ExecutionPayloadHeaderDeneb, ExecutionPayloadHeaderElectra, ExecutionPayloadHeaderFulu, + ExecutionPayloadHeaderHeze, ExecutionPayloadHeaderRef, ExecutionPayloadHeaderRefMut, }; pub use execution_requests::{ ConsolidationRequests, DepositRequests, ExecutionRequests, RequestType, WithdrawalRequests, @@ -40,10 +39,10 @@ pub use inclusion_list::{ }; pub use payload::{ AbstractExecPayload, BlindedPayload, BlindedPayloadBellatrix, BlindedPayloadCapella, - BlindedPayloadDeneb, BlindedPayloadHeze, BlindedPayloadElectra, BlindedPayloadFulu, + BlindedPayloadDeneb, BlindedPayloadElectra, BlindedPayloadFulu, BlindedPayloadHeze, BlindedPayloadRef, BlockProductionVersion, BlockType, ExecPayload, FullPayload, - FullPayloadBellatrix, FullPayloadCapella, FullPayloadDeneb, FullPayloadHeze, - FullPayloadElectra, FullPayloadFulu, FullPayloadRef, OwnedExecPayload, + FullPayloadBellatrix, FullPayloadCapella, FullPayloadDeneb, FullPayloadElectra, + FullPayloadFulu, FullPayloadHeze, FullPayloadRef, OwnedExecPayload, }; pub use signed_bls_to_execution_change::SignedBlsToExecutionChange; pub use signed_execution_payload_bid::{ diff --git a/consensus/types/src/execution/payload.rs b/consensus/types/src/execution/payload.rs index 8057e07f94..8b5b5fadaa 100644 --- a/consensus/types/src/execution/payload.rs +++ b/consensus/types/src/execution/payload.rs @@ -14,11 +14,10 @@ use crate::{ core::{Address, EthSpec, ExecutionBlockHash, Hash256}, execution::{ ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella, - ExecutionPayloadDeneb, ExecutionPayloadHeze, ExecutionPayloadElectra, - ExecutionPayloadFulu, ExecutionPayloadHeader, ExecutionPayloadHeaderBellatrix, - ExecutionPayloadHeaderCapella, ExecutionPayloadHeaderDeneb, ExecutionPayloadHeaderHeze, - ExecutionPayloadHeaderElectra, ExecutionPayloadHeaderFulu, ExecutionPayloadRef, - Transactions, + ExecutionPayloadDeneb, ExecutionPayloadElectra, ExecutionPayloadFulu, + ExecutionPayloadHeader, ExecutionPayloadHeaderBellatrix, ExecutionPayloadHeaderCapella, + ExecutionPayloadHeaderDeneb, ExecutionPayloadHeaderElectra, ExecutionPayloadHeaderFulu, + ExecutionPayloadHeaderHeze, ExecutionPayloadHeze, ExecutionPayloadRef, Transactions, }, fork::ForkName, map_execution_payload_into_blinded_payload, map_execution_payload_into_full_payload, @@ -483,9 +482,7 @@ impl ExecPayload for FullPayloadRef<'_, E> { FullPayloadRef::Electra(inner) => { Ok(inner.execution_payload.withdrawals.tree_hash_root()) } - FullPayloadRef::Heze(inner) => { - Ok(inner.execution_payload.withdrawals.tree_hash_root()) - } + FullPayloadRef::Heze(inner) => Ok(inner.execution_payload.withdrawals.tree_hash_root()), FullPayloadRef::Fulu(inner) => Ok(inner.execution_payload.withdrawals.tree_hash_root()), } } @@ -803,9 +800,7 @@ impl<'b, E: EthSpec> ExecPayload for BlindedPayloadRef<'b, E> { BlindedPayloadRef::Electra(inner) => { Ok(inner.execution_payload_header.withdrawals_root) } - BlindedPayloadRef::Heze(inner) => { - Ok(inner.execution_payload_header.withdrawals_root) - } + BlindedPayloadRef::Heze(inner) => Ok(inner.execution_payload_header.withdrawals_root), BlindedPayloadRef::Fulu(inner) => Ok(inner.execution_payload_header.withdrawals_root), } } diff --git a/consensus/types/src/execution/signed_execution_payload_bid.rs b/consensus/types/src/execution/signed_execution_payload_bid.rs index 1da2c8d354..49e04ca01b 100644 --- a/consensus/types/src/execution/signed_execution_payload_bid.rs +++ b/consensus/types/src/execution/signed_execution_payload_bid.rs @@ -1,6 +1,4 @@ -use crate::execution::{ - ExecutionPayloadBidGloas, ExecutionPayloadBidHeze, ExecutionPayloadBidRef, -}; +use crate::execution::{ExecutionPayloadBidGloas, ExecutionPayloadBidHeze, ExecutionPayloadBidRef}; use crate::state::BeaconStateError; use crate::test_utils::TestRandom; use crate::{EthSpec, ForkName}; diff --git a/consensus/types/src/light_client/light_client_bootstrap.rs b/consensus/types/src/light_client/light_client_bootstrap.rs index aa840da5e9..a920aaaa33 100644 --- a/consensus/types/src/light_client/light_client_bootstrap.rs +++ b/consensus/types/src/light_client/light_client_bootstrap.rs @@ -144,9 +144,7 @@ impl LightClientBootstrap { } ForkName::Fulu => as Encode>::ssz_fixed_len(), // TODO(gloas): implement Gloas light client - ForkName::Gloas => { - as Encode>::ssz_fixed_len() - } + ForkName::Gloas => as Encode>::ssz_fixed_len(), }; fixed_len + LightClientHeader::::ssz_max_var_len_for_fork(fork_name) } diff --git a/consensus/types/src/state/beacon_state.rs b/consensus/types/src/state/beacon_state.rs index 9da9c563eb..32842305f0 100644 --- a/consensus/types/src/state/beacon_state.rs +++ b/consensus/types/src/state/beacon_state.rs @@ -37,9 +37,9 @@ use crate::{ deposit::PendingDeposit, execution::{ Eth1Data, ExecutionPayloadHeaderBellatrix, ExecutionPayloadHeaderCapella, - ExecutionPayloadHeaderDeneb, ExecutionPayloadHeaderElectra, - ExecutionPayloadHeaderFulu, ExecutionPayloadHeaderRef, ExecutionPayloadHeaderRefMut, - InclusionListCommittee, InclusionListDuty, + ExecutionPayloadHeaderDeneb, ExecutionPayloadHeaderElectra, ExecutionPayloadHeaderFulu, + ExecutionPayloadHeaderRef, ExecutionPayloadHeaderRefMut, InclusionListCommittee, + InclusionListDuty, }, fork::{Fork, ForkName, ForkVersionDecode, InconsistentFork, map_fork_name}, light_client::consts::{ @@ -2634,7 +2634,6 @@ impl BeaconState { } } - /// Get the committee cache for some `slot`. /// /// Return an error if the cache for the slot's epoch is not initialized. @@ -2785,12 +2784,9 @@ impl BeaconState { }); } Self::Heze(self_inner) => { - map_beacon_state_heze_tree_list_fields_immutable!( - self_inner, - |_, self_field| { - any_pending_mutations |= self_field.has_pending_updates(); - } - ); + map_beacon_state_heze_tree_list_fields_immutable!(self_inner, |_, self_field| { + any_pending_mutations |= self_field.has_pending_updates(); + }); } }; any_pending_mutations diff --git a/consensus/types/src/state/inclusion_list_cache.rs b/consensus/types/src/state/inclusion_list_cache.rs index 5a20f08bbf..42e50c838f 100644 --- a/consensus/types/src/state/inclusion_list_cache.rs +++ b/consensus/types/src/state/inclusion_list_cache.rs @@ -1,4 +1,6 @@ -use crate::{EthSpec, InclusionListCommittee, SignedInclusionList, Slot, Transaction, Transactions}; +use crate::{ + EthSpec, InclusionListCommittee, SignedInclusionList, Slot, Transaction, Transactions, +}; use ssz_types::BitVector; use std::collections::{HashMap, HashSet}; use tracing::info; @@ -40,11 +42,7 @@ impl InclusionListCache { .contains(&inclusion_list.message.validator_index) } - pub fn on_inclusion_list( - &mut self, - inclusion_list: SignedInclusionList, - is_timely: bool, - ) { + pub fn on_inclusion_list(&mut self, inclusion_list: SignedInclusionList, is_timely: bool) { let slot = inclusion_list.message.slot; let validator_index = inclusion_list.message.validator_index; let inner = self.inner_map.entry(slot).or_default(); @@ -52,8 +50,7 @@ impl InclusionListCache { if inner.inclusion_list_equivocators.contains(&validator_index) { info!( ?slot, - validator_index, - "This validator was flagged for an equivocating inclusion list", + validator_index, "This validator was flagged for an equivocating inclusion list", ); return; } @@ -69,10 +66,7 @@ impl InclusionListCache { if inner.inclusion_lists_seen.contains(&validator_index) && !inner.inclusion_lists.contains(&inclusion_list) { - info!( - ?slot, - validator_index, "Equivocating inclusion list", - ); + info!(?slot, validator_index, "Equivocating inclusion list",); inner.inclusion_list_equivocators.insert(validator_index); // Remove equivocator's transactions per spec @@ -86,7 +80,12 @@ impl InclusionListCache { return; } - let txs: Vec<_> = inclusion_list.message.transactions.iter().cloned().collect(); + let txs: Vec<_> = inclusion_list + .message + .transactions + .iter() + .cloned() + .collect(); for tx in &txs { inner.inclusion_list_transactions.insert(tx.clone()); if is_timely { @@ -94,7 +93,9 @@ impl InclusionListCache { } } inner.validator_transactions.insert(validator_index, txs); - inner.inclusion_list_timeliness.insert(validator_index, is_timely); + inner + .inclusion_list_timeliness + .insert(validator_index, is_timely); inner.inclusion_lists_seen.insert(validator_index); inner.inclusion_lists.insert(inclusion_list); diff --git a/validator_client/lighthouse_validator_store/src/lib.rs b/validator_client/lighthouse_validator_store/src/lib.rs index f4e7716e57..989624db3b 100644 --- a/validator_client/lighthouse_validator_store/src/lib.rs +++ b/validator_client/lighthouse_validator_store/src/lib.rs @@ -21,12 +21,12 @@ use tracing::{Instrument, debug, error, info, info_span, instrument, warn}; use types::{ AbstractExecPayload, Address, AggregateAndProof, Attestation, BeaconBlock, BlindedPayload, ChainSpec, ContributionAndProof, Domain, Epoch, EthSpec, ExecutionPayloadEnvelope, Fork, - FullPayload, Graffiti, Hash256, InclusionList, PayloadAttestationData, PayloadAttestationMessage, - SelectionProof, SignedAggregateAndProof, SignedBeaconBlock, SignedContributionAndProof, - SignedExecutionPayloadEnvelope, SignedInclusionList, SignedRoot, SignedValidatorRegistrationData, - SignedVoluntaryExit, Slot, SyncAggregatorSelectionData, SyncCommitteeContribution, - SyncCommitteeMessage, SyncSelectionProof, SyncSubnetId, ValidatorRegistrationData, - VoluntaryExit, graffiti::GraffitiString, + FullPayload, Graffiti, Hash256, InclusionList, PayloadAttestationData, + PayloadAttestationMessage, SelectionProof, SignedAggregateAndProof, SignedBeaconBlock, + SignedContributionAndProof, SignedExecutionPayloadEnvelope, SignedInclusionList, SignedRoot, + SignedValidatorRegistrationData, SignedVoluntaryExit, Slot, SyncAggregatorSelectionData, + SyncCommitteeContribution, SyncCommitteeMessage, SyncSelectionProof, SyncSubnetId, + ValidatorRegistrationData, VoluntaryExit, graffiti::GraffitiString, }; use validator_store::{ AggregateToSign, AttestationToSign, ContributionToSign, DoppelgangerStatus, diff --git a/validator_client/validator_store/src/lib.rs b/validator_client/validator_store/src/lib.rs index 60e4f03d13..7dbc75bb66 100644 --- a/validator_client/validator_store/src/lib.rs +++ b/validator_client/validator_store/src/lib.rs @@ -10,9 +10,8 @@ use types::{ ExecutionPayloadEnvelope, Graffiti, Hash256, InclusionList, PayloadAttestationData, PayloadAttestationMessage, SelectionProof, SignedAggregateAndProof, SignedBlindedBeaconBlock, SignedContributionAndProof, SignedExecutionPayloadEnvelope, SignedInclusionList, - SignedValidatorRegistrationData, Slot, - SyncCommitteeContribution, SyncCommitteeMessage, SyncSelectionProof, SyncSubnetId, - ValidatorRegistrationData, + SignedValidatorRegistrationData, Slot, SyncCommitteeContribution, SyncCommitteeMessage, + SyncSelectionProof, SyncSubnetId, ValidatorRegistrationData, }; #[derive(Debug, PartialEq, Clone)]