mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-16 03:12:41 +00:00
* Refactor to cache Eth1Data * Fix merge conflicts and minor refactorings * Rename Eth1Cache to Eth1DataCache * Refactor events subscription * Add deposits module to interface with BeaconChain deposits * Remove utils * Rename to types.rs and add trait constraints to Eth1DataFetcher * Confirm to trait constraints. Make Web3DataFetcher cloneable * Make fetcher object member of deposit and eth1_data cache and other fixes * Fix update_cache function * Move fetch_eth1_data to impl block * Fix deposit tests * Create Eth1 object for interfacing with Beacon chain * Add `run` function for running update_cache and subscribe_deposit_logs tasks * Add logging * Run `cargo fmt` and make tests pass * Convert sync functions to async * Add timeouts to web3 functions * Return futures from cache functions * Add failed chaining of futures * Working cache updation * Clean up tests and `update_cache` function * Refactor `get_eth1_data` functions to work with future returning functions * Refactor eth1 `run` function to work with modified `update_cache` api * Minor changes * Add distance parameter to `update_cache` * Fix tests and other minor fixes * Working integration with cache and deposits * Add merkle_tree construction, proof generation and verification code * Add function to construct and fetch Deposits for BeaconNode * Add error handling * Import ssz * Add error handling to eth1 cache and fix minor errors * Run rustfmt * Fix minor bug * Rename Eth1Error and change to Result<T> * Change deposit fetching mechanism from notification based to poll based * Add deposits from eth1 chain in a given range every `x` blocks * Modify `run` function to accommodate changes * Minor fixes * Fix formatting * Initial commit. web3 api working. * Tidied up lib. Add function for fetching logs. * Refactor with `Eth1DataFetcher` trait * Add parsing for deposit contract logs and get_eth1_data function * Add `get_eth1_votes` function * Refactor to cache Eth1Data * Fix merge conflicts and minor refactorings * Rename Eth1Cache to Eth1DataCache * Refactor events subscription * Add deposits module to interface with BeaconChain deposits * Remove utils * Rename to types.rs and add trait constraints to Eth1DataFetcher * Confirm to trait constraints. Make Web3DataFetcher cloneable * Make fetcher object member of deposit and eth1_data cache and other fixes * Fix update_cache function * Move fetch_eth1_data to impl block * Fix deposit tests * Create Eth1 object for interfacing with Beacon chain * Add `run` function for running update_cache and subscribe_deposit_logs tasks * Add logging * Run `cargo fmt` and make tests pass * Convert sync functions to async * Add timeouts to web3 functions * Return futures from cache functions * Add failed chaining of futures * Working cache updation * Clean up tests and `update_cache` function * Refactor `get_eth1_data` functions to work with future returning functions * Refactor eth1 `run` function to work with modified `update_cache` api * Minor changes * Add distance parameter to `update_cache` * Fix tests and other minor fixes * Working integration with cache and deposits * Add merkle_tree construction, proof generation and verification code * Add function to construct and fetch Deposits for BeaconNode * Add error handling * Import ssz * Add error handling to eth1 cache and fix minor errors * Run rustfmt * Fix minor bug * Rename Eth1Error and change to Result<T> * Change deposit fetching mechanism from notification based to poll based * Add deposits from eth1 chain in a given range every `x` blocks * Modify `run` function to accommodate changes * Minor fixes * Fix formatting * Fix merge issue * Refactor with `Config` struct. Remote `ContractConfig` * Rename eth1_chain crate to eth1 * Rename files and read abi file using `fs::read` * Move eth1 to lib * Remove unnecessary mutability constraint * Add `Web3Backend` for returning actual eth1 data * Refactor `get_eth1_votes` to return a Result * Delete `eth1_chain` crate * Return `Result` from `get_deposits` * Fix range of deposits to return to beacon chain * Add `get_block_height_by_hash` trait function * Add naive method for getting `previous_eth1_distance` * Add eth1 config params to main config * Add instructions for setting up eth1 testing environment * Add build script to fetch deposit contract abi * Contract ABI is part of compiled binary * Fix minor bugs * Move docs to lib * Add timeout to config * Remove print statements * Change warn to error * Fix typos * Removed prints in test and get timeout value from config * Fixed error types * Added logging to web3_fetcher * Refactor for modified web3 api * Fix minor stuff * Add build script * Tidy, hide eth1 integration tests behind flag * Add http crate * Add first stages of eth1_test_rig * Fix deposits on test rig * Fix bug with deposit count method * Add block hash getter to http eth1 * Clean eth1 http crate and tests * Add script to start ganache * Adds deposit tree to eth1-http * Extend deposit tree tests * Tidy tests in eth1-http * Add more detail to get block request * Add block cache to eth1-http * Rename deposit tree to deposit cache * Add inital updating to eth1-http * Tidy updater * Fix compile bugs in tests * Adds an Eth1DataCache builder * Reorg eth1-http files * Add (failing) tests for eth1 updater * Rename files, fix bug in eth1-http * Ensure that ganache timestamps are increasing * Fix bugs with getting eth1data ancestors * Improve eth1 testing, fix bugs * Add truncate method to block cache * Add pruning to block cache update process * Add tests for block pruning * Allow for dropping an expired cache. * Add more comments * Add first compiling version of deposit updater * Add common fn for getting range of required blocks * Add passing deposit update test * Improve tests * Fix block pruning bug * Add tests for running two updates at once * Add updater services to eth1 * Add deposit collection to beacon chain * Add incomplete builder experiments * Add first working version of beacon chain builder * Update test harness to new beacon chain type * Rename builder file, tidy * Add first working client builder * Progress further on client builder * Update becaon node binary to use client builder * Ensure release tests compile * Remove old eth1 crate * Add first pass of new lighthouse binary * Fix websocket server startup * Remove old binary code from beacon_node crate * Add first working beacon node tests * Add genesis crate, new eth1 cache_2 * Add Serivce to Eth1Cache * Refactor with general eth1 improvements * Add passing genesis test * Tidy, add comments * Add more comments to eth1 service * Add further eth1 progress * Fix some bugs with genesis * Fix eth1 bugs, make eth1 linking more efficient * Shift logic in genesis service * Add more comments to genesis service * Add gzip, max request values, timeouts to http * Update testnet parameters to suit goerli testnet * Add ability to vary Fork, fix custom spec * Be more explicit about deposit fork version * Start adding beacon chain eth1 option * Add more flexibility to prod client * Further runtime refactoring * Allow for starting from store * Add bootstrapping to client config * Add remote_beacon_node crate * Update eth1 service for more configurability * Update eth1 tests to use less runtimes * Patch issues with tests using too many files * Move dummy eth1 backend flag * Ensure all tests pass * Add ganache-cli to Dockerfile * Use a special docker hub image for testing * Appease clippy * Move validator client into lighthouse binary * Allow starting with dummy eth1 backend * Improve logging * Fix dummy eth1 backend from cli * Add extra testnet command * Ensure consistent spec in beacon node * Update eth1 rig to work on goerli * Tidy lcli, start adding support for yaml config * Add incomplete YamlConfig struct * Remove efforts at YamlConfig * Add incomplete eth1 voting. Blocked on spec issues * Add (untested) first pass at eth1 vote algo * Add tests for winning vote * Add more tests for eth1 chain * Add more eth1 voting tests * Added more eth1 voting testing * Change test name * Add more tests to eth1 chain * Tidy eth1 generics, add more tests * Improve comments * Tidy beacon_node tests * Tidy, rename JsonRpc.. to Caching.. * Tidy voting logic * Tidy builder docs * Add comments, tidy eth1 * Add more comments to eth1 * Fix bug with winning_vote * Add doc comments to the `ClientBuilder` * Remove commented-out code * Improve `ClientBuilder` docs * Add comments to client config * Add decoding test for `ClientConfig` * Remove unused `DepositSet` struct * Tidy `block_cache` * Remove commented out lines * Remove unused code in `eth1` crate * Remove old validator binary `main.rs` * Tidy, fix tests compile error * Add initial tests for get_deposits * Remove dead code in eth1_test_rig * Update TestingDepositBuilder * Add testing for getting eth1 deposits * Fix duplicate rand dep * Remove dead code * Remove accidentally-added files * Fix comment in eth1_genesis_service * Add .gitignore for eth1_test_rig * Fix bug in eth1_genesis_service * Remove dead code from eth2_config * Fix tabs/spaces in root Cargo.toml * Tidy eth1 crate * Allow for re-use of eth1 service after genesis * Update docs for new CLI * Change README gif * Tidy eth1 http module * Tidy eth1 service * Tidy environment crate * Remove unused file * Tidy, add comments * Remove commented-out code * Address majority of Michael's comments * Address other PR comments * Add link to issue alongside TODO
354 lines
15 KiB
Rust
354 lines
15 KiB
Rust
use crate::error;
|
|
use crate::service::NetworkMessage;
|
|
use crate::sync::MessageProcessor;
|
|
use beacon_chain::{BeaconChain, BeaconChainTypes};
|
|
use eth2_libp2p::{
|
|
behaviour::PubsubMessage,
|
|
rpc::{RPCError, RPCErrorResponse, RPCRequest, RPCResponse, RequestId},
|
|
PeerId, RPCEvent,
|
|
};
|
|
use futures::future::Future;
|
|
use futures::stream::Stream;
|
|
use slog::{debug, o, trace, warn};
|
|
use ssz::{Decode, DecodeError};
|
|
use std::sync::Arc;
|
|
use tokio::sync::mpsc;
|
|
use types::{Attestation, AttesterSlashing, BeaconBlock, ProposerSlashing, VoluntaryExit};
|
|
|
|
/// Handles messages received from the network and client and organises syncing. This
|
|
/// functionality of this struct is to validate an decode messages from the network before
|
|
/// passing them to the internal message processor. The message processor spawns a syncing thread
|
|
/// which manages which blocks need to be requested and processed.
|
|
pub struct MessageHandler<T: BeaconChainTypes> {
|
|
/// A channel to the network service to allow for gossip propagation.
|
|
network_send: mpsc::UnboundedSender<NetworkMessage>,
|
|
/// Processes validated and decoded messages from the network. Has direct access to the
|
|
/// sync manager.
|
|
message_processor: MessageProcessor<T>,
|
|
/// The `MessageHandler` logger.
|
|
log: slog::Logger,
|
|
}
|
|
|
|
/// Types of messages the handler can receive.
|
|
#[derive(Debug)]
|
|
pub enum HandlerMessage {
|
|
/// We have initiated a connection to a new peer.
|
|
PeerDialed(PeerId),
|
|
/// Peer has disconnected,
|
|
PeerDisconnected(PeerId),
|
|
/// An RPC response/request has been received.
|
|
RPC(PeerId, RPCEvent),
|
|
/// A gossip message has been received. The fields are: message id, the peer that sent us this
|
|
/// message and the message itself.
|
|
PubsubMessage(String, PeerId, PubsubMessage),
|
|
}
|
|
|
|
impl<T: BeaconChainTypes + 'static> MessageHandler<T> {
|
|
/// Initializes and runs the MessageHandler.
|
|
pub fn spawn(
|
|
beacon_chain: Arc<BeaconChain<T>>,
|
|
network_send: mpsc::UnboundedSender<NetworkMessage>,
|
|
executor: &tokio::runtime::TaskExecutor,
|
|
log: slog::Logger,
|
|
) -> error::Result<mpsc::UnboundedSender<HandlerMessage>> {
|
|
let message_handler_log = log.new(o!("service"=> "msg_handler"));
|
|
trace!(message_handler_log, "Service starting");
|
|
|
|
let (handler_send, handler_recv) = mpsc::unbounded_channel();
|
|
|
|
// Initialise a message instance, which itself spawns the syncing thread.
|
|
let message_processor =
|
|
MessageProcessor::new(executor, beacon_chain, network_send.clone(), &log);
|
|
|
|
// generate the Message handler
|
|
let mut handler = MessageHandler {
|
|
network_send,
|
|
message_processor,
|
|
log: message_handler_log,
|
|
};
|
|
|
|
// spawn handler task and move the message handler instance into the spawned thread
|
|
executor.spawn(
|
|
handler_recv
|
|
.for_each(move |msg| Ok(handler.handle_message(msg)))
|
|
.map_err(move |_| {
|
|
debug!(log, "Network message handler terminated.");
|
|
}),
|
|
);
|
|
|
|
Ok(handler_send)
|
|
}
|
|
|
|
/// Handle all messages incoming from the network service.
|
|
fn handle_message(&mut self, message: HandlerMessage) {
|
|
match message {
|
|
// we have initiated a connection to a peer
|
|
HandlerMessage::PeerDialed(peer_id) => {
|
|
self.message_processor.on_connect(peer_id);
|
|
}
|
|
// A peer has disconnected
|
|
HandlerMessage::PeerDisconnected(peer_id) => {
|
|
self.message_processor.on_disconnect(peer_id);
|
|
}
|
|
// An RPC message request/response has been received
|
|
HandlerMessage::RPC(peer_id, rpc_event) => {
|
|
self.handle_rpc_message(peer_id, rpc_event);
|
|
}
|
|
// An RPC message request/response has been received
|
|
HandlerMessage::PubsubMessage(id, peer_id, gossip) => {
|
|
self.handle_gossip(id, peer_id, gossip);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* RPC - Related functionality */
|
|
|
|
/// Handle RPC messages
|
|
fn handle_rpc_message(&mut self, peer_id: PeerId, rpc_message: RPCEvent) {
|
|
match rpc_message {
|
|
RPCEvent::Request(id, req) => self.handle_rpc_request(peer_id, id, req),
|
|
RPCEvent::Response(id, resp) => self.handle_rpc_response(peer_id, id, resp),
|
|
RPCEvent::Error(id, error) => self.handle_rpc_error(peer_id, id, error),
|
|
}
|
|
}
|
|
|
|
/// A new RPC request has been received from the network.
|
|
fn handle_rpc_request(&mut self, peer_id: PeerId, request_id: RequestId, request: RPCRequest) {
|
|
match request {
|
|
RPCRequest::Hello(hello_message) => {
|
|
self.message_processor
|
|
.on_hello_request(peer_id, request_id, hello_message)
|
|
}
|
|
RPCRequest::Goodbye(goodbye_reason) => {
|
|
debug!(
|
|
self.log, "PeerGoodbye";
|
|
"peer" => format!("{:?}", peer_id),
|
|
"reason" => format!("{:?}", goodbye_reason),
|
|
);
|
|
self.message_processor.on_disconnect(peer_id);
|
|
}
|
|
RPCRequest::BeaconBlocks(request) => self
|
|
.message_processor
|
|
.on_beacon_blocks_request(peer_id, request_id, request),
|
|
RPCRequest::RecentBeaconBlocks(request) => self
|
|
.message_processor
|
|
.on_recent_beacon_blocks_request(peer_id, request_id, request),
|
|
}
|
|
}
|
|
|
|
/// An RPC response has been received from the network.
|
|
// we match on id and ignore responses past the timeout.
|
|
fn handle_rpc_response(
|
|
&mut self,
|
|
peer_id: PeerId,
|
|
request_id: RequestId,
|
|
error_response: RPCErrorResponse,
|
|
) {
|
|
// an error could have occurred.
|
|
match error_response {
|
|
RPCErrorResponse::InvalidRequest(error) => {
|
|
warn!(self.log, "Peer indicated invalid request";"peer_id" => format!("{:?}", peer_id), "error" => error.as_string())
|
|
}
|
|
RPCErrorResponse::ServerError(error) => {
|
|
warn!(self.log, "Peer internal server error";"peer_id" => format!("{:?}", peer_id), "error" => error.as_string())
|
|
}
|
|
RPCErrorResponse::Unknown(error) => {
|
|
warn!(self.log, "Unknown peer error";"peer" => format!("{:?}", peer_id), "error" => error.as_string())
|
|
}
|
|
RPCErrorResponse::Success(response) => {
|
|
match response {
|
|
RPCResponse::Hello(hello_message) => {
|
|
self.message_processor
|
|
.on_hello_response(peer_id, hello_message);
|
|
}
|
|
RPCResponse::BeaconBlocks(response) => {
|
|
match self.decode_beacon_blocks(&response) {
|
|
Ok(beacon_blocks) => {
|
|
self.message_processor.on_beacon_blocks_response(
|
|
peer_id,
|
|
request_id,
|
|
beacon_blocks,
|
|
);
|
|
}
|
|
Err(e) => {
|
|
// TODO: Down-vote Peer
|
|
warn!(self.log, "Peer sent invalid BEACON_BLOCKS response";"peer" => format!("{:?}", peer_id), "error" => format!("{:?}", e));
|
|
}
|
|
}
|
|
}
|
|
RPCResponse::RecentBeaconBlocks(response) => {
|
|
match self.decode_beacon_blocks(&response) {
|
|
Ok(beacon_blocks) => {
|
|
self.message_processor.on_recent_beacon_blocks_response(
|
|
peer_id,
|
|
request_id,
|
|
beacon_blocks,
|
|
);
|
|
}
|
|
Err(e) => {
|
|
// TODO: Down-vote Peer
|
|
warn!(self.log, "Peer sent invalid BEACON_BLOCKS response";"peer" => format!("{:?}", peer_id), "error" => format!("{:?}", e));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Handle various RPC errors
|
|
fn handle_rpc_error(&mut self, peer_id: PeerId, request_id: RequestId, error: RPCError) {
|
|
//TODO: Handle error correctly
|
|
warn!(self.log, "RPC Error"; "Peer" => format!("{:?}", peer_id), "request_id" => format!("{}", request_id), "Error" => format!("{:?}", error));
|
|
}
|
|
|
|
/// Handle RPC messages
|
|
fn handle_gossip(&mut self, id: String, peer_id: PeerId, gossip_message: PubsubMessage) {
|
|
match gossip_message {
|
|
PubsubMessage::Block(message) => match self.decode_gossip_block(message) {
|
|
Ok(block) => {
|
|
let should_forward_on = self
|
|
.message_processor
|
|
.on_block_gossip(peer_id.clone(), block);
|
|
// TODO: Apply more sophisticated validation and decoding logic
|
|
if should_forward_on {
|
|
self.propagate_message(id, peer_id.clone());
|
|
}
|
|
}
|
|
Err(e) => {
|
|
debug!(self.log, "Invalid gossiped beacon block"; "peer_id" => format!("{}", peer_id), "Error" => format!("{:?}", e));
|
|
}
|
|
},
|
|
PubsubMessage::Attestation(message) => match self.decode_gossip_attestation(message) {
|
|
Ok(attestation) => {
|
|
// TODO: Apply more sophisticated validation and decoding logic
|
|
self.propagate_message(id, peer_id.clone());
|
|
self.message_processor
|
|
.on_attestation_gossip(peer_id, attestation);
|
|
}
|
|
Err(e) => {
|
|
debug!(self.log, "Invalid gossiped attestation"; "peer_id" => format!("{}", peer_id), "Error" => format!("{:?}", e));
|
|
}
|
|
},
|
|
PubsubMessage::VoluntaryExit(message) => match self.decode_gossip_exit(message) {
|
|
Ok(_exit) => {
|
|
// TODO: Apply more sophisticated validation and decoding logic
|
|
self.propagate_message(id, peer_id.clone());
|
|
// TODO: Handle exits
|
|
debug!(self.log, "Received a voluntary exit"; "peer_id" => format!("{}", peer_id) );
|
|
}
|
|
Err(e) => {
|
|
debug!(self.log, "Invalid gossiped exit"; "peer_id" => format!("{}", peer_id), "Error" => format!("{:?}", e));
|
|
}
|
|
},
|
|
PubsubMessage::ProposerSlashing(message) => {
|
|
match self.decode_gossip_proposer_slashing(message) {
|
|
Ok(_slashing) => {
|
|
// TODO: Apply more sophisticated validation and decoding logic
|
|
self.propagate_message(id, peer_id.clone());
|
|
// TODO: Handle proposer slashings
|
|
debug!(self.log, "Received a proposer slashing"; "peer_id" => format!("{}", peer_id) );
|
|
}
|
|
Err(e) => {
|
|
debug!(self.log, "Invalid gossiped proposer slashing"; "peer_id" => format!("{}", peer_id), "Error" => format!("{:?}", e));
|
|
}
|
|
}
|
|
}
|
|
PubsubMessage::AttesterSlashing(message) => {
|
|
match self.decode_gossip_attestation_slashing(message) {
|
|
Ok(_slashing) => {
|
|
// TODO: Apply more sophisticated validation and decoding logic
|
|
self.propagate_message(id, peer_id.clone());
|
|
// TODO: Handle attester slashings
|
|
debug!(self.log, "Received an attester slashing"; "peer_id" => format!("{}", peer_id) );
|
|
}
|
|
Err(e) => {
|
|
debug!(self.log, "Invalid gossiped attester slashing"; "peer_id" => format!("{}", peer_id), "Error" => format!("{:?}", e));
|
|
}
|
|
}
|
|
}
|
|
PubsubMessage::Unknown(message) => {
|
|
// Received a message from an unknown topic. Ignore for now
|
|
debug!(self.log, "Unknown Gossip Message"; "peer_id" => format!("{}", peer_id), "Message" => format!("{:?}", message));
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Informs the network service that the message should be forwarded to other peers.
|
|
fn propagate_message(&mut self, message_id: String, propagation_source: PeerId) {
|
|
self.network_send
|
|
.try_send(NetworkMessage::Propagate {
|
|
propagation_source,
|
|
message_id,
|
|
})
|
|
.unwrap_or_else(|_| {
|
|
warn!(
|
|
self.log,
|
|
"Could not send propagation request to the network service"
|
|
)
|
|
});
|
|
}
|
|
|
|
/* Decoding of gossipsub objects from the network.
|
|
*
|
|
* The decoding is done in the message handler as it has access to to a `BeaconChain` and can
|
|
* therefore apply more efficient logic in decoding and verification.
|
|
*
|
|
* TODO: Apply efficient decoding/verification of these objects
|
|
*/
|
|
|
|
/* Gossipsub Domain Decoding */
|
|
// Note: These are not generics as type-specific verification will need to be applied.
|
|
fn decode_gossip_block(
|
|
&self,
|
|
beacon_block: Vec<u8>,
|
|
) -> Result<BeaconBlock<T::EthSpec>, DecodeError> {
|
|
//TODO: Apply verification before decoding.
|
|
BeaconBlock::from_ssz_bytes(&beacon_block)
|
|
}
|
|
|
|
fn decode_gossip_attestation(
|
|
&self,
|
|
beacon_block: Vec<u8>,
|
|
) -> Result<Attestation<T::EthSpec>, DecodeError> {
|
|
//TODO: Apply verification before decoding.
|
|
Attestation::from_ssz_bytes(&beacon_block)
|
|
}
|
|
|
|
fn decode_gossip_exit(&self, voluntary_exit: Vec<u8>) -> Result<VoluntaryExit, DecodeError> {
|
|
//TODO: Apply verification before decoding.
|
|
VoluntaryExit::from_ssz_bytes(&voluntary_exit)
|
|
}
|
|
|
|
fn decode_gossip_proposer_slashing(
|
|
&self,
|
|
proposer_slashing: Vec<u8>,
|
|
) -> Result<ProposerSlashing, DecodeError> {
|
|
//TODO: Apply verification before decoding.
|
|
ProposerSlashing::from_ssz_bytes(&proposer_slashing)
|
|
}
|
|
|
|
fn decode_gossip_attestation_slashing(
|
|
&self,
|
|
attester_slashing: Vec<u8>,
|
|
) -> Result<AttesterSlashing<T::EthSpec>, DecodeError> {
|
|
//TODO: Apply verification before decoding.
|
|
AttesterSlashing::from_ssz_bytes(&attester_slashing)
|
|
}
|
|
|
|
/* Req/Resp Domain Decoding */
|
|
|
|
/// Verifies and decodes an ssz-encoded list of `BeaconBlock`s. This list may contain empty
|
|
/// entries encoded with an SSZ NULL.
|
|
fn decode_beacon_blocks(
|
|
&self,
|
|
beacon_blocks: &[u8],
|
|
) -> Result<Vec<BeaconBlock<T::EthSpec>>, DecodeError> {
|
|
if beacon_blocks.is_empty() {
|
|
return Ok(Vec::new());
|
|
}
|
|
//TODO: Implement faster block verification before decoding entirely
|
|
Vec::from_ssz_bytes(&beacon_blocks)
|
|
}
|
|
}
|