From 12f82cfd73195a90701edb310f3c4aed2eb7ac82 Mon Sep 17 00:00:00 2001
From: danceratopz <danceratopz@gmail.com>
Date: Tue, 16 Jun 2026 14:22:09 +0200
Subject: [PATCH 1/2] feat(test-forks): enable filling for TangerineWhistle and
 SpuriousDragon

Remove `ignore=True` from `TangerineWhistle` and `SpuriousDragon` so they
are included in `get_deployed_forks()` and filled. Both have distinct EVM
rulesets (`TANGERINE`/`SPURIOUS`) and full EELS `t8n` support but were
never filled, leaving `valid_from("TangerineWhistle")` tests starting at
Byzantium.

Update the `valid_until` marker test for the two added deployed forks.
---
 .../pytest_commands/plugins/forks/tests/test_markers.py    | 7 ++++++-
 .../testing/src/execution_testing/forks/forks/forks.py     | 2 --
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/tests/test_markers.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/tests/test_markers.py
index 34e84cb1b7e..d6fd07fdff9 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/tests/test_markers.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/tests/test_markers.py
@@ -26,7 +26,12 @@ def test_case(state_test):
                 valid_until='"Cancun"',
             ),
             [],
-            {"passed": 10, "failed": 0, "skipped": 0, "errors": 0},
+            # All deployed forks from Frontier through Cancun, except
+            # Constantinople (filled as ConstantinopleFix): Frontier,
+            # Homestead, TangerineWhistle, SpuriousDragon, Byzantium,
+            # ConstantinopleFix, Istanbul, Berlin, London, Paris, Shanghai,
+            # Cancun = 12 forks.
+            {"passed": 12, "failed": 0, "skipped": 0, "errors": 0},
             id="valid_until",
         ),
         pytest.param(
diff --git a/packages/testing/src/execution_testing/forks/forks/forks.py b/packages/testing/src/execution_testing/forks/forks/forks.py
index acaa4403176..7558959038d 100644
--- a/packages/testing/src/execution_testing/forks/forks/forks.py
+++ b/packages/testing/src/execution_testing/forks/forks/forks.py
@@ -1340,7 +1340,6 @@ class DAOFork(
 
 class TangerineWhistle(
     DAOFork,
-    ignore=True,
     ruleset_name="TANGERINE",
 ):
     """TangerineWhistle fork (EIP-150)."""
@@ -1353,7 +1352,6 @@ class SpuriousDragon(
     eips.EIP161,
     eips.EIP155,
     TangerineWhistle,
-    ignore=True,
     ruleset_name="SPURIOUS",
 ):
     """SpuriousDragon fork."""

From a5f38127e0e24c2af2aa4a1e5cf083051c6cd004 Mon Sep 17 00:00:00 2001
From: danceratopz <danceratopz@gmail.com>
Date: Tue, 16 Jun 2026 14:22:09 +0200
Subject: [PATCH 2/2] chore(ci): rebalance fill fork ranges for the enabled
 forks

Split `Frontier`->`Shanghai` + `Cancun` into `Frontier`->`Paris` +
`Shanghai`->`Cancun` so the two newly filled forks do not overload the
`pre-cancun` job. Keeps the same runner count in both the `fill` matrix
(`test.yaml`) and the release split (`fork-ranges.yaml`).
---
 .github/configs/fork-ranges.yaml | 8 ++++----
 .github/workflows/test.yaml      | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/configs/fork-ranges.yaml b/.github/configs/fork-ranges.yaml
index feb5ed48e38..ef3acf4818e 100644
--- a/.github/configs/fork-ranges.yaml
+++ b/.github/configs/fork-ranges.yaml
@@ -1,11 +1,11 @@
 # Shared fork ranges for splitting multi-fork releases across parallel runners.
 # Features using --until are automatically split using applicable ranges.
 # Features using --fork (single fork) are never split.
-- label: pre-cancun
+- label: pre-shanghai
   from: Frontier
-  until: Shanghai
-- label: cancun
-  from: Cancun
+  until: Paris
+- label: shanghai-cancun
+  from: Shanghai
   until: Cancun
 - label: prague
   from: Prague
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index b328615180e..723ef6c95a4 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -81,11 +81,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - label: pre-cancun
+          - label: pre-shanghai
             from_fork: Frontier
-            until_fork: Shanghai
-          - label: cancun
-            from_fork: Cancun
+            until_fork: Paris
+          - label: shanghai-cancun
+            from_fork: Shanghai
             until_fork: Cancun
           - label: prague
             from_fork: Prague