Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes

beacon_node/store/src/lib.rs

@@ -7,9 +7,6 @@
 //!
 //! Provides a simple API for storing/retrieving all types that sometimes needs type-hints. See
 //! tests for implementation examples.
-#[macro_use]
-extern crate lazy_static;
-
 mod chunk_writer;
 pub mod chunked_iter;
 pub mod chunked_vector;

beacon_node/store/src/metrics.rs

@@ -1,6 +1,7 @@
 pub use lighthouse_metrics::{set_gauge, try_create_int_gauge, *};
 
 use directory::size_of_dir;
+use lazy_static::lazy_static;
 use std::path::Path;
 
 lazy_static! {

beacon_node/store/src/partial_beacon_state.rs

@@ -133,7 +133,6 @@ where
     #[superstruct(only(Electra))]
     pub earliest_consolidation_epoch: Epoch,
 
-    // TODO(electra) should these be optional?
     #[superstruct(only(Electra))]
     pub pending_balance_deposits: List<PendingBalanceDeposit, E::PendingBalanceDepositsLimit>,
     #[superstruct(only(Electra))]