cdec3cec18
- Resolves #1550 - Resolves #824 - Resolves #825 - Resolves #1131 - Resolves #1411 - Resolves #1256 - Resolve #1177 - Includes the `ShufflingId` struct initially defined in #1492. That PR is now closed and the changes are included here, with significant bug fixes. - Implement the https://github.com/ethereum/eth2.0-APIs in a new `http_api` crate using `warp`. This replaces the `rest_api` crate. - Add a new `common/eth2` crate which provides a wrapper around `reqwest`, providing the HTTP client that is used by the validator client and for testing. This replaces the `common/remote_beacon_node` crate. - Create a `http_metrics` crate which is a dedicated server for Prometheus metrics (they are no longer served on the same port as the REST API). We now have flags for `--metrics`, `--metrics-address`, etc. - Allow the `subnet_id` to be an optional parameter for `VerifiedUnaggregatedAttestation::verify`. This means it does not need to be provided unnecessarily by the validator client. - Move `fn map_attestation_committee` in `mod beacon_chain::attestation_verification` to a new `fn with_committee_cache` on the `BeaconChain` so the same cache can be used for obtaining validator duties. - Add some other helpers to `BeaconChain` to assist with common API duties (e.g., `block_root_at_slot`, `head_beacon_block_root`). - Change the `NaiveAggregationPool` so it can index attestations by `hash_tree_root(attestation.data)`. This is a requirement of the API. - Add functions to `BeaconChainHarness` to allow it to create slashings and exits. - Allow for `eth1::Eth1NetworkId` to go to/from a `String`. - Add functions to the `OperationPool` to allow getting all objects in the pool. - Add function to `BeaconState` to check if a committee cache is initialized. - Fix bug where `seconds_per_eth1_block` was not transferring over from `YamlConfig` to `ChainSpec`. - Add the `deposit_contract_address` to `YamlConfig` and `ChainSpec`. We needed to be able to return it in an API response. - Change some uses of serde `serialize_with` and `deserialize_with` to a single use of `with` (code quality). - Impl `Display` and `FromStr` for several BLS fields. - Check for clock discrepancy when VC polls BN for sync state (with +/- 1 slot tolerance). This is not intended to be comprehensive, it was just easy to do. - See #1434 for a per-endpoint overview. - Seeking clarity here: https://github.com/ethereum/eth2.0-APIs/issues/75 - [x] Add docs for prom port to close #1256 - [x] Follow up on this #1177 - [x] ~~Follow up with #1424~~ Will fix in future PR. - [x] Follow up with #1411 - [x] ~~Follow up with #1260~~ Will fix in future PR. - [x] Add quotes to all integers. - [x] Remove `rest_types` - [x] Address missing beacon block error. (#1629) - [x] ~~Add tests for lighthouse/peers endpoints~~ Wontfix - [x] ~~Follow up with validator status proposal~~ Tracked in #1434 - [x] Unify graffiti structs - [x] ~~Start server when waiting for genesis?~~ Will fix in future PR. - [x] TODO in http_api tests - [x] Move lighthouse endpoints off /eth/v1 - [x] Update docs to link to standard - ~~Blocked on #1586~~ Co-authored-by: Michael Sproul <michael@sigmaprime.io>
508 lines
18 KiB
Rust
508 lines
18 KiB
Rust
use crate::metrics;
|
|
use std::collections::HashMap;
|
|
use tree_hash::TreeHash;
|
|
use types::{Attestation, AttestationData, EthSpec, Hash256, Slot};
|
|
|
|
type AttestationDataRoot = Hash256;
|
|
/// The number of slots that will be stored in the pool.
|
|
///
|
|
/// For example, if `SLOTS_RETAINED == 3` and the pool is pruned at slot `6`, then all attestations
|
|
/// at slots less than `4` will be dropped and any future attestation with a slot less than `4`
|
|
/// will be refused.
|
|
const SLOTS_RETAINED: usize = 3;
|
|
|
|
/// The maximum number of distinct `AttestationData` that will be stored in each slot.
|
|
///
|
|
/// This is a DoS protection measure.
|
|
const MAX_ATTESTATIONS_PER_SLOT: usize = 16_384;
|
|
|
|
/// Returned upon successfully inserting an attestation into the pool.
|
|
#[derive(Debug, PartialEq)]
|
|
pub enum InsertOutcome {
|
|
/// The `attestation.data` had not been seen before and was added to the pool.
|
|
NewAttestationData { committee_index: usize },
|
|
/// A validator signature for the given `attestation.data` was already known. No changes were
|
|
/// made.
|
|
SignatureAlreadyKnown { committee_index: usize },
|
|
/// The `attestation.data` was known, but a signature for the given validator was not yet
|
|
/// known. The signature was aggregated into the pool.
|
|
SignatureAggregated { committee_index: usize },
|
|
}
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
pub enum Error {
|
|
/// The given `attestation.data.slot` was too low to be stored. No changes were made.
|
|
SlotTooLow {
|
|
slot: Slot,
|
|
lowest_permissible_slot: Slot,
|
|
},
|
|
/// The given `attestation.aggregation_bits` field was empty.
|
|
NoAggregationBitsSet,
|
|
/// The given `attestation.aggregation_bits` field had more than one signature. The number of
|
|
/// signatures found is included.
|
|
MoreThanOneAggregationBitSet(usize),
|
|
/// We have reached the maximum number of unique `AttestationData` that can be stored in a
|
|
/// slot. This is a DoS protection function.
|
|
ReachedMaxAttestationsPerSlot(usize),
|
|
/// The given `attestation.aggregation_bits` field had a different length to the one currently
|
|
/// stored. This indicates a fairly serious error somewhere in the code that called this
|
|
/// function.
|
|
InconsistentBitfieldLengths,
|
|
/// The given `attestation` was for the incorrect slot. This is an internal error.
|
|
IncorrectSlot { expected: Slot, attestation: Slot },
|
|
}
|
|
|
|
/// A collection of `Attestation` objects, keyed by their `attestation.data`. Enforces that all
|
|
/// `attestation` are from the same slot.
|
|
struct AggregatedAttestationMap<E: EthSpec> {
|
|
map: HashMap<AttestationDataRoot, Attestation<E>>,
|
|
}
|
|
|
|
impl<E: EthSpec> AggregatedAttestationMap<E> {
|
|
/// Create an empty collection with the given `initial_capacity`.
|
|
pub fn new(initial_capacity: usize) -> Self {
|
|
Self {
|
|
map: HashMap::with_capacity(initial_capacity),
|
|
}
|
|
}
|
|
|
|
/// Insert an attestation into `self`, aggregating it into the pool.
|
|
///
|
|
/// The given attestation (`a`) must only have one signature.
|
|
pub fn insert(&mut self, a: &Attestation<E>) -> Result<InsertOutcome, Error> {
|
|
let _timer = metrics::start_timer(&metrics::ATTESTATION_PROCESSING_AGG_POOL_CORE_INSERT);
|
|
|
|
let set_bits = a
|
|
.aggregation_bits
|
|
.iter()
|
|
.enumerate()
|
|
.filter(|(_i, bit)| *bit)
|
|
.map(|(i, _bit)| i)
|
|
.collect::<Vec<_>>();
|
|
|
|
let committee_index = set_bits
|
|
.first()
|
|
.copied()
|
|
.ok_or_else(|| Error::NoAggregationBitsSet)?;
|
|
|
|
if set_bits.len() > 1 {
|
|
return Err(Error::MoreThanOneAggregationBitSet(set_bits.len()));
|
|
}
|
|
|
|
let attestation_data_root = a.data.tree_hash_root();
|
|
|
|
if let Some(existing_attestation) = self.map.get_mut(&attestation_data_root) {
|
|
if existing_attestation
|
|
.aggregation_bits
|
|
.get(committee_index)
|
|
.map_err(|_| Error::InconsistentBitfieldLengths)?
|
|
{
|
|
Ok(InsertOutcome::SignatureAlreadyKnown { committee_index })
|
|
} else {
|
|
let _timer =
|
|
metrics::start_timer(&metrics::ATTESTATION_PROCESSING_AGG_POOL_AGGREGATION);
|
|
existing_attestation.aggregate(a);
|
|
Ok(InsertOutcome::SignatureAggregated { committee_index })
|
|
}
|
|
} else {
|
|
if self.map.len() >= MAX_ATTESTATIONS_PER_SLOT {
|
|
return Err(Error::ReachedMaxAttestationsPerSlot(
|
|
MAX_ATTESTATIONS_PER_SLOT,
|
|
));
|
|
}
|
|
|
|
self.map.insert(attestation_data_root, a.clone());
|
|
Ok(InsertOutcome::NewAttestationData { committee_index })
|
|
}
|
|
}
|
|
|
|
/// Returns an aggregated `Attestation` with the given `data`, if any.
|
|
///
|
|
/// The given `a.data.slot` must match the slot that `self` was initialized with.
|
|
pub fn get(&self, data: &AttestationData) -> Option<Attestation<E>> {
|
|
self.map.get(&data.tree_hash_root()).cloned()
|
|
}
|
|
|
|
/// Returns an aggregated `Attestation` with the given `root`, if any.
|
|
pub fn get_by_root(&self, root: &AttestationDataRoot) -> Option<&Attestation<E>> {
|
|
self.map.get(root)
|
|
}
|
|
|
|
/// Iterate all attestations in `self`.
|
|
pub fn iter(&self) -> impl Iterator<Item = &Attestation<E>> {
|
|
self.map.iter().map(|(_key, attestation)| attestation)
|
|
}
|
|
|
|
pub fn len(&self) -> usize {
|
|
self.map.len()
|
|
}
|
|
}
|
|
|
|
/// A pool of `Attestation` that is specially designed to store "unaggregated" attestations from
|
|
/// the native aggregation scheme.
|
|
///
|
|
/// **The `NaiveAggregationPool` does not do any signature or attestation verification. It assumes
|
|
/// that all `Attestation` objects provided are valid.**
|
|
///
|
|
/// ## Details
|
|
///
|
|
/// The pool sorts the `Attestation` by `attestation.data.slot`, then by `attestation.data`.
|
|
///
|
|
/// As each unaggregated attestation is added it is aggregated with any existing `attestation` with
|
|
/// the same `AttestationData`. Considering that the pool only accepts attestations with a single
|
|
/// signature, there should only ever be a single aggregated `Attestation` for any given
|
|
/// `AttestationData`.
|
|
///
|
|
/// The pool has a capacity for `SLOTS_RETAINED` slots, when a new `attestation.data.slot` is
|
|
/// provided, the oldest slot is dropped and replaced with the new slot. The pool can also be
|
|
/// pruned by supplying a `current_slot`; all existing attestations with a slot lower than
|
|
/// `current_slot - SLOTS_RETAINED` will be removed and any future attestation with a slot lower
|
|
/// than that will also be refused. Pruning is done automatically based upon the attestations it
|
|
/// receives and it can be triggered manually.
|
|
pub struct NaiveAggregationPool<E: EthSpec> {
|
|
lowest_permissible_slot: Slot,
|
|
maps: HashMap<Slot, AggregatedAttestationMap<E>>,
|
|
}
|
|
|
|
impl<E: EthSpec> Default for NaiveAggregationPool<E> {
|
|
fn default() -> Self {
|
|
Self {
|
|
lowest_permissible_slot: Slot::new(0),
|
|
maps: HashMap::new(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<E: EthSpec> NaiveAggregationPool<E> {
|
|
/// Insert an attestation into `self`, aggregating it into the pool.
|
|
///
|
|
/// The given attestation (`a`) must only have one signature and have an
|
|
/// `attestation.data.slot` that is not lower than `self.lowest_permissible_slot`.
|
|
///
|
|
/// The pool may be pruned if the given `attestation.data` has a slot higher than any
|
|
/// previously seen.
|
|
pub fn insert(&mut self, attestation: &Attestation<E>) -> Result<InsertOutcome, Error> {
|
|
let _timer = metrics::start_timer(&metrics::ATTESTATION_PROCESSING_AGG_POOL_INSERT);
|
|
let slot = attestation.data.slot;
|
|
let lowest_permissible_slot = self.lowest_permissible_slot;
|
|
|
|
// Reject any attestations that are too old.
|
|
if slot < lowest_permissible_slot {
|
|
return Err(Error::SlotTooLow {
|
|
slot,
|
|
lowest_permissible_slot,
|
|
});
|
|
}
|
|
|
|
let lock_timer =
|
|
metrics::start_timer(&metrics::ATTESTATION_PROCESSING_AGG_POOL_MAPS_WRITE_LOCK);
|
|
drop(lock_timer);
|
|
|
|
let outcome = if let Some(map) = self.maps.get_mut(&slot) {
|
|
map.insert(attestation)
|
|
} else {
|
|
let _timer = metrics::start_timer(&metrics::ATTESTATION_PROCESSING_AGG_POOL_CREATE_MAP);
|
|
// To avoid re-allocations, try and determine a rough initial capacity for the new item
|
|
// by obtaining the mean size of all items in earlier epoch.
|
|
let (count, sum) = self
|
|
.maps
|
|
.iter()
|
|
// Only include epochs that are less than the given slot in the average. This should
|
|
// generally avoid including recent epochs that are still "filling up".
|
|
.filter(|(map_slot, _item)| **map_slot < slot)
|
|
.map(|(_slot, map)| map.len())
|
|
.fold((0, 0), |(count, sum), len| (count + 1, sum + len));
|
|
|
|
// Use the mainnet default committee size if we can't determine an average.
|
|
let initial_capacity = sum.checked_div(count).unwrap_or(128);
|
|
|
|
let mut item = AggregatedAttestationMap::new(initial_capacity);
|
|
let outcome = item.insert(attestation);
|
|
self.maps.insert(slot, item);
|
|
|
|
outcome
|
|
};
|
|
|
|
self.prune(slot);
|
|
|
|
outcome
|
|
}
|
|
|
|
/// Returns an aggregated `Attestation` with the given `data`, if any.
|
|
pub fn get(&self, data: &AttestationData) -> Option<Attestation<E>> {
|
|
self.maps.get(&data.slot).and_then(|map| map.get(data))
|
|
}
|
|
|
|
/// Returns an aggregated `Attestation` with the given `data`, if any.
|
|
pub fn get_by_slot_and_root(
|
|
&self,
|
|
slot: Slot,
|
|
root: &AttestationDataRoot,
|
|
) -> Option<Attestation<E>> {
|
|
self.maps
|
|
.get(&slot)
|
|
.and_then(|map| map.get_by_root(root).cloned())
|
|
}
|
|
|
|
/// Iterate all attestations in all slots of `self`.
|
|
pub fn iter(&self) -> impl Iterator<Item = &Attestation<E>> {
|
|
self.maps.iter().map(|(_slot, map)| map.iter()).flatten()
|
|
}
|
|
|
|
/// Removes any attestations with a slot lower than `current_slot` and bars any future
|
|
/// attestations with a slot lower than `current_slot - SLOTS_RETAINED`.
|
|
pub fn prune(&mut self, current_slot: Slot) {
|
|
let _timer = metrics::start_timer(&metrics::ATTESTATION_PROCESSING_AGG_POOL_PRUNE);
|
|
|
|
// Taking advantage of saturating subtraction on `Slot`.
|
|
let lowest_permissible_slot = current_slot - Slot::from(SLOTS_RETAINED);
|
|
|
|
// No need to prune if the lowest permissible slot has not changed and the queue length is
|
|
// less than the maximum
|
|
if self.lowest_permissible_slot == lowest_permissible_slot
|
|
&& self.maps.len() <= SLOTS_RETAINED
|
|
{
|
|
return;
|
|
}
|
|
|
|
self.lowest_permissible_slot = lowest_permissible_slot;
|
|
|
|
// Remove any maps that are definitely expired.
|
|
self.maps
|
|
.retain(|slot, _map| *slot >= lowest_permissible_slot);
|
|
|
|
// If we have too many maps, remove the lowest amount to ensure we only have
|
|
// `SLOTS_RETAINED` left.
|
|
if self.maps.len() > SLOTS_RETAINED {
|
|
let mut slots = self
|
|
.maps
|
|
.iter()
|
|
.map(|(slot, _map)| *slot)
|
|
.collect::<Vec<_>>();
|
|
// Sort is generally pretty slow, however `SLOTS_RETAINED` is quite low so it should be
|
|
// negligible.
|
|
slots.sort_unstable();
|
|
slots
|
|
.into_iter()
|
|
.take(self.maps.len().saturating_sub(SLOTS_RETAINED))
|
|
.for_each(|slot| {
|
|
self.maps.remove(&slot);
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use ssz_types::BitList;
|
|
use types::{
|
|
test_utils::{generate_deterministic_keypair, test_random_instance},
|
|
Fork, Hash256,
|
|
};
|
|
|
|
type E = types::MainnetEthSpec;
|
|
|
|
fn get_attestation(slot: Slot) -> Attestation<E> {
|
|
let mut a: Attestation<E> = test_random_instance();
|
|
a.data.slot = slot;
|
|
a.aggregation_bits = BitList::with_capacity(4).expect("should create bitlist");
|
|
a
|
|
}
|
|
|
|
fn sign(a: &mut Attestation<E>, i: usize, genesis_validators_root: Hash256) {
|
|
a.sign(
|
|
&generate_deterministic_keypair(i).sk,
|
|
i,
|
|
&Fork::default(),
|
|
genesis_validators_root,
|
|
&E::default_spec(),
|
|
)
|
|
.expect("should sign attestation");
|
|
}
|
|
|
|
fn unset_bit(a: &mut Attestation<E>, i: usize) {
|
|
a.aggregation_bits
|
|
.set(i, false)
|
|
.expect("should unset aggregation bit")
|
|
}
|
|
|
|
#[test]
|
|
fn single_attestation() {
|
|
let mut a = get_attestation(Slot::new(0));
|
|
|
|
let mut pool = NaiveAggregationPool::default();
|
|
|
|
assert_eq!(
|
|
pool.insert(&a),
|
|
Err(Error::NoAggregationBitsSet),
|
|
"should not accept attestation without any signatures"
|
|
);
|
|
|
|
sign(&mut a, 0, Hash256::random());
|
|
|
|
assert_eq!(
|
|
pool.insert(&a),
|
|
Ok(InsertOutcome::NewAttestationData { committee_index: 0 }),
|
|
"should accept new attestation"
|
|
);
|
|
assert_eq!(
|
|
pool.insert(&a),
|
|
Ok(InsertOutcome::SignatureAlreadyKnown { committee_index: 0 }),
|
|
"should acknowledge duplicate signature"
|
|
);
|
|
|
|
let retrieved = pool
|
|
.get(&a.data)
|
|
.expect("should not error while getting attestation");
|
|
assert_eq!(
|
|
retrieved, a,
|
|
"retrieved attestation should equal the one inserted"
|
|
);
|
|
|
|
sign(&mut a, 1, Hash256::random());
|
|
|
|
assert_eq!(
|
|
pool.insert(&a),
|
|
Err(Error::MoreThanOneAggregationBitSet(2)),
|
|
"should not accept attestation with multiple signatures"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn multiple_attestations() {
|
|
let mut a_0 = get_attestation(Slot::new(0));
|
|
let mut a_1 = a_0.clone();
|
|
|
|
let genesis_validators_root = Hash256::random();
|
|
sign(&mut a_0, 0, genesis_validators_root);
|
|
sign(&mut a_1, 1, genesis_validators_root);
|
|
|
|
let mut pool = NaiveAggregationPool::default();
|
|
|
|
assert_eq!(
|
|
pool.insert(&a_0),
|
|
Ok(InsertOutcome::NewAttestationData { committee_index: 0 }),
|
|
"should accept a_0"
|
|
);
|
|
assert_eq!(
|
|
pool.insert(&a_1),
|
|
Ok(InsertOutcome::SignatureAggregated { committee_index: 1 }),
|
|
"should accept a_1"
|
|
);
|
|
|
|
let retrieved = pool
|
|
.get(&a_0.data)
|
|
.expect("should not error while getting attestation");
|
|
|
|
let mut a_01 = a_0.clone();
|
|
a_01.aggregate(&a_1);
|
|
|
|
assert_eq!(
|
|
retrieved, a_01,
|
|
"retrieved attestation should be aggregated"
|
|
);
|
|
|
|
/*
|
|
* Throw a different attestation data in there and ensure it isn't aggregated
|
|
*/
|
|
|
|
let mut a_different = a_0.clone();
|
|
let different_root = Hash256::from_low_u64_be(1337);
|
|
unset_bit(&mut a_different, 0);
|
|
sign(&mut a_different, 2, genesis_validators_root);
|
|
assert_ne!(a_different.data.beacon_block_root, different_root);
|
|
a_different.data.beacon_block_root = different_root;
|
|
|
|
assert_eq!(
|
|
pool.insert(&a_different),
|
|
Ok(InsertOutcome::NewAttestationData { committee_index: 2 }),
|
|
"should accept a_different"
|
|
);
|
|
|
|
assert_eq!(
|
|
pool.get(&a_0.data)
|
|
.expect("should not error while getting attestation"),
|
|
retrieved,
|
|
"should not have aggregated different attestation data"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn auto_pruning() {
|
|
let mut base = get_attestation(Slot::new(0));
|
|
sign(&mut base, 0, Hash256::random());
|
|
|
|
let mut pool = NaiveAggregationPool::default();
|
|
|
|
for i in 0..SLOTS_RETAINED * 2 {
|
|
let slot = Slot::from(i);
|
|
let mut a = base.clone();
|
|
a.data.slot = slot;
|
|
|
|
assert_eq!(
|
|
pool.insert(&a),
|
|
Ok(InsertOutcome::NewAttestationData { committee_index: 0 }),
|
|
"should accept new attestation"
|
|
);
|
|
|
|
if i < SLOTS_RETAINED {
|
|
let len = i + 1;
|
|
assert_eq!(pool.maps.len(), len, "the pool should have length {}", len);
|
|
} else {
|
|
assert_eq!(
|
|
pool.maps.len(),
|
|
SLOTS_RETAINED,
|
|
"the pool should have length SLOTS_RETAINED"
|
|
);
|
|
|
|
let mut pool_slots = pool
|
|
.maps
|
|
.iter()
|
|
.map(|(slot, _map)| *slot)
|
|
.collect::<Vec<_>>();
|
|
|
|
pool_slots.sort_unstable();
|
|
|
|
for (j, pool_slot) in pool_slots.iter().enumerate() {
|
|
let expected_slot = slot - (SLOTS_RETAINED - 1 - j) as u64;
|
|
assert_eq!(
|
|
*pool_slot, expected_slot,
|
|
"the slot of the map should be {}",
|
|
expected_slot
|
|
)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn max_attestations() {
|
|
let mut base = get_attestation(Slot::new(0));
|
|
sign(&mut base, 0, Hash256::random());
|
|
|
|
let mut pool = NaiveAggregationPool::default();
|
|
|
|
for i in 0..=MAX_ATTESTATIONS_PER_SLOT {
|
|
let mut a = base.clone();
|
|
a.data.beacon_block_root = Hash256::from_low_u64_be(i as u64);
|
|
|
|
if i < MAX_ATTESTATIONS_PER_SLOT {
|
|
assert_eq!(
|
|
pool.insert(&a),
|
|
Ok(InsertOutcome::NewAttestationData { committee_index: 0 }),
|
|
"should accept attestation below limit"
|
|
);
|
|
} else {
|
|
assert_eq!(
|
|
pool.insert(&a),
|
|
Err(Error::ReachedMaxAttestationsPerSlot(
|
|
MAX_ATTESTATIONS_PER_SLOT
|
|
)),
|
|
"should not accept attestation above limit"
|
|
);
|
|
}
|
|
}
|
|
}
|
|
}
|