Initial work towards v0.2.0 (#924)

* Remove ping protocol

* Initial renaming of network services

* Correct rebasing relative to latest master

* Start updating types

* Adds HashMapDelay struct to utils

* Initial network restructure

* Network restructure. Adds new types for v0.2.0

* Removes build artefacts

* Shift validation to beacon chain

* Temporarily remove gossip validation

This is to be updated to match current optimisation efforts.

* Adds AggregateAndProof

* Begin rebuilding pubsub encoding/decoding

* Signature hacking

* Shift gossipsup decoding into eth2_libp2p

* Existing EF tests passing with fake_crypto

* Shifts block encoding/decoding into RPC

* Delete outdated API spec

* All release tests passing bar genesis state parsing

* Update and test YamlConfig

* Update to spec v0.10 compatible BLS

* Updates to BLS EF tests

* Add EF test for AggregateVerify

And delete unused hash2curve tests for uncompressed points

* Update EF tests to v0.10.1

* Use optional block root correctly in block proc

* Use genesis fork in deposit domain. All tests pass

* Fast aggregate verify test

* Update REST API docs

* Fix unused import

* Bump spec tags to v0.10.1

* Add `seconds_per_eth1_block` to chainspec

* Update to timestamp based eth1 voting scheme

* Return None from `get_votes_to_consider` if block cache is empty

* Handle overflows in `is_candidate_block`

* Revert to failing tests

* Fix eth1 data sets test

* Choose default vote according to spec

* Fix collect_valid_votes tests

* Fix `get_votes_to_consider` to choose all eligible blocks

* Uncomment winning_vote tests

* Add comments; remove unused code

* Reduce seconds_per_eth1_block for simulation

* Addressed review comments

* Add test for default vote case

* Fix logs

* Remove unused functions

* Meter default eth1 votes

* Fix comments

* Progress on attestation service

* Address review comments; remove unused dependency

* Initial work on removing libp2p lock

* Add LRU caches to store (rollup)

* Update attestation validation for DB changes (WIP)

* Initial version of should_forward_block

* Scaffold

* Progress on attestation validation

Also, consolidate prod+testing slot clocks so that they share much
of the same implementation and can both handle sub-slot time changes.

* Removes lock from libp2p service

* Completed network lock removal

* Finish(?) attestation processing

* Correct network termination future

* Add slot check to block check

* Correct fmt issues

* Remove Drop implementation for network service

* Add first attempt at attestation proc. re-write

* Add version 2 of attestation processing

* Minor fixes

* Add validator pubkey cache

* Make get_indexed_attestation take a committee

* Link signature processing into new attn verification

* First working version

* Ensure pubkey cache is updated

* Add more metrics, slight optimizations

* Clone committee cache during attestation processing

* Update shuffling cache during block processing

* Remove old commented-out code

* Fix shuffling cache insert bug

* Used indexed attestation in fork choice

* Restructure attn processing, add metrics

* Add more detailed metrics

* Tidy, fix failing tests

* Fix failing tests, tidy

* Address reviewers suggestions

* Disable/delete two outdated tests

* Modification of validator for subscriptions

* Add slot signing to validator client

* Further progress on validation subscription

* Adds necessary validator subscription functionality

* Add new Pubkeys struct to signature_sets

* Refactor with functional approach

* Update beacon chain

* Clean up validator <-> beacon node http types

* Add aggregator status to ValidatorDuty

* Impl Clone for manual slot clock

* Fix minor errors

* Further progress validator client subscription

* Initial subscription and aggregation handling

* Remove decompressed member from pubkey bytes

* Progress to modifying val client for attestation aggregation

* First draft of validator client upgrade for aggregate attestations

* Add hashmap for indices lookup

* Add state cache, remove store cache

* Only build the head committee cache

* Removes lock on a network channel

* Partially implement beacon node subscription http api

* Correct compilation issues

* Change `get_attesting_indices` to use Vec

* Fix failing test

* Partial implementation of timer

* Adds timer, removes exit_future, http api to op pool

* Partial multiple aggregate attestation handling

* Permits bulk messages accross gossipsub network channel

* Correct compile issues

* Improve gosispsub messaging and correct rest api helpers

* Added global gossipsub subscriptions

* Update validator subscriptions data structs

* Tidy

* Re-structure validator subscriptions

* Initial handling of subscriptions

* Re-structure network service

* Add pubkey cache persistence file

* Add more comments

* Integrate persistence file into builder

* Add pubkey cache tests

* Add HashSetDelay and introduce into attestation service

* Handles validator subscriptions

* Add data_dir to beacon chain builder

* Remove Option in pubkey cache persistence file

* Ensure consistency between datadir/data_dir

* Fix failing network test

* Peer subnet discovery gets queued for future subscriptions

* Reorganise attestation service functions

* Initial wiring of attestation service

* First draft of attestation service timing logic

* Correct minor typos

* Tidy

* Fix todos

* Improve tests

* Add PeerInfo to connected peers mapping

* Fix compile error

* Fix compile error from merge

* Split up block processing metrics

* Tidy

* Refactor get_pubkey_from_state

* Remove commented-out code

* Rename state_cache -> checkpoint_cache

* Rename Checkpoint -> Snapshot

* Tidy, add comments

* Tidy up find_head function

* Change some checkpoint -> snapshot

* Add tests

* Expose max_len

* Remove dead code

* Tidy

* Fix bug

* Add sync-speed metric

* Add first attempt at VerifiableBlock

* Start integrating into beacon chain

* Integrate VerifiableBlock

* Rename VerifableBlock -> PartialBlockVerification

* Add start of typed methods

* Add progress

* Add further progress

* Rename structs

* Add full block verification to block_processing.rs

* Further beacon chain integration

* Update checks for gossip

* Add todo

* Start adding segement verification

* Add passing chain segement test

* Initial integration with batch sync

* Minor changes

* Tidy, add more error checking

* Start adding chain_segment tests

* Finish invalid signature tests

* Include single and gossip verified blocks in tests

* Add gossip verification tests

* Start adding docs

* Finish adding comments to block_processing.rs

* Rename block_processing.rs -> block_verification

* Start removing old block processing code

* Fixes beacon_chain compilation

* Fix project-wide compile errors

* Remove old code

* Correct code to pass all tests

* Fix bug with beacon proposer index

* Fix shim for BlockProcessingError

* Only process one epoch at a time

* Fix loop in chain segment processing

* Correct tests from master merge

* Add caching for state.eth1_data_votes

* Add BeaconChain::validator_pubkey

* Revert "Add caching for state.eth1_data_votes"

This reverts commit cd73dcd643.

Co-authored-by: Grant Wuerker <gwuerker@gmail.com>
Co-authored-by: Michael Sproul <michael@sigmaprime.io>
Co-authored-by: Michael Sproul <micsproul@gmail.com>
Co-authored-by: pawan <pawandhananjay@gmail.com>
Co-authored-by: Paul Hauner <paul@paulhauner.com>

eth2/utils/bls/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bls"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 

eth2/utils/bls/src/fake_public_key.rs

@@ -85,6 +85,14 @@ impl FakePublicKey {
     pub fn as_raw(&self) -> &Self {
         self
     }
+
+    pub fn as_point(&self) -> &G1Point {
+        &self.point
+    }
+
+    pub fn into_point(self) -> G1Point {
+        self.point
+    }
 }
 
 impl fmt::Display for FakePublicKey {

eth2/utils/bls/src/macros.rs

@@ -92,7 +92,6 @@ macro_rules! bytes_struct {
         #[derive(Clone)]
         pub struct $name {
             bytes: [u8; $byte_size],
-            decompressed: Option<$type>
         }
     };
     ($name: ident, $type: ty, $byte_size: expr, $small_name: expr) => {
@@ -103,14 +102,12 @@ macro_rules! bytes_struct {
             pub fn from_bytes(bytes: &[u8]) -> Result<Self, ssz::DecodeError> {
                 Ok(Self {
                     bytes: Self::get_bytes(bytes)?,
-                    decompressed: None
                 })
             }
 
             pub fn empty() -> Self {
                 Self {
                     bytes: [0; $byte_size],
-                    decompressed: None
                 }
             }
 
@@ -134,15 +131,6 @@ macro_rules! bytes_struct {
                     Ok(result)
                 }
             }
-
-            pub fn decompress(&mut self) -> Result<(), ssz::DecodeError> {
-                self.decompressed = Some(<&Self as std::convert::TryInto<$type>>::try_into(self)?);
-                Ok(())
-            }
-
-            pub fn decompressed(&self) -> &Option<$type> {
-                &self.decompressed
-            }
         }
 
         impl std::fmt::Debug for $name {
@@ -180,7 +168,44 @@ macro_rules! bytes_struct {
             }
         }
 
-        impl_ssz!($name, $byte_size, "$type");
+        impl ssz::Encode for $name {
+            fn is_ssz_fixed_len() -> bool {
+                true
+            }
+
+            fn ssz_fixed_len() -> usize {
+                $byte_size
+            }
+
+            fn ssz_bytes_len(&self) -> usize {
+                $byte_size
+            }
+
+            fn ssz_append(&self, buf: &mut Vec<u8>) {
+                buf.extend_from_slice(&self.bytes)
+            }
+        }
+
+        impl ssz::Decode for $name {
+            fn is_ssz_fixed_len() -> bool {
+                true
+            }
+
+            fn ssz_fixed_len() -> usize {
+                $byte_size
+            }
+
+            fn from_ssz_bytes(bytes: &[u8]) -> Result<Self, DecodeError> {
+                let len = bytes.len();
+                let expected = <Self as ssz::Decode>::ssz_fixed_len();
+
+                if len != expected {
+                    Err(ssz::DecodeError::InvalidByteLength { len, expected })
+                } else {
+                    Self::from_bytes(bytes)
+                }
+            }
+        }
 
         impl tree_hash::TreeHash for $name {
             fn tree_hash_type() -> tree_hash::TreeHashType {

eth2/utils/bls/src/public_key.rs

@@ -1,5 +1,5 @@
 use super::{SecretKey, BLS_PUBLIC_KEY_BYTE_SIZE};
-use milagro_bls::PublicKey as RawPublicKey;
+use milagro_bls::{G1Point, PublicKey as RawPublicKey};
 use serde::de::{Deserialize, Deserializer};
 use serde::ser::{Serialize, Serializer};
 use serde_hex::{encode as hex_encode, PrefixedHexVisitor};
@@ -24,11 +24,21 @@ impl PublicKey {
         Self(raw)
     }
 
-    /// Returns the underlying signature.
+    /// Returns a reference to the underlying signature.
     pub fn as_raw(&self) -> &RawPublicKey {
         &self.0
     }
 
+    /// Consumes self and returns the underlying signature.
+    pub fn as_point(&self) -> &G1Point {
+        &self.0.point
+    }
+
+    /// Consumes self and returns the underlying signature.
+    pub fn into_point(self) -> G1Point {
+        self.0.point
+    }
+
     /// Returns the underlying point as compressed bytes.
     ///
     /// Identical to `self.as_uncompressed_bytes()`.

eth2/utils/compare_fields/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "compare_fields"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 

eth2/utils/compare_fields_derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "compare_fields_derive"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 

eth2/utils/deposit_contract/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deposit_contract"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 

eth2/utils/eth2_config/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "eth2_config"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 

eth2/utils/eth2_interop_keypairs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "eth2_interop_keypairs"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 

eth2/utils/eth2_testnet_config/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "eth2_testnet_config"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 

eth2/utils/hashmap_delay/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "hashmap_delay"
+version = "0.2.0"
+authors = ["Age Manning <Age@AgeManning.com>"]
+edition = "2018"
+
+[dependencies]
+tokio-timer = "0.2.12"
+futures = "0.1.29"

eth2/utils/hashmap_delay/src/hashmap_delay.rs

@@ -0,0 +1,161 @@
+//! A simple hashmap object coupled with a `delay_queue` which has entries that expire after a
+//! fixed time.
+//!
+//! A `HashMapDelay` implements `Stream` which removes expired items from the map.
+
+/// The default delay for entries, in seconds. This is only used when `insert()` is used to add
+/// entries.
+const DEFAULT_DELAY: u64 = 30;
+
+use futures::prelude::*;
+use std::collections::HashMap;
+use std::time::Duration;
+use tokio_timer::delay_queue::{self, DelayQueue};
+
+pub struct HashMapDelay<K, V>
+where
+    K: std::cmp::Eq + std::hash::Hash + std::clone::Clone,
+{
+    /// The given entries.
+    entries: HashMap<K, MapEntry<V>>,
+    /// A queue holding the timeouts of each entry.
+    expirations: DelayQueue<K>,
+    /// The default expiration timeout of an entry.
+    default_entry_timeout: Duration,
+}
+
+/// A wrapping around entries that adds the link to the entry's expiration, via a `delay_queue` key.
+struct MapEntry<V> {
+    /// The expiration key for the entry.
+    key: delay_queue::Key,
+    /// The actual entry.
+    value: V,
+}
+
+impl<K, V> Default for HashMapDelay<K, V>
+where
+    K: std::cmp::Eq + std::hash::Hash + std::clone::Clone,
+{
+    fn default() -> Self {
+        HashMapDelay::new(Duration::from_secs(DEFAULT_DELAY))
+    }
+}
+
+impl<K, V> HashMapDelay<K, V>
+where
+    K: std::cmp::Eq + std::hash::Hash + std::clone::Clone,
+{
+    /// Creates a new instance of `HashMapDelay`.
+    pub fn new(default_entry_timeout: Duration) -> Self {
+        HashMapDelay {
+            entries: HashMap::new(),
+            expirations: DelayQueue::new(),
+            default_entry_timeout,
+        }
+    }
+
+    /// Insert an entry into the mapping. Entries will expire after the `default_entry_timeout`.
+    pub fn insert(&mut self, key: K, value: V) {
+        self.insert_at(key, value, self.default_entry_timeout);
+    }
+
+    /// Inserts an entry that will expire at a given instant.
+    pub fn insert_at(&mut self, key: K, value: V, entry_duration: Duration) {
+        let delay_key = self.expirations.insert(key.clone(), entry_duration);
+        let entry = MapEntry {
+            key: delay_key,
+            value,
+        };
+        self.entries.insert(key, entry);
+    }
+
+    /// Gets a reference to an entry if it exists.
+    ///
+    /// Returns None if the entry does not exist.
+    pub fn get(&self, key: &K) -> Option<&V> {
+        self.entries.get(key).map(|entry| &entry.value)
+    }
+
+    /// Gets a mutable reference to an entry if it exists.
+    ///
+    /// Returns None if the entry does not exist.
+    pub fn get_mut(&mut self, key: &K) -> Option<&mut V> {
+        self.entries.get_mut(key).map(|entry| &mut entry.value)
+    }
+
+    /// Returns true if the key exists, false otherwise.
+    pub fn contains_key(&self, key: &K) -> bool {
+        self.entries.contains_key(key)
+    }
+
+    /// Returns the length of the mapping.
+    pub fn len(&self) -> usize {
+        self.entries.len()
+    }
+
+    /// Updates the timeout for a given key. Returns true if the key existed, false otherwise.
+    ///
+    /// Panics if the duration is too far in the future.
+    pub fn update_timeout(&mut self, key: &K, timeout: Duration) -> bool {
+        if let Some(entry) = self.entries.get(key) {
+            self.expirations.reset(&entry.key, timeout);
+            true
+        } else {
+            false
+        }
+    }
+
+    /// Removes a key from the map returning the value associated with the key that was in the map.
+    ///
+    /// Return None if the key was not in the map.
+    pub fn remove(&mut self, key: &K) -> Option<V> {
+        if let Some(entry) = self.entries.remove(key) {
+            self.expirations.remove(&entry.key);
+            return Some(entry.value);
+        }
+        return None;
+    }
+
+    /// Retains only the elements specified by the predicate.
+    ///
+    /// In other words, remove all pairs `(k, v)` such that `f(&k,&mut v)` returns false.
+    pub fn retain<F: FnMut(&K, &mut V) -> bool>(&mut self, mut f: F) {
+        let expiration = &mut self.expirations;
+        self.entries.retain(|key, entry| {
+            let result = f(key, &mut entry.value);
+            if !result {
+                expiration.remove(&entry.key);
+            }
+            result
+        })
+    }
+
+    /// Removes all entries from the map.
+    pub fn clear(&mut self) {
+        self.entries.clear();
+        self.expirations.clear();
+    }
+}
+
+impl<K, V> Stream for HashMapDelay<K, V>
+where
+    K: std::cmp::Eq + std::hash::Hash + std::clone::Clone,
+{
+    type Item = (K, V);
+    type Error = &'static str;
+
+    fn poll(&mut self) -> Poll<Option<Self::Item>, Self::Error> {
+        match self.expirations.poll() {
+            Ok(Async::Ready(Some(key))) => {
+                let key = key.into_inner();
+                match self.entries.remove(&key) {
+                    Some(entry) => Ok(Async::Ready(Some((key, entry.value)))),
+                    None => Err("Value no longer exists in expirations"),
+                }
+            }
+            Ok(Async::Ready(None)) => Ok(Async::Ready(None)),
+            Ok(Async::NotReady) => Ok(Async::NotReady),
+            Err(_) => Err("Error polling HashMapDelay"),
+        }
+    }
+}

eth2/utils/hashmap_delay/src/hashset_delay.rs

@@ -0,0 +1,157 @@
+//NOTE: This is just a specific case of a HashMapDelay.
+// The code has been copied to make unique `insert` and `insert_at` functions.
+
+/// The default delay for entries, in seconds. This is only used when `insert()` is used to add
+/// entries.
+const DEFAULT_DELAY: u64 = 30;
+
+use futures::prelude::*;
+use std::collections::HashMap;
+use std::time::{Duration, Instant};
+use tokio_timer::delay_queue::{self, DelayQueue};
+
+pub struct HashSetDelay<K>
+where
+    K: std::cmp::Eq + std::hash::Hash + std::clone::Clone,
+{
+    /// The given entries.
+    entries: HashMap<K, MapEntry>,
+    /// A queue holding the timeouts of each entry.
+    expirations: DelayQueue<K>,
+    /// The default expiration timeout of an entry.
+    default_entry_timeout: Duration,
+}
+
+/// A wrapping around entries that adds the link to the entry's expiration, via a `delay_queue` key.
+struct MapEntry {
+    /// The expiration key for the entry.
+    key: delay_queue::Key,
+    /// The actual entry.
+    value: Instant,
+}
+
+impl<K> Default for HashSetDelay<K>
+where
+    K: std::cmp::Eq + std::hash::Hash + std::clone::Clone,
+{
+    fn default() -> Self {
+        HashSetDelay::new(Duration::from_secs(DEFAULT_DELAY))
+    }
+}
+
+impl<K> HashSetDelay<K>
+where
+    K: std::cmp::Eq + std::hash::Hash + std::clone::Clone,
+{
+    /// Creates a new instance of `HashSetDelay`.
+    pub fn new(default_entry_timeout: Duration) -> Self {
+        HashSetDelay {
+            entries: HashMap::new(),
+            expirations: DelayQueue::new(),
+            default_entry_timeout,
+        }
+    }
+
+    /// Insert an entry into the mapping. Entries will expire after the `default_entry_timeout`.
+    pub fn insert(&mut self, key: K) {
+        self.insert_at(key, self.default_entry_timeout);
+    }
+
+    /// Inserts an entry that will expire at a given instant.
+    pub fn insert_at(&mut self, key: K, entry_duration: Duration) {
+        let delay_key = self.expirations.insert(key.clone(), entry_duration.clone());
+        let entry = MapEntry {
+            key: delay_key,
+            value: Instant::now() + entry_duration,
+        };
+        self.entries.insert(key, entry);
+    }
+
+    /// Gets a reference to an entry if it exists.
+    ///
+    /// Returns None if the entry does not exist.
+    pub fn get(&self, key: &K) -> Option<&Instant> {
+        self.entries.get(key).map(|entry| &entry.value)
+    }
+
+    /// Returns true if the key exists, false otherwise.
+    pub fn contains(&self, key: &K) -> bool {
+        self.entries.contains_key(key)
+    }
+
+    /// Returns the length of the mapping.
+    pub fn len(&self) -> usize {
+        self.entries.len()
+    }
+
+    /// Updates the timeout for a given key. Returns true if the key existed, false otherwise.
+    ///
+    /// Panics if the duration is too far in the future.
+    pub fn update_timeout(&mut self, key: &K, timeout: Duration) -> bool {
+        if let Some(entry) = self.entries.get(key) {
+            self.expirations.reset(&entry.key, timeout);
+            true
+        } else {
+            false
+        }
+    }
+
+    /// Removes a key from the map returning the value associated with the key that was in the map.
+    ///
+    /// Return false if the key was not in the map.
+    pub fn remove(&mut self, key: &K) -> bool {
+        if let Some(entry) = self.entries.remove(key) {
+            self.expirations.remove(&entry.key);
+            return true;
+        }
+        return false;
+    }
+
+    /// Retains only the elements specified by the predicate.
+    ///
+    /// In other words, remove all pairs `(k, v)` such that `f(&k,&mut v)` returns false.
+    pub fn retain<F: FnMut(&K) -> bool>(&mut self, mut f: F) {
+        let expiration = &mut self.expirations;
+        self.entries.retain(|key, entry| {
+            let result = f(key);
+            if !result {
+                expiration.remove(&entry.key);
+            }
+            result
+        })
+    }
+
+    /// Removes all entries from the map.
+    pub fn clear(&mut self) {
+        self.entries.clear();
+        self.expirations.clear();
+    }
+
+    /// Returns a vector of referencing all keys in the map.
+    pub fn keys_vec(&self) -> Vec<&K> {
+        self.entries.keys().collect()
+    }
+}
+
+impl<K> Stream for HashSetDelay<K>
+where
+    K: std::cmp::Eq + std::hash::Hash + std::clone::Clone,
+{
+    type Item = K;
+    type Error = &'static str;
+
+    fn poll(&mut self) -> Poll<Option<Self::Item>, Self::Error> {
+        match self.expirations.poll() {
+            Ok(Async::Ready(Some(key))) => {
+                let key = key.into_inner();
+                match self.entries.remove(&key) {
+                    Some(_) => Ok(Async::Ready(Some(key))),
+                    None => Err("Value no longer exists in expirations"),
+                }
+            }
+            Ok(Async::Ready(None)) => Ok(Async::Ready(None)),
+            Ok(Async::NotReady) => Ok(Async::NotReady),
+            Err(_) => Err("Error polling HashSetDelay"),
+        }
+    }
+}

eth2/utils/hashmap_delay/src/lib.rs

@@ -0,0 +1,21 @@
+//! This crate provides two objects:
+//! - `HashMapDelay`
+//! - `HashSetDelay`
+//!
+//! # HashMapDelay
+//!
+//! This provides a `HashMap` coupled with a `DelayQueue`. Objects that are inserted into
+//! the map are inserted with an expiry. `Stream` is implemented on the `HashMapDelay`
+//! which return objects that have expired. These objects are removed from the mapping.
+//!
+//! # HashSetDelay
+//!
+//! This is similar to a `HashMapDelay` except the mapping maps to the expiry time. This
+//! allows users to add objects and check their expiry deadlines before the `Stream`
+//! consumes them.
+
+mod hashmap_delay;
+mod hashset_delay;
+
+pub use crate::hashmap_delay::HashMapDelay;
+pub use crate::hashset_delay::HashSetDelay;

eth2/utils/int_to_bytes/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "int_to_bytes"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 

eth2/utils/lighthouse_bootstrap/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lighthouse_bootstrap"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 

eth2/utils/lighthouse_metrics/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lighthouse_metrics"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 

eth2/utils/logging/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "logging"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["blacktemplar <blacktemplar@a1.net>"]
 edition = "2018"
 

eth2/utils/merkle_proof/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "merkle_proof"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Michael Sproul <michael@sigmaprime.io>"]
 edition = "2018"
 

eth2/utils/remote_beacon_node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "remote_beacon_node"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 
@@ -12,7 +12,7 @@ url = "1.2"
 serde = "1.0"
 futures = "0.1.25"
 types = { path = "../../../eth2/types" }
-rest_api = { path = "../../../beacon_node/rest_api" }
+rest_types = { path = "../rest_types" }
 hex = "0.3"
 eth2_ssz = { path = "../../../eth2/utils/ssz" }
 serde_json = "^1.0"

eth2/utils/remote_beacon_node/src/lib.rs

@@ -15,15 +15,16 @@ use std::marker::PhantomData;
 use std::time::Duration;
 use types::{
     Attestation, AttesterSlashing, BeaconBlock, BeaconState, CommitteeIndex, Epoch, EthSpec, Fork,
-    Hash256, ProposerSlashing, PublicKey, Signature, SignedBeaconBlock, Slot,
+    Hash256, ProposerSlashing, PublicKey, Signature, SignedAggregateAndProof, SignedBeaconBlock,
+    Slot,
 };
 use url::Url;
 
 pub use operation_pool::PersistedOperationPool;
 pub use proto_array_fork_choice::core::ProtoArray;
-pub use rest_api::{
-    CanonicalHeadResponse, Committee, HeadBeaconBlock, ValidatorDutiesRequest, ValidatorDuty,
-    ValidatorRequest, ValidatorResponse,
+pub use rest_types::{
+    CanonicalHeadResponse, Committee, HeadBeaconBlock, ValidatorDutiesRequest, ValidatorDutyBytes,
+    ValidatorRequest, ValidatorResponse, ValidatorSubscription,
 };
 
 // Setting a long timeout for debug ensures that crypto-heavy operations can still succeed.
@@ -63,6 +64,8 @@ pub enum Error {
     SerdeJsonError(serde_json::Error),
     /// The server responded to the request, however it did not return a 200-type success code.
     DidNotSucceed { status: StatusCode, body: String },
+    /// The request input was invalid.
+    InvalidInput,
 }
 
 #[derive(Clone)]
@@ -166,7 +169,7 @@ pub enum PublishStatus {
     Valid,
     /// The object was not valid and may or may not have been published to the network.
     Invalid(String),
-    /// The server responsed with an unknown status code. The object may or may not have been
+    /// The server responded with an unknown status code. The object may or may not have been
     /// published to the network.
     Unknown,
 }
@@ -178,7 +181,7 @@ impl PublishStatus {
     }
 }
 
-/// Provides the functions on the `/beacon` endpoint of the node.
+/// Provides the functions on the `/validator` endpoint of the node.
 #[derive(Clone)]
 pub struct Validator<E>(HttpClient<E>);
 
@@ -207,13 +210,30 @@ impl<E: EthSpec> Validator<E> {
             .and_then(move |url| client.json_get(url, query_params))
     }
 
-    /// Posts an attestation to the beacon node, expecting it to verify it and publish it to the network.
-    pub fn publish_attestation(
+    /// Produces an aggregate attestation.
+    pub fn produce_aggregate_attestation(
         &self,
-        attestation: Attestation<E>,
+        slot: Slot,
+        committee_index: CommitteeIndex,
+    ) -> impl Future<Item = Attestation<E>, Error = Error> {
+        let query_params = vec![
+            ("slot".into(), format!("{}", slot)),
+            ("committee_index".into(), format!("{}", committee_index)),
+        ];
+
+        let client = self.0.clone();
+        self.url("aggregate_attestation")
+            .into_future()
+            .and_then(move |url| client.json_get(url, query_params))
+    }
+
+    /// Posts a list of attestations to the beacon node, expecting it to verify it and publish it to the network.
+    pub fn publish_attestations(
+        &self,
+        attestation: Vec<Attestation<E>>,
     ) -> impl Future<Item = PublishStatus, Error = Error> {
         let client = self.0.clone();
-        self.url("attestation")
+        self.url("attestations")
             .into_future()
             .and_then(move |url| client.json_post::<_>(url, attestation))
             .and_then(|mut response| {
@@ -232,12 +252,37 @@ impl<E: EthSpec> Validator<E> {
             })
     }
 
+    /// Posts a list of signed aggregates and proofs to the beacon node, expecting it to verify it and publish it to the network.
+    pub fn publish_aggregate_and_proof(
+        &self,
+        signed_aggregate_and_proofs: Vec<SignedAggregateAndProof<E>>,
+    ) -> impl Future<Item = PublishStatus, Error = Error> {
+        let client = self.0.clone();
+        self.url("aggregate_and_proofs")
+            .into_future()
+            .and_then(move |url| client.json_post::<_>(url, signed_aggregate_and_proofs))
+            .and_then(|mut response| {
+                response
+                    .text()
+                    .map(|text| (response, text))
+                    .map_err(Error::from)
+            })
+            .and_then(|(response, text)| match response.status() {
+                StatusCode::OK => Ok(PublishStatus::Valid),
+                StatusCode::ACCEPTED => Ok(PublishStatus::Invalid(text)),
+                _ => response
+                    .error_for_status()
+                    .map_err(Error::from)
+                    .map(|_| PublishStatus::Unknown),
+            })
+    }
+
     /// Returns the duties required of the given validator pubkeys in the given epoch.
     pub fn get_duties(
         &self,
         epoch: Epoch,
         validator_pubkeys: &[PublicKey],
-    ) -> impl Future<Item = Vec<ValidatorDuty>, Error = Error> {
+    ) -> impl Future<Item = Vec<ValidatorDutyBytes>, Error = Error> {
         let client = self.0.clone();
 
         let bulk_request = ValidatorDutiesRequest {
@@ -297,6 +342,31 @@ impl<E: EthSpec> Validator<E> {
             )
         })
     }
+
+    /// Subscribes a list of validators to particular slots for attestation production/publication.
+    pub fn subscribe(
+        &self,
+        subscriptions: Vec<ValidatorSubscription>,
+    ) -> impl Future<Item = PublishStatus, Error = Error> {
+        let client = self.0.clone();
+        self.url("subscribe")
+            .into_future()
+            .and_then(move |url| client.json_post::<_>(url, subscriptions))
+            .and_then(|mut response| {
+                response
+                    .text()
+                    .map(|text| (response, text))
+                    .map_err(Error::from)
+            })
+            .and_then(|(response, text)| match response.status() {
+                StatusCode::OK => Ok(PublishStatus::Valid),
+                StatusCode::ACCEPTED => Ok(PublishStatus::Invalid(text)),
+                _ => response
+                    .error_for_status()
+                    .map_err(Error::from)
+                    .map(|_| PublishStatus::Unknown),
+            })
+    }
 }
 
 /// Provides the functions on the `/beacon` endpoint of the node.

eth2/utils/rest_types/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "rest_types"
+version = "0.2.0"
+authors = ["Age Manning <Age@AgeManning.com>"]
+edition = "2018"
+
+[dependencies]
+types = { path = "../../types" }
+eth2_ssz_derive = { path = "../ssz_derive" }
+eth2_ssz = { path = "../ssz" }
+eth2_hashing = { path = "../eth2_hashing" }
+tree_hash = { path = "../tree_hash" }
+bls = { path = "../bls" }
+serde = { version = "1.0.102", features = ["derive"] }
+rayon = "1.3.0"

eth2/utils/rest_types/src/beacon.rs

@@ -0,0 +1,65 @@
+//! A collection of REST API types for interaction with the beacon node.
+
+use bls::PublicKeyBytes;
+use serde::{Deserialize, Serialize};
+use ssz_derive::{Decode, Encode};
+use types::beacon_state::EthSpec;
+use types::{BeaconState, CommitteeIndex, Hash256, SignedBeaconBlock, Slot, Validator};
+
+/// Information about a block that is at the head of a chain. May or may not represent the
+/// canonical head.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Encode, Decode)]
+pub struct HeadBeaconBlock {
+    pub beacon_block_root: Hash256,
+    pub beacon_block_slot: Slot,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Encode, Decode)]
+#[serde(bound = "T: EthSpec")]
+pub struct BlockResponse<T: EthSpec> {
+    pub root: Hash256,
+    pub beacon_block: SignedBeaconBlock<T>,
+}
+
+/// Information about the block and state that are at head of the beacon chain.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Encode, Decode)]
+pub struct CanonicalHeadResponse {
+    pub slot: Slot,
+    pub block_root: Hash256,
+    pub state_root: Hash256,
+    pub finalized_slot: Slot,
+    pub finalized_block_root: Hash256,
+    pub justified_slot: Slot,
+    pub justified_block_root: Hash256,
+    pub previous_justified_slot: Slot,
+    pub previous_justified_block_root: Hash256,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Encode, Decode)]
+pub struct ValidatorResponse {
+    pub pubkey: PublicKeyBytes,
+    pub validator_index: Option<usize>,
+    pub balance: Option<u64>,
+    pub validator: Option<Validator>,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Encode, Decode)]
+pub struct ValidatorRequest {
+    /// If set to `None`, uses the canonical head state.
+    pub state_root: Option<Hash256>,
+    pub pubkeys: Vec<PublicKeyBytes>,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Encode, Decode)]
+pub struct Committee {
+    pub slot: Slot,
+    pub index: CommitteeIndex,
+    pub committee: Vec<usize>,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Encode, Decode)]
+#[serde(bound = "T: EthSpec")]
+pub struct StateResponse<T: EthSpec> {
+    pub root: Hash256,
+    pub beacon_state: BeaconState<T>,
+}

