Fix PeerDAS sync scoring

beacon_node/beacon_chain/src/data_availability_checker.rs

@@ -20,7 +20,7 @@ use tracing::{debug, error, info_span, Instrument};
 use types::blob_sidecar::{BlobIdentifier, BlobSidecar, FixedBlobSidecarList};
 use types::{
     BlobSidecarList, ChainSpec, ColumnIndex, DataColumnSidecarList, Epoch, EthSpec, Hash256,
-    RuntimeVariableList, SignedBeaconBlock,
+    SignedBeaconBlock,
 };
 
 mod error;
@@ -398,6 +398,9 @@ impl<T: BeaconChainTypes> DataAvailabilityChecker<T> {
         let mut results = Vec::with_capacity(blocks.len());
         let all_blobs = blocks
             .iter()
+            // TODO(das): we may want to remove this line. If blobs are present they should be
+            // verified. It's the role of another function to ignore blobs. And this blobs may not
+            // be checked and imported later.
             .filter(|block| self.blobs_required_for_block(block.as_block()))
             // this clone is cheap as it's cloning an Arc
             .filter_map(|block| block.blobs().cloned())
@@ -412,14 +415,11 @@ impl<T: BeaconChainTypes> DataAvailabilityChecker<T> {
 
         let all_data_columns = blocks
             .iter()
-            .filter(|block| self.data_columns_required_for_block(block.as_block()))
             // this clone is cheap as it's cloning an Arc
             .filter_map(|block| block.custody_columns().cloned())
             .flatten()
             .map(CustodyDataColumn::into_inner)
             .collect::<Vec<_>>();
-        let all_data_columns =
-            RuntimeVariableList::from_vec(all_data_columns, self.spec.number_of_columns as usize);
 
         // verify kzg for all data columns at once
         if !all_data_columns.is_empty() {

beacon_node/beacon_chain/tests/store_tests.rs

@@ -36,6 +36,7 @@ use store::{
     BlobInfo, DBColumn, HotColdDB, StoreConfig,
 };
 use tempfile::{tempdir, TempDir};
+use tracing::info;
 use types::test_utils::{SeedableRng, XorShiftRng};
 use types::*;
 
@@ -2529,6 +2530,7 @@ async fn weak_subjectivity_sync_test(slots: Vec<Slot>, checkpoint_slot: Slot) {
                 .clone()
                 .deconstruct();
             if wss_fork.fulu_enabled() {
+                info!(block_slot = %block.slot(), ?block_root, "Corrupting data column header signature");
                 let AvailableBlockData::DataColumns(mut data_columns) = block_data else {
                     panic!("no columns")
                 };
@@ -2546,6 +2548,7 @@ async fn weak_subjectivity_sync_test(slots: Vec<Slot>, checkpoint_slot: Slot) {
                     beacon_chain.spec.clone(),
                 )
             } else {
+                info!(block_slot = %block.slot(), ?block_root, "Corrupting blob header signature");
                 let AvailableBlockData::Blobs(mut blobs) = block_data else {
                     let blocks_have_blobs = available_blocks
                         .into_iter()
@@ -2599,17 +2602,18 @@ async fn weak_subjectivity_sync_test(slots: Vec<Slot>, checkpoint_slot: Slot) {
                 .clone()
                 .deconstruct();
             if wss_fork.fulu_enabled() {
-                let (data_columns, expected_column_indices) = cols.unwrap();
+                info!(block_slot = %block.slot(), ?block_root, "Corrupting data column KZG proof");
+                let (mut data_columns, expected_column_indices) = cols.unwrap();
                 assert!(
                     !data_columns.is_empty(),
                     "data column sidecars shouldn't be empty"
                 );
-                let mut sidecar = data_columns[0].clone_arc();
-                let mut_sidecar = Arc::make_mut(&mut sidecar);
-                if mut_sidecar.kzg_proofs[0] == KzgProof::empty() {
+                let mut data_column = (*(data_columns[0]).clone_arc()).clone();
+                if data_column.kzg_proofs[0] == KzgProof::empty() {
                     panic!("kzg_proof is already G1_POINT_AT_INFINITY")
                 }
-                mut_sidecar.kzg_proofs[0] = KzgProof::empty();
+                data_column.kzg_proofs[0] = KzgProof::empty();
+                data_columns[0] = CustodyDataColumn::from_asserted_custody(data_column.into());
                 RpcBlock::new_with_custody_columns(
                     Some(block_root),
                     block,
@@ -2619,10 +2623,12 @@ async fn weak_subjectivity_sync_test(slots: Vec<Slot>, checkpoint_slot: Slot) {
                 )
                 .unwrap()
             } else {
+                info!(block_slot = %block.slot(), ?block_root, "Corrupting blob KZG proof");
                 let mut blobs = blobs.unwrap();
                 assert!(!blobs.is_empty(), "blob sidecars shouldn't be empty");
-                let mut_sidecar = Arc::make_mut(&mut blobs[0]);
-                mut_sidecar.kzg_proof = KzgProof::empty();
+                let mut blob = (*blobs[0]).clone();
+                blob.kzg_proof = KzgProof::empty();
+                blobs[0] = blob.into();
                 RpcBlock::new(Some(block_root), block, Some(blobs)).unwrap()
             }
         };