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
109 lines
4.0 KiB
Rust
109 lines
4.0 KiB
Rust
use crate::{success_response, ApiError, ApiResult, NetworkService};
|
|
use beacon_chain::BeaconChainTypes;
|
|
use eth2_libp2p::{Enr, Multiaddr, PeerId};
|
|
use hyper::{Body, Request};
|
|
use std::sync::Arc;
|
|
|
|
/// HTTP handle to return the list of libp2p multiaddr the client is listening on.
|
|
///
|
|
/// Returns a list of `Multiaddr`, serialized according to their `serde` impl.
|
|
pub fn get_listen_addresses<T: BeaconChainTypes>(req: Request<Body>) -> ApiResult {
|
|
let network = req
|
|
.extensions()
|
|
.get::<Arc<NetworkService<T>>>()
|
|
.ok_or_else(|| ApiError::ServerError("NetworkService extension missing".to_string()))?;
|
|
|
|
let multiaddresses: Vec<Multiaddr> = network.listen_multiaddrs();
|
|
|
|
Ok(success_response(Body::from(
|
|
serde_json::to_string(&multiaddresses)
|
|
.map_err(|e| ApiError::ServerError(format!("Unable to serialize Enr: {:?}", e)))?,
|
|
)))
|
|
}
|
|
|
|
/// HTTP handle to return the list of libp2p multiaddr the client is listening on.
|
|
///
|
|
/// Returns a list of `Multiaddr`, serialized according to their `serde` impl.
|
|
pub fn get_listen_port<T: BeaconChainTypes>(req: Request<Body>) -> ApiResult {
|
|
let network = req
|
|
.extensions()
|
|
.get::<Arc<NetworkService<T>>>()
|
|
.ok_or_else(|| ApiError::ServerError("NetworkService extension missing".to_string()))?;
|
|
|
|
Ok(success_response(Body::from(
|
|
serde_json::to_string(&network.listen_port())
|
|
.map_err(|e| ApiError::ServerError(format!("Unable to serialize port: {:?}", e)))?,
|
|
)))
|
|
}
|
|
|
|
/// HTTP handle to return the Discv5 ENR from the client's libp2p service.
|
|
///
|
|
/// ENR is encoded as base64 string.
|
|
pub fn get_enr<T: BeaconChainTypes>(req: Request<Body>) -> ApiResult {
|
|
let network = req
|
|
.extensions()
|
|
.get::<Arc<NetworkService<T>>>()
|
|
.ok_or_else(|| ApiError::ServerError("NetworkService extension missing".to_string()))?;
|
|
|
|
let enr: Enr = network.local_enr();
|
|
|
|
Ok(success_response(Body::from(
|
|
serde_json::to_string(&enr.to_base64())
|
|
.map_err(|e| ApiError::ServerError(format!("Unable to serialize Enr: {:?}", e)))?,
|
|
)))
|
|
}
|
|
|
|
/// HTTP handle to return the `PeerId` from the client's libp2p service.
|
|
///
|
|
/// PeerId is encoded as base58 string.
|
|
pub fn get_peer_id<T: BeaconChainTypes>(req: Request<Body>) -> ApiResult {
|
|
let network = req
|
|
.extensions()
|
|
.get::<Arc<NetworkService<T>>>()
|
|
.ok_or_else(|| ApiError::ServerError("NetworkService extension missing".to_string()))?;
|
|
|
|
let peer_id: PeerId = network.local_peer_id();
|
|
|
|
Ok(success_response(Body::from(
|
|
serde_json::to_string(&peer_id.to_base58())
|
|
.map_err(|e| ApiError::ServerError(format!("Unable to serialize Enr: {:?}", e)))?,
|
|
)))
|
|
}
|
|
|
|
/// HTTP handle to return the number of peers connected in the client's libp2p service.
|
|
pub fn get_peer_count<T: BeaconChainTypes>(req: Request<Body>) -> ApiResult {
|
|
let network = req
|
|
.extensions()
|
|
.get::<Arc<NetworkService<T>>>()
|
|
.ok_or_else(|| ApiError::ServerError("NetworkService extension missing".to_string()))?;
|
|
|
|
let connected_peers: usize = network.connected_peers();
|
|
|
|
Ok(success_response(Body::from(
|
|
serde_json::to_string(&connected_peers)
|
|
.map_err(|e| ApiError::ServerError(format!("Unable to serialize Enr: {:?}", e)))?,
|
|
)))
|
|
}
|
|
|
|
/// HTTP handle to return the list of peers connected to the client's libp2p service.
|
|
///
|
|
/// Peers are presented as a list of `PeerId::to_string()`.
|
|
pub fn get_peer_list<T: BeaconChainTypes>(req: Request<Body>) -> ApiResult {
|
|
let network = req
|
|
.extensions()
|
|
.get::<Arc<NetworkService<T>>>()
|
|
.ok_or_else(|| ApiError::ServerError("NetworkService extension missing".to_string()))?;
|
|
|
|
let connected_peers: Vec<String> = network
|
|
.connected_peer_set()
|
|
.iter()
|
|
.map(PeerId::to_string)
|
|
.collect();
|
|
|
|
Ok(success_response(Body::from(
|
|
serde_json::to_string(&connected_peers).map_err(|e| {
|
|
ApiError::ServerError(format!("Unable to serialize Vec<PeerId>: {:?}", e))
|
|
})?,
|
|
)))
|
|
}
|