finish refactor

beacon_node/beacon_chain/src/blob_verification.rs

@@ -9,12 +9,12 @@ use crate::BlockError::BlobValidation;
 use crate::{kzg_utils, BeaconChainError, BlockError};
 use state_processing::per_block_processing::eip4844::eip4844::verify_kzg_commitments_against_transactions;
 use types::signed_beacon_block::BlobReconstructionError;
+use types::ExecPayload;
 use types::{
     BeaconBlockRef, BeaconStateError, BlobsSidecar, Epoch, EthSpec, Hash256, KzgCommitment,
     SignedBeaconBlock, SignedBeaconBlockAndBlobsSidecar, SignedBeaconBlockHeader, Slot,
     Transactions,
 };
-use types::ExecPayload;
 
 #[derive(Debug)]
 pub enum BlobError {
@@ -89,7 +89,7 @@ pub fn validate_blob_for_gossip<T: BeaconChainTypes>(
     block_root: Hash256,
     chain: &BeaconChain<T>,
 ) -> Result<AvailableBlock<T::EthSpec>, BlobError> {
-    if let BlockWrapper::BlockAndBlob(block, blobs_sidecar) = block_wrapper {
+    if let BlockWrapper::BlockAndBlob(ref block, ref blobs_sidecar) = block_wrapper {
         let blob_slot = blobs_sidecar.beacon_block_slot;
         // Do not gossip or process blobs from future or past slots.
         let latest_permissible_slot = chain
@@ -178,6 +178,16 @@ impl<E: EthSpec> From<SignedBeaconBlock<E>> for BlockWrapper<E> {
     }
 }
 
+impl<E: EthSpec> From<SignedBeaconBlockAndBlobsSidecar<E>> for BlockWrapper<E> {
+    fn from(block: SignedBeaconBlockAndBlobsSidecar<E>) -> Self {
+        let SignedBeaconBlockAndBlobsSidecar {
+            beacon_block,
+            blobs_sidecar,
+        } = block;
+        BlockWrapper::BlockAndBlob(beacon_block, blobs_sidecar)
+    }
+}
+
 impl<E: EthSpec> From<Arc<SignedBeaconBlock<E>>> for BlockWrapper<E> {
     fn from(block: Arc<SignedBeaconBlock<E>>) -> Self {
         BlockWrapper::Block(block)
@@ -327,15 +337,6 @@ impl<E: EthSpec> AvailableBlock<E> {
         }
     }
 
-    pub fn block_cloned(&self) -> Arc<SignedBeaconBlock<E>> {
-        match &self.0 {
-            AvailableBlockInner::Block(block) => block.clone(),
-            AvailableBlockInner::BlockAndBlob(block_sidecar_pair) => {
-                block_sidecar_pair.beacon_block.clone()
-            }
-        }
-    }
-
     pub fn blobs(&self) -> Option<Arc<BlobsSidecar<E>>> {
         match &self.0 {
             AvailableBlockInner::Block(_) => None,
@@ -385,8 +386,9 @@ pub trait AsBlock<E: EthSpec> {
     fn parent_root(&self) -> Hash256;
     fn state_root(&self) -> Hash256;
     fn signed_block_header(&self) -> SignedBeaconBlockHeader;
-    fn as_block(&self) -> &SignedBeaconBlock<E>;
     fn message(&self) -> BeaconBlockRef<E>;
+    fn as_block(&self) -> &SignedBeaconBlock<E>;
+    fn block_cloned(&self) -> Arc<SignedBeaconBlock<E>>;
 }
 
 impl<E: EthSpec> AsBlock<E> for BlockWrapper<E> {
@@ -417,9 +419,7 @@ impl<E: EthSpec> AsBlock<E> for BlockWrapper<E> {
     fn message(&self) -> BeaconBlockRef<E> {
         match &self {
             BlockWrapper::Block(block) => block.message(),
-            BlockWrapper::BlockAndBlob(block, _) => {
-                block.message()
-            }
+            BlockWrapper::BlockAndBlob(block, _) => block.message(),
         }
     }
     fn as_block(&self) -> &SignedBeaconBlock<E> {
@@ -428,6 +428,12 @@ impl<E: EthSpec> AsBlock<E> for BlockWrapper<E> {
             BlockWrapper::BlockAndBlob(block, _) => &block,
         }
     }
+    fn block_cloned(&self) -> Arc<SignedBeaconBlock<E>> {
+        match &self {
+            BlockWrapper::Block(block) => block.clone(),
+            BlockWrapper::BlockAndBlob(block, _) => block.clone(),
+        }
+    }
 }
 
 impl<E: EthSpec> AsBlock<E> for &BlockWrapper<E> {
@@ -458,9 +464,7 @@ impl<E: EthSpec> AsBlock<E> for &BlockWrapper<E> {
     fn message(&self) -> BeaconBlockRef<E> {
         match &self {
             BlockWrapper::Block(block) => block.message(),
-            BlockWrapper::BlockAndBlob(block, _) => {
-                block.message()
-            }
+            BlockWrapper::BlockAndBlob(block, _) => block.message(),
         }
     }
     fn as_block(&self) -> &SignedBeaconBlock<E> {
@@ -469,6 +473,12 @@ impl<E: EthSpec> AsBlock<E> for &BlockWrapper<E> {
             BlockWrapper::BlockAndBlob(block, _) => &block,
         }
     }
+    fn block_cloned(&self) -> Arc<SignedBeaconBlock<E>> {
+        match &self {
+            BlockWrapper::Block(block) => block.clone(),
+            BlockWrapper::BlockAndBlob(block, _) => block.clone(),
+        }
+    }
 }
 
 impl<E: EthSpec> AsBlock<E> for AvailableBlock<E> {
@@ -520,4 +530,12 @@ impl<E: EthSpec> AsBlock<E> for AvailableBlock<E> {
             }
         }
     }
+    fn block_cloned(&self) -> Arc<SignedBeaconBlock<E>> {
+        match &self.0 {
+            AvailableBlockInner::Block(block) => block.clone(),
+            AvailableBlockInner::BlockAndBlob(block_sidecar_pair) => {
+                block_sidecar_pair.beacon_block.clone()
+            }
+        }
+    }
 }

beacon_node/beacon_chain/src/block_verification.rs

@@ -73,6 +73,7 @@ use fork_choice::{AttestationFromBlock, PayloadVerificationStatus};
 use parking_lot::RwLockReadGuard;
 use proto_array::{Block as ProtoBlock, Block};
 use safe_arith::ArithError;
+use slasher::test_utils::{block, E};
 use slog::{debug, error, warn, Logger};
 use slot_clock::SlotClock;
 use ssz::Encode;
@@ -90,7 +91,6 @@ use std::fs;
 use std::io::Write;
 use std::sync::Arc;
 use std::time::Duration;
-use slasher::test_utils::{block, E};
 use store::{Error as DBError, HotStateSummary, KeyValueStore, StoreOp};
 use task_executor::JoinHandle;
 use tree_hash::TreeHash;
@@ -314,7 +314,7 @@ pub enum BlockError<T: EthSpec> {
     BlobValidation(BlobError),
 }
 
-impl <T: EthSpec>From<BlobError> for BlockError<T> {
+impl<T: EthSpec> From<BlobError> for BlockError<T> {
     fn from(e: BlobError) -> Self {
         Self::BlobValidation(e)
     }
@@ -601,10 +601,10 @@ pub fn signature_verify_chain_segment<T: BeaconChainTypes>(
         let mut consensus_context =
             ConsensusContext::new(block.slot()).set_current_block_root(*block_root);
 
-        //FIXME(sean) batch kzg verification
-        let available_block = block.into_available_block(*block_root, chain)?;
+        signature_verifier.include_all_signatures(block.as_block(), &mut consensus_context)?;
 
-        signature_verifier.include_all_signatures(available_block.as_block(), &mut consensus_context)?;
+        //FIXME(sean) batch kzg verification
+        let available_block = block.clone().into_available_block(*block_root, chain)?;
 
         // Save the block and its consensus context. The context will have had its proposer index
         // and attesting indices filled in, which can be used to accelerate later block processing.