gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-03 00:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'unstable' into merge-unstable-to-deneb-20230816

Browse Source 
# Conflicts:
#	beacon_node/http_api/src/lib.rs
This commit is contained in:
Jimmy Chen
2023-08-16 14:31:59 +10:00
parent 7f7ad799b3 59c24bcd2d
commit ff792d950c
26 changed files with 325 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
validator_client/src/duties_service.rs
View File

@@ -1021,7 +1021,7 @@ async fn fill_in_selection_proofs<T: SlotClock + 'static, E: EthSpec>(
/// 2. We won't miss a block if the duties for the current slot happen to change with this poll.
///
/// This sounds great, but is it safe? Firstly, the additional notification will only contain block
/// producers that were not included in the first notification. This should be safety enough.
/// producers that were not included in the first notification. This should be safe enough.
/// However, we also have the slashing protection as a second line of defence. These two factors
/// provide an acceptable level of safety.
///

6
validator_client/src/lib.rs
View File

@@ -524,7 +524,7 @@ impl<T: EthSpec> ProductionValidatorClient<T> {
pub fn start_service(&mut self) -> Result<(), String> {
// We use `SLOTS_PER_EPOCH` as the capacity of the block notification channel, because
// we don't except notifications to be delayed by more than a single slot, let alone a
// we don't expect notifications to be delayed by more than a single slot, let alone a
// whole epoch!
let channel_capacity = T::slots_per_epoch() as usize;
let (block_service_tx, block_service_rx) = mpsc::channel(channel_capacity);
@@ -627,8 +627,8 @@ async fn init_from_beacon_node<E: EthSpec>(
let num_available = beacon_nodes.num_available().await;
let num_total = beacon_nodes.num_total();
let proposer_available = beacon_nodes.num_available().await;
let proposer_total = beacon_nodes.num_total();
let proposer_available = proposer_nodes.num_available().await;
let proposer_total = proposer_nodes.num_total();
if proposer_total > 0 && proposer_available == 0 {
warn!(