diff --git a/beacon_node/beacon_chain/src/kzg_utils.rs b/beacon_node/beacon_chain/src/kzg_utils.rs index 4ee8c35060..58ff79e0f3 100644 --- a/beacon_node/beacon_chain/src/kzg_utils.rs +++ b/beacon_node/beacon_chain/src/kzg_utils.rs @@ -24,8 +24,9 @@ pub fn validate_blobs_sidecar( let blobs = blobs_sidecar .blobs + .clone() // TODO(pawan): avoid this clone .into_iter() - .map(|blob| ssz_blob_to_crypto_blob::(blob.clone())) // TODO(pawan): avoid this clone + .map(|blob| ssz_blob_to_crypto_blob::(blob)) .collect::>(); kzg.verify_aggregate_kzg_proof( diff --git a/consensus/state_processing/src/per_block_processing.rs b/consensus/state_processing/src/per_block_processing.rs index 5fb4bf2ca9..b2d7e00072 100644 --- a/consensus/state_processing/src/per_block_processing.rs +++ b/consensus/state_processing/src/per_block_processing.rs @@ -180,15 +180,7 @@ pub fn per_block_processing>( )?; } -<<<<<<< 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(()) }