eth2/utils/rest_types/src/lib.rs

@@ -0,0 +1,15 @@
+//! A collection of types used to pass data across the rest HTTP API.
+//!
+//! This is primarily used by the validator client and the beacon node rest API.
+
+mod beacon;
+mod validator;
+
+pub use beacon::{
+    BlockResponse, CanonicalHeadResponse, Committee, HeadBeaconBlock, StateResponse,
+    ValidatorRequest, ValidatorResponse,
+};
+
+pub use validator::{
+    ValidatorDutiesRequest, ValidatorDuty, ValidatorDutyBytes, ValidatorSubscription,
+};

eth2/utils/rest_types/src/validator.rs

@@ -0,0 +1,108 @@
+use bls::{PublicKey, PublicKeyBytes, Signature};
+use eth2_hashing::hash;
+use serde::{Deserialize, Serialize};
+use ssz_derive::{Decode, Encode};
+use std::convert::TryInto;
+use types::{ChainSpec, CommitteeIndex, Domain, Epoch, Fork, SignedRoot, Slot};
+
+/// A Validator duty with the validator public key represented a `PublicKeyBytes`.
+pub type ValidatorDutyBytes = ValidatorDutyBase<PublicKeyBytes>;
+/// A validator duty with the pubkey represented as a `PublicKey`.
+pub type ValidatorDuty = ValidatorDutyBase<PublicKey>;
+
+#[derive(PartialEq, Debug, Serialize, Deserialize, Clone)]
+pub struct ValidatorDutyBase<T> {
+    /// The validator's BLS public key, uniquely identifying them. _48-bytes, hex encoded with 0x prefix, case insensitive._
+    pub validator_pubkey: T,
+    /// The validator's index in `state.validators`
+    pub validator_index: Option<u64>,
+    /// The slot at which the validator must attest.
+    pub attestation_slot: Option<Slot>,
+    /// The index of the committee within `slot` of which the validator is a member.
+    pub attestation_committee_index: Option<CommitteeIndex>,
+    /// The position of the validator in the committee.
+    pub attestation_committee_position: Option<usize>,
+    /// The slots in which a validator must propose a block (can be empty).
+    pub block_proposal_slots: Vec<Slot>,
+    /// This provides the modulo: `max(1, len(committee) // TARGET_AGGREGATORS_PER_COMMITTEE)`
+    /// which allows the validator client to determine if this duty requires the validator to be
+    /// aggregate attestations.
+    pub aggregator_modulo: Option<u64>,
+}
+
+impl<T> ValidatorDutyBase<T> {
+    /// Given a `slot_signature` determines if the validator of this duty is an aggregator.
+    // Note that we assume the signature is for the associated pubkey to avoid the signature
+    // verification
+    pub fn is_aggregator(&self, slot_signature: &Signature) -> bool {
+        if let Some(modulo) = self.aggregator_modulo {
+            let signature_hash = hash(&slot_signature.as_bytes());
+            let signature_hash_int = u64::from_le_bytes(
+                signature_hash[0..8]
+                    .try_into()
+                    .expect("first 8 bytes of signature should always convert to fixed array"),
+            );
+            signature_hash_int % modulo == 0
+        } else {
+            false
+        }
+    }
+}
+
+#[derive(PartialEq, Debug, Serialize, Deserialize, Clone, Encode, Decode)]
+pub struct ValidatorDutiesRequest {
+    pub epoch: Epoch,
+    pub pubkeys: Vec<PublicKeyBytes>,
+}
+
+/// A validator subscription, created when a validator subscribes to a slot to perform optional aggregation
+/// duties.
+#[derive(PartialEq, Debug, Serialize, Deserialize, Clone, Encode, Decode)]
+pub struct ValidatorSubscription {
+    /// The validators index.
+    pub validator_index: u64,
+    /// The index of the committee within `slot` of which the validator is a member. Used by the
+    /// beacon node to quickly evaluate the associated `SubnetId`.
+    pub attestation_committee_index: CommitteeIndex,
+    /// The slot the validator is signing.
+    pub slot: Slot,
+    /// The signature of the slot by the validator.
+    pub slot_signature: Signature,
+}
+
+impl ValidatorSubscription {
+    pub fn new(
+        validator_index: u64,
+        attestation_committee_index: CommitteeIndex,
+        slot: Slot,
+        slot_signature: Signature,
+    ) -> Self {
+        ValidatorSubscription {
+            validator_index,
+            attestation_committee_index,
+            slot,
+            slot_signature,
+        }
+    }
+
+    /// Verifies the subscription signature.
+    pub fn verify(
+        &self,
+        pubkey: &PublicKey,
+        spec: &ChainSpec,
+        fork: &Fork,
+        slots_per_epoch: u64,
+    ) -> bool {
+        let domain = spec.get_domain(
+            self.slot.epoch(slots_per_epoch),
+            Domain::SelectionProof,
+            &fork,
+        );
+        let message = self.slot.signing_root(domain);
+        if self.slot_signature.verify(message.as_bytes(), pubkey) {
+            true
+        } else {
+            false
+        }
+    }
+}

