Merge branch 'unstable' of https://github.com/sigp/lighthouse into deneb-free-blobs

2026-03-19 04:42:34 +00:00 · 2023-06-02 11:57:15 -04:00
parent e8f1d533fb d07c78bccf
commit a227959298
63 changed files with 1689 additions and 1193 deletions
--- a/beacon_node/network/src/service.rs
+++ b/beacon_node/network/src/service.rs
@@ -317,8 +317,7 @@ impl<T: BeaconChainTypes> NetworkService<T> {
        // attestation subnet service
        let attestation_service = AttestationService::new(
            beacon_chain.clone(),
-            #[cfg(feature = "deterministic_long_lived_attnets")]
-            network_globals.local_enr().node_id().raw().into(),
+            network_globals.local_enr().node_id(),
            config,
            &network_log,
        );