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>
135 lines
4.2 KiB
Rust
135 lines
4.2 KiB
Rust
#[macro_use]
|
|
mod macros;
|
|
mod exit;
|
|
|
|
use beacon_chain::test_utils::{BeaconChainHarness, EphemeralHarnessType};
|
|
use lazy_static::lazy_static;
|
|
use ssz::Encode;
|
|
use std::env;
|
|
use std::fs::{self, File};
|
|
use std::io::Write;
|
|
use std::path::{Path, PathBuf};
|
|
use std::process::exit;
|
|
use types::{
|
|
test_utils::generate_deterministic_keypairs, BeaconState, EthSpec, Keypair, SignedBeaconBlock,
|
|
};
|
|
use types::{Hash256, MainnetEthSpec, Slot};
|
|
|
|
type E = MainnetEthSpec;
|
|
|
|
pub const VALIDATOR_COUNT: usize = 64;
|
|
|
|
/// The base output directory for test vectors.
|
|
pub const BASE_VECTOR_DIR: &str = "vectors";
|
|
|
|
pub const SLOT_OFFSET: u64 = 1;
|
|
|
|
/// Writes all known test vectors to `CARGO_MANIFEST_DIR/vectors`.
|
|
#[tokio::main]
|
|
async fn main() {
|
|
match write_all_vectors().await {
|
|
Ok(()) => exit(0),
|
|
Err(e) => {
|
|
eprintln!("Error: {}", e);
|
|
exit(1)
|
|
}
|
|
}
|
|
}
|
|
|
|
/// An abstract definition of a test vector that can be run as a test or exported to disk.
|
|
pub struct TestVector {
|
|
pub title: String,
|
|
pub pre_state: BeaconState<E>,
|
|
pub block: SignedBeaconBlock<E>,
|
|
pub post_state: Option<BeaconState<E>>,
|
|
pub error: Option<String>,
|
|
}
|
|
|
|
lazy_static! {
|
|
/// A cached set of keys.
|
|
static ref KEYPAIRS: Vec<Keypair> = generate_deterministic_keypairs(VALIDATOR_COUNT);
|
|
}
|
|
|
|
async fn get_harness<E: EthSpec>(
|
|
slot: Slot,
|
|
validator_count: usize,
|
|
) -> BeaconChainHarness<EphemeralHarnessType<E>> {
|
|
let harness = BeaconChainHarness::builder(E::default())
|
|
.default_spec()
|
|
.keypairs(KEYPAIRS[0..validator_count].to_vec())
|
|
.fresh_ephemeral_store()
|
|
.build();
|
|
let skip_to_slot = slot - SLOT_OFFSET;
|
|
if skip_to_slot > Slot::new(0) {
|
|
let state = harness.get_current_state();
|
|
harness
|
|
.add_attested_blocks_at_slots(
|
|
state,
|
|
Hash256::zero(),
|
|
(skip_to_slot.as_u64()..slot.as_u64())
|
|
.map(Slot::new)
|
|
.collect::<Vec<_>>()
|
|
.as_slice(),
|
|
(0..validator_count).collect::<Vec<_>>().as_slice(),
|
|
)
|
|
.await;
|
|
}
|
|
|
|
harness
|
|
}
|
|
|
|
/// Writes all vectors to file.
|
|
async fn write_all_vectors() -> Result<(), String> {
|
|
write_vectors_to_file("exit", &exit::vectors().await)
|
|
}
|
|
|
|
/// Writes a list of `vectors` to the `title` dir.
|
|
fn write_vectors_to_file(title: &str, vectors: &[TestVector]) -> Result<(), String> {
|
|
let dir = env::var("CARGO_MANIFEST_DIR")
|
|
.map_err(|e| format!("Unable to find manifest dir: {:?}", e))?
|
|
.parse::<PathBuf>()
|
|
.map_err(|e| format!("Unable to parse manifest dir: {:?}", e))?
|
|
.join(BASE_VECTOR_DIR)
|
|
.join(title);
|
|
|
|
if dir.exists() {
|
|
fs::remove_dir_all(&dir).map_err(|e| format!("Unable to remove {:?}: {:?}", dir, e))?;
|
|
}
|
|
fs::create_dir_all(&dir).map_err(|e| format!("Unable to create {:?}: {:?}", dir, e))?;
|
|
|
|
for vector in vectors {
|
|
let dir = dir.clone().join(&vector.title);
|
|
if dir.exists() {
|
|
fs::remove_dir_all(&dir).map_err(|e| format!("Unable to remove {:?}: {:?}", dir, e))?;
|
|
}
|
|
fs::create_dir_all(&dir).map_err(|e| format!("Unable to create {:?}: {:?}", dir, e))?;
|
|
|
|
write_to_ssz_file(&dir.clone().join("pre.ssz"), &vector.pre_state)?;
|
|
write_to_ssz_file(&dir.clone().join("block.ssz"), &vector.block)?;
|
|
if let Some(post_state) = vector.post_state.as_ref() {
|
|
write_to_ssz_file(&dir.clone().join("post.ssz"), post_state)?;
|
|
}
|
|
if let Some(error) = vector.error.as_ref() {
|
|
write_to_file(&dir.clone().join("error.txt"), error.as_bytes())?;
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Write some SSZ object to file.
|
|
fn write_to_ssz_file<T: Encode>(path: &Path, item: &T) -> Result<(), String> {
|
|
write_to_file(path, &item.as_ssz_bytes())
|
|
}
|
|
|
|
/// Write some bytes to file.
|
|
fn write_to_file(path: &Path, item: &[u8]) -> Result<(), String> {
|
|
File::create(path)
|
|
.map_err(|e| format!("Unable to create {:?}: {:?}", path, e))
|
|
.and_then(|mut file| {
|
|
file.write_all(item)
|
|
.map(|_| ())
|
|
.map_err(|e| format!("Unable to write to {:?}: {:?}", path, e))
|
|
})
|
|
}
|