eth2/utils/serde_hex/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_hex"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 

eth2/utils/slot_clock/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "slot_clock"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 
@@ -8,3 +8,4 @@ edition = "2018"
 types = { path = "../../types" }
 lazy_static = "1.4.0"
 lighthouse_metrics = { path = "../lighthouse_metrics" }
+parking_lot = "0.9.0"

eth2/utils/slot_clock/src/lib.rs

@@ -1,14 +1,15 @@
 #[macro_use]
 extern crate lazy_static;
 
+mod manual_slot_clock;
 mod metrics;
 mod system_time_slot_clock;
-mod testing_slot_clock;
 
 use std::time::Duration;
 
+pub use crate::manual_slot_clock::ManualSlotClock;
+pub use crate::manual_slot_clock::ManualSlotClock as TestingSlotClock;
 pub use crate::system_time_slot_clock::SystemTimeSlotClock;
-pub use crate::testing_slot_clock::TestingSlotClock;
 pub use metrics::scrape_for_metrics;
 pub use types::Slot;
 
@@ -16,13 +17,21 @@ pub use types::Slot;
 ///
 /// The clock is not required to be monotonically increasing and may go backwards.
 pub trait SlotClock: Send + Sync + Sized {
-    /// Creates a new slot clock where the first slot is `genesis_slot`, genesis occured
+    /// Creates a new slot clock where the first slot is `genesis_slot`, genesis occurred
     /// `genesis_duration` after the `UNIX_EPOCH` and each slot is `slot_duration` apart.
     fn new(genesis_slot: Slot, genesis_duration: Duration, slot_duration: Duration) -> Self;
 
     /// Returns the slot at this present time.
     fn now(&self) -> Option<Slot>;
 
+    /// Returns the present time as a duration since the UNIX epoch.
+    ///
+    /// Returns `None` if the present time is before the UNIX epoch (unlikely).
+    fn now_duration(&self) -> Option<Duration>;
+
+    /// Returns the slot of the given duration since the UNIX epoch.
+    fn slot_of(&self, now: Duration) -> Option<Slot>;
+
     /// Returns the duration between slots
     fn slot_duration(&self) -> Duration;
 

eth2/utils/slot_clock/src/manual_slot_clock.rs

@@ -0,0 +1,165 @@
+use super::SlotClock;
+use parking_lot::RwLock;
+use std::convert::TryInto;
+use std::time::Duration;
+use types::Slot;
+
+/// Determines the present slot based upon a manually-incremented UNIX timestamp.
+pub struct ManualSlotClock {
+    genesis_slot: Slot,
+    /// Duration from UNIX epoch to genesis.
+    genesis_duration: Duration,
+    /// Duration from UNIX epoch to right now.
+    current_time: RwLock<Duration>,
+    /// The length of each slot.
+    slot_duration: Duration,
+}
+
+impl Clone for ManualSlotClock {
+    fn clone(&self) -> Self {
+        ManualSlotClock {
+            genesis_slot: self.genesis_slot.clone(),
+            genesis_duration: self.genesis_duration.clone(),
+            current_time: RwLock::new(self.current_time.read().clone()),
+            slot_duration: self.slot_duration.clone(),
+        }
+    }
+}
+
+impl ManualSlotClock {
+    pub fn set_slot(&self, slot: u64) {
+        let slots_since_genesis = slot
+            .checked_sub(self.genesis_slot.as_u64())
+            .expect("slot must be post-genesis")
+            .try_into()
+            .expect("slot must fit within a u32");
+        *self.current_time.write() =
+            self.genesis_duration + self.slot_duration * slots_since_genesis;
+    }
+
+    pub fn advance_slot(&self) {
+        self.set_slot(self.now().unwrap().as_u64() + 1)
+    }
+
+    pub fn duration_to_next_slot_from(&self, now: Duration) -> Option<Duration> {
+        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.slot_of(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"),
+            )
+        }
+    }
+
+    pub fn duration_to_next_epoch_from(
+        &self,
+        now: Duration,
+        slots_per_epoch: u64,
+    ) -> Option<Duration> {
+        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"),
+            )
+        }
+    }
+}
+
+impl SlotClock for ManualSlotClock {
+    fn new(genesis_slot: Slot, genesis_duration: Duration, slot_duration: Duration) -> Self {
+        if slot_duration.as_millis() == 0 {
+            panic!("ManualSlotClock cannot have a < 1ms slot duration");
+        }
+
+        Self {
+            genesis_slot,
+            current_time: RwLock::new(genesis_duration.clone()),
+            genesis_duration,
+            slot_duration,
+        }
+    }
+
+    fn now(&self) -> Option<Slot> {
+        self.slot_of(*self.current_time.read())
+    }
+
+    fn now_duration(&self) -> Option<Duration> {
+        Some(*self.current_time.read())
+    }
+
+    fn slot_of(&self, now: Duration) -> Option<Slot> {
+        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> {
+        self.duration_to_next_slot_from(*self.current_time.read())
+    }
+
+    fn duration_to_next_epoch(&self, slots_per_epoch: u64) -> Option<Duration> {
+        self.duration_to_next_epoch_from(*self.current_time.read(), slots_per_epoch)
+    }
+
+    fn slot_duration(&self) -> Duration {
+        self.slot_duration
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_slot_now() {
+        let clock = ManualSlotClock::new(
+            Slot::new(10),
+            Duration::from_secs(0),
+            Duration::from_secs(1),
+        );
+        assert_eq!(clock.now(), Some(Slot::new(10)));
+        clock.set_slot(123);
+        assert_eq!(clock.now(), Some(Slot::new(123)));
+    }
+}

eth2/utils/slot_clock/src/system_time_slot_clock.rs

@@ -1,4 +1,4 @@
-use super::SlotClock;
+use super::{ManualSlotClock, SlotClock};
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 use types::Slot;
 
@@ -7,95 +7,41 @@ 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,
+    clock: ManualSlotClock,
 }
 
 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,
+            clock: ManualSlotClock::new(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;
+        self.clock.slot_of(now)
+    }
 
-        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 now_duration(&self) -> Option<Duration> {
+        SystemTime::now().duration_since(UNIX_EPOCH).ok()
+    }
+
+    fn slot_of(&self, now: Duration) -> Option<Slot> {
+        self.clock.slot_of(now)
     }
 
     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"),
-            )
-        }
+        self.clock.duration_to_next_slot_from(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"),
-            )
-        }
+        self.clock.duration_to_next_epoch_from(now, slots_per_epoch)
     }
 
     fn slot_duration(&self) -> Duration {
-        self.slot_duration
+        self.clock.slot_duration()
     }
 }
 

