removed lots of unneeded functions, removed coverage fixer test, renamed SOLC_PADDING_VERSION to SOLC_EXPECTED_MIN_VERSION

Author: felix314159

src/ethereum_test_forks/__init__.py

@@ -35,15 +35,13 @@
     TransitionFork,
     forks_from,
     forks_from_until,
-    get_closest_fork_with_solc_support,
+    get_closest_fork,
     get_deployed_forks,
     get_development_forks,
     get_fork_by_name,
     get_forks,
     get_forks_with_no_descendants,
     get_forks_with_no_parents,
-    get_forks_with_solc_support,
-    get_forks_without_solc_support,
     get_from_until_fork_set,
     get_last_descendants,
     get_relative_fork_markers,
@@ -85,16 +83,14 @@
     "get_transition_forks",
     "forks_from",
     "forks_from_until",
-    "get_closest_fork_with_solc_support",
+    "get_closest_fork",
     "get_deployed_forks",
     "get_development_forks",
     "get_transition_fork_predecessor",
     "get_transition_fork_successor",
     "get_fork_by_name",
     "get_forks_with_no_descendants",
     "get_forks_with_no_parents",
-    "get_forks_with_solc_support",
-    "get_forks_without_solc_support",
     "get_relative_fork_markers",
     "get_forks",
     "get_from_until_fork_set",

src/ethereum_test_forks/base_fork.py

@@ -16,8 +16,6 @@
     Union,
 )
 
-from semver import Version
-
 from ethereum_test_base_types import AccessList, Address, BlobSchedule
 from ethereum_test_base_types.conversions import BytesConvertible
 from ethereum_test_vm import EVMCodeType, Opcodes
@@ -576,12 +574,6 @@ def solc_name(cls) -> str:
         """Return fork name as it's meant to be passed to the solc compiler."""
         pass
 
-    @classmethod
-    @abstractmethod
-    def solc_min_version(cls) -> Version:
-        """Return minimum version of solc that supports this fork."""
-        pass
-
     @classmethod
     def is_deployed(cls) -> bool:
         """

src/ethereum_test_forks/forks/forks.py

@@ -6,8 +6,6 @@
 from pathlib import Path
 from typing import List, Literal, Mapping, Optional, Sized, Tuple
 
-from semver import Version
-
 from ethereum_test_base_types import AccessList, Address, BlobSchedule, Bytes, ForkBlobSchedule
 from ethereum_test_base_types.conversions import BytesConvertible
 from ethereum_test_vm import EVMCodeType, Opcodes
@@ -46,11 +44,6 @@ def solc_name(cls) -> str:
             return cls._solc_name
         return cls.name().lower()
 
-    @classmethod
-    def solc_min_version(cls) -> Version:
-        """Return minimum version of solc that supports this fork."""
-        return Version.parse("0.8.20")
-
     @classmethod
     def header_base_fee_required(cls, block_number: int = 0, timestamp: int = 0) -> bool:
         """At genesis, header must not contain base fee."""
@@ -929,11 +922,6 @@ def get_blob_constant(cls, name: str) -> int | Literal["big"]:
         )
         return retrieved_constant
 
-    @classmethod
-    def solc_min_version(cls) -> Version:
-        """Return minimum version of solc that supports this fork."""
-        return Version.parse("0.8.24")
-
     @classmethod
     def header_excess_blob_gas_required(cls, block_number: int = 0, timestamp: int = 0) -> bool:
         """Excess blob gas is required starting from Cancun."""
@@ -1131,11 +1119,6 @@ def is_deployed(cls) -> bool:
         """
         return False
 
-    @classmethod
-    def solc_min_version(cls) -> Version:
-        """Return minimum version of solc that supports this fork."""
-        return Version.parse("1.0.0")  # set a high version; currently unknown
-
     @classmethod
     def precompiles(cls, block_number: int = 0, timestamp: int = 0) -> List[Address]:
         """
@@ -1421,11 +1404,6 @@ def valid_opcodes(
             Opcodes.CLZ,
         ] + super(Prague, cls).valid_opcodes()
 
-    @classmethod
-    def solc_min_version(cls) -> Version:
-        """Return minimum version of solc that supports this fork."""
-        return Version.parse("1.0.0")  # set a high version; currently unknown
-
     @classmethod
     def precompiles(cls, block_number: int = 0, timestamp: int = 0) -> List[Address]:
         """
