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

Merge conlficts

Browse Source
This commit is contained in:
Eitan Seri- Levi
2026-03-26 21:50:30 -07:00
parent c396272c00 e1a2cfe202
commit 5567bf9339
158 changed files with 4877 additions and 3908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
beacon_node/lighthouse_network/src/service/mod.rs
View File

@@ -187,10 +187,9 @@ impl<E: EthSpec> Network<E> {
// set up a collection of variables accessible outside of the network crate
// Create an ENR or load from disk if appropriate
let next_fork_digest = ctx
.fork_context
.next_fork_digest()
.unwrap_or_else(|| ctx.fork_context.current_fork_digest());
// Per [spec](https://github.com/ethereum/consensus-specs/blob/1baa05e71148b0975e28918ac6022d2256b56f4a/specs/fulu/p2p-interface.md?plain=1#L636-L637)
// `nfd` must be zero-valued when no next fork is scheduled.
let next_fork_digest = ctx.fork_context.next_fork_digest().unwrap_or_default();
let advertised_cgc = config
.advertise_false_custody_group_count