mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-19 21:04:41 +00:00
Implement standard eth2.0 API (#1569)
- 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>
This commit is contained in:
@@ -1,8 +1,6 @@
|
||||
use remote_beacon_node::RemoteBeaconNode;
|
||||
use rest_types::SyncingResponse;
|
||||
use slog::{debug, error, Logger};
|
||||
use eth2::BeaconNodeHttpClient;
|
||||
use slog::{debug, error, warn, Logger};
|
||||
use slot_clock::SlotClock;
|
||||
use types::EthSpec;
|
||||
|
||||
/// A distance in slots.
|
||||
const SYNC_TOLERANCE: u64 = 4;
|
||||
@@ -17,19 +15,19 @@ const SYNC_TOLERANCE: u64 = 4;
|
||||
///
|
||||
/// The second condition means the even if the beacon node thinks that it's syncing, we'll still
|
||||
/// try to use it if it's close enough to the head.
|
||||
pub async fn is_synced<T: SlotClock, E: EthSpec>(
|
||||
beacon_node: &RemoteBeaconNode<E>,
|
||||
pub async fn is_synced<T: SlotClock>(
|
||||
beacon_node: &BeaconNodeHttpClient,
|
||||
slot_clock: &T,
|
||||
log_opt: Option<&Logger>,
|
||||
) -> bool {
|
||||
let resp = match beacon_node.http.node().syncing_status().await {
|
||||
let resp = match beacon_node.get_node_syncing().await {
|
||||
Ok(resp) => resp,
|
||||
Err(e) => {
|
||||
if let Some(log) = log_opt {
|
||||
error!(
|
||||
log,
|
||||
"Unable connect to beacon node";
|
||||
"error" => format!("{:?}", e)
|
||||
"error" => e.to_string()
|
||||
)
|
||||
}
|
||||
|
||||
@@ -37,44 +35,38 @@ pub async fn is_synced<T: SlotClock, E: EthSpec>(
|
||||
}
|
||||
};
|
||||
|
||||
match &resp {
|
||||
SyncingResponse {
|
||||
is_syncing: false, ..
|
||||
} => true,
|
||||
SyncingResponse {
|
||||
is_syncing: true,
|
||||
sync_status,
|
||||
} => {
|
||||
if let Some(log) = log_opt {
|
||||
debug!(
|
||||
let is_synced = !resp.data.is_syncing || (resp.data.sync_distance.as_u64() < SYNC_TOLERANCE);
|
||||
|
||||
if let Some(log) = log_opt {
|
||||
if !is_synced {
|
||||
debug!(
|
||||
log,
|
||||
"Beacon node sync status";
|
||||
"status" => format!("{:?}", resp),
|
||||
);
|
||||
|
||||
warn!(
|
||||
log,
|
||||
"Beacon node is syncing";
|
||||
"msg" => "not receiving new duties",
|
||||
"sync_distance" => resp.data.sync_distance.as_u64(),
|
||||
"head_slot" => resp.data.head_slot.as_u64(),
|
||||
);
|
||||
}
|
||||
|
||||
if let Some(local_slot) = slot_clock.now() {
|
||||
let remote_slot = resp.data.head_slot + resp.data.sync_distance;
|
||||
if remote_slot + 1 < local_slot || local_slot + 1 < remote_slot {
|
||||
error!(
|
||||
log,
|
||||
"Beacon node sync status";
|
||||
"status" => format!("{:?}", resp),
|
||||
"Time discrepancy with beacon node";
|
||||
"msg" => "check the system time on this host and the beacon node",
|
||||
"beacon_node_slot" => remote_slot,
|
||||
"local_slot" => local_slot,
|
||||
);
|
||||
}
|
||||
|
||||
let now = if let Some(slot) = slot_clock.now() {
|
||||
slot
|
||||
} else {
|
||||
// There's no good reason why we shouldn't be able to read the slot clock, so we'll
|
||||
// indicate we're not synced if that's the case.
|
||||
return false;
|
||||
};
|
||||
|
||||
if sync_status.current_slot + SYNC_TOLERANCE >= now {
|
||||
true
|
||||
} else {
|
||||
if let Some(log) = log_opt {
|
||||
error!(
|
||||
log,
|
||||
"Beacon node is syncing";
|
||||
"msg" => "not receiving new duties",
|
||||
"target_slot" => sync_status.highest_slot.as_u64(),
|
||||
"current_slot" => sync_status.current_slot.as_u64(),
|
||||
);
|
||||
}
|
||||
false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
is_synced
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user