From 58354ff806f32401f4e6de3d57412bd599671006 Mon Sep 17 00:00:00 2001
From: spencer <spencer@spencertaylorbrown.uk>
Date: Mon, 5 Feb 2024 19:01:31 +0700
Subject: [PATCH] simulators/ethereum/pyspec: Use latest EEST fixture release.
 (#985)

* simulators/ethereum/pyspec: Update dockerfile tests release structure.

* simulators/ethereum/pyspec: Tweak to adhere to fixture format change.
---
 simulators/ethereum/pyspec/Dockerfile | 6 +++---
 simulators/ethereum/pyspec/runner.go  | 2 +-
 simulators/ethereum/pyspec/types.go   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/simulators/ethereum/pyspec/Dockerfile b/simulators/ethereum/pyspec/Dockerfile
index 2c5c5cedb1..f407236d8c 100644
--- a/simulators/ethereum/pyspec/Dockerfile
+++ b/simulators/ethereum/pyspec/Dockerfile
@@ -21,9 +21,9 @@ COPY --from=builder /source/pyspec/pyspec .
 # To run locally generated fixtures, comment the following RUN lines and
 # uncomment the ADD line.
 # Download the latest fixture release.
-RUN wget https://github.com/ethereum/execution-spec-tests/releases/latest/download/fixtures_develop_hive.tar.gz
-RUN tar -xzvf fixtures_develop_hive.tar.gz
-RUN mv fixtures /fixtures
+RUN wget https://github.com/ethereum/execution-spec-tests/releases/latest/download/fixtures_develop.tar.gz
+RUN tar -xzvf fixtures_develop.tar.gz
+RUN mv fixtures/blockchain_tests_hive /fixtures
 
 # ADD ./pyspec/fixtures /fixtures
 
diff --git a/simulators/ethereum/pyspec/runner.go b/simulators/ethereum/pyspec/runner.go
index 275ff1312b..6781b968ca 100644
--- a/simulators/ethereum/pyspec/runner.go
+++ b/simulators/ethereum/pyspec/runner.go
@@ -138,7 +138,7 @@ func (tc *testcase) run(t *hivesim.T) {
 		}
 		// set expected payload return status
 		expectedStatus := "VALID"
-		if !engineNewPayload.Valid {
+		if engineNewPayload.ValidationError != nil {
 			expectedStatus = "INVALID"
 		}
 		// check payload status matches expected
diff --git a/simulators/ethereum/pyspec/types.go b/simulators/ethereum/pyspec/types.go
index 63486948ea..7300df297d 100644
--- a/simulators/ethereum/pyspec/types.go
+++ b/simulators/ethereum/pyspec/types.go
@@ -78,7 +78,7 @@ type engineNewPayload struct {
 	BlobVersionedHashes   []common.Hash       `json:"expectedBlobVersionedHashes"`
 	ParentBeaconBlockRoot *common.Hash        `json:"parentBeaconBlockRoot"`
 	Version               math.HexOrDecimal64 `json:"version"`
-	Valid                 bool                `json:"valid"`
+	ValidationError       *string             `json:"validationError"`
 	ErrorCode             int64               `json:"errorCode,string"`
 
 	HiveExecutionPayload *typ.ExecutableData