a236003a7b
* 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
171 lines
5.6 KiB
Rust
171 lines
5.6 KiB
Rust
use bls::Keypair;
|
|
use clap::{App, Arg, SubCommand};
|
|
use slog::{crit, debug, info, o, Drain};
|
|
use std::fs;
|
|
use std::path::PathBuf;
|
|
use types::test_utils::generate_deterministic_keypair;
|
|
use validator_client::Config as ValidatorClientConfig;
|
|
|
|
pub const DEFAULT_DATA_DIR: &str = ".lighthouse-validator";
|
|
pub const CLIENT_CONFIG_FILENAME: &str = "account-manager.toml";
|
|
|
|
fn main() {
|
|
// Logging
|
|
let decorator = slog_term::TermDecorator::new().build();
|
|
let drain = slog_term::CompactFormat::new(decorator).build().fuse();
|
|
let drain = slog_async::Async::new(drain).build().fuse();
|
|
let mut log = slog::Logger::root(drain, o!());
|
|
|
|
// CLI
|
|
let matches = App::new("Lighthouse Accounts Manager")
|
|
.version("0.0.1")
|
|
.author("Sigma Prime <contact@sigmaprime.io>")
|
|
.about("Eth 2.0 Accounts Manager")
|
|
.arg(
|
|
Arg::with_name("logfile")
|
|
.long("logfile")
|
|
.value_name("logfile")
|
|
.help("File path where output will be written.")
|
|
.takes_value(true),
|
|
)
|
|
.arg(
|
|
Arg::with_name("datadir")
|
|
.long("datadir")
|
|
.short("d")
|
|
.value_name("DIR")
|
|
.help("Data directory for keys and databases.")
|
|
.takes_value(true),
|
|
)
|
|
.subcommand(
|
|
SubCommand::with_name("generate")
|
|
.about("Generates a new validator private key")
|
|
.version("0.0.1")
|
|
.author("Sigma Prime <contact@sigmaprime.io>"),
|
|
)
|
|
.subcommand(
|
|
SubCommand::with_name("generate_deterministic")
|
|
.about("Generates a deterministic validator private key FOR TESTING")
|
|
.version("0.0.1")
|
|
.author("Sigma Prime <contact@sigmaprime.io>")
|
|
.arg(
|
|
Arg::with_name("validator index")
|
|
.long("index")
|
|
.short("i")
|
|
.value_name("index")
|
|
.help("The index of the validator, for which the test key is generated")
|
|
.takes_value(true)
|
|
.required(true),
|
|
)
|
|
.arg(
|
|
Arg::with_name("validator count")
|
|
.long("validator_count")
|
|
.short("n")
|
|
.value_name("validator_count")
|
|
.help("If supplied along with `index`, generates keys `i..i + n`.")
|
|
.takes_value(true)
|
|
.default_value("1"),
|
|
),
|
|
)
|
|
.get_matches();
|
|
|
|
let data_dir = match matches
|
|
.value_of("datadir")
|
|
.and_then(|v| Some(PathBuf::from(v)))
|
|
{
|
|
Some(v) => v,
|
|
None => {
|
|
// use the default
|
|
let mut default_dir = match dirs::home_dir() {
|
|
Some(v) => v,
|
|
None => {
|
|
crit!(log, "Failed to find a home directory");
|
|
return;
|
|
}
|
|
};
|
|
default_dir.push(DEFAULT_DATA_DIR);
|
|
default_dir
|
|
}
|
|
};
|
|
|
|
// create the directory if needed
|
|
match fs::create_dir_all(&data_dir) {
|
|
Ok(_) => {}
|
|
Err(e) => {
|
|
crit!(log, "Failed to initialize data dir"; "error" => format!("{}", e));
|
|
return;
|
|
}
|
|
}
|
|
|
|
let mut client_config = ValidatorClientConfig::default();
|
|
|
|
// Ensure the `data_dir` in the config matches that supplied to the CLI.
|
|
client_config.data_dir = data_dir.clone();
|
|
|
|
if let Err(e) = client_config.apply_cli_args(&matches, &mut log) {
|
|
crit!(log, "Failed to parse ClientConfig CLI arguments"; "error" => format!("{:?}", e));
|
|
return;
|
|
};
|
|
|
|
// Log configuration
|
|
info!(log, "";
|
|
"data_dir" => &client_config.data_dir.to_str());
|
|
|
|
match matches.subcommand() {
|
|
("generate", Some(_)) => generate_random(&client_config, &log),
|
|
("generate_deterministic", Some(m)) => {
|
|
if let Some(string) = m.value_of("validator index") {
|
|
let i: usize = string.parse().expect("Invalid validator index");
|
|
if let Some(string) = m.value_of("validator count") {
|
|
let n: usize = string.parse().expect("Invalid end validator count");
|
|
|
|
let indices: Vec<usize> = (i..i + n).collect();
|
|
generate_deterministic_multiple(&indices, &client_config, &log)
|
|
} else {
|
|
generate_deterministic(i, &client_config, &log)
|
|
}
|
|
}
|
|
}
|
|
_ => panic!(
|
|
"The account manager must be run with a subcommand. See help for more information."
|
|
),
|
|
}
|
|
}
|
|
|
|
fn generate_random(config: &ValidatorClientConfig, log: &slog::Logger) {
|
|
save_key(&Keypair::random(), config, log)
|
|
}
|
|
|
|
fn generate_deterministic_multiple(
|
|
validator_indices: &[usize],
|
|
config: &ValidatorClientConfig,
|
|
log: &slog::Logger,
|
|
) {
|
|
for validator_index in validator_indices {
|
|
generate_deterministic(*validator_index, config, log)
|
|
}
|
|
}
|
|
|
|
fn generate_deterministic(
|
|
validator_index: usize,
|
|
config: &ValidatorClientConfig,
|
|
log: &slog::Logger,
|
|
) {
|
|
save_key(
|
|
&generate_deterministic_keypair(validator_index),
|
|
config,
|
|
log,
|
|
)
|
|
}
|
|
|
|
fn save_key(keypair: &Keypair, config: &ValidatorClientConfig, log: &slog::Logger) {
|
|
let key_path: PathBuf = config
|
|
.save_key(&keypair)
|
|
.expect("Unable to save newly generated private key.");
|
|
debug!(
|
|
log,
|
|
"Keypair generated {:?}, saved to: {:?}",
|
|
keypair.identifier(),
|
|
key_path.to_string_lossy()
|
|
);
|
|
}
|