Merge remote-tracking branch 'origin/unstable' into das-sampling-sync

.github/workflows/test-suite.yml

@@ -221,23 +221,13 @@ jobs:
     name: dockerfile-ubuntu
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
       - uses: actions/checkout@v4
       - name: Build the root Dockerfile
         run: docker build --build-arg FEATURES=portable -t lighthouse:local .
       - name: Test the built image
         run: docker run -t lighthouse:local lighthouse --version
-  eth1-simulator-ubuntu:
-    name: eth1-simulator-ubuntu
-=======
-    - uses: actions/checkout@v4
-    - name: Build the root Dockerfile
-      run: docker build --build-arg FEATURES=portable -t lighthouse:local .
-    - name: Test the built image
-      run: docker run -t lighthouse:local lighthouse --version
   basic-simulator-ubuntu:
     name: basic-simulator-ubuntu
->>>>>>> sigp/unstable
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -246,50 +236,10 @@ jobs:
         with:
           channel: stable
           cache-target: release
-<<<<<<< HEAD
-      - name: Install Foundry (anvil)
-        uses: foundry-rs/foundry-toolchain@v1
-        with:
-          version: nightly-ca67d15f4abd46394b324c50e21e66f306a1162d
-      - name: Run the beacon chain sim that starts from an eth1 contract
-        run: cargo run --release --bin simulator eth1-sim
-  merge-transition-ubuntu:
-    name: merge-transition-ubuntu
-=======
-    - name: Run a basic beacon chain sim that starts from Bellatrix
-      run: cargo run --release --bin simulator basic-sim
+      - name: Run a basic beacon chain sim that starts from Bellatrix
+        run: cargo run --release --bin simulator basic-sim
   fallback-simulator-ubuntu:
     name: fallback-simulator-ubuntu
->>>>>>> sigp/unstable
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Get latest version of stable Rust
-        uses: moonrepo/setup-rust@v1
-        with:
-          channel: stable
-          cache-target: release
-<<<<<<< HEAD
-      - name: Install Foundry (anvil)
-        uses: foundry-rs/foundry-toolchain@v1
-        with:
-          version: nightly-ca67d15f4abd46394b324c50e21e66f306a1162d
-      - name: Run the beacon chain sim and go through the merge transition
-        run: cargo run --release --bin simulator eth1-sim --post-merge
-  no-eth1-simulator-ubuntu:
-    name: no-eth1-simulator-ubuntu
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Get latest version of stable Rust
-        uses: moonrepo/setup-rust@v1
-        with:
-          channel: stable
-          cache-target: release
-      - name: Run the beacon chain sim without an eth1 connection
-        run: cargo run --release --bin simulator no-eth1-sim
-  syncing-simulator-ubuntu:
-    name: syncing-simulator-ubuntu
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -298,16 +248,8 @@ jobs:
         with:
           channel: stable
           cache-target: release
-      - name: Install Foundry (anvil)
-        uses: foundry-rs/foundry-toolchain@v1
-        with:
-          version: nightly-ca67d15f4abd46394b324c50e21e66f306a1162d
-      - name: Run the syncing simulator
-        run: cargo run --release --bin simulator syncing-sim
-=======
-    - name: Run a beacon chain sim which tests VC fallback behaviour
-      run: cargo run --release --bin simulator fallback-sim
->>>>>>> sigp/unstable
+      - name: Run a beacon chain sim which tests VC fallback behaviour
+        run: cargo run --release --bin simulator fallback-sim
   doppelganger-protection-test:
     name: doppelganger-protection-test
     runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "CI", "small"]') || 'ubuntu-latest'  }}

Cargo.toml

@@ -119,6 +119,8 @@ libsecp256k1 = "0.7"
 log = "0.4"
 lru = "0.12"
 maplit = "1"
+mockall = "0.12"
+mockall_double = "0.3"
 num_cpus = "1"
 parking_lot = "0.12"
 paste = "1"

beacon_node/beacon_chain/src/block_verification.rs

@@ -48,7 +48,7 @@
 // returned alongside.
 #![allow(clippy::result_large_err)]
 
-use crate::blob_verification::{GossipBlobError, GossipVerifiedBlob};
+use crate::blob_verification::{GossipBlobError, GossipVerifiedBlob, GossipVerifiedBlobList};
 use crate::block_verification_types::{
     AsBlock, BlockContentsError, BlockImportData, GossipVerifiedBlockContents, RpcBlock,
 };
@@ -104,8 +104,8 @@ use tree_hash::TreeHash;
 use types::data_column_sidecar::DataColumnSidecarError;
 use types::{
     BeaconBlockRef, BeaconState, BeaconStateError, BlobSidecarList, ChainSpec, CloneConfig,
-    DataColumnSidecar, DataColumnSubnetId, Epoch, EthSpec, ExecutionBlockHash, Hash256,
-    InconsistentFork, PublicKey, PublicKeyBytes, RelativeEpoch, SignedBeaconBlock,
+    DataColumnSidecar, DataColumnSubnetId, Epoch, EthSpec, ExecutionBlockHash, FullPayload,
+    Hash256, InconsistentFork, PublicKey, PublicKeyBytes, RelativeEpoch, SignedBeaconBlock,
     SignedBeaconBlockHeader, Slot,
 };
 use types::{BlobSidecar, ExecPayload};
@@ -741,43 +741,16 @@ impl<T: BeaconChainTypes> IntoGossipVerifiedBlockContents<T> for PublishBlockReq
             })
             .transpose()?;
 
