mirror/lighthouse-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/lighthouse-pulse.git synced 2024-12-25 21:17:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Attestation service slots (#931)

Browse Source 
* Merge #913

* Correct release tests

* Completed release test corrections

* Initial work on upgrading discovery

* Updates discovery to latest version

* Update ENR initialisation logic

* Remove debug statements

* Shifts timing units to slots
This commit is contained in:
Age Manning 2020-03-19 15:11:54 +11:00 committed by GitHub
parent e4ca896694
commit 24a384d0d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
beacon_node/network/src/attestation_service/mod.rs
View File

@ -24,11 +24,13 @@ const MIN_PEER_DISCOVERY_SLOT_LOOK_AHEAD: u64 = 1;
/// attest to is greater than this, we queue a discovery request for this many slots prior to /// attest to is greater than this, we queue a discovery request for this many slots prior to
/// subscribing. /// subscribing.
const TARGET_PEER_DISCOVERY_SLOT_LOOK_AHEAD: u64 = 6; const TARGET_PEER_DISCOVERY_SLOT_LOOK_AHEAD: u64 = 6;
/// The time (in seconds) before a last seen validator is considered absent and we unsubscribe from the random /// The time (in slots) before a last seen validator is considered absent and we unsubscribe from the random
/// gossip topics that we subscribed to due to the validator connection. /// gossip topics that we subscribed to due to the validator connection.
const LAST_SEEN_VALIDATOR_TIMEOUT: u64 = 1800; // 30 mins const LAST_SEEN_VALIDATOR_TIMEOUT: u32 = 150; // 30 mins at a 12s slot time
/// The number of seconds in advance that we subscribe to a subnet before the required slot. /// The fraction of a slot that we subscribe to a subnet before the required slot.
const ADVANCE_SUBSCRIBE_SECS: u64 = 3; ///
/// Note: The time is calculated as `time = milliseconds_per_slot / ADVANCE_SUBSCRIPTION_TIME`
const ADVANCE_SUBSCRIBE_TIME: u32 = 3;
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
pub enum AttServiceMessage { pub enum AttServiceMessage {
@ -93,6 +95,10 @@ impl<T: BeaconChainTypes> AttestationService<T> {
.saturating_mul(T::EthSpec::slots_per_epoch()) .saturating_mul(T::EthSpec::slots_per_epoch())
.saturating_mul(spec.milliseconds_per_slot); .saturating_mul(spec.milliseconds_per_slot);
// Panics on overflow. Ensure LAST_SEEN_VALIDATOR_TIMEOUT is not too large.
let last_seen_val_timeout = Duration::from_millis(spec.milliseconds_per_slot)
.checked_mul(LAST_SEEN_VALIDATOR_TIMEOUT)
.expect("LAST_SEEN_VALIDATOR_TIMEOUT must not be ridiculously large");
AttestationService { AttestationService {
events: VecDeque::with_capacity(10), events: VecDeque::with_capacity(10),
network_globals, network_globals,
@ -101,7 +107,7 @@ impl<T: BeaconChainTypes> AttestationService<T> {
discover_peers: HashSetDelay::default(), discover_peers: HashSetDelay::default(),
subscriptions: HashSetDelay::default(), subscriptions: HashSetDelay::default(),
unsubscriptions: HashSetDelay::default(), unsubscriptions: HashSetDelay::default(),
known_validators: HashSetDelay::new(Duration::from_secs(LAST_SEEN_VALIDATOR_TIMEOUT)), known_validators: HashSetDelay::new(last_seen_val_timeout),
log, log,
} }
} }
@ -239,7 +245,9 @@ impl<T: BeaconChainTypes> AttestationService<T> {
warn!(self.log, "Could not get the current slot"); warn!(self.log, "Could not get the current slot");
})?; })?;
let slot_duration = Duration::from_millis(self.beacon_chain.spec.milliseconds_per_slot); let slot_duration = Duration::from_millis(self.beacon_chain.spec.milliseconds_per_slot);
let advance_subscription_duration = Duration::from_secs(ADVANCE_SUBSCRIBE_SECS); let advance_subscription_duration = slot_duration
.checked_div(ADVANCE_SUBSCRIBE_TIME)
.expect("ADVANCE_SUBSCRIPTION_TIME cannot be too large");
// calculate the time to subscribe to the subnet // calculate the time to subscribe to the subnet
let duration_to_subscribe = { let duration_to_subscribe = {
@ -385,7 +393,9 @@ impl<T: BeaconChainTypes> AttestationService<T> {
// we are subscribed via a random subnet, if this is to expire during the time we need // we are subscribed via a random subnet, if this is to expire during the time we need
// to be subscribed, just extend the expiry // to be subscribed, just extend the expiry
let slot_duration = Duration::from_millis(self.beacon_chain.spec.milliseconds_per_slot); let slot_duration = Duration::from_millis(self.beacon_chain.spec.milliseconds_per_slot);
let advance_subscription_duration = Duration::from_secs(ADVANCE_SUBSCRIBE_SECS); let advance_subscription_duration = slot_duration
.checked_div(ADVANCE_SUBSCRIBE_TIME)
.expect("ADVANCE_SUBSCRIPTION_TIME cannot be too large");
// we require the subnet subscription for at least a slot on top of the initial // we require the subnet subscription for at least a slot on top of the initial
// subscription time // subscription time
let expected_end_subscription_duration = slot_duration + advance_subscription_duration; let expected_end_subscription_duration = slot_duration + advance_subscription_duration;