diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs index a45caba79..78e1cc46f 100644 --- a/beacon_node/beacon_chain/src/beacon_chain.rs +++ b/beacon_node/beacon_chain/src/beacon_chain.rs @@ -5123,7 +5123,7 @@ impl BeaconChain { kzg_utils::validate_blobs::( kzg, expected_kzg_commitments, - blobs, + blobs.iter().collect(), &kzg_proofs, ) .map_err(BlockProductionError::KzgError)?; diff --git a/beacon_node/beacon_chain/src/blob_verification.rs b/beacon_node/beacon_chain/src/blob_verification.rs index 1c8bc9be8..b535f3104 100644 --- a/beacon_node/beacon_chain/src/blob_verification.rs +++ b/beacon_node/beacon_chain/src/blob_verification.rs @@ -502,8 +502,7 @@ pub fn verify_kzg_for_blob( kzg: &Kzg, ) -> Result, AvailabilityCheckError> { let _timer = crate::metrics::start_timer(&crate::metrics::KZG_VERIFICATION_SINGLE_TIMES); - //TODO(sean) remove clone - if validate_blob::(kzg, blob.blob.clone(), blob.kzg_commitment, blob.kzg_proof) + if validate_blob::(kzg, &blob.blob, blob.kzg_commitment, blob.kzg_proof) .map_err(AvailabilityCheckError::Kzg)? { Ok(KzgVerifiedBlob { blob }) @@ -524,15 +523,10 @@ pub fn verify_kzg_for_blob_list( let _timer = crate::metrics::start_timer(&crate::metrics::KZG_VERIFICATION_BATCH_TIMES); let (blobs, (commitments, proofs)): (Vec<_>, (Vec<_>, Vec<_>)) = blob_list .iter() - .map(|blob| (blob.blob.clone(), (blob.kzg_commitment, blob.kzg_proof))) + .map(|blob| (&blob.blob, (blob.kzg_commitment, blob.kzg_proof))) .unzip(); - if validate_blobs::( - kzg, - commitments.as_slice(), - blobs.as_slice(), - proofs.as_slice(), - ) - .map_err(AvailabilityCheckError::Kzg)? + if validate_blobs::(kzg, commitments.as_slice(), blobs, proofs.as_slice()) + .map_err(AvailabilityCheckError::Kzg)? { Ok(()) } else { diff --git a/beacon_node/beacon_chain/src/kzg_utils.rs b/beacon_node/beacon_chain/src/kzg_utils.rs index 144e21367..b4c70befa 100644 --- a/beacon_node/beacon_chain/src/kzg_utils.rs +++ b/beacon_node/beacon_chain/src/kzg_utils.rs @@ -12,12 +12,12 @@ fn ssz_blob_to_crypto_blob( /// Validate a single blob-commitment-proof triplet from a `BlobSidecar`. pub fn validate_blob( kzg: &Kzg, - blob: Blob, + blob: &Blob, kzg_commitment: KzgCommitment, kzg_proof: KzgProof, ) -> Result { kzg.verify_blob_kzg_proof( - &ssz_blob_to_crypto_blob::(&blob)?, + &ssz_blob_to_crypto_blob::(blob)?, kzg_commitment, kzg_proof, ) @@ -27,12 +27,12 @@ pub fn validate_blob( pub fn validate_blobs( kzg: &Kzg, expected_kzg_commitments: &[KzgCommitment], - blobs: &[Blob], + blobs: Vec<&Blob>, kzg_proofs: &[KzgProof], ) -> Result { let blobs = blobs - .iter() - .map(|blob| ssz_blob_to_crypto_blob::(blob)) // Avoid this clone + .into_iter() + .map(|blob| ssz_blob_to_crypto_blob::(blob)) .collect::, KzgError>>()?; kzg.verify_blob_kzg_proof_batch(&blobs, expected_kzg_commitments, kzg_proofs) diff --git a/testing/ef_tests/src/cases/kzg_verify_blob_kzg_proof.rs b/testing/ef_tests/src/cases/kzg_verify_blob_kzg_proof.rs index 2d18c9bdc..ff918cac1 100644 --- a/testing/ef_tests/src/cases/kzg_verify_blob_kzg_proof.rs +++ b/testing/ef_tests/src/cases/kzg_verify_blob_kzg_proof.rs @@ -91,7 +91,7 @@ impl Case for KZGVerifyBlobKZGProof { let kzg = get_kzg::()?; let result = parse_input(&self.input).and_then(|(blob, commitment, proof)| { - validate_blob::(&kzg, blob, commitment, proof) + validate_blob::(&kzg, &blob, commitment, proof) .map_err(|e| Error::InternalError(format!("Failed to validate blob: {:?}", e))) }); diff --git a/testing/ef_tests/src/cases/kzg_verify_blob_kzg_proof_batch.rs b/testing/ef_tests/src/cases/kzg_verify_blob_kzg_proof_batch.rs index cc941618a..43c2c8cf6 100644 --- a/testing/ef_tests/src/cases/kzg_verify_blob_kzg_proof_batch.rs +++ b/testing/ef_tests/src/cases/kzg_verify_blob_kzg_proof_batch.rs @@ -54,7 +54,7 @@ impl Case for KZGVerifyBlobKZGProofBatch { let kzg = get_kzg::()?; let result = parse_input(&self.input).and_then(|(commitments, blobs, proofs)| { - validate_blobs::(&kzg, &commitments, &blobs, &proofs) + validate_blobs::(&kzg, &commitments, blobs.iter().collect(), &proofs) .map_err(|e| Error::InternalError(format!("Failed to validate blobs: {:?}", e))) });