Merge branch 'unstable' into peerdas-get-blob-sidecars

Author: jimmygchen

.github/workflows/test-suite.yml

@@ -350,7 +350,7 @@ jobs:
     - name: Check formatting with cargo fmt
       run: make cargo-fmt
     - name: Lint code for quality and style with Clippy
-      run: make lint
+      run: make lint-full
     - name: Certify Cargo.lock freshness
       run: git diff --exit-code Cargo.lock
     - name: Typecheck benchmark code without running it

Makefile

@@ -204,7 +204,7 @@ test-full: cargo-fmt test-release test-debug test-ef test-exec-engine
 # Lints the code for bad style and potentially unsafe arithmetic using Clippy.
 # Clippy lints are opt-in per-crate for now. By default, everything is allowed except for performance and correctness lints.
 lint:
-	RUSTFLAGS="-C debug-assertions=no $(RUSTFLAGS)" cargo clippy --workspace --benches --tests $(EXTRA_CLIPPY_OPTS) --features "$(TEST_FEATURES)" -- \
+	cargo clippy --workspace --benches --tests $(EXTRA_CLIPPY_OPTS) --features "$(TEST_FEATURES)" -- \
 		-D clippy::fn_to_numeric_cast_any \
 		-D clippy::manual_let_else \
 		-D clippy::large_stack_frames \
@@ -220,6 +220,10 @@ lint:
 lint-fix:
 	EXTRA_CLIPPY_OPTS="--fix --allow-staged --allow-dirty" $(MAKE) lint
 
+# Also run the lints on the optimized-only tests
+lint-full:
+	RUSTFLAGS="-C debug-assertions=no $(RUSTFLAGS)" $(MAKE) lint
+
 # Runs the makefile in the `ef_tests` repo.
 #
 # May download and extract an archive of test vectors from the ethereum

beacon_node/beacon_chain/src/kzg_utils.rs

@@ -246,13 +246,15 @@ fn build_data_column_sidecars<E: EthSpec>(
 
 /// Reconstruct blobs from a subset of data column sidecars (requires at least 50%).
 ///
-/// If `blob_indices_opt` is `None`, this function attempts to reconstruct all blobs.
+/// If `blob_indices_opt` is `None`, this function attempts to reconstruct all blobs associated
+/// with the block.
 pub fn reconstruct_blobs<E: EthSpec>(
     kzg: &Kzg,
     data_columns: &[Arc<DataColumnSidecar<E>>],
     blob_indices_opt: Option<Vec<u64>>,
     signed_block: &SignedBlindedBeaconBlock<E>,
 ) -> Result<BlobSidecarList<E>, String> {
+    // The data columns are from the database, so we assume their correctness.
     let first_data_column = data_columns
         .first()
         .ok_or("data_columns should have at least one element".to_string())?;

scripts/local_testnet/network_params_das.yaml

@@ -3,17 +3,18 @@ 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
 snooper_enabled: false
+global_log_level: debug
 additional_services:
   - dora
   - goomy_blob

scripts/local_testnet/start_local_testnet.sh

@@ -7,7 +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.4.0
+ETHEREUM_PKG_VERSION=main
 
 BUILD_IMAGE=true
 BUILDER_PROPOSALS=false