@@ -1514,8 +1492,3 @@ def is_deployed(cls) -> bool:
         development.
         """
         return False
-
-    @classmethod
-    def solc_min_version(cls) -> Version:
-        """Return minimum version of solc that supports this fork."""
-        return Version.parse("1.0.0")  # set a high version; currently unknown

src/ethereum_test_forks/helpers.py

@@ -77,30 +77,11 @@ def get_parent_fork(fork: Type[BaseFork]) -> Type[BaseFork]:
     return parent_fork
 
 
-def get_forks_with_solc_support(solc_version: Version) -> List[Type[BaseFork]]:
-    """Return list of all fork classes that are supported by solc."""
-    return [fork for fork in get_forks() if solc_version >= fork.solc_min_version()]
-
-
-def get_forks_without_solc_support(solc_version: Version) -> List[Type[BaseFork]]:
-    """Return list of all fork classes that aren't supported by solc."""
-    return [fork for fork in get_forks() if solc_version < fork.solc_min_version()]
-
-
-def get_closest_fork_with_solc_support(
-    fork: Type[BaseFork], solc_version: Version
-) -> Optional[Type[BaseFork]]:
-    """
-    Return closest fork, potentially the provided fork itself, that has
-    solc support.
-    """
+def get_closest_fork(fork: Type[BaseFork], solc_version: Version) -> Optional[Type[BaseFork]]:
+    """Return None if BaseFork is passed, otherwise return the fork itself."""
     if fork is BaseFork:
         return None
-    return (
-        fork
-        if solc_version >= fork.solc_min_version()
-        else get_closest_fork_with_solc_support(get_parent_fork(fork), solc_version)
-    )
+    return fork
 
 
 def get_transition_forks() -> Set[Type[BaseFork]]:

src/ethereum_test_forks/tests/test_forks.py

@@ -4,7 +4,6 @@
 
 import pytest
 from pydantic import BaseModel
-from semver import Version
 
 from ethereum_test_base_types import BlobSchedule
 
@@ -31,10 +30,8 @@
     Fork,
     forks_from,
     forks_from_until,
-    get_closest_fork_with_solc_support,
     get_deployed_forks,
     get_forks,
-    get_forks_with_solc_support,
     transition_fork_from_to,
     transition_fork_to,
 )
@@ -298,18 +295,6 @@ def test_tx_types():  # noqa: D103
     Cancun.tx_types() == list(range(4))  # noqa: B015
 
 
