chore: Updated fork name from Merge -> Paris

src/ethereum_test_forks/__init__.py

@@ -21,7 +21,7 @@
 )
 from .forks.transition import (
     BerlinToLondonAt5,
-    MergeToShanghaiAtTime15k,
+    ParisToShanghaiAtTime15K,
     ShanghaiToCancunAtTime15k,
 )
 from .helpers import (
@@ -53,7 +53,7 @@
     "Istanbul",
     "London",
     "Paris",
-    "MergeToShanghaiAtTime15k",
+    "ParisToShanghaiAtTime15K",
     "MuirGlacier",
     "Shanghai",
     "ShanghaiToCancunAtTime15k",

src/ethereum_test_forks/forks/forks.py

@@ -264,7 +264,7 @@ class GrayGlacier(ArrowGlacier):
 
 class Paris(London):
     """
-    Merge fork
+    Paris (Merge) fork
     """
 
     @classmethod

src/ethereum_test_forks/forks/transition.py

@@ -16,7 +16,7 @@ class BerlinToLondonAt5(Berlin):
 
 
 @transition_fork(to_fork=Shanghai, at_timestamp=15_000)
-class MergeToShanghaiAtTime15k(Paris):
+class ParisToShanghaiAtTime15K(Paris):
     """
     Merge to Shanghai transition at Timestamp 15k
     """

src/ethereum_test_forks/tests/test_forks.py

@@ -6,7 +6,7 @@
 
 from ..base_fork import Fork
 from ..forks.forks import Berlin, Cancun, Frontier, London, Paris, Shanghai
-from ..forks.transition import BerlinToLondonAt5, MergeToShanghaiAtTime15k
+from ..forks.transition import BerlinToLondonAt5, ParisToShanghaiAtTime15K
 from ..helpers import (
     forks_from,
     forks_from_until,
@@ -31,7 +31,7 @@ def test_transition_forks():
     """
     assert transition_fork_from_to(Berlin, London) == BerlinToLondonAt5
     assert transition_fork_from_to(Berlin, Paris) is None
-    assert transition_fork_to(Shanghai) == [MergeToShanghaiAtTime15k]
+    assert transition_fork_to(Shanghai) == [ParisToShanghaiAtTime15K]
 
     # Test forks transitioned to and from
     assert BerlinToLondonAt5.transitions_to() == London
@@ -42,18 +42,18 @@ def test_transition_forks():
     # Default values of transition forks is the transition block
     assert BerlinToLondonAt5.fork() == "London"
 
-    assert MergeToShanghaiAtTime15k.fork(0, 14_999) == "Paris"
-    assert MergeToShanghaiAtTime15k.fork(0, 15_000) == "Shanghai"
-    assert MergeToShanghaiAtTime15k.fork() == "Shanghai"
+    assert ParisToShanghaiAtTime15K.fork(0, 14_999) == "Paris"
+    assert ParisToShanghaiAtTime15K.fork(0, 15_000) == "Shanghai"
+    assert ParisToShanghaiAtTime15K.fork() == "Shanghai"
 
     assert BerlinToLondonAt5.header_base_fee_required(4, 0) is False
     assert BerlinToLondonAt5.header_base_fee_required(5, 0) is True
 
-    assert MergeToShanghaiAtTime15k.header_withdrawals_required(0, 14_999) is False
-    assert MergeToShanghaiAtTime15k.header_withdrawals_required(0, 15_000) is True
+    assert ParisToShanghaiAtTime15K.header_withdrawals_required(0, 14_999) is False
+    assert ParisToShanghaiAtTime15K.header_withdrawals_required(0, 15_000) is True
 
-    assert MergeToShanghaiAtTime15k.engine_new_payload_version(0, 14_999) == 1
-    assert MergeToShanghaiAtTime15k.engine_new_payload_version(0, 15_000) == 2
+    assert ParisToShanghaiAtTime15K.engine_new_payload_version(0, 14_999) == 1
+    assert ParisToShanghaiAtTime15K.engine_new_payload_version(0, 15_000) == 2
 
 
 def test_forks_from():  # noqa: D103
@@ -76,9 +76,9 @@ def test_forks():
 
     # Test fork names
     assert London.name() == "London"
-    assert MergeToShanghaiAtTime15k.name() == "MergeToShanghaiAtTime15k"
+    assert ParisToShanghaiAtTime15K.name() == "ParisToShanghaiAtTime15K"
     assert f"{London}" == "London"
-    assert f"{MergeToShanghaiAtTime15k}" == "MergeToShanghaiAtTime15k"
+    assert f"{ParisToShanghaiAtTime15K}" == "ParisToShanghaiAtTime15K"
 
     # Test some fork properties
     assert Berlin.header_base_fee_required(0, 0) is False
@@ -90,9 +90,9 @@ def test_forks():
     # Transition forks too
     assert cast(Fork, BerlinToLondonAt5).header_base_fee_required(4, 0) is False
     assert cast(Fork, BerlinToLondonAt5).header_base_fee_required(5, 0) is True
-    assert cast(Fork, MergeToShanghaiAtTime15k).header_withdrawals_required(0, 14_999) is False
-    assert cast(Fork, MergeToShanghaiAtTime15k).header_withdrawals_required(0, 15_000) is True
-    assert cast(Fork, MergeToShanghaiAtTime15k).header_withdrawals_required() is True
+    assert cast(Fork, ParisToShanghaiAtTime15K).header_withdrawals_required(0, 14_999) is False
+    assert cast(Fork, ParisToShanghaiAtTime15K).header_withdrawals_required(0, 15_000) is True
+    assert cast(Fork, ParisToShanghaiAtTime15K).header_withdrawals_required() is True
 
     assert is_fork(Berlin, Berlin) is True
     assert is_fork(London, Berlin) is True

src/ethereum_test_tools/code/yul.py

@@ -34,7 +34,6 @@ def get_evm_version_from_fork(fork: Fork | None):
     if not fork:
         return None
     fork_to_evm_version_map: Mapping[str, str] = {
-        "Merge": "paris",
         "ConstantinopleFix": "constantinople",
     }
     if fork.name() in fork_to_evm_version_map: