gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-30 12:47:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/unstable' into fc-compliance

Browse Source
This commit is contained in:
Michael Sproul
2026-05-25 15:42:29 +10:00
parent cc55c9ef5e dfb259171a
commit 0a91b63c25
21 changed files with 526 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
testing/ef_tests/Cargo.toml
View File

@@ -28,6 +28,7 @@ hex = { workspace = true }
kzg = { workspace = true }
logging = { workspace = true }
milhouse = { workspace = true }
proto_array = { workspace = true }
rayon = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }

18
testing/ef_tests/src/cases/fork_choice.rs
View File

@@ -7,10 +7,7 @@ use ::fork_choice::{
use beacon_chain::beacon_proposer_cache::compute_proposer_duties_from_head;
use beacon_chain::blob_verification::GossipBlobError;
use beacon_chain::block_verification_types::LookupBlock;
use beacon_chain::chain_config::{
DEFAULT_RE_ORG_HEAD_THRESHOLD, DEFAULT_RE_ORG_MAX_EPOCHS_SINCE_FINALIZATION,
DEFAULT_RE_ORG_PARENT_THRESHOLD, DisallowedReOrgOffsets,
};
use beacon_chain::chain_config::DisallowedReOrgOffsets;
use beacon_chain::data_column_verification::GossipVerifiedDataColumn;
use beacon_chain::slot_clock::SlotClock;
use beacon_chain::{
@@ -24,6 +21,7 @@ use bls::AggregateSignature;
use execution_layer::{
PayloadStatusV1, PayloadStatusV1Status, json_structures::JsonPayloadStatusV1Status,
};
use proto_array::ReOrgThreshold;
use serde::Deserialize;
use ssz_derive::Decode;
use ssz_types::VariableList;
@@ -39,9 +37,9 @@ use std::time::Duration;
use types::{
Attestation, AttestationRef, AttesterSlashing, AttesterSlashingRef, BeaconBlock, BeaconState,
BlobSidecar, BlobsList, BlockImportSource, Checkpoint, DataColumnSidecar,
DataColumnSidecarList, DataColumnSubnetId, ExecutionBlockHash, Hash256, IndexedAttestation,
IndexedPayloadAttestation, KzgProof, PayloadAttestationMessage, ProposerPreparationData,
SignedBeaconBlock, SignedExecutionPayloadEnvelope, Slot, Uint256,
DataColumnSidecarList, DataColumnSubnetId, Epoch, ExecutionBlockHash, Hash256,
IndexedAttestation, IndexedPayloadAttestation, KzgProof, PayloadAttestationMessage,
ProposerPreparationData, SignedBeaconBlock, SignedExecutionPayloadEnvelope, Slot, Uint256,
};
// When set to true, cache any states fetched from the db.
@@ -1263,10 +1261,10 @@ impl<E: EthSpec> Tester<E> {
let proposer_head_result = fc.get_proposer_head(
slot,
canonical_head,
DEFAULT_RE_ORG_HEAD_THRESHOLD,
DEFAULT_RE_ORG_PARENT_THRESHOLD,
ReOrgThreshold(self.spec.reorg_head_weight_threshold),
ReOrgThreshold(self.spec.reorg_parent_weight_threshold),
&DisallowedReOrgOffsets::default(),
DEFAULT_RE_ORG_MAX_EPOCHS_SINCE_FINALIZATION,
Epoch::new(self.spec.reorg_max_epochs_since_finalization),
);
let proposer_head = match proposer_head_result {
Ok(head) => head.parent_node.root(),