Merge remote-tracking branch 'origin/unstable' into tree-states

boot_node/Cargo.toml

@@ -21,7 +21,6 @@ slog-scope = "4.3.0"
 slog-stdlog = "4.0.0"
 hex = { workspace = true }
 serde = { workspace = true }
-serde_derive = "1.0.116"
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }
 eth2_network_config = { workspace = true }

boot_node/src/config.rs

@@ -7,7 +7,7 @@ use lighthouse_network::{
     discovery::{load_enr_from_disk, use_or_load_enr},
     load_private_key, CombinedKeyExt, NetworkConfig,
 };
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use ssz::Encode;
 use std::net::{SocketAddrV4, SocketAddrV6};
 use std::time::Duration;