* Update to spec v0.9.0 * Update to v0.9.1 * Bump spec tags for v0.9.1 * Formatting, fix CI failures * Resolve accidental KeyPair merge conflict * Document new BeaconState functions * Add `validator` changes from `validator-to-rest` * Add initial (failing) REST api tests * Fix signature parsing * Add more tests * Refactor http router * Add working tests for publish beacon block * Add validator duties tests * Move account_manager under `lighthouse` binary * Unify logfile handling in `environment` crate. * Fix incorrect cache drops in `advance_caches` * Update fork choice for v0.9.1 * Add `deposit_contract` crate * Add progress on validator onboarding * Add unfinished attesation code * Update account manager CLI * Write eth1 data file as hex string * Integrate ValidatorDirectory with validator_client * Move ValidatorDirectory into validator_client * Clean up some FIXMEs * Add beacon_chain_sim * Fix a few docs/logs * Expand `beacon_chain_sim` * Fix spec for `beacon_chain_sim * More testing for api * Start work on attestation endpoint * Reject empty attestations * Allow attestations to genesis block * Add working tests for `rest_api` validator endpoint * Remove grpc from beacon_node * Start heavy refactor of validator client - Block production is working * Prune old validator client files * Start works on attestation service * Add attestation service to validator client * Use full pubkey for validator directories * Add validator duties post endpoint * Use par_iter for keypair generation * Use bulk duties request in validator client * Add version http endpoint tests * Add interop keys and startup wait * Ensure a prompt exit * Add duties pruning * Fix compile error in beacon node tests * Add github workflow * Modify rust.yaml * Modify gitlab actions * Add to CI file * Add sudo to CI npm install * Move cargo fmt to own job in tests * Fix cargo fmt in CI * Add rustup update before cargo fmt * Change name of CI job * Make other CI jobs require cargo fmt * Add CI badge * Remove gitlab and travis files * Add different http timeout for debug * Update docker file, use makefile in CI * Use make in the dockerfile, skip the test * Use the makefile for debug GI test * Update book * Tidy grpc and misc things * Apply discv5 fixes * Address other minor issues * Fix warnings * Attempt fix for addr parsing * Tidy validator config, CLIs * Tidy comments * Tidy signing, reduce ForkService duplication * Fail if skipping too many slots * Set default recent genesis time to 0 * Add custom http timeout to validator * Fix compile bug in node_test_rig * Remove old bootstrap flag from val CLI * Update docs * Tidy val client * Change val client log levels * Add comments, more validity checks * Fix compile error, add comments * Undo changes to eth2-libp2p/src * Reduce duplication of keypair generation * Add more logging for validator duties * Fix beacon_chain_sim, nitpicks * Fix compile error, minor nits * Update to use v0.9.2 version of deposit contract * Add efforts to automate eth1 testnet deployment * Fix lcli testnet deployer * Modify bn CLI to parse eth2_testnet_dir * Progress with account_manager deposit tools * Make account manager submit deposits * Add password option for submitting deposits * Allow custom deposit amount * Add long names to lcli clap * Add password option to lcli deploy command * Fix minor bugs whilst testing * Address Michael's comments * Add refund-deposit-contract to lcli * Use time instead of skip count for denying long skips * Improve logging for eth1 * Fix bug with validator services exiting on error * Drop the block cache after genesis * Modify eth1 testnet config * Improve eth1 logging * Make validator wait until genesis time * Fix bug in eth1 voting * Add more logging to eth1 voting * Handle errors in eth1 http module * Set SECONDS_PER_DAY to sensible minimum * Shorten delay before testnet start * Ensure eth1 block is produced without any votes * Improve eth1 logging * Fix broken tests in eth1 * Tidy code in rest_api * Fix failing test in deposit_contract * Make CLI args more consistent * Change validator/duties endpoint * Add time-based skip slot limiting * Add new error type missed in previous commit * Add log when waiting for genesis * Refactor beacon node CLI * Remove unused dep * Add lcli eth1-genesis command * Fix bug in master merge * Apply clippy lints to beacon node * Add support for YamlConfig in Eth2TestnetDir * Upgrade tesnet deposit contract version * Remove unnecessary logging and correct formatting * Add a hardcoded eth2 testnet config * Ensure http server flag works. Overwrite configs with flags. * Ensure boot nodes are loaded from testnet dir * Fix account manager CLI bugs * Fix bugs with beacon node cli * Allow testnet dir without boot nodes * Write genesis state as SSZ * Remove ---/n from the start of testnet_dir files * Set default libp2p address * Tidy account manager CLI, add logging * Add check to see if testnet dir exists * Apply reviewers suggestions * Add HeadTracker struct * Add fork choice persistence * Shorten slot time for simulator * Add the /beacon/heads API endpoint * Update hardcoded testnet * Add tests for BeaconChain persistence + fix bugs * Extend BeaconChain persistence testing * Ensure chain is finalized b4 persistence tests * Ensure boot_enr.yaml is include in binary * Refactor beacon_chain_sim * Move files about in beacon sim * Update beacon_chain_sim * Fix bug with deposit inclusion * Increase log in genesis service, fix todo * Tidy sim, fix broken rest_api tests * Fix more broken tests * Update testnet * Fix broken rest api test * Tidy account manager CLI * Use tempdir for account manager * Stop hardcoded testnet dir from creating dir * Rename Eth2TestnetDir to Eth2TestnetConfig * Change hardcoded -> hard_coded * Tidy account manager * Add log to account manager * Tidy, ensure head tracker is loaded from disk * Tidy beacon chain builder * Tidy eth1_chain * Adds log support for simulator * Revert "Adds log support for simulator" This reverts commit ec77c66a052350f551db145cf20f213823428dd3. * Adds log support for simulator * Tidy after self-review * Change default log level * Address Michael's delicious PR comments * Fix off-by-one in tests
201 lines
6.5 KiB
Rust
201 lines
6.5 KiB
Rust
use crate::fork_service::ForkService;
|
|
use crate::validator_directory::{ValidatorDirectory, ValidatorDirectoryBuilder};
|
|
use parking_lot::RwLock;
|
|
use rayon::prelude::*;
|
|
use slog::{error, Logger};
|
|
use slot_clock::SlotClock;
|
|
use std::collections::HashMap;
|
|
use std::fs::read_dir;
|
|
use std::iter::FromIterator;
|
|
use std::marker::PhantomData;
|
|
use std::path::PathBuf;
|
|
use std::sync::Arc;
|
|
use tempdir::TempDir;
|
|
use tree_hash::TreeHash;
|
|
use types::{
|
|
Attestation, BeaconBlock, ChainSpec, Domain, Epoch, EthSpec, Fork, PublicKey, Signature,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct ValidatorStore<T, E: EthSpec> {
|
|
validators: Arc<RwLock<HashMap<PublicKey, ValidatorDirectory>>>,
|
|
spec: Arc<ChainSpec>,
|
|
log: Logger,
|
|
temp_dir: Option<Arc<TempDir>>,
|
|
fork_service: ForkService<T, E>,
|
|
_phantom: PhantomData<E>,
|
|
}
|
|
|
|
impl<T: SlotClock + 'static, E: EthSpec> ValidatorStore<T, E> {
|
|
pub fn load_from_disk(
|
|
base_dir: PathBuf,
|
|
spec: ChainSpec,
|
|
fork_service: ForkService<T, E>,
|
|
log: Logger,
|
|
) -> Result<Self, String> {
|
|
let validator_iter = read_dir(&base_dir)
|
|
.map_err(|e| format!("Failed to read base directory {:?}: {:?}", base_dir, e))?
|
|
.filter_map(|validator_dir| {
|
|
let path = validator_dir.ok()?.path();
|
|
|
|
if path.is_dir() {
|
|
match ValidatorDirectory::load_for_signing(path.clone()) {
|
|
Ok(validator_directory) => Some(validator_directory),
|
|
Err(e) => {
|
|
error!(
|
|
log,
|
|
"Failed to load a validator directory";
|
|
"error" => e,
|
|
"path" => path.to_str(),
|
|
);
|
|
None
|
|
}
|
|
}
|
|
} else {
|
|
None
|
|
}
|
|
})
|
|
.filter_map(|validator_directory| {
|
|
validator_directory
|
|
.voting_keypair
|
|
.clone()
|
|
.map(|voting_keypair| (voting_keypair.pk, validator_directory))
|
|
});
|
|
|
|
Ok(Self {
|
|
validators: Arc::new(RwLock::new(HashMap::from_iter(validator_iter))),
|
|
spec: Arc::new(spec),
|
|
log,
|
|
temp_dir: None,
|
|
fork_service,
|
|
_phantom: PhantomData,
|
|
})
|
|
}
|
|
|
|
pub fn insecure_ephemeral_validators(
|
|
validator_indices: &[usize],
|
|
spec: ChainSpec,
|
|
fork_service: ForkService<T, E>,
|
|
log: Logger,
|
|
) -> Result<Self, String> {
|
|
let temp_dir = TempDir::new("insecure_validator")
|
|
.map_err(|e| format!("Unable to create temp dir: {:?}", e))?;
|
|
let data_dir = PathBuf::from(temp_dir.path());
|
|
|
|
let validators = validator_indices
|
|
.par_iter()
|
|
.map(|index| {
|
|
ValidatorDirectoryBuilder::default()
|
|
.spec(spec.clone())
|
|
.full_deposit_amount()?
|
|
.insecure_keypairs(*index)
|
|
.create_directory(data_dir.clone())?
|
|
.write_keypair_files()?
|
|
.write_eth1_data_file()?
|
|
.build()
|
|
})
|
|
.collect::<Result<Vec<_>, _>>()?
|
|
.into_iter()
|
|
.filter_map(|validator_directory| {
|
|
validator_directory
|
|
.voting_keypair
|
|
.clone()
|
|
.map(|voting_keypair| (voting_keypair.pk, validator_directory))
|
|
});
|
|
|
|
Ok(Self {
|
|
validators: Arc::new(RwLock::new(HashMap::from_iter(validators))),
|
|
spec: Arc::new(spec),
|
|
log,
|
|
temp_dir: Some(Arc::new(temp_dir)),
|
|
fork_service,
|
|
_phantom: PhantomData,
|
|
})
|
|
}
|
|
|
|
pub fn voting_pubkeys(&self) -> Vec<PublicKey> {
|
|
self.validators
|
|
.read()
|
|
.iter()
|
|
.map(|(pubkey, _dir)| pubkey.clone())
|
|
.collect()
|
|
}
|
|
|
|
pub fn num_voting_validators(&self) -> usize {
|
|
self.validators.read().len()
|
|
}
|
|
|
|
fn fork(&self) -> Option<Fork> {
|
|
if self.fork_service.fork().is_none() {
|
|
error!(
|
|
self.log,
|
|
"Unable to get Fork for signing";
|
|
);
|
|
}
|
|
self.fork_service.fork()
|
|
}
|
|
|
|
pub fn randao_reveal(&self, validator_pubkey: &PublicKey, epoch: Epoch) -> Option<Signature> {
|
|
// TODO: check this against the slot clock to make sure it's not an early reveal?
|
|
self.validators
|
|
.read()
|
|
.get(validator_pubkey)
|
|
.and_then(|validator_dir| {
|
|
let voting_keypair = validator_dir.voting_keypair.as_ref()?;
|
|
let message = epoch.tree_hash_root();
|
|
let domain = self.spec.get_domain(epoch, Domain::Randao, &self.fork()?);
|
|
|
|
Some(Signature::new(&message, domain, &voting_keypair.sk))
|
|
})
|
|
}
|
|
|
|
pub fn sign_block(
|
|
&self,
|
|
validator_pubkey: &PublicKey,
|
|
mut block: BeaconBlock<E>,
|
|
) -> Option<BeaconBlock<E>> {
|
|
// TODO: check for slashing.
|
|
self.validators
|
|
.read()
|
|
.get(validator_pubkey)
|
|
.and_then(|validator_dir| {
|
|
let voting_keypair = validator_dir.voting_keypair.as_ref()?;
|
|
block.sign(&voting_keypair.sk, &self.fork()?, &self.spec);
|
|
Some(block)
|
|
})
|
|
}
|
|
|
|
pub fn sign_attestation(
|
|
&self,
|
|
validator_pubkey: &PublicKey,
|
|
validator_committee_position: usize,
|
|
attestation: &mut Attestation<E>,
|
|
) -> Option<()> {
|
|
// TODO: check for slashing.
|
|
self.validators
|
|
.read()
|
|
.get(validator_pubkey)
|
|
.and_then(|validator_dir| {
|
|
let voting_keypair = validator_dir.voting_keypair.as_ref()?;
|
|
|
|
attestation
|
|
.sign(
|
|
&voting_keypair.sk,
|
|
validator_committee_position,
|
|
&self.fork()?,
|
|
&self.spec,
|
|
)
|
|
.map_err(|e| {
|
|
error!(
|
|
self.log,
|
|
"Error whilst signing attestation";
|
|
"error" => format!("{:?}", e)
|
|
)
|
|
})
|
|
.ok()?;
|
|
|
|
Some(())
|
|
})
|
|
}
|
|
}
|