From 2356bdd25690e3760547ba0f422b2a86c55d848e Mon Sep 17 00:00:00 2001 From: Devnet Bot Date: Wed, 6 May 2026 16:08:52 +0000 Subject: [PATCH] chore: cargo fmt + fix clippy warnings --- .../src/scheduler/work_reprocessing_queue.rs | 32 +++++++++++-------- .../execution_layer/src/engine_api/http.rs | 8 +++-- beacon_node/execution_layer/src/lib.rs | 11 +++++-- .../gossip_methods.rs | 24 ++++++-------- consensus/fork_choice/src/fork_choice.rs | 6 +++- .../beacon_node_fallback/src/lib.rs | 17 ++++------ .../src/payload_envelope_monitor.rs | 3 +- .../src/inclusion_list_service.rs | 13 ++------ 8 files changed, 58 insertions(+), 56 deletions(-) diff --git a/beacon_node/beacon_processor/src/scheduler/work_reprocessing_queue.rs b/beacon_node/beacon_processor/src/scheduler/work_reprocessing_queue.rs index d15a3c2752..805bb3dc5d 100644 --- a/beacon_node/beacon_processor/src/scheduler/work_reprocessing_queue.rs +++ b/beacon_node/beacon_processor/src/scheduler/work_reprocessing_queue.rs @@ -312,6 +312,7 @@ struct ReprocessQueue { next_attestation: usize, next_lc_update: usize, early_block_debounce: TimeLatch, + #[allow(dead_code)] early_envelope_debounce: TimeLatch, envelope_delay_debounce: TimeLatch, rpc_block_debounce: TimeLatch, @@ -598,7 +599,10 @@ impl ReprocessQueue { .try_send(ReadyWork::Envelope(early_envelope)) .is_err() { - error!(?block_root, "Failed to send early envelope for immediate processing"); + error!( + ?block_root, + "Failed to send early envelope for immediate processing" + ); } } else { debug!(?block_root, %envelope_slot, "Dropping early envelope, cannot determine slot timing"); @@ -661,15 +665,14 @@ impl ReprocessQueue { // Check if we already have a retry pending for this root. if let Some((_existing, _delay_key, count)) = self.retry_envelopes_per_root.get(&block_root) + && *count >= MAX_ENVELOPE_RETRIES { - if *count >= MAX_ENVELOPE_RETRIES { - warn!( - ?block_root, - retries = *count, - "Envelope exceeded max retries for transient EL error, dropping" - ); - return; - } + warn!( + ?block_root, + retries = *count, + "Envelope exceeded max retries for transient EL error, dropping" + ); + return; } // Determine retry count from any prior attempt. @@ -874,8 +877,7 @@ impl ReprocessQueue { self.retry_envelope_delay_queue.remove(&delay_key); debug!( ?block_root, - retry_count, - "Dispatching retry envelope after BlockImported" + retry_count, "Dispatching retry envelope after BlockImported" ); if self .ready_work_tx @@ -1052,7 +1054,10 @@ impl ReprocessQueue { .try_send(ReadyWork::Envelope(ready_envelope)) .is_err() { - error!(?block_root, "Failed to send early envelope after slot arrived"); + error!( + ?block_root, + "Failed to send early envelope after slot arrived" + ); } } // An envelope's timeout has expired. Send it for processing regardless of @@ -1214,8 +1219,7 @@ impl ReprocessQueue { { debug!( ?block_root, - retry_count, - "Retry envelope fallback timeout expired, dispatching" + retry_count, "Retry envelope fallback timeout expired, dispatching" ); if self .ready_work_tx diff --git a/beacon_node/execution_layer/src/engine_api/http.rs b/beacon_node/execution_layer/src/engine_api/http.rs index 0a459ec20a..583bdea025 100644 --- a/beacon_node/execution_layer/src/engine_api/http.rs +++ b/beacon_node/execution_layer/src/engine_api/http.rs @@ -758,7 +758,10 @@ impl HttpJsonRpc { pub async fn update_payload_with_inclusion_list(&self) {} - pub async fn get_inclusion_list(&self, parent_hash: ExecutionBlockHash) -> Result>, Error> { + pub async fn get_inclusion_list( + &self, + parent_hash: ExecutionBlockHash, + ) -> Result>, Error> { let params = json!([parent_hash]); self.rpc_request( @@ -1645,7 +1648,8 @@ impl HttpJsonRpc { if new_payload_request_gloas.is_heze_fork { // Force V6 for Heze blocks — Besu supports it but capability // detection may not pick it up from exchangeCapabilities. - self.new_payload_v6_from_gloas(new_payload_request_gloas).await + self.new_payload_v6_from_gloas(new_payload_request_gloas) + .await } else if engine_capabilities.new_payload_v5 { self.new_payload_v5_gloas(new_payload_request_gloas).await } else { diff --git a/beacon_node/execution_layer/src/lib.rs b/beacon_node/execution_layer/src/lib.rs index fcd6cadb9c..b19acc02c1 100644 --- a/beacon_node/execution_layer/src/lib.rs +++ b/beacon_node/execution_layer/src/lib.rs @@ -2006,9 +2006,16 @@ impl ExecutionLayer { } } - pub async fn get_inclusion_list(&self, parent_hash: ExecutionBlockHash) -> Result, Error> { + pub async fn get_inclusion_list( + &self, + parent_hash: ExecutionBlockHash, + ) -> Result, Error> { debug!("Requesting inclusion list from EL"); - let raw_transactions = self.engine().api.get_inclusion_list::(parent_hash).await?; + let raw_transactions = self + .engine() + .api + .get_inclusion_list::(parent_hash) + .await?; let mut transactions = vec![]; diff --git a/beacon_node/network/src/network_beacon_processor/gossip_methods.rs b/beacon_node/network/src/network_beacon_processor/gossip_methods.rs index 255a1a2eac..8a3464c0a6 100644 --- a/beacon_node/network/src/network_beacon_processor/gossip_methods.rs +++ b/beacon_node/network/src/network_beacon_processor/gossip_methods.rs @@ -4068,8 +4068,7 @@ impl NetworkBeaconProcessor { // Re-verify and re-import the envelope from scratch. match chain.verify_envelope_for_gossip(raw_envelope).await { Ok(re_verified) => { - let re_block_root = - re_verified.signed_envelope.beacon_block_root(); + let re_block_root = re_verified.signed_envelope.beacon_block_root(); let result = chain .process_execution_payload_envelope( re_block_root, @@ -4117,22 +4116,17 @@ impl NetworkBeaconProcessor { .beacon_processor_send .try_send(WorkEvent { drop_during_sync: false, - work: Work::Reprocess( - ReprocessQueueMessage::RetryEnvelope( - QueuedGossipEnvelope { - beacon_block_slot: envelope_slot, - beacon_block_root, - process_fn, - }, - ), - ), + work: Work::Reprocess(ReprocessQueueMessage::RetryEnvelope( + QueuedGossipEnvelope { + beacon_block_slot: envelope_slot, + beacon_block_root, + process_fn, + }, + )), }) .is_err() { - error!( - ?beacon_block_root, - "Failed to queue envelope for EL retry" - ); + error!(?beacon_block_root, "Failed to queue envelope for EL retry"); } } EnvelopeError::BadSignature diff --git a/consensus/fork_choice/src/fork_choice.rs b/consensus/fork_choice/src/fork_choice.rs index 11e99aade0..dd264cedc1 100644 --- a/consensus/fork_choice/src/fork_choice.rs +++ b/consensus/fork_choice/src/fork_choice.rs @@ -421,7 +421,11 @@ where // first forkchoice update sends a valid head to the EL. let parent_hash = if anchor_block.slot() == spec.genesis_slot && anchor_state.slot() == spec.genesis_slot - && signed_bid.message().parent_block_hash().into_root().is_zero() + && signed_bid + .message() + .parent_block_hash() + .into_root() + .is_zero() && signed_bid.message().block_hash().into_root().is_zero() { *anchor_state diff --git a/validator_client/beacon_node_fallback/src/lib.rs b/validator_client/beacon_node_fallback/src/lib.rs index 59d3368d34..fc03073c30 100644 --- a/validator_client/beacon_node_fallback/src/lib.rs +++ b/validator_client/beacon_node_fallback/src/lib.rs @@ -7,9 +7,6 @@ pub mod beacon_node_health; pub mod payload_envelope_monitor; use beacon_head_monitor::{BeaconHeadCache, HeadEvent, poll_head_event_from_beacon_nodes}; -use payload_envelope_monitor::{ - PayloadEnvelopeEvent, poll_payload_envelope_event_from_beacon_nodes, -}; use beacon_node_health::{ BeaconNodeHealth, BeaconNodeSyncDistanceTiers, ExecutionEngineHealth, IsOptimistic, SyncDistanceTier, check_node_health, @@ -17,6 +14,9 @@ use beacon_node_health::{ use clap::ValueEnum; use eth2::{BeaconNodeHttpClient, Timeouts}; use futures::future; +use payload_envelope_monitor::{ + PayloadEnvelopeEvent, poll_payload_envelope_event_from_beacon_nodes, +}; use sensitive_url::SensitiveUrl; use serde::{Deserialize, Serialize, Serializer, ser::SerializeStruct}; use slot_clock::SlotClock; @@ -109,15 +109,10 @@ pub fn start_fallback_updater_service( let payload_envelope_future = async move { loop { if let Err(error) = - poll_payload_envelope_event_from_beacon_nodes::( - beacon_nodes_ref2.clone(), - ) - .await + poll_payload_envelope_event_from_beacon_nodes::(beacon_nodes_ref2.clone()) + .await { - warn!( - error, - "Payload envelope service failed, retrying next slot" - ); + warn!(error, "Payload envelope service failed, retrying next slot"); let sleep_time = beacon_nodes_ref2 .slot_clock diff --git a/validator_client/beacon_node_fallback/src/payload_envelope_monitor.rs b/validator_client/beacon_node_fallback/src/payload_envelope_monitor.rs index be8c00da44..529180c007 100644 --- a/validator_client/beacon_node_fallback/src/payload_envelope_monitor.rs +++ b/validator_client/beacon_node_fallback/src/payload_envelope_monitor.rs @@ -84,7 +84,8 @@ pub async fn poll_payload_envelope_event_from_beacon_nodes { warn!( event_kind = event.topic_name(), - candidate_index, "Received unexpected event from BN in payload envelope monitor" + candidate_index, + "Received unexpected event from BN in payload envelope monitor" ); continue; } diff --git a/validator_client/validator_services/src/inclusion_list_service.rs b/validator_client/validator_services/src/inclusion_list_service.rs index e6fd5c303f..06f0aa3d8c 100644 --- a/validator_client/validator_services/src/inclusion_list_service.rs +++ b/validator_client/validator_services/src/inclusion_list_service.rs @@ -174,19 +174,12 @@ impl InclusionListService