78d82d9193
* Update to spec v0.9.0 * Update to v0.9.1 * Bump spec tags for v0.9.1 * Formatting, fix CI failures * Resolve accidental KeyPair merge conflict * Document new BeaconState functions * Add `validator` changes from `validator-to-rest` * Add initial (failing) REST api tests * Fix signature parsing * Add more tests * Refactor http router * Add working tests for publish beacon block * Add validator duties tests * Move account_manager under `lighthouse` binary * Unify logfile handling in `environment` crate. * Fix incorrect cache drops in `advance_caches` * Update fork choice for v0.9.1 * Add `deposit_contract` crate * Add progress on validator onboarding * Add unfinished attesation code * Update account manager CLI * Write eth1 data file as hex string * Integrate ValidatorDirectory with validator_client * Move ValidatorDirectory into validator_client * Clean up some FIXMEs * Add beacon_chain_sim * Fix a few docs/logs * Expand `beacon_chain_sim` * Fix spec for `beacon_chain_sim * More testing for api * Start work on attestation endpoint * Reject empty attestations * Allow attestations to genesis block * Add working tests for `rest_api` validator endpoint * Remove grpc from beacon_node * Start heavy refactor of validator client - Block production is working * Prune old validator client files * Start works on attestation service * Add attestation service to validator client * Use full pubkey for validator directories * Add validator duties post endpoint * Use par_iter for keypair generation * Use bulk duties request in validator client * Add version http endpoint tests * Add interop keys and startup wait * Ensure a prompt exit * Add duties pruning * Fix compile error in beacon node tests * Add github workflow * Modify rust.yaml * Modify gitlab actions * Add to CI file * Add sudo to CI npm install * Move cargo fmt to own job in tests * Fix cargo fmt in CI * Add rustup update before cargo fmt * Change name of CI job * Make other CI jobs require cargo fmt * Add CI badge * Remove gitlab and travis files * Add different http timeout for debug * Update docker file, use makefile in CI * Use make in the dockerfile, skip the test * Use the makefile for debug GI test * Update book * Tidy grpc and misc things * Apply discv5 fixes * Address other minor issues * Fix warnings * Attempt fix for addr parsing * Tidy validator config, CLIs * Tidy comments * Tidy signing, reduce ForkService duplication * Fail if skipping too many slots * Set default recent genesis time to 0 * Add custom http timeout to validator * Fix compile bug in node_test_rig * Remove old bootstrap flag from val CLI * Update docs * Tidy val client * Change val client log levels * Add comments, more validity checks * Fix compile error, add comments * Undo changes to eth2-libp2p/src * Reduce duplication of keypair generation * Add more logging for validator duties * Fix beacon_chain_sim, nitpicks * Fix compile error, minor nits * Address Michael's comments
166 lines
4.9 KiB
Rust
166 lines
4.9 KiB
Rust
use super::SlotClock;
|
|
use std::time::{Duration, SystemTime, UNIX_EPOCH};
|
|
use types::Slot;
|
|
|
|
pub use std::time::SystemTimeError;
|
|
|
|
/// Determines the present slot based upon the present system time.
|
|
#[derive(Clone)]
|
|
pub struct SystemTimeSlotClock {
|
|
genesis_slot: Slot,
|
|
genesis_duration: Duration,
|
|
slot_duration: Duration,
|
|
}
|
|
|
|
impl SlotClock for SystemTimeSlotClock {
|
|
fn new(genesis_slot: Slot, genesis_duration: Duration, slot_duration: Duration) -> Self {
|
|
if slot_duration.as_millis() == 0 {
|
|
panic!("SystemTimeSlotClock cannot have a < 1ms slot duration.");
|
|
}
|
|
|
|
Self {
|
|
genesis_slot,
|
|
genesis_duration,
|
|
slot_duration,
|
|
}
|
|
}
|
|
|
|
fn now(&self) -> Option<Slot> {
|
|
let now = SystemTime::now().duration_since(UNIX_EPOCH).ok()?;
|
|
let genesis = self.genesis_duration;
|
|
|
|
if now >= genesis {
|
|
let since_genesis = now
|
|
.checked_sub(genesis)
|
|
.expect("Control flow ensures now is greater than or equal to genesis");
|
|
let slot =
|
|
Slot::from((since_genesis.as_millis() / self.slot_duration.as_millis()) as u64);
|
|
Some(slot + self.genesis_slot)
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
fn duration_to_next_slot(&self) -> Option<Duration> {
|
|
let now = SystemTime::now().duration_since(UNIX_EPOCH).ok()?;
|
|
let genesis = self.genesis_duration;
|
|
|
|
let slot_start = |slot: Slot| -> Duration {
|
|
let slot = slot.as_u64() as u32;
|
|
genesis + slot * self.slot_duration
|
|
};
|
|
|
|
if now >= genesis {
|
|
Some(
|
|
slot_start(self.now()? + 1)
|
|
.checked_sub(now)
|
|
.expect("The next slot cannot start before now"),
|
|
)
|
|
} else {
|
|
Some(
|
|
genesis
|
|
.checked_sub(now)
|
|
.expect("Control flow ensures genesis is greater than or equal to now"),
|
|
)
|
|
}
|
|
}
|
|
|
|
fn duration_to_next_epoch(&self, slots_per_epoch: u64) -> Option<Duration> {
|
|
let now = SystemTime::now().duration_since(UNIX_EPOCH).ok()?;
|
|
let genesis = self.genesis_duration;
|
|
|
|
let slot_start = |slot: Slot| -> Duration {
|
|
let slot = slot.as_u64() as u32;
|
|
genesis + slot * self.slot_duration
|
|
};
|
|
|
|
let epoch_start_slot = self
|
|
.now()
|
|
.map(|slot| slot.epoch(slots_per_epoch))
|
|
.map(|epoch| (epoch + 1).start_slot(slots_per_epoch))?;
|
|
|
|
if now >= genesis {
|
|
Some(
|
|
slot_start(epoch_start_slot)
|
|
.checked_sub(now)
|
|
.expect("The next epoch cannot start before now"),
|
|
)
|
|
} else {
|
|
Some(
|
|
genesis
|
|
.checked_sub(now)
|
|
.expect("Control flow ensures genesis is greater than or equal to now"),
|
|
)
|
|
}
|
|
}
|
|
|
|
fn slot_duration(&self) -> Duration {
|
|
self.slot_duration
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
/*
|
|
* Note: these tests are using actual system times and could fail if they are executed on a
|
|
* very slow machine.
|
|
*/
|
|
#[test]
|
|
fn test_slot_now() {
|
|
let genesis_slot = Slot::new(0);
|
|
|
|
let prior_genesis = |milliseconds_prior: u64| {
|
|
SystemTime::now()
|
|
.duration_since(UNIX_EPOCH)
|
|
.expect("should get system time")
|
|
- Duration::from_millis(milliseconds_prior)
|
|
};
|
|
|
|
let clock =
|
|
SystemTimeSlotClock::new(genesis_slot, prior_genesis(0), Duration::from_secs(1));
|
|
assert_eq!(clock.now(), Some(Slot::new(0)));
|
|
|
|
let clock =
|
|
SystemTimeSlotClock::new(genesis_slot, prior_genesis(5_000), Duration::from_secs(1));
|
|
assert_eq!(clock.now(), Some(Slot::new(5)));
|
|
|
|
let clock =
|
|
SystemTimeSlotClock::new(genesis_slot, prior_genesis(500), Duration::from_secs(1));
|
|
assert_eq!(clock.now(), Some(Slot::new(0)));
|
|
assert!(clock.duration_to_next_slot().unwrap() <= Duration::from_millis(500));
|
|
|
|
let clock =
|
|
SystemTimeSlotClock::new(genesis_slot, prior_genesis(1_500), Duration::from_secs(1));
|
|
assert_eq!(clock.now(), Some(Slot::new(1)));
|
|
assert!(clock.duration_to_next_slot().unwrap() <= Duration::from_millis(500));
|
|
}
|
|
|
|
#[test]
|
|
#[should_panic]
|
|
fn zero_seconds() {
|
|
SystemTimeSlotClock::new(Slot::new(0), Duration::from_secs(0), Duration::from_secs(0));
|
|
}
|
|
|
|
#[test]
|
|
#[should_panic]
|
|
fn zero_millis() {
|
|
SystemTimeSlotClock::new(
|
|
Slot::new(0),
|
|
Duration::from_secs(0),
|
|
Duration::from_millis(0),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
#[should_panic]
|
|
fn less_than_one_millis() {
|
|
SystemTimeSlotClock::new(
|
|
Slot::new(0),
|
|
Duration::from_secs(0),
|
|
Duration::from_nanos(999),
|
|
);
|
|
}
|
|
}
|