[Merged by Bors] - Shift networking configuration

beacon_node/beacon_chain/src/attestation_verification.rs

@@ -35,10 +35,8 @@
 mod batch;
 
 use crate::{
- beacon_chain::{MAXIMUM_GOSSIP_CLOCK_DISPARITY, VALIDATOR_PUBKEY_CACHE_LOCK_TIMEOUT},
- metrics,
- observed_aggregates::ObserveOutcome,
- observed_attesters::Error as ObservedAttestersError,
+ beacon_chain::VALIDATOR_PUBKEY_CACHE_LOCK_TIMEOUT, metrics,
+ observed_aggregates::ObserveOutcome, observed_attesters::Error as ObservedAttestersError,
  BeaconChain, BeaconChainError, BeaconChainTypes,
 };
 use bls::verify_signature_sets;
@@ -57,8 +55,8 @@ use std::borrow::Cow;
 use strum::AsRefStr;
 use tree_hash::TreeHash;
 use types::{
- Attestation, BeaconCommittee, CommitteeIndex, Epoch, EthSpec, Hash256, IndexedAttestation,
- SelectionProof, SignedAggregateAndProof, Slot, SubnetId,
+ Attestation, BeaconCommittee, ChainSpec, CommitteeIndex, Epoch, EthSpec, Hash256,
+ IndexedAttestation, SelectionProof, SignedAggregateAndProof, Slot, SubnetId,
 };
 
 pub use batch::{batch_verify_aggregated_attestations, batch_verify_unaggregated_attestations};
