Merge branch 'eip4844' into deneb-free-blobs

common/eth2_network_config/Cargo.toml

@@ -20,4 +20,4 @@ types = { path = "../../consensus/types"}
 kzg = { path = "../../crypto/kzg" }
 eth2_ssz = "0.4.1"
 eth2_config = { path = "../eth2_config"}
-enr = { version = "0.6.2", features = ["ed25519", "k256"] }
+discv5 = "0.2.2"

common/eth2_network_config/built_in_network_configs/mainnet/config.yaml

@@ -38,7 +38,7 @@ BELLATRIX_FORK_VERSION: 0x02000000
 BELLATRIX_FORK_EPOCH: 144896 # Sept 6, 2022, 11:34:47am UTC
 # Capella
 CAPELLA_FORK_VERSION: 0x03000000
-CAPELLA_FORK_EPOCH: 18446744073709551615
+CAPELLA_FORK_EPOCH: 194048 # April 12, 2023, 10:27:35pm UTC
 # Eip4844
 EIP4844_FORK_VERSION: 0x04000000
 EIP4844_FORK_EPOCH: 18446744073709551615

common/eth2_network_config/src/lib.rs

@@ -11,7 +11,7 @@
 //! To add a new built-in testnet, add it to the `define_hardcoded_nets` invocation in the `eth2_config`
 //! crate.
 
-use enr::{CombinedKey, Enr};
+use discv5::enr::{CombinedKey, Enr};
 use eth2_config::{instantiate_hardcoded_nets, HardcodedNet};
 use kzg::TrustedSetup;
 use std::fs::{create_dir_all, File};

common/lighthouse_version/src/lib.rs

@@ -17,8 +17,8 @@ pub const VERSION: &str = git_version!(
         // NOTE: using --match instead of --exclude for compatibility with old Git
         "--match=thiswillnevermatchlol"
     ],
-    prefix = "Lighthouse/v3.5.1-",
-    fallback = "Lighthouse/v3.5.1"
+    prefix = "Lighthouse/v4.0.1-rc.0-",
+    fallback = "Lighthouse/v4.0.1-rc.0"
 );
 
 /// Returns `VERSION`, but with platform information appended to the end.