Merge branch 'unstable' into das-fetch-blobs

beacon_node/network/src/sync/block_lookups/tests.rs

@@ -1967,6 +1967,7 @@ fn sampling_happy_path() {
 }
 
 #[test]
+#[ignore] // Ignoring due to flakiness https://github.com/sigp/lighthouse/issues/6319
 fn sampling_with_retries() {
     let Some(mut r) = TestRig::test_setup_after_peerdas() else {
         return;

beacon_node/network/src/sync/network_context.rs

@@ -28,7 +28,6 @@ use rand::thread_rng;
 use requests::ActiveDataColumnsByRootRequest;
 pub use requests::LookupVerifyError;
 use slog::{debug, error, warn};
-use slot_clock::SlotClock;
 use std::collections::hash_map::Entry;
 use std::collections::HashMap;
 use std::sync::Arc;
@@ -595,21 +594,6 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
         block_root: Hash256,
         downloaded_block: Option<Arc<SignedBeaconBlock<T::EthSpec>>>,
     ) -> Result<LookupRequestResult, RpcRequestSendError> {
-        // Check if we are into deneb, and before peerdas
-        if !self
-            .chain
-            .data_availability_checker
-            .blobs_required_for_epoch(
-                // TODO(das): use the block's slot
-                self.chain
-                    .slot_clock
-                    .now_or_genesis()
-                    .ok_or(RpcRequestSendError::SlotClockError)?
-                    .epoch(T::EthSpec::slots_per_epoch()),
-            )
-        {
-            return Ok(LookupRequestResult::NoRequestNeeded);
-        }
         let Some(block) = downloaded_block.or_else(|| {
             // If the block is already being processed or fully validated, retrieve how many blobs
             // it expects. Consider any stage of the block. If the block root has been validated, we
@@ -637,7 +621,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
         let expected_blobs = block.num_expected_blobs();
         let block_epoch = block.slot().epoch(T::EthSpec::slots_per_epoch());
 
-        // Check if we are into peerdas
+        // Check if we are in deneb, before peerdas and inside da window
         if !self.chain.should_fetch_blobs(block_epoch) {
             return Ok(LookupRequestResult::NoRequestNeeded);
         }
@@ -750,7 +734,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
         let expected_blobs = block.num_expected_blobs();
         let block_epoch = block.slot().epoch(T::EthSpec::slots_per_epoch());
 
-        // Check if we are into peerdas
+        // Check if we are into peerdas and inside da window
         if !self.chain.should_fetch_custody_columns(block_epoch) {
             return Ok(LookupRequestResult::NoRequestNeeded);
         }

scripts/local_testnet/network_params_das_local.yaml → scripts/local_testnet/network_params_das.yaml

@@ -3,13 +3,13 @@ participants:
     cl_image: lighthouse:local
     cl_extra_params:
       - --subscribe-all-data-column-subnets
-      - --target-peers=2
+      - --target-peers=3
     count: 2
   - cl_type: lighthouse
     cl_image: lighthouse:local
     cl_extra_params:
-      - --target-peers=2
-    count: 1
+      - --target-peers=3
+    count: 2
 network_params:
   eip7594_fork_epoch: 0
   seconds_per_slot: 6
@@ -18,3 +18,4 @@ global_log_level: debug
 additional_services:
   - dora
   - goomy_blob
+  - prometheus_grafana

scripts/local_testnet/start_local_testnet.sh

@@ -7,6 +7,7 @@ set -Eeuo pipefail
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 ENCLAVE_NAME=local-testnet
 NETWORK_PARAMS_FILE=$SCRIPT_DIR/network_params.yaml
+ETHEREUM_PKG_VERSION=4.2.0
 
 BUILD_IMAGE=true
 BUILDER_PROPOSALS=false
@@ -80,6 +81,6 @@ if [ "$KEEP_ENCLAVE" = false ]; then
   kurtosis enclave rm -f $ENCLAVE_NAME 2>/dev/null || true
 fi
 
-kurtosis run --enclave $ENCLAVE_NAME github.com/ethpandaops/ethereum-package --args-file $NETWORK_PARAMS_FILE
+kurtosis run --enclave $ENCLAVE_NAME github.com/ethpandaops/ethereum-package@$ETHEREUM_PKG_VERSION --args-file $NETWORK_PARAMS_FILE
 
 echo "Started!"