Merge pull request sigp#35 from realbigsean/devnet6-test

Devnet6 test

beacon_node/beacon_chain/src/beacon_chain.rs

@@ -115,9 +115,8 @@ use store::{
 use task_executor::{ShutdownReason, TaskExecutor};
 use tokio_stream::Stream;
 use tree_hash::TreeHash;
-use types::beacon_block_body::KzgCommitments;
 use types::beacon_state::CloneConfig;
-use types::blob_sidecar::{BlobSidecarList, Blobs};
+use types::blob_sidecar::BlobSidecarList;
 use types::consts::deneb::MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS;
 use types::*;
 
@@ -467,7 +466,7 @@ pub struct BeaconChain<T: BeaconChainTypes> {
     pub genesis_backfill_slot: Slot,
     pub proposal_blob_cache: BlobCache<T::EthSpec>,
     pub data_availability_checker: Arc<DataAvailabilityChecker<T>>,
-    pub kzg: Option<Arc<Kzg>>,
+    pub kzg: Option<Arc<Kzg<<T::EthSpec as EthSpec>::Kzg>>>,
 }
 
 type BeaconBlockAndState<T, Payload> = (BeaconBlock<T, Payload>, BeaconState<T>);
@@ -4929,7 +4928,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
 
         //FIXME(sean)
         // - add a new timer for processing here
-        if let Some(blobs) = blobs_opt {
+        if let (Some(blobs), Some(proofs)) = (blobs_opt, proofs_opt) {
             let kzg = self
                 .kzg
                 .as_ref()
@@ -4950,14 +4949,10 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                 )));
             }
 
-            let kzg_proofs = if let Some(proofs) = proofs_opt {
-                Vec::from(proofs)
-            } else {
-                Self::compute_blob_kzg_proofs(kzg, &blobs, expected_kzg_commitments, slot)?
-            };
+            let kzg_proofs = Vec::from(proofs);
 
             kzg_utils::validate_blobs::<T::EthSpec>(
-                kzg,
+                kzg.as_ref(),
                 expected_kzg_commitments,
                 &blobs,
                 &kzg_proofs,
@@ -5008,29 +5003,6 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
         Ok((block, state))
     }
 
-    fn compute_blob_kzg_proofs(
-        kzg: &Arc<Kzg>,
-        blobs: &Blobs<T::EthSpec>,
-        expected_kzg_commitments: &KzgCommitments<T::EthSpec>,
-        slot: Slot,
-    ) -> Result<Vec<KzgProof>, BlockProductionError> {
-        blobs
-            .iter()
-            .enumerate()
-            .map(|(blob_index, blob)| {
-                let kzg_commitment = expected_kzg_commitments.get(blob_index).ok_or(
-                    BlockProductionError::MissingKzgCommitment(format!(
-                        "Missing KZG commitment for slot {} blob index {}",
-                        slot, blob_index
-                    )),
-                )?;
-
-                kzg_utils::compute_blob_kzg_proof::<T::EthSpec>(kzg, blob, *kzg_commitment)
-                    .map_err(BlockProductionError::KzgError)
-            })
-            .collect::<Result<Vec<KzgProof>, BlockProductionError>>()
-    }
-
     /// This method must be called whenever an execution engine indicates that a payload is
     /// invalid.
     ///

beacon_node/beacon_chain/src/blob_verification.rs

