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

Make proposer_index mandatory in on_block

Browse Source
This commit is contained in:
Michael Sproul
2026-03-26 11:07:38 +11:00
parent f1b261f336
commit d58df3a656
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
consensus/proto_array/src/error.rs
View File

@@ -61,6 +61,7 @@ pub enum Error {
block_root: Hash256, block_root: Hash256,
}, },
NoViableChildren, NoViableChildren,
OnBlockRequiresProposerIndex,
} }
impl From<ArithError> for Error { impl From<ArithError> for Error {

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

@@ -280,7 +280,7 @@ impl ForkChoiceTestDefinition {
unrealized_finalized_checkpoint: None, unrealized_finalized_checkpoint: None,
execution_payload_parent_hash, execution_payload_parent_hash,
execution_payload_block_hash, execution_payload_block_hash,
proposer_index: None, proposer_index: Some(0),
}; };
fork_choice fork_choice
.process_block::<MainnetEthSpec>( .process_block::<MainnetEthSpec>(

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

@@ -551,6 +551,12 @@ impl ProtoArray {
return Ok(()); return Ok(());
} }
// We do not allow `proposer_index=None` for calls to `on_block`, it is only non-optional
// for backwards-compatibility with pre-Gloas V17 proto nodes.
let Some(proposer_index) = block.proposer_index else {
return Err(Error::OnBlockRequiresProposerIndex);
};
let node_index = self.nodes.len(); let node_index = self.nodes.len();
let parent_index = block let parent_index = block
@@ -658,7 +664,7 @@ impl ProtoArray {
BitVector::default() BitVector::default()
}, },
payload_received: is_genesis, payload_received: is_genesis,
proposer_index: block.proposer_index.unwrap_or(0), proposer_index,
// Spec: `record_block_timeliness` + `get_forkchoice_store`. // Spec: `record_block_timeliness` + `get_forkchoice_store`.
// Anchor gets [True, True]. Others computed from time_into_slot. // Anchor gets [True, True]. Others computed from time_into_slot.
block_timeliness_attestation_threshold: is_genesis block_timeliness_attestation_threshold: is_genesis

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

@@ -492,7 +492,7 @@ impl ProtoArrayForkChoice {
unrealized_finalized_checkpoint: Some(finalized_checkpoint), unrealized_finalized_checkpoint: Some(finalized_checkpoint),
execution_payload_parent_hash, execution_payload_parent_hash,
execution_payload_block_hash, execution_payload_block_hash,
proposer_index: None, proposer_index: Some(0),
}; };
proto_array proto_array
@@ -1338,7 +1338,7 @@ mod test_compute_deltas {
unrealized_finalized_checkpoint: Some(genesis_checkpoint), unrealized_finalized_checkpoint: Some(genesis_checkpoint),
execution_payload_parent_hash: None, execution_payload_parent_hash: None,
execution_payload_block_hash: None, execution_payload_block_hash: None,
proposer_index: None, proposer_index: Some(0),
}, },
genesis_slot + 1, genesis_slot + 1,
genesis_checkpoint, genesis_checkpoint,
@@ -1368,7 +1368,7 @@ mod test_compute_deltas {
unrealized_finalized_checkpoint: None, unrealized_finalized_checkpoint: None,
execution_payload_parent_hash: None, execution_payload_parent_hash: None,
execution_payload_block_hash: None, execution_payload_block_hash: None,
proposer_index: None, proposer_index: Some(0),
}, },
genesis_slot + 1, genesis_slot + 1,
genesis_checkpoint, genesis_checkpoint,
@@ -1505,7 +1505,7 @@ mod test_compute_deltas {
unrealized_finalized_checkpoint: Some(genesis_checkpoint), unrealized_finalized_checkpoint: Some(genesis_checkpoint),
execution_payload_parent_hash: None, execution_payload_parent_hash: None,
execution_payload_block_hash: None, execution_payload_block_hash: None,
proposer_index: None, proposer_index: Some(0),
}, },
Slot::from(block.slot), Slot::from(block.slot),
genesis_checkpoint, genesis_checkpoint,