gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-30 12:47:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflict and migrate il service to new pardigmn

Browse Source
This commit is contained in:
Eitan Seri-Levi
2025-05-21 12:43:43 -07:00
parent 7bd50a6fe8 e29b607257
commit e21b578073
358 changed files with 11541 additions and 6759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_node/beacon_chain/src/execution_payload.rs
View File

@@ -24,7 +24,7 @@ use state_processing::per_block_processing::{
};
use std::sync::Arc;
use tokio::task::JoinHandle;
use tracing::{debug, warn, info};
use tracing::{debug, info, warn};
use tree_hash::TreeHash;
use types::payload::BlockProductionVersion;
use types::*;
@@ -374,9 +374,9 @@ pub fn validate_execution_payload_for_gossip<T: BeaconChainTypes>(
.slot_clock
.start_of(block.slot())
.map(|d| d.as_secs())
.ok_or(BlockError::BeaconChainError(
.ok_or(BlockError::BeaconChainError(Box::new(
BeaconChainError::UnableToComputeTimeAtSlot,
))?;
)))?;
// The block's execution payload timestamp is correct with respect to the slot
if execution_payload.timestamp() != expected_timestamp {
@@ -559,7 +559,7 @@ where
"prepare_execution_payload_forkchoice_update_params",
)
.await
.map_err(BlockProductionError::BeaconChain)?;
.map_err(|e| BlockProductionError::BeaconChain(Box::new(e)))?;
let suggested_fee_recipient = execution_layer
.get_suggested_fee_recipient(proposer_index)