mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-02 16:21:42 +00:00
* types: first updates for v0.8 * state_processing: epoch processing v0.8.0 * state_processing: block processing v0.8.0 * tree_hash_derive: support generics in SignedRoot * types v0.8: update to use ssz_types * state_processing v0.8: use ssz_types * ssz_types: add bitwise methods and from_elem * types: fix v0.8 FIXMEs * ssz_types: add bitfield shift_up * ssz_types: iterators and DerefMut for VariableList * types,state_processing: use VariableList * ssz_types: fix BitVector Decode impl Fixed a typo in the implementation of ssz::Decode for BitVector, which caused it to be considered variable length! * types: fix test modules for v0.8 update * types: remove slow type-level arithmetic * state_processing: fix tests for v0.8 * op_pool: update for v0.8 * ssz_types: Bitfield difference length-independent Allow computing the difference of two bitfields of different lengths. * Implement compact committee support * epoch_processing: committee & active index roots * state_processing: genesis state builder v0.8 * state_processing: implement v0.8.1 * Further improve tree_hash * Strip examples, tests from cached_tree_hash * Update TreeHash, un-impl CachedTreeHash * Update bitfield TreeHash, un-impl CachedTreeHash * Update FixedLenVec TreeHash, unimpl CachedTreeHash * Update update tree_hash_derive for new TreeHash * Fix TreeHash, un-impl CachedTreeHash for ssz_types * Remove fixed_len_vec, ssz benches SSZ benches relied upon fixed_len_vec -- it is easier to just delete them and rebuild them later (when necessary) * Remove boolean_bitfield crate * Fix fake_crypto BLS compile errors * Update ef_tests for new v.8 type params * Update ef_tests submodule to v0.8.1 tag * Make fixes to support parsing ssz ef_tests * `compact_committee...` to `compact_committees...` * Derive more traits for `CompactCommittee` * Flip bitfield byte-endianness * Fix tree_hash for bitfields * Modify CLI output for ef_tests * Bump ssz crate version * Update ssz_types doc comment * Del cached tree hash tests from ssz_static tests * Tidy SSZ dependencies * Rename ssz_types crate to eth2_ssz_types * validator_client: update for v0.8 * ssz_types: update union/difference for bit order swap * beacon_node: update for v0.8, EthSpec * types: disable cached tree hash, update min spec * state_processing: fix slot bug in committee update * tests: temporarily disable fork choice harness test See #447 * committee cache: prevent out-of-bounds access In the case where we tried to access the committee of a shard that didn't have a committee in the current epoch, we were accessing elements beyond the end of the shuffling vector and panicking! This commit adds a check to make the failure safe and explicit. * fix bug in get_indexed_attestation and simplify There was a bug in our implementation of get_indexed_attestation whereby incorrect "committee indices" were used to index into the custody bitfield. The bug was only observable in the case where some bits of the custody bitfield were set to 1. The implementation has been simplified to remove the bug, and a test added. * state_proc: workaround for compact committees bug https://github.com/ethereum/eth2.0-specs/issues/1315 * v0.8: updates to make the EF tests pass * Remove redundant max operation checks. * Always supply both messages when checking attestation signatures -- allowing verification of an attestation with no signatures. * Swap the order of the fork and domain constant in `get_domain`, to match the spec. * rustfmt * ef_tests: add new epoch processing tests * Integrate v0.8 into master (compiles) * Remove unused crates, fix clippy lints * Replace v0.6.3 tags w/ v0.8.1 * Remove old comment * Ensure lmd ghost tests only run in release * Update readme
146 lines
4.6 KiB
Rust
146 lines
4.6 KiB
Rust
mod api;
|
|
mod key;
|
|
mod metrics;
|
|
|
|
use beacon_chain::{BeaconChain, BeaconChainTypes};
|
|
use clap::ArgMatches;
|
|
use futures::Future;
|
|
use iron::prelude::*;
|
|
use network::NetworkMessage;
|
|
use prometheus::Registry;
|
|
use router::Router;
|
|
use serde_derive::{Deserialize, Serialize};
|
|
use slog::{info, o, warn};
|
|
use std::path::PathBuf;
|
|
use std::sync::Arc;
|
|
use tokio::runtime::TaskExecutor;
|
|
use tokio::sync::mpsc;
|
|
|
|
#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
|
|
pub struct HttpServerConfig {
|
|
pub enabled: bool,
|
|
pub listen_address: String,
|
|
pub listen_port: String,
|
|
}
|
|
|
|
impl Default for HttpServerConfig {
|
|
fn default() -> Self {
|
|
Self {
|
|
enabled: false,
|
|
listen_address: "127.0.0.1".to_string(),
|
|
listen_port: "5052".to_string(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl HttpServerConfig {
|
|
pub fn apply_cli_args(&mut self, args: &ArgMatches) -> Result<(), &'static str> {
|
|
if args.is_present("http") {
|
|
self.enabled = true;
|
|
}
|
|
|
|
if let Some(listen_address) = args.value_of("http-address") {
|
|
self.listen_address = listen_address.to_string();
|
|
}
|
|
|
|
if let Some(listen_port) = args.value_of("http-port") {
|
|
self.listen_port = listen_port.to_string();
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
/// Build the `iron` HTTP server, defining the core routes.
|
|
pub fn create_iron_http_server<T: BeaconChainTypes + 'static>(
|
|
beacon_chain: Arc<BeaconChain<T>>,
|
|
db_path: PathBuf,
|
|
metrics_registry: Registry,
|
|
) -> Iron<Router> {
|
|
let mut router = Router::new();
|
|
|
|
// A `GET` request to `/metrics` is handled by the `metrics` module.
|
|
router.get(
|
|
"/metrics",
|
|
metrics::build_handler(beacon_chain.clone(), db_path, metrics_registry),
|
|
"metrics",
|
|
);
|
|
|
|
// Any request to all other endpoints is handled by the `api` module.
|
|
router.any("/*", api::build_handler(beacon_chain.clone()), "api");
|
|
|
|
Iron::new(router)
|
|
}
|
|
|
|
/// Start the HTTP service on the tokio `TaskExecutor`.
|
|
pub fn start_service<T: BeaconChainTypes + 'static>(
|
|
config: &HttpServerConfig,
|
|
executor: &TaskExecutor,
|
|
_network_chan: mpsc::UnboundedSender<NetworkMessage<T::EthSpec>>,
|
|
beacon_chain: Arc<BeaconChain<T>>,
|
|
db_path: PathBuf,
|
|
metrics_registry: Registry,
|
|
log: &slog::Logger,
|
|
) -> exit_future::Signal {
|
|
let log = log.new(o!("Service"=>"HTTP"));
|
|
|
|
// Create:
|
|
// - `shutdown_trigger` a one-shot to shut down this service.
|
|
// - `wait_for_shutdown` a future that will wait until someone calls shutdown.
|
|
let (shutdown_trigger, wait_for_shutdown) = exit_future::signal();
|
|
|
|
// Create an `iron` http, without starting it yet.
|
|
let iron = create_iron_http_server(beacon_chain, db_path, metrics_registry);
|
|
|
|
// Create a HTTP server future.
|
|
//
|
|
// 1. Start the HTTP server
|
|
// 2. Build an exit future that will shutdown the server when requested.
|
|
// 3. Return the exit future, so the caller may shutdown the service when desired.
|
|
let http_service = {
|
|
let listen_address = format!("{}:{}", config.listen_address, config.listen_port);
|
|
// Start the HTTP server
|
|
let server_start_result = iron.http(listen_address.clone());
|
|
|
|
if server_start_result.is_ok() {
|
|
info!(log, "HTTP server running on {}", listen_address);
|
|
} else {
|
|
warn!(log, "HTTP server failed to start on {}", listen_address);
|
|
}
|
|
|
|
// Build a future that will shutdown the HTTP server when the `shutdown_trigger` is
|
|
// triggered.
|
|
wait_for_shutdown.and_then(move |_| {
|
|
info!(log, "HTTP server shutting down");
|
|
|
|
if let Ok(mut server) = server_start_result {
|
|
// According to the documentation, `server.close()` "doesn't work" and the server
|
|
// keeps listening.
|
|
//
|
|
// It is being called anyway, because it seems like the right thing to do. If you
|
|
// know this has negative side-effects, please create an issue to discuss.
|
|
//
|
|
// See: https://docs.rs/iron/0.6.0/iron/struct.Listening.html#impl
|
|
match server.close() {
|
|
_ => (),
|
|
};
|
|
}
|
|
info!(log, "HTTP server shutdown complete.");
|
|
Ok(())
|
|
})
|
|
};
|
|
|
|
// Attach the HTTP server to the executor.
|
|
executor.spawn(http_service);
|
|
|
|
shutdown_trigger
|
|
}
|
|
|
|
/// Helper function for mapping a failure to read state to a 500 server error.
|
|
fn map_persistent_err_to_500(e: persistent::PersistentError) -> iron::error::IronError {
|
|
iron::error::IronError {
|
|
error: Box::new(e),
|
|
response: iron::Response::with(iron::status::Status::InternalServerError),
|
|
}
|
|
}
|