gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-21 06:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

vote sanity and genesis epoch fix

Browse Source
This commit is contained in:
hopinheimer
2026-03-02 13:25:03 -05:00
parent 59033a5092
commit e68cc03114
8 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
consensus/proto_array/src/fork_choice_test_definition/votes.rs
View File

@@ -339,7 +339,7 @@ pub fn get_votes_test_definition() -> ForkChoiceTestDefinition {
execution_payload_block_hash: None,
});
// Ensure that 5 becomes the head.
// Ensure that 5 is filtered out and the head stays at 4.
//
// 0
// / \
@@ -347,9 +347,9 @@ pub fn get_votes_test_definition() -> ForkChoiceTestDefinition {
// |
// 3
// |
// 4
// 4 <- head
// /
// head-> 5
// 5
ops.push(Operation::FindHead {
justified_checkpoint: Checkpoint {
epoch: Epoch::new(1),
@@ -360,7 +360,7 @@ pub fn get_votes_test_definition() -> ForkChoiceTestDefinition {
root: get_root(0),
},
justified_state_balances: balances.clone(),
expected_head: get_root(5),
expected_head: get_root(4),
});
// Add block 6, which has a justified epoch of 0.
@@ -476,8 +476,8 @@ pub fn get_votes_test_definition() -> ForkChoiceTestDefinition {
execution_payload_block_hash: None,
});
// Ensure that 9 is the head. The branch rooted at 5 remains viable and its best descendant
// is selected.
// Ensure that 6 is the head, even though 5 has all the votes. This is testing to ensure
// that 5 is filtered out due to a differing justified epoch.
//
// 0
// / \
@@ -487,13 +487,13 @@ pub fn get_votes_test_definition() -> ForkChoiceTestDefinition {
// |
// 4
// / \
// 5 6
// 5 6 <- head
// |
// 7
// |
// 8
// /
// head-> 9
// 9
ops.push(Operation::FindHead {
justified_checkpoint: Checkpoint {
epoch: Epoch::new(1),
@@ -504,7 +504,7 @@ pub fn get_votes_test_definition() -> ForkChoiceTestDefinition {
root: get_root(0),
},
justified_state_balances: balances.clone(),
expected_head: get_root(9),
expected_head: get_root(6),
});
// Change fork-choice justified epoch to 1, and the start block to 5 and ensure that 9 is

3
consensus/proto_array/src/proto_array.rs
View File

@@ -130,7 +130,6 @@ pub struct ProtoNode {
#[superstruct(only(V29), partial_getter(copy))]
pub execution_payload_block_hash: ExecutionBlockHash,
/// Tiebreaker for payload preference when full_payload_weight == empty_payload_weight.
/// Per spec: prefer Full if block was timely and data is available; otherwise prefer Empty.
#[superstruct(only(V29), partial_getter(copy))]
pub payload_tiebreak: PayloadTiebreak,
}
@@ -1152,7 +1151,7 @@ impl ProtoArray {
return false;
}
let genesis_epoch = Epoch::new(1);
let genesis_epoch = Epoch::new(0);
let current_epoch = current_slot.epoch(E::slots_per_epoch());
let node_epoch = node.slot().epoch(E::slots_per_epoch());
let node_justified_checkpoint = node.justified_checkpoint();

2
consensus/proto_array/src/proto_array_fork_choice.rs
View File

@@ -530,6 +530,8 @@ impl ProtoArrayForkChoice {
if attestation_slot > vote.next_slot || *vote == VoteTracker::default() {
vote.next_root = block_root;
vote.next_slot = attestation_slot;
vote.next_payload_present = false;
vote.next_blob_data_available = false;
}
Ok(())