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

Fix more issues (mainly payload attestation application)

Browse Source
This commit is contained in:
Michael Sproul
2026-05-11 22:04:24 +10:00
parent ed4de4ee52
commit df9399e957
4 changed files with 97 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -685,7 +685,7 @@ impl ProtoArray {
/// Returns `true` if the proposer boost should be kept. Returns `false` if the
/// boost should be subtracted (invalidated) because the parent is weak and there
/// are no equivocating blocks at the parent's slot.
fn should_apply_proposer_boost<E: EthSpec>(
pub(crate) fn should_apply_proposer_boost<E: EthSpec>(
&self,
proposer_boost_root: Hash256,
justified_balances: &JustifiedBalances,
@@ -1328,7 +1328,7 @@ impl ProtoArray {
/// Spec: `get_weight`.
#[allow(clippy::too_many_arguments)]
fn get_weight<E: EthSpec>(
pub(crate) fn get_weight<E: EthSpec>(
&self,
fc_node: &IndexedForkChoiceNode,
proto_node: &ProtoNode,

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

@@ -1089,7 +1089,10 @@ impl ProtoArrayForkChoice {
current_slot: Slot,
justified_checkpoint: Checkpoint,
finalized_checkpoint: Checkpoint,
) -> Result<Vec<(Hash256, u64)>, String> {
proposer_boost_root: Hash256,
justified_balances: &JustifiedBalances,
spec: &ChainSpec,
) -> Result<Vec<(Hash256, PayloadStatus, u64)>, String> {
let start_index = self
.proto_array
.indices
@@ -1107,6 +1110,12 @@ impl ProtoArrayForkChoice {
justified_checkpoint,
finalized_checkpoint,
);
let apply_proposer_boost = self
.proto_array
.should_apply_proposer_boost::<E>(proposer_boost_root, justified_balances, spec)
.map_err(|e| format!("should_apply_proposer_boost failed: {e:?}"))?;
let mut leaves = Vec::with_capacity(viable.len());
for &i in &viable {
let has_viable_child = viable
@@ -1120,7 +1129,70 @@ impl ProtoArrayForkChoice {
.nodes
.get(i)
.ok_or_else(|| format!("invalid viable node index {i}"))?;
leaves.push((node.root(), node.weight()));
let is_gloas = node.payload_received().is_ok();
if is_gloas {
// Gloas: expand into Empty/Full virtual children.
let empty_fc = IndexedForkChoiceNode {
root: node.root(),
proto_node_index: i,
payload_status: PayloadStatus::Empty,
};
let empty_weight = self
.proto_array
.get_weight::<E>(
&empty_fc,
node,
apply_proposer_boost,
proposer_boost_root,
current_slot,
justified_balances,
spec,
)
.map_err(|e| format!("get_weight failed: {e:?}"))?;
leaves.push((node.root(), PayloadStatus::Empty, empty_weight));
if node.payload_received().is_ok_and(|r| r) {
let full_fc = IndexedForkChoiceNode {
root: node.root(),
proto_node_index: i,
payload_status: PayloadStatus::Full,
};
let full_weight = self
.proto_array
.get_weight::<E>(
&full_fc,
node,
apply_proposer_boost,
proposer_boost_root,
current_slot,
justified_balances,
spec,
)
.map_err(|e| format!("get_weight failed: {e:?}"))?;
leaves.push((node.root(), PayloadStatus::Full, full_weight));
}
} else {
// Pre-Gloas: use Pending status (no payload split).
let fc_node = IndexedForkChoiceNode {
root: node.root(),
proto_node_index: i,
payload_status: PayloadStatus::Pending,
};
let weight = self
.proto_array
.get_weight::<E>(
&fc_node,
node,
apply_proposer_boost,
proposer_boost_root,
current_slot,
justified_balances,
spec,
)
.map_err(|e| format!("get_weight failed: {e:?}"))?;
leaves.push((node.root(), PayloadStatus::Pending, weight));
}
}
Ok(leaves)
}