be4e261e74
## Overview This rather extensive PR achieves two primary goals: 1. Uses the finalized/justified checkpoints of fork choice (FC), rather than that of the head state. 2. Refactors fork choice, block production and block processing to `async` functions. Additionally, it achieves: - Concurrent forkchoice updates to the EL and cache pruning after a new head is selected. - Concurrent "block packing" (attestations, etc) and execution payload retrieval during block production. - Concurrent per-block-processing and execution payload verification during block processing. - The `Arc`-ification of `SignedBeaconBlock` during block processing (it's never mutated, so why not?): - I had to do this to deal with sending blocks into spawned tasks. - Previously we were cloning the beacon block at least 2 times during each block processing, these clones are either removed or turned into cheaper `Arc` clones. - We were also `Box`-ing and un-`Box`-ing beacon blocks as they moved throughout the networking crate. This is not a big deal, but it's nice to avoid shifting things between the stack and heap. - Avoids cloning *all the blocks* in *every chain segment* during sync. - It also has the potential to clean up our code where we need to pass an *owned* block around so we can send it back in the case of an error (I didn't do much of this, my PR is already big enough 😅) - The `BeaconChain::HeadSafetyStatus` struct was removed. It was an old relic from prior merge specs. For motivation for this change, see https://github.com/sigp/lighthouse/pull/3244#issuecomment-1160963273 ## Changes to `canonical_head` and `fork_choice` Previously, the `BeaconChain` had two separate fields: ``` canonical_head: RwLock<Snapshot>, fork_choice: RwLock<BeaconForkChoice> ``` Now, we have grouped these values under a single struct: ``` canonical_head: CanonicalHead { cached_head: RwLock<Arc<Snapshot>>, fork_choice: RwLock<BeaconForkChoice> } ``` Apart from ergonomics, the only *actual* change here is wrapping the canonical head snapshot in an `Arc`. This means that we no longer need to hold the `cached_head` (`canonical_head`, in old terms) lock when we want to pull some values from it. This was done to avoid deadlock risks by preventing functions from acquiring (and holding) the `cached_head` and `fork_choice` locks simultaneously. ## Breaking Changes ### The `state` (root) field in the `finalized_checkpoint` SSE event Consider the scenario where epoch `n` is just finalized, but `start_slot(n)` is skipped. There are two state roots we might in the `finalized_checkpoint` SSE event: 1. The state root of the finalized block, which is `get_block(finalized_checkpoint.root).state_root`. 4. The state root at slot of `start_slot(n)`, which would be the state from (1), but "skipped forward" through any skip slots. Previously, Lighthouse would choose (2). However, we can see that when [Teku generates that event](de2b2801c8/data/beaconrestapi/src/main/java/tech/pegasys/teku/beaconrestapi/handlers/v1/events/EventSubscriptionManager.java (L171-L182)
) it uses [`getStateRootFromBlockRoot`](de2b2801c8/data/provider/src/main/java/tech/pegasys/teku/api/ChainDataProvider.java (L336-L341)
) which uses (1). I have switched Lighthouse from (2) to (1). I think it's a somewhat arbitrary choice between the two, where (1) is easier to compute and is consistent with Teku. ## Notes for Reviewers I've renamed `BeaconChain::fork_choice` to `BeaconChain::recompute_head`. Doing this helped ensure I broke all previous uses of fork choice and I also find it more descriptive. It describes an action and can't be confused with trying to get a reference to the `ForkChoice` struct. I've changed the ordering of SSE events when a block is received. It used to be `[block, finalized, head]` and now it's `[block, head, finalized]`. It was easier this way and I don't think we were making any promises about SSE event ordering so it's not "breaking". I've made it so fork choice will run when it's first constructed. I did this because I wanted to have a cached version of the last call to `get_head`. Ensuring `get_head` has been run *at least once* means that the cached values doesn't need to wrapped in an `Option`. This was fairly simple, it just involved passing a `slot` to the constructor so it knows *when* it's being run. When loading a fork choice from the store and a slot clock isn't handy I've just used the `slot` that was saved in the `fork_choice_store`. That seems like it would be a faithful representation of the slot when we saved it. I added the `genesis_time: u64` to the `BeaconChain`. It's small, constant and nice to have around. Since we're using FC for the fin/just checkpoints, we no longer get the `0x00..00` roots at genesis. You can see I had to remove a work-around in `ef-tests` here: b56be3bc2. I can't find any reason why this would be an issue, if anything I think it'll be better since the genesis-alias has caught us out a few times (0x00..00 isn't actually a real root). Edit: I did find a case where the `network` expected the 0x00..00 alias and patched it here: 3f26ac3e2. You'll notice a lot of changes in tests. Generally, tests should be functionally equivalent. Here are the things creating the most diff-noise in tests: - Changing tests to be `tokio::async` tests. - Adding `.await` to fork choice, block processing and block production functions. - Refactor of the `canonical_head` "API" provided by the `BeaconChain`. E.g., `chain.canonical_head.cached_head()` instead of `chain.canonical_head.read()`. - Wrapping `SignedBeaconBlock` in an `Arc`. - In the `beacon_chain/tests/block_verification`, we can't use the `lazy_static` `CHAIN_SEGMENT` variable anymore since it's generated with an async function. We just generate it in each test, not so efficient but hopefully insignificant. I had to disable `rayon` concurrent tests in the `fork_choice` tests. This is because the use of `rayon` and `block_on` was causing a panic. Co-authored-by: Mac L <mjladson@pm.me>
202 lines
7.5 KiB
Rust
202 lines
7.5 KiB
Rust
use crate::{BeaconForkChoiceStore, BeaconSnapshot};
|
|
use fork_choice::{ForkChoice, PayloadVerificationStatus};
|
|
use itertools::process_results;
|
|
use slog::{info, warn, Logger};
|
|
use state_processing::state_advance::complete_state_advance;
|
|
use state_processing::{
|
|
per_block_processing, per_block_processing::BlockSignatureStrategy, VerifyBlockRoot,
|
|
};
|
|
use std::sync::Arc;
|
|
use std::time::Duration;
|
|
use store::{iter::ParentRootBlockIterator, HotColdDB, ItemStore};
|
|
use types::{BeaconState, ChainSpec, EthSpec, ForkName, Hash256, SignedBeaconBlock, Slot};
|
|
|
|
const CORRUPT_DB_MESSAGE: &str = "The database could be corrupt. Check its file permissions or \
|
|
consider deleting it by running with the --purge-db flag.";
|
|
|
|
/// Revert the head to the last block before the most recent hard fork.
|
|
///
|
|
/// This function is destructive and should only be used if there is no viable alternative. It will
|
|
/// cause the reverted blocks and states to be completely forgotten, lying dormant in the database
|
|
/// forever.
|
|
///
|
|
/// Return the `(head_block_root, head_block)` that should be used post-reversion.
|
|
pub fn revert_to_fork_boundary<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>>(
|
|
current_slot: Slot,
|
|
head_block_root: Hash256,
|
|
store: Arc<HotColdDB<E, Hot, Cold>>,
|
|
spec: &ChainSpec,
|
|
log: &Logger,
|
|
) -> Result<(Hash256, SignedBeaconBlock<E>), String> {
|
|
let current_fork = spec.fork_name_at_slot::<E>(current_slot);
|
|
let fork_epoch = spec
|
|
.fork_epoch(current_fork)
|
|
.ok_or_else(|| format!("Current fork '{}' never activates", current_fork))?;
|
|
|
|
if current_fork == ForkName::Base {
|
|
return Err(format!(
|
|
"Cannot revert to before phase0 hard fork. {}",
|
|
CORRUPT_DB_MESSAGE
|
|
));
|
|
}
|
|
|
|
warn!(
|
|
log,
|
|
"Reverting invalid head block";
|
|
"target_fork" => %current_fork,
|
|
"fork_epoch" => fork_epoch,
|
|
);
|
|
let block_iter = ParentRootBlockIterator::fork_tolerant(&store, head_block_root);
|
|
|
|
let (block_root, blinded_block) = process_results(block_iter, |mut iter| {
|
|
iter.find_map(|(block_root, block)| {
|
|
if block.slot() < fork_epoch.start_slot(E::slots_per_epoch()) {
|
|
Some((block_root, block))
|
|
} else {
|
|
info!(
|
|
log,
|
|
"Reverting block";
|
|
"block_root" => ?block_root,
|
|
"slot" => block.slot(),
|
|
);
|
|
None
|
|
}
|
|
})
|
|
})
|
|
.map_err(|e| {
|
|
format!(
|
|
"Error fetching blocks to revert: {:?}. {}",
|
|
e, CORRUPT_DB_MESSAGE
|
|
)
|
|
})?
|
|
.ok_or_else(|| format!("No pre-fork blocks found. {}", CORRUPT_DB_MESSAGE))?;
|
|
|
|
let block = store
|
|
.make_full_block(&block_root, blinded_block)
|
|
.map_err(|e| format!("Unable to add payload to new head block: {:?}", e))?;
|
|
|
|
Ok((block_root, block))
|
|
}
|
|
|
|
/// Reset fork choice to the finalized checkpoint of the supplied head state.
|
|
///
|
|
/// The supplied `head_block_root` should correspond to the most recently applied block on
|
|
/// `head_state`.
|
|
///
|
|
/// This function avoids quirks of fork choice initialization by replaying all of the blocks from
|
|
/// the checkpoint to the head.
|
|
///
|
|
/// See this issue for details: https://github.com/ethereum/consensus-specs/issues/2566
|
|
///
|
|
/// It will fail if the finalized state or any of the blocks to replay are unavailable.
|
|
///
|
|
/// WARNING: this function is destructive and causes fork choice to permanently forget all
|
|
/// chains other than the chain leading to `head_block_root`. It should only be used in extreme
|
|
/// circumstances when there is no better alternative.
|
|
pub fn reset_fork_choice_to_finalization<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>>(
|
|
head_block_root: Hash256,
|
|
head_state: &BeaconState<E>,
|
|
store: Arc<HotColdDB<E, Hot, Cold>>,
|
|
current_slot: Option<Slot>,
|
|
spec: &ChainSpec,
|
|
) -> Result<ForkChoice<BeaconForkChoiceStore<E, Hot, Cold>, E>, String> {
|
|
// Fetch finalized block.
|
|
let finalized_checkpoint = head_state.finalized_checkpoint();
|
|
let finalized_block_root = finalized_checkpoint.root;
|
|
let finalized_block = store
|
|
.get_full_block(&finalized_block_root)
|
|
.map_err(|e| format!("Error loading finalized block: {:?}", e))?
|
|
.ok_or_else(|| {
|
|
format!(
|
|
"Finalized block missing for revert: {:?}",
|
|
finalized_block_root
|
|
)
|
|
})?;
|
|
|
|
// Advance finalized state to finalized epoch (to handle skipped slots).
|
|
let finalized_state_root = finalized_block.state_root();
|
|
let mut finalized_state = store
|
|
.get_state(&finalized_state_root, Some(finalized_block.slot()))
|
|
.map_err(|e| format!("Error loading finalized state: {:?}", e))?
|
|
.ok_or_else(|| {
|
|
format!(
|
|
"Finalized block state missing from database: {:?}",
|
|
finalized_state_root
|
|
)
|
|
})?;
|
|
let finalized_slot = finalized_checkpoint.epoch.start_slot(E::slots_per_epoch());
|
|
complete_state_advance(
|
|
&mut finalized_state,
|
|
Some(finalized_state_root),
|
|
finalized_slot,
|
|
spec,
|
|
)
|
|
.map_err(|e| {
|
|
format!(
|
|
"Error advancing finalized state to finalized epoch: {:?}",
|
|
e
|
|
)
|
|
})?;
|
|
let finalized_snapshot = BeaconSnapshot {
|
|
beacon_block_root: finalized_block_root,
|
|
beacon_block: Arc::new(finalized_block),
|
|
beacon_state: finalized_state,
|
|
};
|
|
|
|
let fc_store = BeaconForkChoiceStore::get_forkchoice_store(store.clone(), &finalized_snapshot);
|
|
|
|
let mut fork_choice = ForkChoice::from_anchor(
|
|
fc_store,
|
|
finalized_block_root,
|
|
&finalized_snapshot.beacon_block,
|
|
&finalized_snapshot.beacon_state,
|
|
current_slot,
|
|
spec,
|
|
)
|
|
.map_err(|e| format!("Unable to reset fork choice for revert: {:?}", e))?;
|
|
|
|
// Replay blocks from finalized checkpoint back to head.
|
|
// We do not replay attestations presently, relying on the absence of other blocks
|
|
// to guarantee `head_block_root` as the head.
|
|
let blocks = store
|
|
.load_blocks_to_replay(finalized_slot + 1, head_state.slot(), head_block_root)
|
|
.map_err(|e| format!("Error loading blocks to replay for fork choice: {:?}", e))?;
|
|
|
|
let mut state = finalized_snapshot.beacon_state;
|
|
for block in blocks {
|
|
complete_state_advance(&mut state, None, block.slot(), spec)
|
|
.map_err(|e| format!("State advance failed: {:?}", e))?;
|
|
|
|
per_block_processing(
|
|
&mut state,
|
|
&block,
|
|
None,
|
|
BlockSignatureStrategy::NoVerification,
|
|
VerifyBlockRoot::True,
|
|
spec,
|
|
)
|
|
.map_err(|e| format!("Error replaying block: {:?}", e))?;
|
|
|
|
// Setting this to unverified is the safest solution, since we don't have a way to
|
|
// retro-actively determine if they were valid or not.
|
|
//
|
|
// This scenario is so rare that it seems OK to double-verify some blocks.
|
|
let payload_verification_status = PayloadVerificationStatus::Optimistic;
|
|
|
|
fork_choice
|
|
.on_block(
|
|
block.slot(),
|
|
block.message(),
|
|
block.canonical_root(),
|
|
// Reward proposer boost. We are reinforcing the canonical chain.
|
|
Duration::from_secs(0),
|
|
&state,
|
|
payload_verification_status,
|
|
spec,
|
|
)
|
|
.map_err(|e| format!("Error applying replayed block to fork choice: {:?}", e))?;
|
|
}
|
|
|
|
Ok(fork_choice)
|
|
}
|