mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-09 19:51:47 +00:00
* Attestation superstruct changes for EIP 7549 (#5644)
* update
* experiment
* superstruct changes
* revert
* superstruct changes
* fix tests
* indexed attestation
* indexed attestation superstruct
* updated TODOs
* `superstruct` the `AttesterSlashing` (#5636)
* `superstruct` Attester Fork Variants
* Push a little further
* Deal with Encode / Decode of AttesterSlashing
* not so sure about this..
* Stop Encode/Decode Bounds from Propagating Out
* Tons of Changes..
* More Conversions to AttestationRef
* Add AsReference trait (#15)
* Add AsReference trait
* Fix some snafus
* Got it Compiling! :D
* Got Tests Building
* Get beacon chain tests compiling
---------
Co-authored-by: Michael Sproul <micsproul@gmail.com>
* Merge remote-tracking branch 'upstream/unstable' into electra_attestation_changes
* Make EF Tests Fork-Agnostic (#5713)
* Finish EF Test Fork Agnostic (#5714)
* Superstruct `AggregateAndProof` (#5715)
* Upgrade `superstruct` to `0.8.0`
* superstruct `AggregateAndProof`
* Merge remote-tracking branch 'sigp/unstable' into electra_attestation_changes
* cargo fmt
* Merge pull request #5726 from realbigsean/electra_attestation_changes
Merge unstable into Electra attestation changes
* EIP7549 `get_attestation_indices` (#5657)
* get attesting indices electra impl
* fmt
* get tests to pass
* fmt
* fix some beacon chain tests
* fmt
* fix slasher test
* fmt got me again
* fix more tests
* fix tests
* Some small changes (#5739)
* cargo fmt (#5740)
* Sketch op pool changes
* fix get attesting indices (#5742)
* fix get attesting indices
* better errors
* fix compile
* only get committee index once
* Ef test fixes (#5753)
* attestation related ef test fixes
* delete commented out stuff
* Fix Aggregation Pool for Electra (#5754)
* Fix Aggregation Pool for Electra
* Remove Outdated Interface
* fix ssz (#5755)
* Get `electra_op_pool` up to date (#5756)
* fix get attesting indices (#5742)
* fix get attesting indices
* better errors
* fix compile
* only get committee index once
* Ef test fixes (#5753)
* attestation related ef test fixes
* delete commented out stuff
* Fix Aggregation Pool for Electra (#5754)
* Fix Aggregation Pool for Electra
* Remove Outdated Interface
* fix ssz (#5755)
---------
Co-authored-by: realbigsean <sean@sigmaprime.io>
* Revert "Get `electra_op_pool` up to date (#5756)" (#5757)
This reverts commit ab9e58aa3d.
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into electra_op_pool
* Compute on chain aggregate impl (#5752)
* add compute_on_chain_agg impl to op pool changes
* fmt
* get op pool tests to pass
* update the naive agg pool interface (#5760)
* Fix bugs in cross-committee aggregation
* Add comment to max cover optimisation
* Fix assert
* Merge pull request #5749 from sigp/electra_op_pool
Optimise Electra op pool aggregation
* update committee offset
* Fix Electra Fork Choice Tests (#5764)
* Subscribe to the correct subnets for electra attestations (#5782)
* subscribe to the correct att subnets for electra
* subscribe to the correct att subnets for electra
* cargo fmt
* fix slashing handling
* Merge remote-tracking branch 'upstream/unstable'
* Send unagg attestation based on fork
* Publish all aggregates
* just one more check bro plz..
* Merge pull request #5832 from ethDreamer/electra_attestation_changes_merge_unstable
Merge `unstable` into `electra_attestation_changes`
* Merge pull request #5835 from realbigsean/fix-validator-logic
Fix validator logic
* Merge pull request #5816 from realbigsean/electra-attestation-slashing-handling
Electra slashing handling
* Electra attestation changes rm decode impl (#5856)
* Remove Crappy Decode impl for Attestation
* Remove Inefficient Attestation Decode impl
* Implement Schema Upgrade / Downgrade
* Update beacon_node/beacon_chain/src/schema_change/migration_schema_v20.rs
Co-authored-by: Michael Sproul <micsproul@gmail.com>
---------
Co-authored-by: Michael Sproul <micsproul@gmail.com>
* Fix failing attestation tests and misc electra attestation cleanup (#5810)
* - get attestation related beacon chain tests to pass
- observed attestations are now keyed off of data + committee index
- rename op pool attestationref to compactattestationref
- remove unwraps in agg pool and use options instead
- cherry pick some changes from ef-tests-electra
* cargo fmt
* fix failing test
* Revert dockerfile changes
* make committee_index return option
* function args shouldnt be a ref to attestation ref
* fmt
* fix dup imports
---------
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
* fix some todos (#5817)
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes
* add consolidations to merkle calc for inclusion proof
* Remove Duplicate KZG Commitment Merkle Proof Code (#5874)
* Remove Duplicate KZG Commitment Merkle Proof Code
* s/tree_lists/fields/
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes
* fix compile
* Fix slasher tests (#5906)
* Fix electra tests
* Add electra attestations to double vote tests
* Update superstruct to 0.8
* Merge remote-tracking branch 'origin/unstable' into electra_attestation_changes
* Small cleanup in slasher tests
* Clean up Electra observed aggregates (#5929)
* Use consistent key in observed_attestations
* Remove unwraps from observed aggregates
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes
* De-dup attestation constructor logic
* Remove unwraps in Attestation construction
* Dedup match_attestation_data
* Remove outdated TODO
* Use ForkName Ord in fork-choice tests
* Use ForkName Ord in BeaconBlockBody
* Make to_electra not fallible
* Remove TestRandom impl for IndexedAttestation
* Remove IndexedAttestation faulty Decode impl
* Drop TestRandom impl
* Add PendingAttestationInElectra
* Indexed att on disk (#35)
* indexed att on disk
* fix lints
* Update slasher/src/migrate.rs
Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com>
---------
Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com>
Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com>
* add electra fork enabled fn to ForkName impl (#36)
* add electra fork enabled fn to ForkName impl
* remove inadvertent file
* Update common/eth2/src/types.rs
Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com>
* Dedup attestation constructor logic in attester cache
* Use if let Ok for committee_bits
* Dedup Attestation constructor code
* Diff reduction in tests
* Fix beacon_chain tests
* Diff reduction
* Use Ord for ForkName in pubsub
* Resolve into_attestation_and_indices todo
* Remove stale TODO
* Fix beacon_chain tests
* Test spec invariant
* Use electra_enabled in pubsub
* Remove get_indexed_attestation_from_signed_aggregate
* Use ok_or instead of if let else
* committees are sorted
* remove dup method `get_indexed_attestation_from_committees`
* Merge pull request #5940 from dapplion/electra_attestation_changes_lionreview
Electra attestations #5712 review
* update default persisted op pool deserialization
* ensure aggregate and proof uses serde untagged on ref
* Fork aware ssz static attestation tests
* Electra attestation changes from Lions review (#5971)
* dedup/cleanup and remove unneeded hashset use
* remove irrelevant TODOs
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes
* Electra attestation changes sean review (#5972)
* instantiate empty bitlist in unreachable code
* clean up error conversion
* fork enabled bool cleanup
* remove a couple todos
* return bools instead of options in `aggregate` and use the result
* delete commented out code
* use map macros in simple transformations
* remove signers_disjoint_from
* get ef tests compiling
* get ef tests compiling
* update intentionally excluded files
* Avoid changing slasher schema for Electra
* Delete slasher schema v4
* Fix clippy
* Fix compilation of beacon_chain tests
* Update database.rs
* Add electra lightclient types
* Update slasher/src/database.rs
* fix imports
* Merge pull request #5980 from dapplion/electra-lightclient
Add electra lightclient types
* Merge pull request #5975 from michaelsproul/electra-slasher-no-migration
Avoid changing slasher schema for Electra
* Update beacon_node/beacon_chain/src/attestation_verification.rs
* Update beacon_node/beacon_chain/src/attestation_verification.rs
282 lines
10 KiB
Rust
282 lines
10 KiB
Rust
//! Provides tools for checking if a node is ready for the Bellatrix upgrade and following merge
|
|
//! transition.
|
|
|
|
use crate::{BeaconChain, BeaconChainError as Error, BeaconChainTypes};
|
|
use execution_layer::BlockByNumberQuery;
|
|
use serde::{Deserialize, Serialize, Serializer};
|
|
use slog::debug;
|
|
use std::fmt;
|
|
use std::fmt::Write;
|
|
use types::*;
|
|
|
|
/// The time before the Bellatrix fork when we will start issuing warnings about preparation.
|
|
pub const SECONDS_IN_A_WEEK: u64 = 604800;
|
|
pub const BELLATRIX_READINESS_PREPARATION_SECONDS: u64 = SECONDS_IN_A_WEEK * 2;
|
|
|
|
#[derive(Default, Debug, Serialize, Deserialize)]
|
|
pub struct MergeConfig {
|
|
#[serde(serialize_with = "serialize_uint256")]
|
|
pub terminal_total_difficulty: Option<Uint256>,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
pub terminal_block_hash: Option<ExecutionBlockHash>,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
pub terminal_block_hash_epoch: Option<Epoch>,
|
|
}
|
|
|
|
impl fmt::Display for MergeConfig {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
if self.terminal_block_hash.is_none()
|
|
&& self.terminal_block_hash_epoch.is_none()
|
|
&& self.terminal_total_difficulty.is_none()
|
|
{
|
|
return write!(
|
|
f,
|
|
"Merge terminal difficulty parameters not configured, check your config"
|
|
);
|
|
}
|
|
let mut display_string = String::new();
|
|
if let Some(terminal_total_difficulty) = self.terminal_total_difficulty {
|
|
write!(
|
|
display_string,
|
|
"terminal_total_difficulty: {},",
|
|
terminal_total_difficulty
|
|
)?;
|
|
}
|
|
if let Some(terminal_block_hash) = self.terminal_block_hash {
|
|
write!(
|
|
display_string,
|
|
"terminal_block_hash: {},",
|
|
terminal_block_hash
|
|
)?;
|
|
}
|
|
if let Some(terminal_block_hash_epoch) = self.terminal_block_hash_epoch {
|
|
write!(
|
|
display_string,
|
|
"terminal_block_hash_epoch: {},",
|
|
terminal_block_hash_epoch
|
|
)?;
|
|
}
|
|
write!(f, "{}", display_string.trim_end_matches(','))?;
|
|
Ok(())
|
|
}
|
|
}
|
|
impl MergeConfig {
|
|
/// Instantiate `self` from the values in a `ChainSpec`.
|
|
pub fn from_chainspec(spec: &ChainSpec) -> Self {
|
|
let mut params = MergeConfig::default();
|
|
if spec.terminal_total_difficulty != Uint256::max_value() {
|
|
params.terminal_total_difficulty = Some(spec.terminal_total_difficulty);
|
|
}
|
|
if spec.terminal_block_hash != ExecutionBlockHash::zero() {
|
|
params.terminal_block_hash = Some(spec.terminal_block_hash);
|
|
}
|
|
if spec.terminal_block_hash_activation_epoch != Epoch::max_value() {
|
|
params.terminal_block_hash_epoch = Some(spec.terminal_block_hash_activation_epoch);
|
|
}
|
|
params
|
|
}
|
|
}
|
|
|
|
/// Indicates if a node is ready for the Bellatrix upgrade and subsequent merge transition.
|
|
#[derive(Debug, Serialize, Deserialize)]
|
|
#[serde(rename_all = "snake_case")]
|
|
#[serde(tag = "type")]
|
|
pub enum BellatrixReadiness {
|
|
/// The node is ready, as far as we can tell.
|
|
Ready {
|
|
config: MergeConfig,
|
|
#[serde(serialize_with = "serialize_uint256")]
|
|
current_difficulty: Option<Uint256>,
|
|
},
|
|
/// The EL can be reached and has the correct configuration, however it's not yet synced.
|
|
NotSynced,
|
|
/// The user has not configured this node to use an execution endpoint.
|
|
NoExecutionEndpoint,
|
|
}
|
|
|
|
impl fmt::Display for BellatrixReadiness {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
match self {
|
|
BellatrixReadiness::Ready {
|
|
config: params,
|
|
current_difficulty,
|
|
} => {
|
|
write!(
|
|
f,
|
|
"This node appears ready for Bellatrix \
|
|
Params: {}, current_difficulty: {:?}",
|
|
params, current_difficulty
|
|
)
|
|
}
|
|
BellatrixReadiness::NotSynced => write!(
|
|
f,
|
|
"The execution endpoint is connected and configured, \
|
|
however it is not yet synced"
|
|
),
|
|
BellatrixReadiness::NoExecutionEndpoint => write!(
|
|
f,
|
|
"The --execution-endpoint flag is not specified, this is a \
|
|
requirement for Bellatrix"
|
|
),
|
|
}
|
|
}
|
|
}
|
|
|
|
pub enum GenesisExecutionPayloadStatus {
|
|
Correct(ExecutionBlockHash),
|
|
BlockHashMismatch {
|
|
got: ExecutionBlockHash,
|
|
expected: ExecutionBlockHash,
|
|
},
|
|
TransactionsRootMismatch {
|
|
got: Hash256,
|
|
expected: Hash256,
|
|
},
|
|
WithdrawalsRootMismatch {
|
|
got: Hash256,
|
|
expected: Hash256,
|
|
},
|
|
OtherMismatch,
|
|
Irrelevant,
|
|
AlreadyHappened,
|
|
}
|
|
|
|
impl<T: BeaconChainTypes> BeaconChain<T> {
|
|
/// Returns `true` if user has an EL configured, or if the Bellatrix fork has occurred or will
|
|
/// occur within `BELLATRIX_READINESS_PREPARATION_SECONDS`.
|
|
pub fn is_time_to_prepare_for_bellatrix(&self, current_slot: Slot) -> bool {
|
|
if let Some(bellatrix_epoch) = self.spec.bellatrix_fork_epoch {
|
|
let bellatrix_slot = bellatrix_epoch.start_slot(T::EthSpec::slots_per_epoch());
|
|
let bellatrix_readiness_preparation_slots =
|
|
BELLATRIX_READINESS_PREPARATION_SECONDS / self.spec.seconds_per_slot;
|
|
|
|
if self.execution_layer.is_some() {
|
|
// The user has already configured an execution layer, start checking for readiness
|
|
// right away.
|
|
true
|
|
} else {
|
|
// Return `true` if Bellatrix has happened or is within the preparation time.
|
|
current_slot + bellatrix_readiness_preparation_slots > bellatrix_slot
|
|
}
|
|
} else {
|
|
// The Bellatrix fork epoch has not been defined yet, no need to prepare.
|
|
false
|
|
}
|
|
}
|
|
|
|
/// Attempts to connect to the EL and confirm that it is ready for Bellatrix.
|
|
pub async fn check_bellatrix_readiness(&self, current_slot: Slot) -> BellatrixReadiness {
|
|
if let Some(el) = self.execution_layer.as_ref() {
|
|
if !el.is_synced_for_notifier(current_slot).await {
|
|
// The EL is not synced.
|
|
return BellatrixReadiness::NotSynced;
|
|
}
|
|
let params = MergeConfig::from_chainspec(&self.spec);
|
|
let current_difficulty = el.get_current_difficulty().await.ok();
|
|
BellatrixReadiness::Ready {
|
|
config: params,
|
|
current_difficulty,
|
|
}
|
|
} else {
|
|
// There is no EL configured.
|
|
BellatrixReadiness::NoExecutionEndpoint
|
|
}
|
|
}
|
|
|
|
/// Check that the execution payload embedded in the genesis state matches the EL's genesis
|
|
/// block.
|
|
pub async fn check_genesis_execution_payload_is_correct(
|
|
&self,
|
|
) -> Result<GenesisExecutionPayloadStatus, Error> {
|
|
let head_snapshot = self.head_snapshot();
|
|
let genesis_state = &head_snapshot.beacon_state;
|
|
|
|
if genesis_state.slot() != 0 {
|
|
return Ok(GenesisExecutionPayloadStatus::AlreadyHappened);
|
|
}
|
|
|
|
let Ok(latest_execution_payload_header) = genesis_state.latest_execution_payload_header()
|
|
else {
|
|
return Ok(GenesisExecutionPayloadStatus::Irrelevant);
|
|
};
|
|
let fork = self.spec.fork_name_at_epoch(Epoch::new(0));
|
|
|
|
let execution_layer = self
|
|
.execution_layer
|
|
.as_ref()
|
|
.ok_or(Error::ExecutionLayerMissing)?;
|
|
let exec_block_hash = latest_execution_payload_header.block_hash();
|
|
|
|
// Use getBlockByNumber(0) to check that the block hash matches.
|
|
// At present, Geth does not respond to engine_getPayloadBodiesByRange before genesis.
|
|
let execution_block = execution_layer
|
|
.get_block_by_number(BlockByNumberQuery::Tag("0x0"))
|
|
.await
|
|
.map_err(|e| Error::ExecutionLayerGetBlockByNumberFailed(Box::new(e)))?
|
|
.ok_or(Error::BlockHashMissingFromExecutionLayer(exec_block_hash))?;
|
|
|
|
if execution_block.block_hash != exec_block_hash {
|
|
return Ok(GenesisExecutionPayloadStatus::BlockHashMismatch {
|
|
got: execution_block.block_hash,
|
|
expected: exec_block_hash,
|
|
});
|
|
}
|
|
|
|
// Double-check the block by reconstructing it.
|
|
let execution_payload = execution_layer
|
|
.get_payload_by_hash_legacy(exec_block_hash, fork)
|
|
.await
|
|
.map_err(|e| Error::ExecutionLayerGetBlockByHashFailed(Box::new(e)))?
|
|
.ok_or(Error::BlockHashMissingFromExecutionLayer(exec_block_hash))?;
|
|
|
|
// Verify payload integrity.
|
|
let header_from_payload = ExecutionPayloadHeader::from(execution_payload.to_ref());
|
|
|
|
let got_transactions_root = header_from_payload.transactions_root();
|
|
let expected_transactions_root = latest_execution_payload_header.transactions_root();
|
|
let got_withdrawals_root = header_from_payload.withdrawals_root().ok();
|
|
let expected_withdrawals_root = latest_execution_payload_header.withdrawals_root().ok();
|
|
|
|
if got_transactions_root != expected_transactions_root {
|
|
return Ok(GenesisExecutionPayloadStatus::TransactionsRootMismatch {
|
|
got: got_transactions_root,
|
|
expected: expected_transactions_root,
|
|
});
|
|
}
|
|
|
|
if let Some(expected) = expected_withdrawals_root {
|
|
if let Some(got) = got_withdrawals_root {
|
|
if got != expected {
|
|
return Ok(GenesisExecutionPayloadStatus::WithdrawalsRootMismatch {
|
|
got,
|
|
expected,
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
if header_from_payload.to_ref() != latest_execution_payload_header {
|
|
debug!(
|
|
self.log,
|
|
"Genesis execution payload reconstruction failure";
|
|
"consensus_node_header" => ?latest_execution_payload_header,
|
|
"execution_node_header" => ?header_from_payload
|
|
);
|
|
return Ok(GenesisExecutionPayloadStatus::OtherMismatch);
|
|
}
|
|
|
|
Ok(GenesisExecutionPayloadStatus::Correct(exec_block_hash))
|
|
}
|
|
}
|
|
|
|
/// Utility function to serialize a Uint256 as a decimal string.
|
|
fn serialize_uint256<S>(val: &Option<Uint256>, s: S) -> Result<S::Ok, S::Error>
|
|
where
|
|
S: Serializer,
|
|
{
|
|
match val {
|
|
Some(v) => v.to_string().serialize(s),
|
|
None => s.serialize_none(),
|
|
}
|
|
}
|