@@ -4,8 +4,8 @@ use state_processing::state_advance::partial_state_advance;
 use std::sync::Arc;
 
 use crate::beacon_chain::{
-    BeaconChain, BeaconChainTypes, MAXIMUM_GOSSIP_CLOCK_DISPARITY,
-    VALIDATOR_PUBKEY_CACHE_LOCK_TIMEOUT,
+    BeaconChain, BeaconChainTypes, BLOCK_PROCESSING_CACHE_LOCK_TIMEOUT,
+    MAXIMUM_GOSSIP_CLOCK_DISPARITY, VALIDATOR_PUBKEY_CACHE_LOCK_TIMEOUT,
 };
 use crate::data_availability_checker::{
     AvailabilityCheckError, AvailabilityPendingBlock, AvailableBlock,
@@ -20,9 +20,9 @@ use ssz_types::FixedVector;
 use std::borrow::Cow;
 use types::blob_sidecar::{BlobIdentifier, FixedBlobSidecarList};
 use types::{
-    BeaconBlockRef, BeaconState, BeaconStateError, BlobSidecar, ChainSpec, CloneConfig, Epoch,
-    EthSpec, FullPayload, Hash256, KzgCommitment, RelativeEpoch, SignedBeaconBlock,
-    SignedBeaconBlockHeader, SignedBlobSidecar, Slot,
+    BeaconBlockRef, BeaconState, BeaconStateError, BlobSidecar, BlobSidecarList, ChainSpec,
+    CloneConfig, Epoch, EthSpec, FullPayload, Hash256, KzgCommitment, RelativeEpoch,
+    SignedBeaconBlock, SignedBeaconBlockHeader, SignedBlobSidecar, Slot,
 };
 
 #[derive(Debug)]
@@ -240,36 +240,72 @@ pub fn validate_blob_sidecar_for_gossip<T: BeaconChainTypes>(
             "block_root" => %block_root,
             "index" => %blob_index,
         );
-        // The cached head state is in the same epoch as the blob or the state has already been
-        // advanced to the blob's epoch
-        let snapshot = &chain.canonical_head.cached_head().snapshot;
-        if snapshot.beacon_state.current_epoch() == blob_slot.epoch(T::EthSpec::slots_per_epoch()) {
-            (
-                snapshot
-                    .beacon_state
-                    .get_beacon_proposer_index(blob_slot, &chain.spec)?,
-                snapshot.beacon_state.fork(),
-            )
+        if let Some(mut snapshot) = chain
+            .snapshot_cache
+            .try_read_for(BLOCK_PROCESSING_CACHE_LOCK_TIMEOUT)
+            .and_then(|snapshot_cache| {
+                snapshot_cache.get_cloned(block_parent_root, CloneConfig::committee_caches_only())
+            })
+        {
+            if snapshot.beacon_state.slot() == blob_slot {
+                debug!(
+                    chain.log,
+                    "Cloning snapshot cache state for blob verification";
+                    "block_root" => %block_root,
+                    "index" => %blob_index,
+                );
+                (
+                    snapshot
+                        .beacon_state
+                        .get_beacon_proposer_index(blob_slot, &chain.spec)?,
+                    snapshot.beacon_state.fork(),
+                )
+            } else {
+                debug!(
+                    chain.log,
+                    "Cloning and advancing snapshot cache state for blob verification";
+                    "block_root" => %block_root,
+                    "index" => %blob_index,
+                );
+                let state = cheap_state_advance_to_obtain_committees(
+                    &mut snapshot.beacon_state,
+                    Some(snapshot.beacon_block_root),
+                    blob_slot,
+                    &chain.spec,
+                )?;
+                (
+                    state.get_beacon_proposer_index(blob_slot, &chain.spec)?,
+                    state.fork(),
+                )
+            }
         }
         // Need to advance the state to get the proposer index
         else {
-            // Reaching this condition too often might be an issue since we could theoretically have
-            // 5 threads (4 blob indices + 1 block) cloning the state.
-            // We shouldn't be seeing this condition a lot because we try to advance the state
-            // 3 seconds before the start of a slot. However, if this becomes an issue during testing, we should
-            // consider sending a blob for reprocessing to reduce the number of state clones.
             warn!(
                 chain.log,
-                "Cached head not advanced for blob verification";
+                "Snapshot cache miss for blob verification";
                 "block_root" => %block_root,
                 "index" => %blob_index,
-                "action" => "contact the devs if you see this msg too often"
             );
-            // The state produced is only valid for determining proposer/attester shuffling indices.
-            let mut cloned_state = snapshot.clone_with(CloneConfig::committee_caches_only());
+
+            let parent_block = chain
+                .get_blinded_block(&block_parent_root)
+                .map_err(BlobError::BeaconChainError)?
+                .ok_or_else(|| {
+                    BlobError::from(BeaconChainError::MissingBeaconBlock(block_parent_root))
+                })?;
+
+            let mut parent_state = chain
+                .get_state(&parent_block.state_root(), Some(parent_block.slot()))?
+                .ok_or_else(|| {
+                    BeaconChainError::DBInconsistent(format!(
+                        "Missing state {:?}",
+                        parent_block.state_root()
+                    ))
+                })?;
             let state = cheap_state_advance_to_obtain_committees(
-                &mut cloned_state.beacon_state,
-                None,
+                &mut parent_state,
+                Some(parent_block.state_root()),
                 blob_slot,
                 &chain.spec,
             )?;
@@ -449,7 +485,7 @@ impl<T: EthSpec> KzgVerifiedBlob<T> {
 /// Returns an error if the kzg verification check fails.
 pub fn verify_kzg_for_blob<T: EthSpec>(
     blob: Arc<BlobSidecar<T>>,
-    kzg: &Kzg,
+    kzg: &Kzg<T::Kzg>,
 ) -> Result<KzgVerifiedBlob<T>, AvailabilityCheckError> {
     let _timer = crate::metrics::start_timer(&crate::metrics::KZG_VERIFICATION_SINGLE_TIMES);
     //TODO(sean) remove clone
@@ -469,7 +505,7 @@ pub fn verify_kzg_for_blob<T: EthSpec>(
 /// in a loop since this function kzg verifies a list of blobs more efficiently.
 pub fn verify_kzg_for_blob_list<T: EthSpec>(
     blob_list: Vec<Arc<BlobSidecar<T>>>,
-    kzg: &Kzg,
+    kzg: &Kzg<T::Kzg>,
 ) -> Result<KzgVerifiedBlobList<T>, AvailabilityCheckError> {
     let _timer = crate::metrics::start_timer(&crate::metrics::KZG_VERIFICATION_BATCH_TIMES);
     let (blobs, (commitments, proofs)): (Vec<_>, (Vec<_>, Vec<_>)) = blob_list
@@ -614,6 +650,15 @@ pub enum BlockWrapper<E: EthSpec> {
 }
 
 impl<E: EthSpec> BlockWrapper<E> {
+    pub fn new(block: Arc<SignedBeaconBlock<E>>, blobs: Option<BlobSidecarList<E>>) -> Self {
+        match blobs {
+            Some(blobs) => {
+                let blobs = FixedVector::from(blobs.into_iter().map(Some).collect::<Vec<_>>());
+                BlockWrapper::BlockAndBlobs(block, blobs)
+            }
+            None => BlockWrapper::Block(block),
+        }
+    }
     pub fn deconstruct(self) -> (Arc<SignedBeaconBlock<E>>, Option<FixedBlobSidecarList<E>>) {
         match self {
             BlockWrapper::Block(block) => (block, None),

beacon_node/beacon_chain/src/data_availability_checker.rs

@@ -79,7 +79,7 @@ impl From<ssz::DecodeError> for AvailabilityCheckError {
 pub struct DataAvailabilityChecker<T: BeaconChainTypes> {
     availability_cache: Arc<OverflowLRUCache<T>>,
     slot_clock: T::SlotClock,
-    kzg: Option<Arc<Kzg>>,
+    kzg: Option<Arc<Kzg<<T::EthSpec as EthSpec>::Kzg>>>,
     spec: ChainSpec,
 }
 
@@ -108,7 +108,7 @@ impl<T: EthSpec> Availability<T> {
 impl<T: BeaconChainTypes> DataAvailabilityChecker<T> {
     pub fn new(
         slot_clock: T::SlotClock,
-        kzg: Option<Arc<Kzg>>,
+        kzg: Option<Arc<Kzg<<T::EthSpec as EthSpec>::Kzg>>>,
         store: BeaconStore<T>,
         spec: ChainSpec,
     ) -> Result<Self, AvailabilityCheckError> {

beacon_node/beacon_chain/src/kzg_utils.rs

@@ -1,18 +1,16 @@
-use kzg::{Error as KzgError, Kzg, BYTES_PER_BLOB};
+use kzg::{Error as KzgError, Kzg, KzgPreset};
 use types::{Blob, EthSpec, Hash256, KzgCommitment, KzgProof};
 
 /// Converts a blob ssz List object to an array to be used with the kzg
 /// crypto library.
-fn ssz_blob_to_crypto_blob<T: EthSpec>(blob: Blob<T>) -> kzg::Blob {
-    let blob_vec: Vec<u8> = blob.into();
-    let mut arr = [0; BYTES_PER_BLOB];
-    arr.copy_from_slice(&blob_vec);
-    arr.into()
+fn ssz_blob_to_crypto_blob<T: EthSpec>(blob: Blob<T>) -> <<T as EthSpec>::Kzg as KzgPreset>::Blob {
+    //TODO(sean) remove unwrap
+    T::blob_from_bytes(blob.to_vec().as_slice()).unwrap()
 }
 
 /// Validate a single blob-commitment-proof triplet from a `BlobSidecar`.
 pub fn validate_blob<T: EthSpec>(
-    kzg: &Kzg,
+    kzg: &Kzg<T::Kzg>,
     blob: Blob<T>,
     kzg_commitment: KzgCommitment,
     kzg_proof: KzgProof,
@@ -26,11 +24,24 @@ pub fn validate_blob<T: EthSpec>(
 
 /// Validate a batch of blob-commitment-proof triplets from multiple `BlobSidecars`.
 pub fn validate_blobs<T: EthSpec>(
-    kzg: &Kzg,
+    kzg: &Kzg<T::Kzg>,
     expected_kzg_commitments: &[KzgCommitment],
     blobs: &[Blob<T>],
     kzg_proofs: &[KzgProof],
 ) -> Result<bool, KzgError> {
+    // TODO(sean) batch verification fails with a single element, it's unclear to me why
+    if blobs.len() == 1 && kzg_proofs.len() == 1 && expected_kzg_commitments.len() == 1 {
+        if let (Some(blob), Some(kzg_proof), Some(kzg_commitment)) = (
+            blobs.get(0),
+            kzg_proofs.get(0),
+            expected_kzg_commitments.get(0),
+        ) {
+            return validate_blob::<T>(kzg, blob.clone(), *kzg_commitment, *kzg_proof);
+        } else {
+            return Ok(false);
+        }
+    }
+
     let blobs = blobs
         .iter()
         .map(|blob| ssz_blob_to_crypto_blob::<T>(blob.clone())) // Avoid this clone
@@ -41,7 +52,7 @@ pub fn validate_blobs<T: EthSpec>(
 
 /// Compute the kzg proof given an ssz blob and its kzg commitment.
 pub fn compute_blob_kzg_proof<T: EthSpec>(
-    kzg: &Kzg,
+    kzg: &Kzg<T::Kzg>,
     blob: &Blob<T>,
     kzg_commitment: KzgCommitment,
 ) -> Result<KzgProof, KzgError> {
@@ -51,15 +62,15 @@ pub fn compute_blob_kzg_proof<T: EthSpec>(
 
 /// Compute the kzg commitment for a given blob.
 pub fn blob_to_kzg_commitment<T: EthSpec>(
-    kzg: &Kzg,
+    kzg: &Kzg<T::Kzg>,
     blob: Blob<T>,
 ) -> Result<KzgCommitment, KzgError> {
     kzg.blob_to_kzg_commitment(ssz_blob_to_crypto_blob::<T>(blob))
 }
 
 /// Compute the kzg proof for a given blob and an evaluation point z.
 pub fn compute_kzg_proof<T: EthSpec>(
-    kzg: &Kzg,
+    kzg: &Kzg<T::Kzg>,
     blob: Blob<T>,
     z: Hash256,
 ) -> Result<(KzgProof, Hash256), KzgError> {
@@ -70,7 +81,7 @@ pub fn compute_kzg_proof<T: EthSpec>(
 
 /// Verify a `kzg_proof` for a `kzg_commitment` that evaluating a polynomial at `z` results in `y`
 pub fn verify_kzg_proof<T: EthSpec>(
-    kzg: &Kzg,
+    kzg: &Kzg<T::Kzg>,
     kzg_commitment: KzgCommitment,
     kzg_proof: KzgProof,
     z: Hash256,