From 5cf1f24b39ddef259470f58413337b81bda081a6 Mon Sep 17 00:00:00 2001
From: danceratopz <danceratopz@gmail.com>
Date: Wed, 27 Nov 2024 14:42:33 +0100
Subject: [PATCH] chore(fill): fix prague filling with EELS (#969)

---
 eels_resolutions.json             | 6 +++---
 src/pytest_plugins/forks/forks.py | 2 +-
 uv.lock                           | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/eels_resolutions.json b/eels_resolutions.json
index b1d1f46f44..7b625adb28 100644
--- a/eels_resolutions.json
+++ b/eels_resolutions.json
@@ -13,7 +13,7 @@
     "Byzantium": {
         "same_as": "EELSMaster"
     },
-    "Constantinople": {
+    "ConstantinopleFix": {
         "same_as": "EELSMaster"
     },
     "Istanbul": {
@@ -36,7 +36,7 @@
     },
     "Prague": {
         "git_url": "https://github.com/ethereum/execution-specs.git",
-        "branch": "prague",
-        "commit": "2875a733d6b1e9e751e437c7894d3ebe6ff58ecc"
+        "branch": "forks/prague",
+        "commit": "1ea4a8d30d68bb819e77ff52eeb2095ae3c67f5f"
     }
 }
diff --git a/src/pytest_plugins/forks/forks.py b/src/pytest_plugins/forks/forks.py
index c0eb18952a..4a1afa9f61 100644
--- a/src/pytest_plugins/forks/forks.py
+++ b/src/pytest_plugins/forks/forks.py
@@ -426,7 +426,7 @@ def get_fork_option(config, option_name: str, parameter_name: str) -> Set[Fork]:
     if evm_bin is not None:
         t8n = TransitionTool.from_binary_path(binary_path=evm_bin)
         config.unsupported_forks = frozenset(  # type: ignore
-            filter(lambda fork: not t8n.is_fork_supported(fork), fork_set)
+            fork for fork in fork_set if not t8n.is_fork_supported(fork)
         )
 
 
diff --git a/uv.lock b/uv.lock
index 21c1202c56..1da42089d2 100644
--- a/uv.lock
+++ b/uv.lock
@@ -637,7 +637,7 @@ requires-dist = [
 [[package]]
 name = "ethereum-spec-evm-resolver"
 version = "0.0.5"
-source = { git = "https://github.com/petertdavies/ethereum-spec-evm-resolver#ed7dbce2e64c57812821d96297b6e0efc2967802" }
+source = { git = "https://github.com/petertdavies/ethereum-spec-evm-resolver#c68756230a27709e10426d5fbe4fa1b142a0b0ee" }
 dependencies = [
     { name = "coincurve" },
     { name = "filelock" },
@@ -645,6 +645,7 @@ dependencies = [
     { name = "platformdirs" },
     { name = "py-ecc" },
     { name = "pycryptodome" },
+    { name = "pydantic" },
     { name = "requests-unixsocket2" },
     { name = "typing-extensions" },
     { name = "urllib3" },