cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

solve couple of merge conflicts

Browse Source
This commit is contained in:
Diva M 2023-03-02 15:46:14 -05:00
parent d93753cc88
commit a9be1eae40
No known key found for this signature in database
GPG Key ID: 1BAE5E01126680FE
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
beacon_node/beacon_chain/src/kzg_utils.rs
View File

@ -24,8 +24,9 @@ pub fn validate_blobs_sidecar<T: EthSpec>(
let blobs = blobs_sidecar let blobs = blobs_sidecar
.blobs .blobs
.clone() // TODO(pawan): avoid this clone
.into_iter() .into_iter()
.map(|blob| ssz_blob_to_crypto_blob::<T>(blob.clone())) // TODO(pawan): avoid this clone .map(|blob| ssz_blob_to_crypto_blob::<T>(blob))
.collect::<Vec<_>>(); .collect::<Vec<_>>();
kzg.verify_aggregate_kzg_proof( kzg.verify_aggregate_kzg_proof(

8
consensus/state_processing/src/per_block_processing.rs
View File

@ -180,15 +180,7 @@ pub fn per_block_processing<T: EthSpec, Payload: AbstractExecPayload<T>>(
)?; )?;
} }
<<<<<<< HEAD
process_blob_kzg_commitments(block.body(), ctxt)?; 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(()) Ok(())
} }