Merge remote-tracking branch 'upstream/unstable' into gloas-containers

testing/ef_tests/Makefile

@@ -1,6 +1,6 @@
 # To download/extract nightly tests, run:
 # CONSENSUS_SPECS_TEST_VERSION=nightly make
-CONSENSUS_SPECS_TEST_VERSION ?= v1.6.0-alpha.5
+CONSENSUS_SPECS_TEST_VERSION ?= v1.6.0-alpha.6
 REPO_NAME := consensus-spec-tests
 OUTPUT_DIR := ./$(REPO_NAME)
 

testing/ef_tests/check_all_files_accessed.py

@@ -59,6 +59,9 @@ excluded_paths = [
     "tests/.*/.*/epoch_processing/.*/post_epoch.ssz_snappy",
     # Ignore gloas tests for now
     "tests/.*/gloas/.*",
+    # Ignore KZG tests that target internal kzg library functions
+    "tests/.*/compute_verify_cell_kzg_proof_batch_challenge/.*",
+    "tests/.*/compute_challenge/.*",
 ]
 
 

testing/ef_tests/src/cases/fork.rs

@@ -60,7 +60,7 @@ impl<E: EthSpec> Case for ForkTest<E> {
     fn result(&self, _case_index: usize, fork_name: ForkName) -> Result<(), Error> {
         let mut result_state = self.pre.clone();
         let mut expected = Some(self.post.clone());
-        let spec = &E::default_spec();
+        let spec = &fork_name.make_genesis_spec(E::default_spec());
 
         let mut result = match fork_name {
             ForkName::Base => panic!("phase0 not supported"),

testing/execution_engine_integration/Cargo.toml

@@ -18,6 +18,7 @@ fork_choice = { workspace = true }
 futures = { workspace = true }
 hex = { workspace = true }
 logging = { workspace = true }
+network_utils = { workspace = true }
 reqwest = { workspace = true }
 sensitive_url = { workspace = true }
 serde_json = { workspace = true }
@@ -25,4 +26,3 @@ task_executor = { workspace = true }
 tempfile = { workspace = true }
 tokio = { workspace = true }
 types = { workspace = true }
-unused_port = { workspace = true }

testing/execution_engine_integration/src/execution_engine.rs

@@ -1,10 +1,10 @@
 use ethers_providers::{Http, Provider};
 use execution_layer::DEFAULT_JWT_FILE;
+use network_utils::unused_port::unused_tcp4_port;
 use sensitive_url::SensitiveUrl;
 use std::path::PathBuf;
 use std::process::Child;
 use tempfile::TempDir;
-use unused_port::unused_tcp4_port;
 
 pub const KEYSTORE_PASSWORD: &str = "testpwd";
 pub const ACCOUNT1: &str = "7b8C3a386C0eea54693fFB0DA17373ffC9228139";

testing/execution_engine_integration/src/geth.rs

@@ -1,11 +1,11 @@
 use crate::build_utils;
 use crate::execution_engine::GenericExecutionEngine;
 use crate::genesis_json::geth_genesis_json;
+use network_utils::unused_port::unused_tcp4_port;
 use std::path::{Path, PathBuf};
 use std::process::{Child, Command, Output};
 use std::{env, fs};
 use tempfile::TempDir;
-use unused_port::unused_tcp4_port;
 
 const GETH_BRANCH: &str = "master";
 const GETH_REPO_URL: &str = "https://github.com/ethereum/go-ethereum";

testing/execution_engine_integration/src/nethermind.rs

@@ -1,12 +1,12 @@
 use crate::build_utils;
 use crate::execution_engine::GenericExecutionEngine;
 use crate::genesis_json::nethermind_genesis_json;
+use network_utils::unused_port::unused_tcp4_port;
 use std::env;
 use std::fs;
 use std::path::{Path, PathBuf};
 use std::process::{Child, Command, Output};
 use tempfile::TempDir;
-use unused_port::unused_tcp4_port;
 
 /// We've pinned the Nethermind version since our method of using the `master` branch to
 /// find the latest tag isn't working. It appears Nethermind don't always tag on `master`.

testing/simulator/src/checks.rs

@@ -424,7 +424,7 @@ pub async fn verify_full_blob_production_up_to<E: EthSpec>(
         // the `verify_full_block_production_up_to` function.
         if block.is_some() {
             remote_node
-                .get_blobs::<E>(BlockId::Slot(Slot::new(slot)), None, &E::default_spec())
+                .get_blobs::<E>(BlockId::Slot(Slot::new(slot)), None)
                 .await
                 .map_err(|e| format!("Failed to get blobs at slot {slot:?}: {e:?}"))?
                 .ok_or_else(|| format!("No blobs available at slot {slot:?}"))?;