* 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 * Address Michael's comments
405 lines
13 KiB
Rust
405 lines
13 KiB
Rust
use bls::get_withdrawal_credentials;
|
|
use deposit_contract::eth1_tx_data;
|
|
use hex;
|
|
use ssz::{Decode, Encode};
|
|
use ssz_derive::{Decode, Encode};
|
|
use std::fs;
|
|
use std::fs::File;
|
|
use std::io::prelude::*;
|
|
use std::os::unix::fs::PermissionsExt;
|
|
use std::path::PathBuf;
|
|
use types::{
|
|
test_utils::generate_deterministic_keypair, ChainSpec, DepositData, Hash256, Keypair,
|
|
PublicKey, SecretKey, Signature,
|
|
};
|
|
|
|
const VOTING_KEY_PREFIX: &str = "voting";
|
|
const WITHDRAWAL_KEY_PREFIX: &str = "withdrawal";
|
|
const ETH1_DEPOSIT_DATA_FILE: &str = "eth1_deposit_data.rlp";
|
|
|
|
/// Returns the filename of a keypair file.
|
|
fn keypair_file(prefix: &str) -> String {
|
|
format!("{}_keypair", prefix)
|
|
}
|
|
|
|
/// Returns the name of the folder to be generated for a validator with the given voting key.
|
|
fn dir_name(voting_pubkey: &PublicKey) -> String {
|
|
format!("0x{}", hex::encode(voting_pubkey.as_ssz_bytes()))
|
|
}
|
|
|
|
/// Represents the files/objects for each dedicated lighthouse validator directory.
|
|
///
|
|
/// Generally lives in `~/.lighthouse/validators/`.
|
|
#[derive(Debug, Clone, PartialEq)]
|
|
pub struct ValidatorDirectory {
|
|
pub directory: PathBuf,
|
|
pub voting_keypair: Option<Keypair>,
|
|
pub withdrawal_keypair: Option<Keypair>,
|
|
pub deposit_data: Option<Vec<u8>>,
|
|
}
|
|
|
|
impl ValidatorDirectory {
|
|
/// Attempts to load a validator from the given directory, requiring only components necessary
|
|
/// for signing messages.
|
|
pub fn load_for_signing(directory: PathBuf) -> Result<Self, String> {
|
|
if !directory.exists() {
|
|
return Err(format!(
|
|
"Validator directory does not exist: {:?}",
|
|
directory
|
|
));
|
|
}
|
|
|
|
Ok(Self {
|
|
voting_keypair: Some(
|
|
load_keypair(directory.clone(), VOTING_KEY_PREFIX)
|
|
.map_err(|e| format!("Unable to get voting keypair: {}", e))?,
|
|
),
|
|
withdrawal_keypair: load_keypair(directory.clone(), WITHDRAWAL_KEY_PREFIX).ok(),
|
|
deposit_data: load_eth1_deposit_data(directory.clone()).ok(),
|
|
directory,
|
|
})
|
|
}
|
|
}
|
|
|
|
/// Load a `Keypair` from a file.
|
|
fn load_keypair(base_path: PathBuf, file_prefix: &str) -> Result<Keypair, String> {
|
|
let path = base_path.join(keypair_file(file_prefix));
|
|
|
|
if !path.exists() {
|
|
return Err(format!("Keypair file does not exist: {:?}", path));
|
|
}
|
|
|
|
let mut bytes = vec![];
|
|
|
|
File::open(&path)
|
|
.map_err(|e| format!("Unable to open keypair file: {}", e))?
|
|
.read_to_end(&mut bytes)
|
|
.map_err(|e| format!("Unable to read keypair file: {}", e))?;
|
|
|
|
SszEncodableKeypair::from_ssz_bytes(&bytes)
|
|
.map(Into::into)
|
|
.map_err(|e| format!("Unable to decode keypair: {:?}", e))
|
|
}
|
|
|
|
/// Load eth1_deposit_data from file.
|
|
fn load_eth1_deposit_data(base_path: PathBuf) -> Result<Vec<u8>, String> {
|
|
let path = base_path.join(ETH1_DEPOSIT_DATA_FILE);
|
|
|
|
if !path.exists() {
|
|
return Err(format!("Eth1 deposit data file does not exist: {:?}", path));
|
|
}
|
|
|
|
let mut bytes = vec![];
|
|
|
|
File::open(&path)
|
|
.map_err(|e| format!("Unable to open eth1 deposit data file: {}", e))?
|
|
.read_to_end(&mut bytes)
|
|
.map_err(|e| format!("Unable to read eth1 deposit data file: {}", e))?;
|
|
|
|
let string = String::from_utf8_lossy(&bytes);
|
|
if string.starts_with("0x") {
|
|
hex::decode(&string[2..])
|
|
.map_err(|e| format!("Unable to decode eth1 data file as hex: {}", e))
|
|
} else {
|
|
Err(format!("String did not start with 0x: {}", string))
|
|
}
|
|
}
|
|
|
|
/// A helper struct to allow SSZ enc/dec for a `Keypair`.
|
|
#[derive(Encode, Decode)]
|
|
struct SszEncodableKeypair {
|
|
pk: PublicKey,
|
|
sk: SecretKey,
|
|
}
|
|
|
|
impl Into<Keypair> for SszEncodableKeypair {
|
|
fn into(self) -> Keypair {
|
|
Keypair {
|
|
sk: self.sk,
|
|
pk: self.pk,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<Keypair> for SszEncodableKeypair {
|
|
fn from(kp: Keypair) -> Self {
|
|
Self {
|
|
sk: kp.sk,
|
|
pk: kp.pk,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Builds a `ValidatorDirectory`, both in-memory and on-disk.
|
|
#[derive(Default)]
|
|
pub struct ValidatorDirectoryBuilder {
|
|
directory: Option<PathBuf>,
|
|
voting_keypair: Option<Keypair>,
|
|
withdrawal_keypair: Option<Keypair>,
|
|
amount: Option<u64>,
|
|
deposit_data: Option<Vec<u8>>,
|
|
spec: Option<ChainSpec>,
|
|
}
|
|
|
|
impl ValidatorDirectoryBuilder {
|
|
pub fn spec(mut self, spec: ChainSpec) -> Self {
|
|
self.spec = Some(spec);
|
|
self
|
|
}
|
|
|
|
pub fn full_deposit_amount(mut self) -> Result<Self, String> {
|
|
let spec = self
|
|
.spec
|
|
.as_ref()
|
|
.ok_or_else(|| "full_deposit_amount requires a spec")?;
|
|
self.amount = Some(spec.max_effective_balance);
|
|
Ok(self)
|
|
}
|
|
|
|
pub fn custom_deposit_amount(mut self, gwei: u64) -> Self {
|
|
self.amount = Some(gwei);
|
|
self
|
|
}
|
|
|
|
pub fn thread_random_keypairs(mut self) -> Self {
|
|
self.voting_keypair = Some(Keypair::random());
|
|
self.withdrawal_keypair = Some(Keypair::random());
|
|
self
|
|
}
|
|
|
|
pub fn insecure_keypairs(mut self, index: usize) -> Self {
|
|
let keypair = generate_deterministic_keypair(index);
|
|
self.voting_keypair = Some(keypair.clone());
|
|
self.withdrawal_keypair = Some(keypair);
|
|
self
|
|
}
|
|
|
|
/// Creates a validator directory in the given `base_path` (e.g., `~/.lighthouse/validators/`).
|
|
pub fn create_directory(mut self, base_path: PathBuf) -> Result<Self, String> {
|
|
let voting_keypair = self
|
|
.voting_keypair
|
|
.as_ref()
|
|
.ok_or_else(|| "directory requires a voting_keypair")?;
|
|
|
|
let directory = base_path.join(dir_name(&voting_keypair.pk));
|
|
|
|
if directory.exists() {
|
|
return Err(format!(
|
|
"Validator directory already exists: {:?}",
|
|
directory
|
|
));
|
|
}
|
|
|
|
fs::create_dir_all(&directory)
|
|
.map_err(|e| format!("Unable to create validator directory: {}", e))?;
|
|
|
|
self.directory = Some(directory);
|
|
|
|
Ok(self)
|
|
}
|
|
|
|
pub fn write_keypair_files(self) -> Result<Self, String> {
|
|
let voting_keypair = self
|
|
.voting_keypair
|
|
.clone()
|
|
.ok_or_else(|| "write_keypair_files requires a voting_keypair")?;
|
|
let withdrawal_keypair = self
|
|
.withdrawal_keypair
|
|
.clone()
|
|
.ok_or_else(|| "write_keypair_files requires a withdrawal_keypair")?;
|
|
|
|
self.save_keypair(voting_keypair, VOTING_KEY_PREFIX)?;
|
|
self.save_keypair(withdrawal_keypair, WITHDRAWAL_KEY_PREFIX)?;
|
|
Ok(self)
|
|
}
|
|
|
|
fn save_keypair(&self, keypair: Keypair, file_prefix: &str) -> Result<(), String> {
|
|
let path = self
|
|
.directory
|
|
.as_ref()
|
|
.map(|directory| directory.join(keypair_file(file_prefix)))
|
|
.ok_or_else(|| "save_keypair requires a directory")?;
|
|
|
|
if path.exists() {
|
|
return Err(format!("Keypair file already exists at: {:?}", path));
|
|
}
|
|
|
|
let mut file = File::create(&path).map_err(|e| format!("Unable to create file: {}", e))?;
|
|
|
|
// Ensure file has correct permissions.
|
|
let mut perm = file
|
|
.metadata()
|
|
.map_err(|e| format!("Unable to get file metadata: {}", e))?
|
|
.permissions();
|
|
perm.set_mode((libc::S_IWUSR | libc::S_IRUSR) as u32);
|
|
file.set_permissions(perm)
|
|
.map_err(|e| format!("Unable to set file permissions: {}", e))?;
|
|
|
|
file.write_all(&SszEncodableKeypair::from(keypair).as_ssz_bytes())
|
|
.map_err(|e| format!("Unable to write keypair to file: {}", e))?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
pub fn write_eth1_data_file(mut self) -> Result<Self, String> {
|
|
let voting_keypair = self
|
|
.voting_keypair
|
|
.as_ref()
|
|
.ok_or_else(|| "write_eth1_data_file requires a voting_keypair")?;
|
|
let withdrawal_keypair = self
|
|
.withdrawal_keypair
|
|
.as_ref()
|
|
.ok_or_else(|| "write_eth1_data_file requires a withdrawal_keypair")?;
|
|
let amount = self
|
|
.amount
|
|
.ok_or_else(|| "write_eth1_data_file requires an amount")?;
|
|
let spec = self.spec.as_ref().ok_or_else(|| "build requires a spec")?;
|
|
let path = self
|
|
.directory
|
|
.as_ref()
|
|
.map(|directory| directory.join(ETH1_DEPOSIT_DATA_FILE))
|
|
.ok_or_else(|| "write_eth1_data_filer requires a directory")?;
|
|
|
|
let deposit_data = {
|
|
let withdrawal_credentials = Hash256::from_slice(&get_withdrawal_credentials(
|
|
&withdrawal_keypair.pk,
|
|
spec.bls_withdrawal_prefix_byte,
|
|
));
|
|
|
|
let mut deposit_data = DepositData {
|
|
pubkey: voting_keypair.pk.clone().into(),
|
|
withdrawal_credentials,
|
|
amount,
|
|
signature: Signature::empty_signature().into(),
|
|
};
|
|
|
|
deposit_data.signature = deposit_data.create_signature(&voting_keypair.sk, &spec);
|
|
|
|
eth1_tx_data(&deposit_data)
|
|
.map_err(|e| format!("Unable to encode eth1 deposit tx data: {:?}", e))?
|
|
};
|
|
|
|
if path.exists() {
|
|
return Err(format!("Eth1 data file already exists at: {:?}", path));
|
|
}
|
|
|
|
File::create(&path)
|
|
.map_err(|e| format!("Unable to create file: {}", e))?
|
|
.write_all(&format!("0x{}", hex::encode(&deposit_data)).as_bytes())
|
|
.map_err(|e| format!("Unable to write eth1 data file: {}", e))?;
|
|
|
|
self.deposit_data = Some(deposit_data);
|
|
|
|
Ok(self)
|
|
}
|
|
|
|
pub fn build(self) -> Result<ValidatorDirectory, String> {
|
|
Ok(ValidatorDirectory {
|
|
directory: self.directory.ok_or_else(|| "build requires a directory")?,
|
|
voting_keypair: self.voting_keypair,
|
|
withdrawal_keypair: self.withdrawal_keypair,
|
|
deposit_data: self.deposit_data,
|
|
})
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use tempdir::TempDir;
|
|
use types::{EthSpec, MinimalEthSpec};
|
|
|
|
type E = MinimalEthSpec;
|
|
|
|
#[test]
|
|
fn random_keypairs_round_trip() {
|
|
let spec = E::default_spec();
|
|
let temp_dir = TempDir::new("acc_manager").expect("should create test dir");
|
|
|
|
let created_dir = ValidatorDirectoryBuilder::default()
|
|
.spec(spec)
|
|
.full_deposit_amount()
|
|
.expect("should set full deposit amount")
|
|
.thread_random_keypairs()
|
|
.create_directory(temp_dir.path().into())
|
|
.expect("should create directory")
|
|
.write_keypair_files()
|
|
.expect("should write keypair files")
|
|
.write_eth1_data_file()
|
|
.expect("should write eth1 data file")
|
|
.build()
|
|
.expect("should build dir");
|
|
|
|
let loaded_dir = ValidatorDirectory::load_for_signing(created_dir.directory.clone())
|
|
.expect("should load directory");
|
|
|
|
assert_eq!(
|
|
created_dir, loaded_dir,
|
|
"the directory created should match the one loaded"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn deterministic_keypairs_round_trip() {
|
|
let spec = E::default_spec();
|
|
let temp_dir = TempDir::new("acc_manager").expect("should create test dir");
|
|
let index = 42;
|
|
|
|
let created_dir = ValidatorDirectoryBuilder::default()
|
|
.spec(spec)
|
|
.full_deposit_amount()
|
|
.expect("should set full deposit amount")
|
|
.insecure_keypairs(index)
|
|
.create_directory(temp_dir.path().into())
|
|
.expect("should create directory")
|
|
.write_keypair_files()
|
|
.expect("should write keypair files")
|
|
.write_eth1_data_file()
|
|
.expect("should write eth1 data file")
|
|
.build()
|
|
.expect("should build dir");
|
|
|
|
assert!(
|
|
created_dir.directory.exists(),
|
|
"should have created directory"
|
|
);
|
|
|
|
let mut parent = created_dir.directory.clone();
|
|
parent.pop();
|
|
assert_eq!(
|
|
parent,
|
|
PathBuf::from(temp_dir.path()),
|
|
"should have created directory ontop of base dir"
|
|
);
|
|
|
|
let expected_keypair = generate_deterministic_keypair(index);
|
|
assert_eq!(
|
|
created_dir.voting_keypair,
|
|
Some(expected_keypair.clone()),
|
|
"voting keypair should be as expected"
|
|
);
|
|
assert_eq!(
|
|
created_dir.withdrawal_keypair,
|
|
Some(expected_keypair),
|
|
"withdrawal keypair should be as expected"
|
|
);
|
|
assert!(
|
|
created_dir
|
|
.deposit_data
|
|
.clone()
|
|
.expect("should have data")
|
|
.len()
|
|
> 0,
|
|
"should have some deposit data"
|
|
);
|
|
|
|
let loaded_dir = ValidatorDirectory::load_for_signing(created_dir.directory.clone())
|
|
.expect("should load directory");
|
|
|
|
assert_eq!(
|
|
created_dir, loaded_dir,
|
|
"the directory created should match the one loaded"
|
|
);
|
|
}
|
|
}
|