diff --git a/beacon_node/network/src/sync/block_lookups/tests.rs b/beacon_node/network/src/sync/block_lookups/tests.rs index 9572bf7f444..5d1f2dafc9a 100644 --- a/beacon_node/network/src/sync/block_lookups/tests.rs +++ b/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; diff --git a/beacon_node/network/src/sync/network_context.rs b/beacon_node/network/src/sync/network_context.rs index 3da6f92cfed..333c770bd91 100644 --- a/beacon_node/network/src/sync/network_context.rs +++ b/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 SyncNetworkContext { block_root: Hash256, downloaded_block: Option>>, ) -> Result { - // 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 SyncNetworkContext { 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 SyncNetworkContext { 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); } diff --git a/scripts/local_testnet/network_params_das_local.yaml b/scripts/local_testnet/network_params_das.yaml similarity index 81% rename from scripts/local_testnet/network_params_das_local.yaml rename to scripts/local_testnet/network_params_das.yaml index d1b646a34a3..ab2f07a24ec 100644 --- a/scripts/local_testnet/network_params_das_local.yaml +++ b/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 diff --git a/scripts/local_testnet/network_params_das_devnet_1.yaml b/scripts/local_testnet/network_params_das_devnet_1.yaml deleted file mode 100644 index fcd131a06ca..00000000000 --- a/scripts/local_testnet/network_params_das_devnet_1.yaml +++ /dev/null @@ -1,8 +0,0 @@ -participants: - - cl_type: lighthouse - cl_image: lighthouse:local -network_params: - network: peerdas-devnet-1 -global_log_level: debug -additional_services: - - prometheus_grafana \ No newline at end of file diff --git a/scripts/local_testnet/network_params_das_interop.yaml b/scripts/local_testnet/network_params_das_interop.yaml deleted file mode 100644 index 0c8f9d7f49d..00000000000 --- a/scripts/local_testnet/network_params_das_interop.yaml +++ /dev/null @@ -1,38 +0,0 @@ -# Full configuration reference [here](https://github.com/ethpandaops/ethereum-package?tab=readme-ov-file#configuration). -participants: - - cl_type: prysm - cl_image: ethpandaops/prysm-beacon-chain:peerDAS - - - cl_type: lighthouse - cl_extra_params: [ - --subscribe-all-data-column-subnets, - ] - cl_image: lighthouse:local - - - cl_type: lighthouse - cl_image: lighthouse:local - - - cl_type: teku - cl_image: ethpandaops/teku:nashatyrev-das - -# - cl_type: nimbus -# cl_image: ethpandaops/nimbus-eth2:kzgpeerdas -# -# - cl_type: grandine -# cl_image: ethpandaops/grandine:das -# -# - cl_type: lodestar -# cl_image: ethpandaops/lodestar:peerDAS -network_params: - eip7594_fork_epoch: 0 - eip7594_fork_version: "0x50000038" - data_column_sidecar_subnet_count: 128 - samples_per_slot: 16 - custody_requirement: 4 -snooper_enabled: false -global_log_level: debug -ethereum_metrics_exporter_enabled: true -additional_services: - - dora - - goomy_blob - - prometheus_grafana diff --git a/scripts/local_testnet/start_local_testnet.sh b/scripts/local_testnet/start_local_testnet.sh index 330df76d813..f90132764e4 100755 --- a/scripts/local_testnet/start_local_testnet.sh +++ b/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!"