diff --git a/packages/testing/src/execution_testing/forks/forks/forks.py b/packages/testing/src/execution_testing/forks/forks/forks.py index 4e66d9bf95..7e650a821d 100644 --- a/packages/testing/src/execution_testing/forks/forks/forks.py +++ b/packages/testing/src/execution_testing/forks/forks/forks.py @@ -2211,14 +2211,6 @@ def block_rlp_size_limit( safety_margin = 2_097_152 return max_block_size - safety_margin - @classmethod - def is_deployed(cls) -> bool: - """ - Flag that the fork has not been deployed to mainnet; it is under active - development. - """ - return False - @classmethod def valid_opcodes( cls, *, block_number: int = 0, timestamp: int = 0 @@ -2405,6 +2397,11 @@ class BPO3(BPO2, bpo_fork=True): For testing purposes only. """ + @classmethod + def is_deployed(cls) -> bool: + """BPO3 is a pseudo fork for testing, not deployed to mainnet.""" + return False + @classmethod def blob_base_fee_update_fraction( cls, *, block_number: int = 0, timestamp: int = 0 diff --git a/packages/testing/src/execution_testing/forks/helpers.py b/packages/testing/src/execution_testing/forks/helpers.py index fe94bdb3cb..b86c2bc46f 100644 --- a/packages/testing/src/execution_testing/forks/helpers.py +++ b/packages/testing/src/execution_testing/forks/helpers.py @@ -76,11 +76,12 @@ def get_deployed_forks() -> List[Type[BaseFork]]: """ Return list of all the fork classes implemented by `execution_testing.forks` that have been deployed to mainnet, chronologically ordered by deployment. + BPO (Blob Parameter Only) forks are excluded as they are handled separately. """ return [ fork for fork in get_forks() - if fork.is_deployed() and not fork.ignore() + if fork.is_deployed() and not fork.ignore() and not fork.bpo_fork() ] diff --git a/packages/testing/src/execution_testing/forks/tests/test_forks.py b/packages/testing/src/execution_testing/forks/tests/test_forks.py index b5a91ef81f..f945fad0a6 100644 --- a/packages/testing/src/execution_testing/forks/tests/test_forks.py +++ b/packages/testing/src/execution_testing/forks/tests/test_forks.py @@ -8,6 +8,7 @@ from execution_testing.base_types import BlobSchedule from ..forks.forks import ( + Amsterdam, BPO1, BPO2, BPO3, @@ -49,9 +50,9 @@ from ..transition_base_fork import transition_fork FIRST_DEPLOYED = Frontier -LAST_DEPLOYED = Prague -LAST_DEVELOPMENT = Osaka -DEVELOPMENT_FORKS = [Osaka] +LAST_DEPLOYED = Osaka +LAST_DEVELOPMENT = Amsterdam +DEVELOPMENT_FORKS = [Amsterdam] def test_transition_forks() -> None: