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>
73 lines
2.2 KiB
Rust
73 lines
2.2 KiB
Rust
use crate::metrics;
|
|
use lru::LruCache;
|
|
use types::{beacon_state::CommitteeCache, Epoch, Hash256, ShufflingId};
|
|
|
|
/// The size of the LRU cache that stores committee caches for quicker verification.
|
|
///
|
|
/// Each entry should be `8 + 800,000 = 800,008` bytes in size with 100k validators. (8-byte hash +
|
|
/// 100k indices). Therefore, this cache should be approx `16 * 800,008 = 12.8 MB`. (Note: this
|
|
/// ignores a few extra bytes in the caches that should be insignificant compared to the indices).
|
|
const CACHE_SIZE: usize = 16;
|
|
|
|
/// Provides an LRU cache for `CommitteeCache`.
|
|
///
|
|
/// It has been named `ShufflingCache` because `CommitteeCacheCache` is a bit weird and looks like
|
|
/// a find/replace error.
|
|
pub struct ShufflingCache {
|
|
cache: LruCache<ShufflingId, CommitteeCache>,
|
|
}
|
|
|
|
impl ShufflingCache {
|
|
pub fn new() -> Self {
|
|
Self {
|
|
cache: LruCache::new(CACHE_SIZE),
|
|
}
|
|
}
|
|
|
|
pub fn get(&mut self, key: &ShufflingId) -> Option<&CommitteeCache> {
|
|
let opt = self.cache.get(key);
|
|
|
|
if opt.is_some() {
|
|
metrics::inc_counter(&metrics::SHUFFLING_CACHE_HITS);
|
|
} else {
|
|
metrics::inc_counter(&metrics::SHUFFLING_CACHE_MISSES);
|
|
}
|
|
|
|
opt
|
|
}
|
|
|
|
pub fn contains(&self, key: &ShufflingId) -> bool {
|
|
self.cache.contains(key)
|
|
}
|
|
|
|
pub fn insert(&mut self, key: ShufflingId, committee_cache: &CommitteeCache) {
|
|
if !self.cache.contains(&key) {
|
|
self.cache.put(key, committee_cache.clone());
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Contains the shuffling IDs for a beacon block.
|
|
pub struct BlockShufflingIds {
|
|
pub current: ShufflingId,
|
|
pub next: ShufflingId,
|
|
pub block_root: Hash256,
|
|
}
|
|
|
|
impl BlockShufflingIds {
|
|
/// Returns the shuffling ID for the given epoch.
|
|
///
|
|
/// Returns `None` if `epoch` is prior to `self.current.shuffling_epoch`.
|
|
pub fn id_for_epoch(&self, epoch: Epoch) -> Option<ShufflingId> {
|
|
if epoch == self.current.shuffling_epoch {
|
|
Some(self.current.clone())
|
|
} else if epoch == self.next.shuffling_epoch {
|
|
Some(self.next.clone())
|
|
} else if epoch > self.next.shuffling_epoch {
|
|
Some(ShufflingId::from_components(epoch, self.block_root))
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
}
|