Merge branch 'unstable' into eip4844

testing/execution_engine_integration/src/geth.rs

@@ -7,7 +7,7 @@ use std::{env, fs::File};
 use tempfile::TempDir;
 use unused_port::unused_tcp_port;
 
-// const GETH_BRANCH: &str = "master";
+const GETH_BRANCH: &str = "master";
 const GETH_REPO_URL: &str = "https://github.com/ethereum/go-ethereum";
 
 pub fn build_result(repo_dir: &Path) -> Output {
@@ -27,9 +27,7 @@ pub fn build(execution_clients_dir: &Path) {
     }
 
     // Get the latest tag on the branch
-    // TODO: Update when version is corrected
-    // let last_release = build_utils::get_latest_release(&repo_dir, GETH_BRANCH).unwrap();
-    let last_release = "v1.11.1";
+    let last_release = build_utils::get_latest_release(&repo_dir, GETH_BRANCH).unwrap();
     build_utils::checkout(&repo_dir, dbg!(&last_release)).unwrap();
 
     // Build geth

testing/execution_engine_integration/src/test_rig.rs

@@ -427,7 +427,16 @@ impl<E: GenericExecutionEngine> TestRig<E> {
             .notify_new_payload(&invalid_payload)
             .await
             .unwrap();
-        assert!(matches!(status, PayloadStatus::InvalidBlockHash { .. }));
+        assert!(matches!(
+            status,
+            PayloadStatus::InvalidBlockHash { .. }
+                // Geth is returning `INVALID` with a `null` LVH to indicate it
+                // does not know the invalid ancestor.
+                | PayloadStatus::Invalid {
+                    latest_valid_hash: None,
+                    ..
+                }
+        ));
 
         /*
          * Execution Engine A:

testing/web3signer_tests/src/lib.rs

@@ -660,17 +660,17 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn ropsten_base_types() {
-        test_base_types("ropsten", 4250).await
+    async fn sepolia_base_types() {
+        test_base_types("sepolia", 4250).await
     }
 
     #[tokio::test]
-    async fn ropsten_altair_types() {
-        test_altair_types("ropsten", 4251).await
+    async fn sepolia_altair_types() {
+        test_altair_types("sepolia", 4251).await
     }
 
     #[tokio::test]
-    async fn ropsten_merge_types() {
-        test_merge_types("ropsten", 4252).await
+    async fn sepolia_merge_types() {
+        test_merge_types("sepolia", 4252).await
     }
 }