0c3fdcd57c
* Renamed fork_choice::process_attestation_from_block * Processing attestation in fork choice * Retrieving state from store and checking signature * Looser check on beacon state validity. * Cleaned up get_attestation_state * Expanded fork choice api to provide latest validator message. * Checking if the an attestation contains a latest message * Correct process_attestation error handling. * Copy paste error in comment fixed. * Tidy ancestor iterators * Getting attestation slot via helper method * Refactored attestation creation in test utils * Revert "Refactored attestation creation in test utils" This reverts commit 4d277fe4239a7194758b18fb5c00dfe0b8231306. * Integration tests for free attestation processing * Implicit conflicts resolved. * formatting * Do first pass on Grants code * Add another attestation processing test * Tidy attestation processing * Remove old code fragment * Add non-compiling half finished changes * Simplify, fix bugs, add tests for chain iters * Remove attestation processing from op pool * Fix bug with fork choice, tidy * Fix overly restrictive check in fork choice. * Ensure committee cache is build during attn proc * Ignore unknown blocks at fork choice * Various minor fixes * Make fork choice write lock in to read lock * Remove unused method * Tidy comments * Fix attestation prod. target roots change * Fix compile error in store iters * Reject any attestation prior to finalization * Begin metrics refactor * Move beacon_chain to new metrics structure. * Make metrics not panic if already defined * Use global prometheus gather at rest api * Unify common metric fns into a crate * Add heavy metering to block processing * Remove hypen from prometheus metric name * Add more beacon chain metrics * Add beacon chain persistence metric * Prune op pool on finalization * Add extra prom beacon chain metrics * Prefix BeaconChain metrics with "beacon_" * Add more store metrics * Add basic metrics to libp2p * Add metrics to HTTP server * Remove old `http_server` crate * Update metrics names to be more like standard * Fix broken beacon chain metrics, add slot clock metrics * Add lighthouse_metrics gather fn * Remove http args * Fix wrong state given to op pool prune * Make prom metric names more consistent * Add more metrics, tidy existing metrics * Fix store block read metrics * Tidy attestation metrics * Fix minor PR comments * Fix minor PR comments * Remove duplicated attestation finalization check * Remove awkward `let` statement * Add first attempts at HTTP bootstrap * Add beacon_block methods to rest api * Fix serde for block.body.grafitti * Allow travis failures on beta (see desc) There's a non-backward compatible change in `cargo fmt`. Stable and beta do not agree. * Add network routes to API * Fix rustc warnings * Add best_slot method * Add --bootstrap arg to beacon node * Get bootstrapper working for ENR address * Store intermediate states during block processing * Allow bootstrapper to scrape libp2p address * Update bootstrapper libp2p address finding * Add comments * Tidy API to be more consistent with recent decisions * Address some review comments * Make BeaconChainTypes Send + Sync + 'static * Add `/network/listen_port` API endpoint * Abandon starting the node if libp2p doesn't start * Update bootstrapper for API changes * Remove unnecessary trait bounds
175 lines
6.5 KiB
Rust
175 lines
6.5 KiB
Rust
use crate::ApiError;
|
|
use beacon_chain::{BeaconChain, BeaconChainTypes};
|
|
use store::{iter::AncestorIter, Store};
|
|
use types::{BeaconState, EthSpec, Hash256, RelativeEpoch, Slot};
|
|
|
|
/// Parse a slot from a `0x` preixed string.
|
|
///
|
|
/// E.g., `"1234"`
|
|
pub fn parse_slot(string: &str) -> Result<Slot, ApiError> {
|
|
string
|
|
.parse::<u64>()
|
|
.map(Slot::from)
|
|
.map_err(|e| ApiError::InvalidQueryParams(format!("Unable to parse slot: {:?}", e)))
|
|
}
|
|
|
|
/// Parse a root from a `0x` preixed string.
|
|
///
|
|
/// E.g., `"0x0000000000000000000000000000000000000000000000000000000000000000"`
|
|
pub fn parse_root(string: &str) -> Result<Hash256, ApiError> {
|
|
const PREFIX: &str = "0x";
|
|
|
|
if string.starts_with(PREFIX) {
|
|
let trimmed = string.trim_start_matches(PREFIX);
|
|
trimmed
|
|
.parse()
|
|
.map_err(|e| ApiError::InvalidQueryParams(format!("Unable to parse root: {:?}", e)))
|
|
} else {
|
|
Err(ApiError::InvalidQueryParams(
|
|
"Root must have a '0x' prefix".to_string(),
|
|
))
|
|
}
|
|
}
|
|
|
|
/// Returns the root of the `BeaconBlock` in the canonical chain of `beacon_chain` at the given
|
|
/// `slot`, if possible.
|
|
///
|
|
/// May return a root for a previous slot, in the case of skip slots.
|
|
pub fn block_root_at_slot<T: BeaconChainTypes>(
|
|
beacon_chain: &BeaconChain<T>,
|
|
target: Slot,
|
|
) -> Option<Hash256> {
|
|
beacon_chain
|
|
.rev_iter_block_roots()
|
|
.take_while(|(_root, slot)| *slot >= target)
|
|
.find(|(_root, slot)| *slot == target)
|
|
.map(|(root, _slot)| root)
|
|
}
|
|
|
|
/// Returns a `BeaconState` and it's root in the canonical chain of `beacon_chain` at the given
|
|
/// `slot`, if possible.
|
|
///
|
|
/// Will not return a state if the request slot is in the future. Will return states higher than
|
|
/// the current head by skipping slots.
|
|
pub fn state_at_slot<T: BeaconChainTypes>(
|
|
beacon_chain: &BeaconChain<T>,
|
|
slot: Slot,
|
|
) -> Result<(Hash256, BeaconState<T::EthSpec>), ApiError> {
|
|
let head_state = &beacon_chain.head().beacon_state;
|
|
|
|
if head_state.slot == slot {
|
|
// The request slot is the same as the best block (head) slot.
|
|
|
|
// I'm not sure if this `.clone()` will be optimized out. If not, it seems unnecessary.
|
|
Ok((
|
|
beacon_chain.head().beacon_state_root,
|
|
beacon_chain.head().beacon_state.clone(),
|
|
))
|
|
} else {
|
|
let root = state_root_at_slot(beacon_chain, slot)?;
|
|
|
|
let state: BeaconState<T::EthSpec> = beacon_chain
|
|
.store
|
|
.get(&root)?
|
|
.ok_or_else(|| ApiError::NotFound(format!("Unable to find state at root {}", root)))?;
|
|
|
|
Ok((root, state))
|
|
}
|
|
}
|
|
|
|
/// Returns the root of the `BeaconState` in the canonical chain of `beacon_chain` at the given
|
|
/// `slot`, if possible.
|
|
///
|
|
/// Will not return a state root if the request slot is in the future. Will return state roots
|
|
/// higher than the current head by skipping slots.
|
|
pub fn state_root_at_slot<T: BeaconChainTypes>(
|
|
beacon_chain: &BeaconChain<T>,
|
|
slot: Slot,
|
|
) -> Result<Hash256, ApiError> {
|
|
let head_state = &beacon_chain.head().beacon_state;
|
|
let current_slot = beacon_chain
|
|
.read_slot_clock()
|
|
.ok_or_else(|| ApiError::ServerError("Unable to read slot clock".to_string()))?;
|
|
|
|
// There are four scenarios when obtaining a state for a given slot:
|
|
//
|
|
// 1. The request slot is in the future.
|
|
// 2. The request slot is the same as the best block (head) slot.
|
|
// 3. The request slot is prior to the head slot.
|
|
// 4. The request slot is later than the head slot.
|
|
if current_slot < slot {
|
|
// 1. The request slot is in the future. Reject the request.
|
|
//
|
|
// We could actually speculate about future state roots by skipping slots, however that's
|
|
// likely to cause confusion for API users.
|
|
Err(ApiError::InvalidQueryParams(format!(
|
|
"Requested slot {} is past the current slot {}",
|
|
slot, current_slot
|
|
)))
|
|
} else if head_state.slot == slot {
|
|
// 2. The request slot is the same as the best block (head) slot.
|
|
//
|
|
// The head state root is stored in memory, return a reference.
|
|
Ok(beacon_chain.head().beacon_state_root)
|
|
} else if head_state.slot > slot {
|
|
// 3. The request slot is prior to the head slot.
|
|
//
|
|
// Iterate through the state roots on the head state to find the root for that
|
|
// slot. Once the root is found, load it from the database.
|
|
Ok(head_state
|
|
.try_iter_ancestor_roots(beacon_chain.store.clone())
|
|
.ok_or_else(|| ApiError::ServerError("Failed to create roots iterator".to_string()))?
|
|
.find(|(_root, s)| *s == slot)
|
|
.map(|(root, _slot)| root)
|
|
.ok_or_else(|| ApiError::NotFound(format!("Unable to find state at slot {}", slot)))?)
|
|
} else {
|
|
// 4. The request slot is later than the head slot.
|
|
//
|
|
// Use `per_slot_processing` to advance the head state to the present slot,
|
|
// assuming that all slots do not contain a block (i.e., they are skipped slots).
|
|
let mut state = beacon_chain.head().beacon_state.clone();
|
|
let spec = &T::EthSpec::default_spec();
|
|
|
|
for _ in state.slot.as_u64()..slot.as_u64() {
|
|
// Ensure the next epoch state caches are built in case of an epoch transition.
|
|
state.build_committee_cache(RelativeEpoch::Next, spec)?;
|
|
|
|
state_processing::per_slot_processing(&mut state, spec)?;
|
|
}
|
|
|
|
// Note: this is an expensive operation. Once the tree hash cache is implement it may be
|
|
// used here.
|
|
Ok(state.canonical_root())
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn parse_root_works() {
|
|
assert_eq!(
|
|
parse_root("0x0000000000000000000000000000000000000000000000000000000000000000"),
|
|
Ok(Hash256::zero())
|
|
);
|
|
assert_eq!(
|
|
parse_root("0x000000000000000000000000000000000000000000000000000000000000002a"),
|
|
Ok(Hash256::from_low_u64_be(42))
|
|
);
|
|
assert!(
|
|
parse_root("0000000000000000000000000000000000000000000000000000000000000042").is_err()
|
|
);
|
|
assert!(parse_root("0x").is_err());
|
|
assert!(parse_root("0x00").is_err());
|
|
}
|
|
|
|
#[test]
|
|
fn parse_slot_works() {
|
|
assert_eq!(parse_slot("0"), Ok(Slot::new(0)));
|
|
assert_eq!(parse_slot("42"), Ok(Slot::new(42)));
|
|
assert_eq!(parse_slot("10000000"), Ok(Slot::new(10_000_000)));
|
|
assert!(parse_slot("cats").is_err());
|
|
}
|
|
}
|