Merge branch 'eip4844' into deneb-free-blobs

consensus/types/src/chain_spec.rs

@@ -633,7 +633,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

@@ -171,3 +171,13 @@ 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,
+            ExecutionPayload::Eip4844(_) => ForkName::Eip4844,
+        }
+    }
+}