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

Ensure genesis is not triggered too early (#1052)

Browse Source
This commit is contained in:
Paul Hauner 2020-04-29 11:37:14 +10:00 committed by GitHub
parent 37dc3d463d
commit 7f2121205a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ use futures::{
use parking_lot::Mutex; use parking_lot::Mutex;
use slog::{debug, error, info, trace, Logger}; use slog::{debug, error, info, trace, Logger};
use state_processing::{ use state_processing::{
initialize_beacon_state_from_eth1, is_valid_genesis_state, eth2_genesis_time, initialize_beacon_state_from_eth1, is_valid_genesis_state,
per_block_processing::process_deposit, process_activations, per_block_processing::process_deposit, process_activations,
}; };
use std::sync::Arc; use std::sync::Arc;
@ -223,9 +223,15 @@ impl Eth1GenesisService {
.blocks() .blocks()
.read() .read()
.iter() .iter()
// It's only worth scanning blocks that have timestamps _after_ genesis time. It's // Filter out any blocks that would result in a genesis time that is earlier than
// impossible for any other block to trigger genesis. // `MIN_GENESIS_TIME`.
.filter(|block| block.timestamp >= spec.min_genesis_time) //
// Note: any `SafeArith` errors are suppressed here; we simply skip blocks that cause
// overflow/div-by-zero.
.filter(|block| {
eth2_genesis_time(block.timestamp, spec)
.map_or(false, |t| t >= spec.min_genesis_time)
})
// The block cache might be more recently updated than deposit cache. Restrict any // The block cache might be more recently updated than deposit cache. Restrict any
// block numbers that are not known by all caches. // block numbers that are not known by all caches.
.filter(|block| { .filter(|block| {

17
eth2/state_processing/src/genesis.rs
View File

@ -1,6 +1,6 @@
use super::per_block_processing::{errors::BlockProcessingError, process_deposit}; use super::per_block_processing::{errors::BlockProcessingError, process_deposit};
use crate::common::DepositDataTree; use crate::common::DepositDataTree;
use safe_arith::SafeArith; use safe_arith::{ArithError, SafeArith};
use tree_hash::TreeHash; use tree_hash::TreeHash;
use types::DEPOSIT_TREE_DEPTH; use types::DEPOSIT_TREE_DEPTH;
use types::*; use types::*;
@ -15,9 +15,7 @@ pub fn initialize_beacon_state_from_eth1<T: EthSpec>(
deposits: Vec<Deposit>, deposits: Vec<Deposit>,
spec: &ChainSpec, spec: &ChainSpec,
) -> Result<BeaconState<T>, BlockProcessingError> { ) -> Result<BeaconState<T>, BlockProcessingError> {
let genesis_time = eth1_timestamp let genesis_time = eth2_genesis_time(eth1_timestamp, spec)?;
.safe_sub(eth1_timestamp.safe_rem(spec.min_genesis_delay)?)?
.safe_add(2.safe_mul(spec.min_genesis_delay)?)?;
let eth1_data = Eth1Data { let eth1_data = Eth1Data {
// Temporary deposit root // Temporary deposit root
deposit_root: Hash256::zero(), deposit_root: Hash256::zero(),
@ -79,3 +77,14 @@ pub fn process_activations<T: EthSpec>(
} }
Ok(()) Ok(())
} }
/// Returns the `state.genesis_time` for the corresponding `eth1_timestamp`.
///
/// Does _not_ ensure that the time is greater than `MIN_GENESIS_TIME`.
///
/// 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)?)
}

5
eth2/state_processing/src/lib.rs
View File

@ -10,7 +10,10 @@ pub mod per_epoch_processing;
pub mod per_slot_processing; pub mod per_slot_processing;
pub mod test_utils; pub mod test_utils;
pub use genesis::{initialize_beacon_state_from_eth1, is_valid_genesis_state, process_activations}; pub use genesis::{
eth2_genesis_time, initialize_beacon_state_from_eth1, is_valid_genesis_state,
process_activations,
};
pub use per_block_processing::{ pub use per_block_processing::{
block_signature_verifier, errors::BlockProcessingError, per_block_processing, signature_sets, block_signature_verifier, errors::BlockProcessingError, per_block_processing, signature_sets,
BlockSignatureStrategy, BlockSignatureVerifier, VerifySignatures, BlockSignatureStrategy, BlockSignatureVerifier, VerifySignatures,