cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Do not override spec defaults via default flags (#1022)

Browse Source
This commit is contained in:
Paul Hauner 2020-04-20 11:58:39 +10:00 committed by GitHub
parent 489ad90536
commit 2871253905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lcli/src/main.rs
View File

@ -251,7 +251,8 @@ fn main() {
.subcommand( .subcommand(
SubCommand::with_name("new-testnet") SubCommand::with_name("new-testnet")
.about( .about(
"Produce a new testnet directory.", "Produce a new testnet directory. If any of the optional flags are not
supplied the values will remain the default for the --spec flag",
) )
.arg( .arg(
Arg::with_name("min-genesis-time") Arg::with_name("min-genesis-time")
@ -266,7 +267,6 @@ fn main() {
.long("min-genesis-active-validator-count") .long("min-genesis-active-validator-count")
.value_name("INTEGER") .value_name("INTEGER")
.takes_value(true) .takes_value(true)
.default_value("16384")
.help("The number of validators required to trigger eth2 genesis."), .help("The number of validators required to trigger eth2 genesis."),
) )
.arg( .arg(
@ -274,7 +274,6 @@ fn main() {
.long("min-genesis-delay") .long("min-genesis-delay")
.value_name("SECONDS") .value_name("SECONDS")
.takes_value(true) .takes_value(true)
.default_value("3600") // 10 minutes
.help("The delay between sufficient eth1 deposits and eth2 genesis."), .help("The delay between sufficient eth1 deposits and eth2 genesis."),
) )
.arg( .arg(
@ -282,7 +281,6 @@ fn main() {
.long("min-deposit-amount") .long("min-deposit-amount")
.value_name("GWEI") .value_name("GWEI")
.takes_value(true) .takes_value(true)
.default_value("100000000") // 0.1 Eth
.help("The minimum permitted deposit amount."), .help("The minimum permitted deposit amount."),
) )
.arg( .arg(
@ -290,7 +288,6 @@ fn main() {
.long("max-effective-balance") .long("max-effective-balance")
.value_name("GWEI") .value_name("GWEI")
.takes_value(true) .takes_value(true)
.default_value("3200000000") // 3.2 Eth
.help("The amount required to become a validator."), .help("The amount required to become a validator."),
) )
.arg( .arg(
@ -298,7 +295,6 @@ fn main() {
.long("effective-balance-increment") .long("effective-balance-increment")
.value_name("GWEI") .value_name("GWEI")
.takes_value(true) .takes_value(true)
.default_value("100000000") // 0.1 Eth
.help("The steps in effective balance calculation."), .help("The steps in effective balance calculation."),
) )
.arg( .arg(
@ -306,7 +302,6 @@ fn main() {
.long("ejection-balance") .long("ejection-balance")
.value_name("GWEI") .value_name("GWEI")
.takes_value(true) .takes_value(true)
.default_value("1600000000") // 1.6 Eth
.help("The balance at which a validator gets ejected."), .help("The balance at which a validator gets ejected."),
) )
.arg( .arg(
@ -314,7 +309,6 @@ fn main() {
.long("eth1-follow-distance") .long("eth1-follow-distance")
.value_name("ETH1_BLOCKS") .value_name("ETH1_BLOCKS")
.takes_value(true) .takes_value(true)
.default_value("16")
.help("The distance to follow behind the eth1 chain head."), .help("The distance to follow behind the eth1 chain head."),
) )
.arg( .arg(
@ -322,7 +316,6 @@ fn main() {
.long("genesis-fork-version") .long("genesis-fork-version")
.value_name("HEX") .value_name("HEX")
.takes_value(true) .takes_value(true)
.default_value("0x00000000")
.help("Used to avoid reply attacks between testnets. Recommended to set to .help("Used to avoid reply attacks between testnets. Recommended to set to
non-default."), non-default."),
) )
@ -331,7 +324,7 @@ fn main() {
.long("deposit-contract-address") .long("deposit-contract-address")
.value_name("ETH1_ADDRESS") .value_name("ETH1_ADDRESS")
.takes_value(true) .takes_value(true)
.default_value("0x0000000000000000000000000000000000000000") .required(true)
.help("The address of the deposit contract."), .help("The address of the deposit contract."),
) )
.arg( .arg(

54
lcli/src/new_testnet.rs
View File

@ -4,7 +4,6 @@ use clap_utils::{
}; };
use eth2_testnet_config::Eth2TestnetConfig; use eth2_testnet_config::Eth2TestnetConfig;
use std::path::PathBuf; use std::path::PathBuf;
use std::time::{SystemTime, UNIX_EPOCH};
use types::{Address, EthSpec, YamlConfig}; use types::{Address, EthSpec, YamlConfig};
pub fn run<T: EthSpec>(matches: &ArgMatches) -> Result<(), String> { pub fn run<T: EthSpec>(matches: &ArgMatches) -> Result<(), String> {
@ -13,18 +12,8 @@ pub fn run<T: EthSpec>(matches: &ArgMatches) -> Result<(), String> {
"testnet-dir", "testnet-dir",
PathBuf::from(".lighthouse/testnet"), PathBuf::from(".lighthouse/testnet"),
)?; )?;
let min_genesis_time = parse_optional(matches, "min-genesis-time")?;
let min_genesis_delay = parse_required(matches, "min-genesis-delay")?;
let min_genesis_active_validator_count =
parse_required(matches, "min-genesis-active-validator-count")?;
let min_deposit_amount = parse_required(matches, "min-deposit-amount")?;
let max_effective_balance = clap_utils::parse_required(matches, "max-effective-balance")?;
let effective_balance_increment = parse_required(matches, "effective-balance-increment")?;
let ejection_balance = parse_required(matches, "ejection-balance")?;
let eth1_follow_distance = parse_required(matches, "eth1-follow-distance")?;
let deposit_contract_deploy_block = parse_required(matches, "deposit-contract-deploy-block")?;
let genesis_fork_version = parse_ssz_optional::<[u8; 4]>(matches, "genesis-fork-version")?;
let deposit_contract_address: Address = parse_required(matches, "deposit-contract-address")?; let deposit_contract_address: Address = parse_required(matches, "deposit-contract-address")?;
let deposit_contract_deploy_block = parse_required(matches, "deposit-contract-deploy-block")?;
if testnet_dir_path.exists() { if testnet_dir_path.exists() {
return Err(format!( return Err(format!(
@ -34,19 +23,29 @@ pub fn run<T: EthSpec>(matches: &ArgMatches) -> Result<(), String> {
} }
let mut spec = T::default_spec(); let mut spec = T::default_spec();
if let Some(time) = min_genesis_time {
spec.min_genesis_time = time; // Update the spec value if the flag was defined. Otherwise, leave it as the default.
} else { macro_rules! maybe_update {
spec.min_genesis_time = time_now()?; ($flag: tt, $var: ident) => {
if let Some(val) = parse_optional(matches, $flag)? {
spec.$var = val
}
};
} }
spec.min_deposit_amount = min_deposit_amount;
spec.min_genesis_active_validator_count = min_genesis_active_validator_count; maybe_update!("min-genesis-time", min_genesis_time);
spec.max_effective_balance = max_effective_balance; maybe_update!("min-deposit-amount", min_deposit_amount);
spec.effective_balance_increment = effective_balance_increment; maybe_update!(
spec.ejection_balance = ejection_balance; "min-genesis-active-validator-count",
spec.eth1_follow_distance = eth1_follow_distance; min_genesis_active_validator_count
spec.min_genesis_delay = min_genesis_delay; );
if let Some(v) = genesis_fork_version { maybe_update!("max-effective-balance", max_effective_balance);
maybe_update!("effective-balance-increment", effective_balance_increment);
maybe_update!("ejection-balance", ejection_balance);
maybe_update!("eth1-follow_distance", eth1_follow_distance);
maybe_update!("min-genesis-delay", min_genesis_delay);
if let Some(v) = parse_ssz_optional(matches, "genesis-fork-version")? {
spec.genesis_fork_version = v; spec.genesis_fork_version = v;
} }
@ -60,10 +59,3 @@ pub fn run<T: EthSpec>(matches: &ArgMatches) -> Result<(), String> {
testnet.write_to_file(testnet_dir_path) testnet.write_to_file(testnet_dir_path)
} }
pub fn time_now() -> Result<u64, String> {
SystemTime::now()
.duration_since(UNIX_EPOCH)
.map(|duration| duration.as_secs())
.map_err(|e| format!("Unable to get time: {:?}", e))
}