-        let gossip_verified_data_columns = gossip_verified_blobs
-            .as_ref()
-            .map(|blobs| {
-                // NOTE: we expect KZG to be initialized if the blobs are present
-                let kzg = chain
-                    .kzg
-                    .as_ref()
-                    .ok_or(BlockContentsError::DataColumnError(
-                        GossipDataColumnError::<T::EthSpec>::KzgNotInitialized,
-                    ))?;
-
-                let blob_sidecar_list: Vec<_> =
-                    blobs.iter().map(|blob| blob.clone_blob()).collect();
-                let blob_sidecar_list = BlobSidecarList::new(blob_sidecar_list)
-                    .map_err(DataColumnSidecarError::SszError)?;
-                let timer = metrics::start_timer(&metrics::DATA_COLUMN_SIDECAR_COMPUTATION);
-                let sidecars = DataColumnSidecar::build_sidecars(&blob_sidecar_list, &block, kzg)?;
-                drop(timer);
-                let mut gossip_verified_data_columns = vec![];
-                for sidecar in sidecars {
-                    let subnet = DataColumnSubnetId::try_from_column_index::<T::EthSpec>(
-                        sidecar.index as usize,
-                    )
-                    .map_err(|_| {
-                        BlockContentsError::<T::EthSpec>::DataColumnSidecarError(
-                            DataColumnSidecarError::DataColumnIndexOutOfBounds,
-                        )
-                    })?;
-                    let column = GossipVerifiedDataColumn::new(sidecar, subnet.into(), chain)?;
-                    gossip_verified_data_columns.push(column);
-                }
-                let gossip_verified_data_columns =
-                    GossipVerifiedDataColumnList::new(gossip_verified_data_columns)
-                        .map_err(DataColumnSidecarError::SszError)?;
-                Ok::<_, BlockContentsError<T::EthSpec>>(gossip_verified_data_columns)
-            })
-            .transpose()?;
+        let peer_das_enabled = chain
+            .spec
+            .peer_das_epoch
+            .map_or(false, |peer_das_epoch| block.epoch() >= peer_das_epoch);
+
+        let gossip_verified_data_columns = if peer_das_enabled {
+            build_gossip_verified_data_columns(chain, &block, gossip_verified_blobs.as_ref())?
+        } else {
+            None
+        };
 
         let gossip_verified_block = GossipVerifiedBlock::new(block, chain)?;
 
@@ -793,6 +766,49 @@ impl<T: BeaconChainTypes> IntoGossipVerifiedBlockContents<T> for PublishBlockReq
     }
 }
 
+fn build_gossip_verified_data_columns<T: BeaconChainTypes>(
+    chain: &BeaconChain<T>,
+    block: &SignedBeaconBlock<T::EthSpec, FullPayload<T::EthSpec>>,
+    gossip_verified_blobs: Option<&GossipVerifiedBlobList<T>>,
+) -> Result<Option<GossipVerifiedDataColumnList<T>>, BlockContentsError<T::EthSpec>> {
+    gossip_verified_blobs
+        // Only attempt to build data columns if blobs is non empty to avoid skewing the metrics.
+        .filter(|b| !b.is_empty())
+        .map(|blobs| {
+            // NOTE: we expect KZG to be initialized if the blobs are present
+            let kzg = chain
+                .kzg
+                .as_ref()
+                .ok_or(BlockContentsError::DataColumnError(
+                    GossipDataColumnError::<T::EthSpec>::KzgNotInitialized,
+                ))?;
+
+            let blob_sidecar_list: Vec<_> = blobs.iter().map(|blob| blob.clone_blob()).collect();
+            let blob_sidecar_list = BlobSidecarList::new(blob_sidecar_list)
+                .map_err(DataColumnSidecarError::SszError)?;
+            let timer = metrics::start_timer(&metrics::DATA_COLUMN_SIDECAR_COMPUTATION);
+            let sidecars = DataColumnSidecar::build_sidecars(&blob_sidecar_list, block, kzg)?;
+            drop(timer);
+            let mut gossip_verified_data_columns = vec![];
+            for sidecar in sidecars {
+                let subnet =
+                    DataColumnSubnetId::try_from_column_index::<T::EthSpec>(sidecar.index as usize)
+                        .map_err(|_| {
+                            BlockContentsError::<T::EthSpec>::DataColumnSidecarError(
+                                DataColumnSidecarError::DataColumnIndexOutOfBounds,
+                            )
+                        })?;
+                let column = GossipVerifiedDataColumn::new(sidecar, subnet.into(), chain)?;
+                gossip_verified_data_columns.push(column);
+            }
+            let gossip_verified_data_columns =
+                GossipVerifiedDataColumnList::new(gossip_verified_data_columns)
+                    .map_err(DataColumnSidecarError::SszError)?;
+            Ok::<_, BlockContentsError<T::EthSpec>>(gossip_verified_data_columns)
+        })
+        .transpose()
+}
+
 /// Implemented on types that can be converted into a `ExecutionPendingBlock`.
 ///
 /// Used to allow functions to accept blocks at various stages of verification.

beacon_node/beacon_chain/src/block_verification_types.rs

@@ -84,8 +84,8 @@ enum RpcBlockInner<E: EthSpec> {
     /// This variant is used with parent lookups and by-range responses. It should have all blobs
     /// ordered, all block roots matching, and the correct number of blobs for this block.
     BlockAndBlobs(Arc<SignedBeaconBlock<E>>, BlobSidecarList<E>),
-    /// This variant is used with parent lookups and by-range responses. It should have all data columns
-    /// ordered, all block roots matching, and the correct number of data columns for this block.
+    /// This variant is used with parent lookups and by-range responses. It should have all
+    /// requested data columns, all block roots matching for this block.
     BlockAndDataColumns(Arc<SignedBeaconBlock<E>>, DataColumnSidecarList<E>),
 }