From 984f264ea5c8eb434cf7fa3ac63637381855090b Mon Sep 17 00:00:00 2001
From: fselmo <fselmo2@gmail.com>
Date: Mon, 27 Feb 2023 13:01:38 -0700
Subject: [PATCH] Handle merge->shanghai transition tests properly

---
 eth/tools/fixtures/helpers.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eth/tools/fixtures/helpers.py b/eth/tools/fixtures/helpers.py
index 4377294c6c..d3090e98ae 100644
--- a/eth/tools/fixtures/helpers.py
+++ b/eth/tools/fixtures/helpers.py
@@ -195,6 +195,12 @@ def chain_vm_configuration(fixture: Dict[str, Any]) -> Iterable[Tuple[int, Type[
             (0, GrayGlacierVM),
             (6, ParisVM),
         )
+    elif network == "MergeToShanghaiAtTime15k":
+        # Transition expected at 5 (timestamp==15000) for all tests written thus far
+        return (
+            (0, ParisVM),
+            (5, ShanghaiVM),
+        )
 
     else:
         raise ValueError(f"Network {network} does not match any known VM rules")