eth2/utils/slot_clock/src/testing_slot_clock.rs

@@ -1,64 +0,0 @@
-use super::SlotClock;
-use std::sync::RwLock;
-use std::time::Duration;
-use types::Slot;
-
-/// A slot clock where the slot is manually set instead of being determined by the system time.
-///
-/// Useful for testing scenarios.
-pub struct TestingSlotClock {
-    slot: RwLock<Slot>,
-}
-
-impl TestingSlotClock {
-    pub fn set_slot(&self, slot: u64) {
-        *self.slot.write().expect("TestingSlotClock poisoned.") = Slot::from(slot);
-    }
-
-    pub fn advance_slot(&self) {
-        self.set_slot(self.now().unwrap().as_u64() + 1)
-    }
-}
-
-impl SlotClock for TestingSlotClock {
-    fn new(genesis_slot: Slot, _genesis_duration: Duration, _slot_duration: Duration) -> Self {
-        TestingSlotClock {
-            slot: RwLock::new(genesis_slot),
-        }
-    }
-
-    fn now(&self) -> Option<Slot> {
-        let slot = *self.slot.read().expect("TestingSlotClock poisoned.");
-        Some(slot)
-    }
-
-    /// Always returns a duration of 1 second.
-    fn duration_to_next_slot(&self) -> Option<Duration> {
-        Some(Duration::from_secs(1))
-    }
-
-    /// Always returns a duration of `1 * slots_per_epoch` second.
-    fn duration_to_next_epoch(&self, slots_per_epoch: u64) -> Option<Duration> {
-        Some(Duration::from_secs(slots_per_epoch))
-    }
-
-    /// Always returns a slot duration of 0 seconds.
-    fn slot_duration(&self) -> Duration {
-        Duration::from_secs(0)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_slot_now() {
-        let null = Duration::from_secs(0);
-
-        let clock = TestingSlotClock::new(Slot::new(10), null, null);
-        assert_eq!(clock.now(), Some(Slot::new(10)));
-        clock.set_slot(123);
-        assert_eq!(clock.now(), Some(Slot::new(123)));
-    }
-}

eth2/utils/ssz_types/src/bitfield.rs

@@ -302,7 +302,7 @@ impl<T: BitfieldBehaviour> Bitfield<T> {
 
     /// Returns the value of the `i`'th bit.
     ///
-    /// Returns `None` if `i` is out-of-bounds of `self`.
+    /// Returns `Error` if `i` is out-of-bounds of `self`.
     pub fn get(&self, i: usize) -> Result<bool, Error> {
         if i < self.len {
             let byte = self

eth2/utils/swap_or_not_shuffle/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "swap_or_not_shuffle"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 

eth2/utils/test_random_derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "test_random_derive"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["thojest <thojest@gmail.com>"]
 edition = "2018"
 description = "Procedural derive macros for implementation of TestRandom trait"