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

Fix conflicts

Browse Source
This commit is contained in:
Mac L
2024-01-16 20:38:46 +11:00
parent e555dc9213
commit ba322391d4
1 changed files with 34 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
validator_client/src/block_service.rs
View File

@@ -553,34 +553,30 @@ impl<T: SlotClock + 'static, E: EthSpec> BlockService<T, E> {
// Try the proposer nodes last, since it's likely that they don't have a // Try the proposer nodes last, since it's likely that they don't have a
// great view of attestations on the network. // great view of attestations on the network.
let unsigned_block = proposer_fallback let unsigned_block = proposer_fallback
.request_proposers_last( .request_proposers_last(|beacon_node| async move {
RequireSynced::No, let _get_timer = metrics::start_timer_vec(
OfflineOnFailure::Yes, &metrics::BLOCK_SERVICE_TIMES,
|beacon_node| async move { &[metrics::BEACON_BLOCK_HTTP_GET],
let _get_timer = metrics::start_timer_vec( );
&metrics::BLOCK_SERVICE_TIMES, let block_response = Self::get_validator_block_v3(
&[metrics::BEACON_BLOCK_HTTP_GET], &beacon_node,
); slot,
let block_response = Self::get_validator_block_v3( randao_reveal_ref,
beacon_node, graffiti,
slot, proposer_index,
randao_reveal_ref, builder_boost_factor,
graffiti, log,
proposer_index, )
builder_boost_factor, .await
log, .map_err(|e| {
) BlockError::Recoverable(format!(
.await "Error from beacon node when producing block: {:?}",
.map_err(|e| { e
BlockError::Recoverable(format!( ))
"Error from beacon node when producing block: {:?}", });
e
))
});
Ok::<_, BlockError>(block_response) Ok::<_, BlockError>(block_response)
}, })
)
.await??; .await??;
self_ref self_ref
@@ -660,21 +656,17 @@ impl<T: SlotClock + 'static, E: EthSpec> BlockService<T, E> {
// Try the proposer nodes last, since it's likely that they don't have a // Try the proposer nodes last, since it's likely that they don't have a
// great view of attestations on the network. // great view of attestations on the network.
let unsigned_block = proposer_fallback let unsigned_block = proposer_fallback
.request_proposers_last( .request_proposers_last(move |beacon_node| {
RequireSynced::No, Self::get_validator_block(
OfflineOnFailure::Yes, beacon_node,
move |beacon_node| { slot,
Self::get_validator_block( randao_reveal_ref,
beacon_node, graffiti,
slot, proposer_index,
randao_reveal_ref, builder_proposal,
graffiti, log,
proposer_index, )
builder_proposal, })
log,
)
},
)
.await?; .await?;
self_ref self_ref