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

Merge branch 'unstable' into merge-unstable-to-deneb-20230816

Browse Source 
# Conflicts:
#	beacon_node/http_api/src/lib.rs
This commit is contained in:
Jimmy Chen
2023-08-16 14:31:59 +10:00
parent 7f7ad799b3 59c24bcd2d
commit ff792d950c
26 changed files with 325 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -884,7 +884,7 @@ impl ProtoArray {
}
} else {
// Choose the winner by weight.
if child.weight >= best_child.weight {
if child.weight > best_child.weight {
change_to_child
} else {
no_change
@@ -910,7 +910,7 @@ impl ProtoArray {
Ok(())
}
/// Indicates if the node itself is viable for the head, or if it's best descendant is viable
/// Indicates if the node itself is viable for the head, or if its best descendant is viable
/// for the head.
fn node_leads_to_viable_head<E: EthSpec>(
&self,