Merge remote-tracking branch 'origin/unstable' into tree-states

2026-03-16 11:22:56 +00:00 · 2023-10-19 12:07:35 +11:00
parent bb6675e42d 98cac2bc6b
commit 72d8c3852c
189 changed files with 1475 additions and 951 deletions
--- a/beacon_node/execution_layer/src/engine_api/http.rs
+++ b/beacon_node/execution_layer/src/engine_api/http.rs
@@ -897,10 +897,9 @@ impl HttpJsonRpc {
                    .await?;
                Ok(JsonGetPayloadResponse::V3(response).into())
            }
-            _ => Err(Error::UnsupportedForkVariant(format!(
-                "called get_payload_v3 with {}",
-                fork_name
-            ))),
+            ForkName::Base | ForkName::Altair | ForkName::Merge | ForkName::Capella => Err(
+                Error::UnsupportedForkVariant(format!("called get_payload_v3 with {}", fork_name)),
+            ),
        }
    }