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 confklicts

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-05-18 23:12:53 +03:00
parent a67985d616 1a68631180
commit 299ed09d7e
58 changed files with 2570 additions and 922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
validator_client/validator_services/src/block_service.rs
View File

@@ -14,7 +14,6 @@ use std::time::Duration;
use task_executor::TaskExecutor;
use tokio::sync::mpsc;
use tracing::{Instrument, debug, error, info, info_span, instrument, trace, warn};
use types::consts::gloas::BUILDER_INDEX_SELF_BUILD;
use types::{BlockType, ChainSpec, EthSpec, Graffiti, Slot};
use validator_store::{Error as ValidatorStoreError, SignedBlock, UnsignedBlock, ValidatorStore};
@@ -479,6 +478,7 @@ impl<S: ValidatorStore + 'static, T: SlotClock + 'static> BlockService<S, T> {
slot,
randao_reveal_ref,
graffiti.as_ref(),
None,
builder_boost_factor,
self_ref.graffiti_policy,
)
@@ -506,6 +506,7 @@ impl<S: ValidatorStore + 'static, T: SlotClock + 'static> BlockService<S, T> {
slot,
randao_reveal_ref,
graffiti.as_ref(),
None,
builder_boost_factor,
self_ref.graffiti_policy,
)
@@ -652,18 +653,14 @@ impl<S: ValidatorStore + 'static, T: SlotClock + 'static> BlockService<S, T> {
) -> Result<(), BlockError> {
info!(slot = slot.as_u64(), "Fetching execution payload envelope");
// Fetch the envelope from the beacon node. Use builder_index=BUILDER_INDEX_SELF_BUILD for local building.
// Fetch the envelope from the beacon node.
// TODO(gloas): Use proposer_fallback once multi-BN is supported.
let fork_name = self.chain_spec.fork_name_at_slot::<S::E>(slot);
let envelope = self
.beacon_nodes
.first_success(|beacon_node| async move {
beacon_node
.get_validator_execution_payload_envelope_ssz::<S::E>(
slot,
BUILDER_INDEX_SELF_BUILD,
fork_name,
)
.get_validator_execution_payload_envelope_ssz::<S::E>(slot, fork_name)
.await
.map_err(|e| {
BlockError::Recoverable(format!(