Add Electra fork boilerplate (#5122)

* Add Electra fork boilerplate

* Remove electra from spec tests

* Fix tests

* Remove sneaky log file

* Fix more tests

* Fix even more tests and add suggestions

* Remove unrelated lcli addition

* Update more tests

* Merge branch 'unstable' into electra

* Add comment for test-suite lcli override

* Merge branch 'unstable' into electra

* Cleanup

* Merge branch 'unstable' into electra

* Apply suggestions

* Merge branch 'unstable' into electra

* Merge sigp/unstable into electra

* Merge branch 'unstable' into electra

common/eth2/src/types.rs

@@ -1032,6 +1032,9 @@ impl ForkVersionDeserialize for SsePayloadAttributes {
             ForkName::Deneb => serde_json::from_value(value)
                 .map(Self::V3)
                 .map_err(serde::de::Error::custom),
+            ForkName::Electra => serde_json::from_value(value)
+                .map(Self::V3)
+                .map_err(serde::de::Error::custom),
             ForkName::Base | ForkName::Altair => Err(serde::de::Error::custom(format!(
                 "SsePayloadAttributes deserialization for {fork_name} not implemented"
             ))),
@@ -1599,7 +1602,7 @@ impl<T: EthSpec> FullBlockContents<T> {
                 BeaconBlock::from_ssz_bytes_for_fork(bytes, fork_name)
                     .map(|block| FullBlockContents::Block(block))
             }
-            ForkName::Deneb => {
+            ForkName::Deneb | ForkName::Electra => {
                 let mut builder = ssz::SszDecoderBuilder::new(bytes);
 
                 builder.register_anonymous_variable_length_item()?;
@@ -1660,7 +1663,7 @@ impl<T: EthSpec> ForkVersionDeserialize for FullBlockContents<T> {
                     BeaconBlock::deserialize_by_fork::<'de, D>(value, fork_name)?,
                 ))
             }
-            ForkName::Deneb => Ok(FullBlockContents::BlockContents(
+            ForkName::Deneb | ForkName::Electra => Ok(FullBlockContents::BlockContents(
                 BlockContents::deserialize_by_fork::<'de, D>(value, fork_name)?,
             )),
         }
@@ -1759,7 +1762,7 @@ impl<T: EthSpec> PublishBlockRequest<T> {
                 SignedBeaconBlock::from_ssz_bytes_for_fork(bytes, fork_name)
                     .map(|block| PublishBlockRequest::Block(Arc::new(block)))
             }
-            ForkName::Deneb => {
+            ForkName::Deneb | ForkName::Electra => {
                 let mut builder = ssz::SszDecoderBuilder::new(bytes);
                 builder.register_anonymous_variable_length_item()?;
                 builder.register_type::<KzgProofs<T>>()?;
@@ -1843,9 +1846,9 @@ impl<T: EthSpec> TryFrom<Arc<SignedBeaconBlock<T>>> for PublishBlockRequest<T> {
             | SignedBeaconBlock::Altair(_)
             | SignedBeaconBlock::Merge(_)
             | SignedBeaconBlock::Capella(_) => Ok(PublishBlockRequest::Block(block)),
-            SignedBeaconBlock::Deneb(_) => {
-                Err("deneb block contents cannot be fully constructed from just the signed block")
-            }
+            SignedBeaconBlock::Deneb(_) | SignedBeaconBlock::Electra(_) => Err(
+                "post-Deneb block contents cannot be fully constructed from just the signed block",
+            ),
         }
     }
 }
@@ -1953,7 +1956,7 @@ impl<E: EthSpec> ForkVersionDeserialize for FullPayloadContents<E> {
             ForkName::Merge | ForkName::Capella => serde_json::from_value(value)
                 .map(Self::Payload)
                 .map_err(serde::de::Error::custom),
-            ForkName::Deneb => serde_json::from_value(value)
+            ForkName::Deneb | ForkName::Electra => serde_json::from_value(value)
                 .map(Self::PayloadAndBlobs)
                 .map_err(serde::de::Error::custom),
             ForkName::Base | ForkName::Altair => Err(serde::de::Error::custom(format!(

common/eth2_network_config/built_in_network_configs/chiado/config.yaml

@@ -46,7 +46,9 @@ CAPELLA_FORK_EPOCH: 244224 # Wed May 24 2023 13:12:00 GMT+0000
 # Deneb
 DENEB_FORK_VERSION: 0x0400006f
 DENEB_FORK_EPOCH: 516608 # Wed Jan 31 2024 18:15:40 GMT+0000
-
+# Electra
+ELECTRA_FORK_VERSION: 0x0500006f
+ELECTRA_FORK_EPOCH: 18446744073709551615
 
 # Time parameters
 # ---------------------------------------------------------------

common/eth2_network_config/built_in_network_configs/gnosis/config.yaml

@@ -42,12 +42,9 @@ CAPELLA_FORK_EPOCH: 648704
 # Deneb
 DENEB_FORK_VERSION: 0x04000064
 DENEB_FORK_EPOCH: 889856 # 2024-03-11T18:30:20.000Z
-# Sharding
-SHARDING_FORK_VERSION: 0x03000064
-SHARDING_FORK_EPOCH: 18446744073709551615
-
-# TBD, 2**32 is a placeholder. Merge transition approach is in active R&D.
-TRANSITION_TOTAL_DIFFICULTY: 4294967296
+# Electra
+ELECTRA_FORK_VERSION: 0x05000064
+ELECTRA_FORK_EPOCH: 18446744073709551615
 
 
 # Time parameters

common/eth2_network_config/built_in_network_configs/holesky/config.yaml

@@ -28,14 +28,15 @@ BELLATRIX_FORK_EPOCH: 0
 TERMINAL_TOTAL_DIFFICULTY: 0
 TERMINAL_BLOCK_HASH: 0x0000000000000000000000000000000000000000000000000000000000000000
 TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: 18446744073709551615
-
 # Capella
 CAPELLA_FORK_VERSION: 0x04017000
 CAPELLA_FORK_EPOCH: 256
-
 # Deneb
 DENEB_FORK_VERSION: 0x05017000
 DENEB_FORK_EPOCH: 29696
+# Electra
+ELECTRA_FORK_VERSION: 0x06017000
+ELECTRA_FORK_EPOCH: 18446744073709551615
 
 # Time parameters
 # ---------------------------------------------------------------

common/eth2_network_config/built_in_network_configs/mainnet/config.yaml

@@ -50,6 +50,9 @@ CAPELLA_FORK_EPOCH: 194048  # April 12, 2023, 10:27:35pm UTC
 # Deneb
 DENEB_FORK_VERSION: 0x04000000
 DENEB_FORK_EPOCH: 269568  # March 13, 2024, 01:55:35pm UTC
+# Electra
+ELECTRA_FORK_VERSION: 0x05000000
+ELECTRA_FORK_EPOCH: 18446744073709551615
 
 
 # Time parameters