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

Update v0.12.0 to v0.12.1 (#1259)

Browse Source
This commit is contained in:
Michael Sproul 2020-06-11 10:07:10 +10:00 committed by GitHub
parent 7ce9a252a4
commit 39bf05e3e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
beacon_node/genesis/src/eth1_genesis_service.rs
View File

@ -213,7 +213,7 @@ impl Eth1GenesisService {
info!(
log,
"Waiting for adequate eth1 timestamp";
"ming_genesis_delay" => spec.min_genesis_delay,
"genesis_delay" => spec.genesis_delay,
"genesis_time" => spec.min_genesis_time,
"latest_eth1_timestamp" => latest_timestamp,
);
@ -279,7 +279,7 @@ impl Eth1GenesisService {
trace!(
log,
"Insufficient block timestamp";
"min_genesis_delay" => spec.min_genesis_delay,
"genesis_delay" => spec.genesis_delay,
"min_genesis_time" => spec.min_genesis_time,
"eth1_block_timestamp" => block.timestamp,
"eth1_block_number" => block.number,

4
book/src/http/spec.md
View File

@ -44,7 +44,7 @@ Typical Responses | 200
"effective_balance_increment": 1000000000,
"genesis_fork_version": "0x00000000",
"bls_withdrawal_prefix_byte": "0x00",
"min_genesis_delay": 86400,
"genesis_delay": 172800,
"milliseconds_per_slot": 12000,
"min_attestation_inclusion_delay": 1,
"min_seed_lookahead": 1,
@ -106,7 +106,7 @@ Typical Responses | 200
"effective_balance_increment": 1000000000,
"genesis_fork_version": "0x00000000",
"bls_withdrawal_prefix_byte": "0x00",
"min_genesis_delay": 86400,
"genesis_delay": 172800,
"milliseconds_per_slot": 12000,
"min_attestation_inclusion_delay": 1,
"min_seed_lookahead": 1,

4
consensus/state_processing/src/genesis.rs
View File

@ -84,7 +84,5 @@ pub fn process_activations<T: EthSpec>(
///
/// Spec v0.11.1
pub fn eth2_genesis_time(eth1_timestamp: u64, spec: &ChainSpec) -> Result<u64, ArithError> {
eth1_timestamp
.safe_sub(eth1_timestamp.safe_rem(spec.min_genesis_delay)?)?
.safe_add(2.safe_mul(spec.min_genesis_delay)?)
eth1_timestamp.safe_add(spec.genesis_delay)
}

12
consensus/types/src/chain_spec.rs
View File

@ -75,7 +75,7 @@ pub struct ChainSpec {
/*
* Time parameters
*/
pub min_genesis_delay: u64,
pub genesis_delay: u64,
pub milliseconds_per_slot: u64,
pub min_attestation_inclusion_delay: u64,
pub min_seed_lookahead: Epoch,
@ -285,7 +285,7 @@ impl ChainSpec {
/*
* Time parameters
*/
min_genesis_delay: 86400, // 1 day
genesis_delay: 172800, // 2 days
milliseconds_per_slot: 12_000,
min_attestation_inclusion_delay: 1,
min_seed_lookahead: Epoch::new(1),
@ -354,7 +354,7 @@ impl ChainSpec {
eth1_follow_distance: 16,
genesis_fork_version: [0x00, 0x00, 0x00, 0x01],
shard_committee_period: 64,
min_genesis_delay: 300,
genesis_delay: 300,
milliseconds_per_slot: 6_000,
safe_slots_to_update_justified: 2,
network_id: 2, // lighthouse testnet network id
@ -459,7 +459,7 @@ pub struct YamlConfig {
shuffle_round_count: u8,
min_genesis_active_validator_count: u64,
min_genesis_time: u64,
min_genesis_delay: u64,
genesis_delay: u64,
min_deposit_amount: u64,
max_effective_balance: u64,
ejection_balance: u64,
@ -576,7 +576,7 @@ impl YamlConfig {
shuffle_round_count: spec.shuffle_round_count,
min_genesis_active_validator_count: spec.min_genesis_active_validator_count,
min_genesis_time: spec.min_genesis_time,
min_genesis_delay: spec.min_genesis_delay,
genesis_delay: spec.genesis_delay,
min_deposit_amount: spec.min_deposit_amount,
max_effective_balance: spec.max_effective_balance,
ejection_balance: spec.ejection_balance,
@ -674,7 +674,7 @@ impl YamlConfig {
min_genesis_active_validator_count: self.min_genesis_active_validator_count,
min_genesis_time: self.min_genesis_time,
min_deposit_amount: self.min_deposit_amount,
min_genesis_delay: self.min_genesis_delay,
genesis_delay: self.genesis_delay,
max_effective_balance: self.max_effective_balance,
hysteresis_quotient: self.hysteresis_quotient,
hysteresis_downward_multiplier: self.hysteresis_downward_multiplier,

4
lcli/src/main.rs
View File

@ -313,8 +313,8 @@ fn main() {
.help("The number of validators required to trigger eth2 genesis."),
)
.arg(
Arg::with_name("min-genesis-delay")
.long("min-genesis-delay")
Arg::with_name("genesis-delay")
.long("genesis-delay")
.value_name("SECONDS")
.takes_value(true)
.help("The delay between sufficient eth1 deposits and eth2 genesis."),

2
lcli/src/new_testnet.rs
View File

@ -47,7 +47,7 @@ pub fn run<T: EthSpec>(matches: &ArgMatches) -> Result<(), String> {
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);
maybe_update!("genesis-delay", genesis_delay);
if let Some(v) = parse_ssz_optional(matches, "genesis-fork-version")? {
spec.genesis_fork_version = v;

2
lighthouse/environment/tests/minimal_spec/eth2-spec.toml
View File

@ -17,7 +17,7 @@ ejection_balance = 16000000000
effective_balance_increment = 1000000000
genesis_fork_version = "0x00000000"
bls_withdrawal_prefix_byte = "0x00"
min_genesis_delay = 86400
genesis_delay = 300
milliseconds_per_slot = 12000
min_attestation_inclusion_delay = 1
min_seed_lookahead = 1

2
lighthouse/environment/tests/testnet_dir/config.yaml
View File

@ -8,7 +8,7 @@ CHURN_LIMIT_QUOTIENT: 65536
SHUFFLE_ROUND_COUNT: 90
MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 4096
MIN_GENESIS_TIME: 0
MIN_GENESIS_DELAY: 3600
GENESIS_DELAY: 3600
MIN_DEPOSIT_AMOUNT: 10000000
MAX_EFFECTIVE_BALANCE: 3200000000
EJECTION_BALANCE: 1600000000

3
testing/ef_tests/Makefile
View File

@ -1,5 +1,4 @@
# Bump the test tag here and in .gitlab-ci.yml and CI will take care of updating the cached tarballs
TESTS_TAG := v0.12.0
TESTS_TAG := v0.12.1
TESTS = general minimal mainnet
TARBALLS = $(patsubst %,%-$(TESTS_TAG).tar.gz,$(TESTS))

2
testing/simulator/src/eth1_sim.rs
View File

@ -56,7 +56,7 @@ pub fn run_eth1_sim(matches: &ArgMatches) -> Result<(), String> {
spec.milliseconds_per_slot /= speed_up_factor;
spec.eth1_follow_distance = 16;
spec.min_genesis_delay = eth1_block_time.as_secs() * spec.eth1_follow_distance * 2;
spec.genesis_delay = eth1_block_time.as_secs() * spec.eth1_follow_distance * 2;
spec.min_genesis_time = 0;
spec.min_genesis_active_validator_count = 64;
spec.seconds_per_eth1_block = 1;

2
testing/simulator/src/no_eth1_sim.rs
View File

@ -56,7 +56,7 @@ pub fn run_no_eth1_sim(matches: &ArgMatches) -> Result<(), String> {
spec.milliseconds_per_slot /= speed_up_factor;
spec.eth1_follow_distance = 16;
spec.min_genesis_delay = eth1_block_time.as_secs() * spec.eth1_follow_distance * 2;
spec.genesis_delay = eth1_block_time.as_secs() * spec.eth1_follow_distance * 2;
spec.min_genesis_time = 0;
spec.min_genesis_active_validator_count = 64;
spec.seconds_per_eth1_block = 1;

2
testing/simulator/src/sync_sim.rs
View File

@ -55,7 +55,7 @@ fn syncing_sim(
spec.milliseconds_per_slot /= speed_up_factor;
spec.eth1_follow_distance = 16;
spec.min_genesis_delay = eth1_block_time.as_secs() * spec.eth1_follow_distance * 2;
spec.genesis_delay = eth1_block_time.as_secs() * spec.eth1_follow_distance * 2;
spec.min_genesis_time = 0;
spec.min_genesis_active_validator_count = 64;
spec.seconds_per_eth1_block = 1;