Merge branch 'unstable' into validator-manager

consensus/types/src/chain_spec.rs

@@ -615,7 +615,7 @@ impl ChainSpec {
              * Capella hard fork params
              */
             capella_fork_version: [0x03, 00, 00, 00],
-            capella_fork_epoch: None,
+            capella_fork_epoch: Some(Epoch::new(194048)),
             max_validators_per_withdrawals_sweep: 16384,
 
             /*

consensus/types/src/execution_payload.rs

@@ -152,3 +152,12 @@ impl<T: EthSpec> ForkVersionDeserialize for ExecutionPayload<T> {
         })
     }
 }
+
+impl<T: EthSpec> ExecutionPayload<T> {
+    pub fn fork_name(&self) -> ForkName {
+        match self {
+            ExecutionPayload::Merge(_) => ForkName::Merge,
+            ExecutionPayload::Capella(_) => ForkName::Capella,
+        }
+    }
+}

consensus/types/src/lib.rs

@@ -1,6 +1,4 @@
 //! Ethereum 2.0 types
-// Required for big type-level numbers
-#![recursion_limit = "128"]
 // Clippy lint set up
 #![cfg_attr(
     not(test),

consensus/types/src/payload.rs

@@ -12,7 +12,7 @@ use test_random_derive::TestRandom;
 use tree_hash::TreeHash;
 use tree_hash_derive::TreeHash;
 
-#[derive(Debug)]
+#[derive(Debug, PartialEq)]
 pub enum BlockType {
     Blinded,
     Full,