cerc-io/lighthouse
15
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix fork choice error message (#4122)

Browse Source 
## Issue Addressed

NA

## Proposed Changes

Ensures that we log the values of the *head* block rather than the *justified* block.

## Additional Info

NA
This commit is contained in:
Paul Hauner 2023-03-23 07:16:49 +00:00
parent 0616e01202
commit 23ea1481e0
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
consensus/fork_choice/src/fork_choice.rs
View File

@ -799,7 +799,10 @@ where
// If block is from past epochs, try to update store's justified & finalized checkpoints right away // If block is from past epochs, try to update store's justified & finalized checkpoints right away
if block.slot().epoch(E::slots_per_epoch()) < current_slot.epoch(E::slots_per_epoch()) { if block.slot().epoch(E::slots_per_epoch()) < current_slot.epoch(E::slots_per_epoch()) {
self.pull_up_store_checkpoints()?; self.pull_up_store_checkpoints(
unrealized_justified_checkpoint,
unrealized_finalized_checkpoint,
)?;
} }
( (
@ -1159,15 +1162,21 @@ where
// Update the justified/finalized checkpoints based upon the // Update the justified/finalized checkpoints based upon the
// best-observed unrealized justification/finality. // best-observed unrealized justification/finality.
self.pull_up_store_checkpoints()?; let unrealized_justified_checkpoint = *self.fc_store.unrealized_justified_checkpoint();
let unrealized_finalized_checkpoint = *self.fc_store.unrealized_finalized_checkpoint();
self.pull_up_store_checkpoints(
unrealized_justified_checkpoint,
unrealized_finalized_checkpoint,
)?;
Ok(()) Ok(())
} }
fn pull_up_store_checkpoints(&mut self) -> Result<(), Error<T::Error>> { fn pull_up_store_checkpoints(
// Update store.justified_checkpoint if a better unrealized justified checkpoint is known &mut self,
let unrealized_justified_checkpoint = *self.fc_store.unrealized_justified_checkpoint(); unrealized_justified_checkpoint: Checkpoint,
let unrealized_finalized_checkpoint = *self.fc_store.unrealized_finalized_checkpoint(); unrealized_finalized_checkpoint: Checkpoint,
) -> Result<(), Error<T::Error>> {
self.update_checkpoints( self.update_checkpoints(
unrealized_justified_checkpoint, unrealized_justified_checkpoint,
unrealized_finalized_checkpoint, unrealized_finalized_checkpoint,

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

@ -665,9 +665,9 @@ impl ProtoArray {
start_root: *justified_root, start_root: *justified_root,
justified_checkpoint: self.justified_checkpoint, justified_checkpoint: self.justified_checkpoint,
finalized_checkpoint: self.finalized_checkpoint, finalized_checkpoint: self.finalized_checkpoint,
head_root: justified_node.root, head_root: best_node.root,
head_justified_checkpoint: justified_node.justified_checkpoint, head_justified_checkpoint: best_node.justified_checkpoint,
head_finalized_checkpoint: justified_node.finalized_checkpoint, head_finalized_checkpoint: best_node.finalized_checkpoint,
}))); })));
} }