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

Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra-focil

Browse Source
This commit is contained in:
Eitan Seri-Levi
2025-04-05 17:49:57 -07:00
parent 7d699224cb 7cc64cab83
commit 7bd50a6fe8
84 changed files with 1358 additions and 1313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -779,7 +779,7 @@ impl ProtoArray {
///
/// - The child is already the best child but it's now invalid due to a FFG change and should be removed.
/// - The child is already the best child and the parent is updated with the new
/// best-descendant.
/// best-descendant.
/// - The child is not the best child but becomes the best child.
/// - The child is not the best child and does not become the best child.
fn maybe_update_best_child_and_descendant<E: EthSpec>(

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

@@ -1124,7 +1124,7 @@ mod test_compute_deltas {
///
/// - `A` (slot 31) is the common descendant.
/// - `B` (slot 33) descends from `A`, but there is a single skip slot
/// between it and `A`.
/// between it and `A`.
/// - `C` (slot 32) descends from `A` and conflicts with `B`.
///
/// Imagine that the `B` chain is finalized at epoch 1. This means that the