Merge branch 'unstable' into off-4844

consensus/state_processing/src/per_block_processing.rs

@@ -180,7 +180,15 @@ pub fn per_block_processing<T: EthSpec, Payload: AbstractExecPayload<T>>(
         )?;
     }
 
+<<<<<<< HEAD
     process_blob_kzg_commitments(block.body(), ctxt)?;
+=======
+    // Eip4844 specifications are not yet released so additional care is taken
+    // to ensure the code does not run in production.
+    if matches!(block, BeaconBlockRef::Eip4844(_)) {
+        process_blob_kzg_commitments(block.body())?;
+    }
+>>>>>>> unstable
 
     Ok(())
 }

consensus/state_processing/src/per_block_processing/verify_bls_to_execution_change.rs

@@ -10,8 +10,8 @@ fn error(reason: Invalid) -> BlockOperationError<Invalid> {
     BlockOperationError::invalid(reason)
 }
 
-/// Indicates if a `BlsToExecutionChange` is valid to be included in a block in the current epoch of the given
-/// state.
+/// Indicates if a `BlsToExecutionChange` is valid to be included in a block,
+/// where the block is being applied to the given `state`.
 ///
 /// Returns `Ok(())` if the `SignedBlsToExecutionChange` is valid, otherwise indicates the reason for invalidity.
 pub fn verify_bls_to_execution_change<T: EthSpec>(