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

18
validator_client/src/block_service.rs
View File

@@ -553,16 +553,13 @@ 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,
OfflineOnFailure::Yes,
|beacon_node| async move {
let _get_timer = metrics::start_timer_vec( let _get_timer = metrics::start_timer_vec(
&metrics::BLOCK_SERVICE_TIMES, &metrics::BLOCK_SERVICE_TIMES,
&[metrics::BEACON_BLOCK_HTTP_GET], &[metrics::BEACON_BLOCK_HTTP_GET],
); );
let block_response = Self::get_validator_block_v3( let block_response = Self::get_validator_block_v3(
beacon_node, &beacon_node,
slot, slot,
randao_reveal_ref, randao_reveal_ref,
graffiti, graffiti,
@@ -579,8 +576,7 @@ impl<T: SlotClock + 'static, E: EthSpec> BlockService<T, E> {
}); });
Ok::<_, BlockError>(block_response) Ok::<_, BlockError>(block_response)
}, })
)
.await??; .await??;
self_ref self_ref
@@ -660,10 +656,7 @@ 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,
OfflineOnFailure::Yes,
move |beacon_node| {
Self::get_validator_block( Self::get_validator_block(
beacon_node, beacon_node,
slot, slot,
@@ -673,8 +666,7 @@ impl<T: SlotClock + 'static, E: EthSpec> BlockService<T, E> {
builder_proposal, builder_proposal,
log, log,
) )
}, })
)
.await?; .await?;
self_ref self_ref