@@ -454,7 +452,7 @@ impl<'a, T: BeaconChainTypes> IndexedAggregatedAttestation<'a, T> {
  // MAXIMUM_GOSSIP_CLOCK_DISPARITY allowance).
  //
  // We do not queue future attestations for later processing.
- verify_propagation_slot_range(&chain.slot_clock, attestation)?;
+ verify_propagation_slot_range(&chain.slot_clock, attestation, &chain.spec)?;
 
  // Check the attestation's epoch matches its target.
  if attestation.data.slot.epoch(T::EthSpec::slots_per_epoch())
@@ -718,7 +716,7 @@ impl<'a, T: BeaconChainTypes> IndexedUnaggregatedAttestation<'a, T> {
  // MAXIMUM_GOSSIP_CLOCK_DISPARITY allowance).
  //
  // We do not queue future attestations for later processing.
- verify_propagation_slot_range(&chain.slot_clock, attestation)?;
+ verify_propagation_slot_range(&chain.slot_clock, attestation, &chain.spec)?;
 
  // Check to ensure that the attestation is "unaggregated". I.e., it has exactly one
  // aggregation bit set.
@@ -1033,11 +1031,11 @@ fn verify_head_block_is_known<T: BeaconChainTypes>(
 pub fn verify_propagation_slot_range<S: SlotClock, E: EthSpec>(
  slot_clock: &S,
  attestation: &Attestation<E>,
+ spec: &ChainSpec,
 ) -> Result<(), Error> {
  let attestation_slot = attestation.data.slot;
-
  let latest_permissible_slot = slot_clock
- .now_with_future_tolerance(MAXIMUM_GOSSIP_CLOCK_DISPARITY)
+ .now_with_future_tolerance(spec.clone().maximum_gossip_clock_disparity())
  .ok_or(BeaconChainError::UnableToReadSlot)?;
  if attestation_slot > latest_permissible_slot {
  return Err(Error::FutureSlot {
@@ -1048,7 +1046,7 @@ pub fn verify_propagation_slot_range<S: SlotClock, E: EthSpec>(
 
  // Taking advantage of saturating subtraction on `Slot`.
  let earliest_permissible_slot = slot_clock
- .now_with_past_tolerance(MAXIMUM_GOSSIP_CLOCK_DISPARITY)
+ .now_with_past_tolerance(spec.clone().maximum_gossip_clock_disparity())
  .ok_or(BeaconChainError::UnableToReadSlot)?
  - E::slots_per_epoch();
  if attestation_slot < earliest_permissible_slot {

beacon_node/beacon_chain/src/beacon_chain.rs

@@ -206,11 +206,6 @@ pub enum OverrideForkchoiceUpdate {
  AlreadyApplied,
 }
 
-/// The accepted clock drift for nodes gossiping blocks and attestations. See:
-///
-/// https://github.com/ethereum/eth2.0-specs/blob/v0.12.1/specs/phase0/p2p-interface.md#configuration
-pub const MAXIMUM_GOSSIP_CLOCK_DISPARITY: Duration = Duration::from_millis(500);
-
 #[derive(Debug, PartialEq)]
 pub enum AttestationProcessingOutcome {
  Processed,

beacon_node/beacon_chain/src/block_verification.rs

@@ -58,7 +58,7 @@ use crate::validator_pubkey_cache::ValidatorPubkeyCache;
 use crate::{
  beacon_chain::{
  BeaconForkChoice, ForkChoiceError, BLOCK_PROCESSING_CACHE_LOCK_TIMEOUT,
- MAXIMUM_GOSSIP_CLOCK_DISPARITY, VALIDATOR_PUBKEY_CACHE_LOCK_TIMEOUT,
+ VALIDATOR_PUBKEY_CACHE_LOCK_TIMEOUT,
  },
  metrics, BeaconChain, BeaconChainError, BeaconChainTypes,
 };
@@ -695,7 +695,9 @@ impl<T: BeaconChainTypes> GossipVerifiedBlock<T> {
  // Do not gossip or process blocks from future slots.
  let present_slot_with_tolerance = chain
  .slot_clock
- .now_with_future_tolerance(MAXIMUM_GOSSIP_CLOCK_DISPARITY)
+ .now_with_future_tolerance(Duration::from_millis(
+ chain.spec.maximum_gossip_clock_disparity_millis,
+ ))
  .ok_or(BeaconChainError::UnableToReadSlot)?;
  if block.slot() > present_slot_with_tolerance {
  return Err(BlockError::FutureSlot {

beacon_node/beacon_chain/src/lib.rs

@@ -54,7 +54,7 @@ pub use self::beacon_chain::{
  AttestationProcessingOutcome, BeaconChain, BeaconChainTypes, BeaconStore, ChainSegmentResult,
  ForkChoiceError, OverrideForkchoiceUpdate, ProduceBlockVerification, StateSkipConfig,
  WhenSlotSkipped, INVALID_FINALIZED_MERGE_TRANSITION_BLOCK_SHUTDOWN_REASON,
- INVALID_JUSTIFIED_PAYLOAD_SHUTDOWN_REASON, MAXIMUM_GOSSIP_CLOCK_DISPARITY,
+ INVALID_JUSTIFIED_PAYLOAD_SHUTDOWN_REASON,
 };
 pub use self::beacon_snapshot::BeaconSnapshot;
 pub use self::chain_config::ChainConfig;

beacon_node/beacon_chain/src/light_client_finality_update_verification.rs

@@ -1,6 +1,4 @@
-use crate::{
- beacon_chain::MAXIMUM_GOSSIP_CLOCK_DISPARITY, BeaconChain, BeaconChainError, BeaconChainTypes,
-};
+use crate::{BeaconChain, BeaconChainError, BeaconChainTypes};
 use derivative::Derivative;
 use slot_clock::SlotClock;
 use std::time::Duration;
@@ -103,7 +101,9 @@ impl<T: BeaconChainTypes> VerifiedLightClientFinalityUpdate<T> {
  // verify that enough time has passed for the block to have been propagated
  match start_time {
  Some(time) => {
- if seen_timestamp + MAXIMUM_GOSSIP_CLOCK_DISPARITY < time + one_third_slot_duration
+ if seen_timestamp
+ + Duration::from_millis(chain.spec.maximum_gossip_clock_disparity_millis)
+ < time + one_third_slot_duration
  {
  return Err(Error::TooEarly);
  }

beacon_node/beacon_chain/src/light_client_optimistic_update_verification.rs

@@ -1,6 +1,4 @@
-use crate::{
- beacon_chain::MAXIMUM_GOSSIP_CLOCK_DISPARITY, BeaconChain, BeaconChainError, BeaconChainTypes,
-};
+use crate::{BeaconChain, BeaconChainError, BeaconChainTypes};
 use derivative::Derivative;
 use eth2::types::Hash256;
 use slot_clock::SlotClock;
@@ -103,7 +101,9 @@ impl<T: BeaconChainTypes> VerifiedLightClientOptimisticUpdate<T> {
  // verify that enough time has passed for the block to have been propagated
  match start_time {
  Some(time) => {
- if seen_timestamp + MAXIMUM_GOSSIP_CLOCK_DISPARITY < time + one_third_slot_duration
+ if seen_timestamp
+ + Duration::from_millis(chain.spec.maximum_gossip_clock_disparity_millis)
+ < time + one_third_slot_duration
  {
  return Err(Error::TooEarly);
  }

beacon_node/beacon_chain/src/sync_committee_verification.rs

@@ -28,10 +28,8 @@
 
 use crate::observed_attesters::SlotSubcommitteeIndex;
 use crate::{
- beacon_chain::{MAXIMUM_GOSSIP_CLOCK_DISPARITY, VALIDATOR_PUBKEY_CACHE_LOCK_TIMEOUT},
- metrics,
- observed_aggregates::ObserveOutcome,
- BeaconChain, BeaconChainError, BeaconChainTypes,
+ beacon_chain::VALIDATOR_PUBKEY_CACHE_LOCK_TIMEOUT, metrics,
+ observed_aggregates::ObserveOutcome, BeaconChain, BeaconChainError, BeaconChainTypes,
 };
 use bls::{verify_signature_sets, PublicKeyBytes};
 use derivative::Derivative;
@@ -43,8 +41,9 @@ use state_processing::signature_sets::{
  sync_committee_contribution_signature_set_from_pubkeys,
  sync_committee_message_set_from_pubkeys,
 };
-use std::borrow::Cow;
+use types::ChainSpec;
 use std::collections::HashMap;
+use std::borrow::Cow;
 use strum::AsRefStr;
 use tree_hash::TreeHash;
 use types::consts::altair::SYNC_COMMITTEE_SUBNET_COUNT;
@@ -287,7 +286,7 @@ impl<T: BeaconChainTypes> VerifiedSyncContribution<T> {
  let subcommittee_index = contribution.subcommittee_index as usize;
 
  // Ensure sync committee contribution is within the MAXIMUM_GOSSIP_CLOCK_DISPARITY allowance.
- verify_propagation_slot_range(&chain.slot_clock, contribution)?;
+ verify_propagation_slot_range(&chain.slot_clock, contribution, &chain.spec)?;
 
  // Validate subcommittee index.
  if contribution.subcommittee_index >= SYNC_COMMITTEE_SUBNET_COUNT {
@@ -442,7 +441,7 @@ impl VerifiedSyncCommitteeMessage {
  // MAXIMUM_GOSSIP_CLOCK_DISPARITY allowance).
  //
  // We do not queue future sync committee messages for later processing.
- verify_propagation_slot_range(&chain.slot_clock, &sync_message)?;
+ verify_propagation_slot_range(&chain.slot_clock, &sync_message, &chain.spec)?;
 
  // Ensure the `subnet_id` is valid for the given validator.
  let pubkey = chain
@@ -558,11 +557,11 @@ impl VerifiedSyncCommitteeMessage {
 pub fn verify_propagation_slot_range<S: SlotClock, U: SlotData>(
  slot_clock: &S,
  sync_contribution: &U,
+ spec: &ChainSpec,
 ) -> Result<(), Error> {
  let message_slot = sync_contribution.get_slot();
-
  let latest_permissible_slot = slot_clock
- .now_with_future_tolerance(MAXIMUM_GOSSIP_CLOCK_DISPARITY)
+ .now_with_future_tolerance(spec.clone().maximum_gossip_clock_disparity())
  .ok_or(BeaconChainError::UnableToReadSlot)?;
  if message_slot > latest_permissible_slot {
  return Err(Error::FutureSlot {
@@ -572,7 +571,7 @@ pub fn verify_propagation_slot_range<S: SlotClock, U: SlotData>(
  }
 
  let earliest_permissible_slot = slot_clock
- .now_with_past_tolerance(MAXIMUM_GOSSIP_CLOCK_DISPARITY)
+ .now_with_past_tolerance(spec.clone().maximum_gossip_clock_disparity())
  .ok_or(BeaconChainError::UnableToReadSlot)?;
 
  if message_slot < earliest_permissible_slot {

beacon_node/http_api/src/attester_duties.rs

@@ -1,12 +1,11 @@
 //! Contains the handler for the `GET validator/duties/attester/{epoch}` endpoint.
 
 use crate::state_id::StateId;
-use beacon_chain::{
- BeaconChain, BeaconChainError, BeaconChainTypes, MAXIMUM_GOSSIP_CLOCK_DISPARITY,
-};
+use beacon_chain::{BeaconChain, BeaconChainError, BeaconChainTypes};
 use eth2::types::{self as api_types};
 use slot_clock::SlotClock;
 use state_processing::state_advance::partial_state_advance;
+use std::time::Duration;
 use types::{
  AttestationDuty, BeaconState, ChainSpec, CloneConfig, Epoch, EthSpec, Hash256, RelativeEpoch,
 };
@@ -32,7 +31,9 @@ pub fn attester_duties<T: BeaconChainTypes>(
  // will equal `current_epoch + 1`
  let tolerant_current_epoch = chain
  .slot_clock
- .now_with_future_tolerance(MAXIMUM_GOSSIP_CLOCK_DISPARITY)
+ .now_with_future_tolerance(Duration::from_millis(
+ chain.spec.maximum_gossip_clock_disparity_millis,
+ ))
  .ok_or_else(|| warp_utils::reject::custom_server_error("unable to read slot clock".into()))?
  .epoch(T::EthSpec::slots_per_epoch());
 

beacon_node/http_api/src/proposer_duties.rs

@@ -3,13 +3,13 @@
 use crate::state_id::StateId;
 use beacon_chain::{
  beacon_proposer_cache::{compute_proposer_duties_from_head, ensure_state_is_in_epoch},
- BeaconChain, BeaconChainError, BeaconChainTypes, MAXIMUM_GOSSIP_CLOCK_DISPARITY,
+ BeaconChain, BeaconChainError, BeaconChainTypes,
 };
 use eth2::types::{self as api_types};
 use safe_arith::SafeArith;
 use slog::{debug, Logger};
 use slot_clock::SlotClock;
-use std::cmp::Ordering;
+use std::{cmp::Ordering, time::Duration};
 use types::{CloneConfig, Epoch, EthSpec, Hash256, Slot};
 
 /// The struct that is returned to the requesting HTTP client.
@@ -33,7 +33,9 @@ pub fn proposer_duties<T: BeaconChainTypes>(
  // will equal `current_epoch + 1`
  let tolerant_current_epoch = chain
  .slot_clock
- .now_with_future_tolerance(MAXIMUM_GOSSIP_CLOCK_DISPARITY)
+ .now_with_future_tolerance(Duration::from_millis(
+ chain.spec.maximum_gossip_clock_disparity_millis,
+ ))
  .ok_or_else(|| warp_utils::reject::custom_server_error("unable to read slot clock".into()))?
  .epoch(T::EthSpec::slots_per_epoch());
 

beacon_node/http_api/src/sync_committees.rs

@@ -6,7 +6,7 @@ use beacon_chain::sync_committee_verification::{
 };
 use beacon_chain::{
  validator_monitor::timestamp_now, BeaconChain, BeaconChainError, BeaconChainTypes,
- StateSkipConfig, MAXIMUM_GOSSIP_CLOCK_DISPARITY,
+ StateSkipConfig,
 };
 use eth2::types::{self as api_types};
 use lighthouse_network::PubsubMessage;
@@ -15,6 +15,7 @@ use slog::{debug, error, warn, Logger};
 use slot_clock::SlotClock;
 use std::cmp::max;
 use std::collections::HashMap;
+use std::time::Duration;
 use tokio::sync::mpsc::UnboundedSender;
 use types::{
  slot_data::SlotData, BeaconStateError, Epoch, EthSpec, SignedContributionAndProof,
@@ -85,7 +86,9 @@ fn duties_from_state_load<T: BeaconChainTypes>(
  let current_epoch = chain.epoch()?;
  let tolerant_current_epoch = chain
  .slot_clock
- .now_with_future_tolerance(MAXIMUM_GOSSIP_CLOCK_DISPARITY)
+ .now_with_future_tolerance(Duration::from_millis(
+ chain.spec.maximum_gossip_clock_disparity_millis,
+ ))
  .ok_or(BeaconChainError::UnableToReadSlot)?
  .epoch(T::EthSpec::slots_per_epoch());
 

beacon_node/http_api/tests/tests.rs

@@ -1,7 +1,7 @@
 use beacon_chain::test_utils::RelativeSyncCommittee;
 use beacon_chain::{
  test_utils::{AttestationStrategy, BeaconChainHarness, BlockStrategy, EphemeralHarnessType},
- BeaconChain, StateSkipConfig, WhenSlotSkipped, MAXIMUM_GOSSIP_CLOCK_DISPARITY,
+ BeaconChain, StateSkipConfig, WhenSlotSkipped,
 };
 use environment::null_logger;
 use eth2::{
@@ -2259,7 +2259,9 @@ impl ApiTester {
  .unwrap();
 
  self.chain.slot_clock.set_current_time(
- current_epoch_start - MAXIMUM_GOSSIP_CLOCK_DISPARITY - Duration::from_millis(1),
+ current_epoch_start
+ - Duration::from_millis(self.chain.spec.maximum_gossip_clock_disparity_millis)
+ - Duration::from_millis(1),
  );
 
  let dependent_root = self
@@ -2296,9 +2298,10 @@ impl ApiTester {
  "should not get attester duties outside of tolerance"
  );
 
- self.chain
- .slot_clock
- .set_current_time(current_epoch_start - MAXIMUM_GOSSIP_CLOCK_DISPARITY);
+ self.chain.slot_clock.set_current_time(
+ current_epoch_start
+ - Duration::from_millis(self.chain.spec.maximum_gossip_clock_disparity_millis),
+ );
 
  self.client
  .get_validator_duties_proposer(current_epoch)