-def test_solc_versioning():  # noqa: D103
-    assert len(get_forks_with_solc_support(Version.parse("0.8.20"))) == 13
-    assert len(get_forks_with_solc_support(Version.parse("0.8.24"))) > 13
-
-
-def test_closest_fork_supported_by_solc():  # noqa: D103
-    assert get_closest_fork_with_solc_support(Paris, Version.parse("0.8.20")) == Paris
-    assert get_closest_fork_with_solc_support(Cancun, Version.parse("0.8.20")) == Shanghai
-    assert get_closest_fork_with_solc_support(Cancun, Version.parse("0.8.24")) == Cancun
-    assert get_closest_fork_with_solc_support(Prague, Version.parse("0.8.24")) == Cancun
-
-
 @pytest.mark.parametrize(
     "fork",
     [

src/ethereum_test_tools/tests/conftest.py

@@ -20,9 +20,9 @@
 from ethereum_test_types import Alloc, Environment, Transaction
 from ethereum_test_vm import Opcodes as Op
 from ethereum_test_vm import UndefinedOpcodes
+from pytest_plugins.solc.solc import SOLC_EXPECTED_MIN_VERSION
 
 from ..code import CalldataCase, Case, Conditional, Initcode, Switch
-from .conftest import SOLC_PADDING_VERSION
 
 
 @pytest.fixture(params=get_deployed_forks())
@@ -36,15 +36,15 @@ def expected_bytes(request: pytest.FixtureRequest, solc_version: Version, fork:
     """Return the expected bytes for the test."""
     expected_bytes = request.param
     if isinstance(expected_bytes, Template):
-        if solc_version < SOLC_PADDING_VERSION or fork <= Homestead:
+        if solc_version < SOLC_EXPECTED_MIN_VERSION or fork <= Homestead:
             solc_padding = ""
         else:
             solc_padding = "00"
         return bytes.fromhex(expected_bytes.substitute(solc_padding=solc_padding))
     if isinstance(expected_bytes, bytes):
         if fork >= Shanghai:
             expected_bytes = b"\x5f" + expected_bytes[2:]
-        if solc_version < SOLC_PADDING_VERSION or fork <= Homestead:
+        if solc_version < SOLC_EXPECTED_MIN_VERSION or fork <= Homestead:
             return expected_bytes
         else:
             return expected_bytes + b"\x00"

src/ethereum_test_tools/tests/test_code.py

@@ -17,11 +17,7 @@
 from _pytest.python import Module
 
 from ethereum_test_fixtures import BaseFixture, LabeledFixtureFormat
-from ethereum_test_forks import (
-    Fork,
-    get_closest_fork_with_solc_support,
-    get_forks_with_solc_support,
-)
+from ethereum_test_forks import Fork, get_closest_fork
 from ethereum_test_specs import BaseStaticTest, BaseTest
 from ethereum_test_tools.code.yul import Yul
 
@@ -356,9 +352,8 @@ class so that upon instantiation within the test case, it provides the
                 break
         else:
             pytest.fail(f"{request.node.name}: Fork {marker.args[0]} not found in forks list.")
-        assert solc_target_fork in get_forks_with_solc_support(request.config.solc_version)
     else:
-        solc_target_fork = get_closest_fork_with_solc_support(fork, request.config.solc_version)
+        solc_target_fork = get_closest_fork(fork, request.config.solc_version)
         assert solc_target_fork is not None, "No fork supports provided solc version."
         if solc_target_fork != fork and request.config.getoption("verbose") >= 1:
             warnings.warn(

src/pytest_plugins/filler/static_filler.py

@@ -7,7 +7,7 @@
 from pytest_metadata.plugin import metadata_key  # type: ignore
 from semver import Version
 
-from ethereum_test_forks import Frontier
+SOLC_EXPECTED_MIN_VERSION: Version = Version.parse("0.8.24")
 
 
 def pytest_addoption(parser: pytest.Parser):
@@ -53,7 +53,6 @@ def pytest_configure(config: pytest.Config):
             stderr=subprocess.STDOUT,
             text=True,
             check=True,
-            timeout=10,
         )
     except subprocess.CalledProcessError as e:
         pytest.exit(
@@ -86,7 +85,7 @@ def pytest_configure(config: pytest.Config):
 
     # Extract version number
     try:
-        # Format is typically "Version: 0.8.24+commit.e11b9ed9.Linux.g++"
+        # --version format is typically something like "0.8.24+commit.e11b9ed9.Linux.g++"
         version_str = version_line.split()[1].split("+")[0]
         solc_version_semver = Version.parse(version_str)
     except (IndexError, ValueError) as e:
@@ -104,10 +103,10 @@ def pytest_configure(config: pytest.Config):
         config.stash[metadata_key]["Tools"]["solc"] = str(solc_version_semver)
 
     # Check minimum version requirement
-    if solc_version_semver < Frontier.solc_min_version():
+    if solc_version_semver < SOLC_EXPECTED_MIN_VERSION:
         pytest.exit(
             f"Unsupported solc version: {solc_version_semver}. Minimum required version is "
-            f"{Frontier.solc_min_version()}",
+            f"{SOLC_EXPECTED_MIN_VERSION}",
             returncode=pytest.ExitCode.USAGE_ERROR,
         )
 

src/pytest_plugins/solc/solc.py

@@ -511,44 +511,3 @@ def test_selfdestruct_not_created_in_same_tx_with_revert(
     )
 
     state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.valid_from("Cancun")
-def test_coverage_script_fix(
-    state_test: StateTestFiller,
-    env: Environment,
-    pre: Alloc,
-):
-    """Fixes coverage script by making use of SWAP3 and JUMP."""
-    env = Environment()
-    sender = pre.fund_eoa()
-
-    account_code = (
-        Op.PUSH1(0x08)
-        + Op.PUSH0
-        + Op.PUSH0
-        + Op.PUSH0
-        + Op.SWAP3
-        + Op.JUMP  # jump to JUMPDEST when 0x08 is on top of stack
-        + Op.INVALID
-        + Op.JUMPDEST
-        + Op.STOP
-    )
-
-    account = pre.deploy_contract(account_code)
-
-    tx = Transaction(
-        ty=0x0,
-        nonce=0,
-        sender=sender,
-        to=account,
-        gas_limit=20_000_000,
-        gas_price=10,
-        value=0,
-        data="",
-    )
-
-    post = {}
-    post[account] = Account(storage={})
-
-    state_test(env=env, pre=pre, post=post, tx=tx)