feat(forks|consume): bpo framework requirements (#2050)

* feat(tests): add bpo transtion test with 7918 reserve trigger.

* chore: ruleset tweak.

* feat(forks): Add BPO2, BPO3

* feat(ruleset): Add BPO2, BPO3

* fix: ruleset copy-paste error

* fix(plugins): Update mapper

* feat(forks): Add `blob_reserve_price_active`, `blob_base_cost`

* chore(tests): cherry pick updates.

* feat(forks): Add BPO4 (Decreases blob parameters)

* fix(ruleset): Add BPO4

* fix(eels_resolutions): Add BPO4

* feat(forks): Add `bpo_fork` property to forks

* feat(plugins/fork): Add `valid_for_bpo_forks` validity marker

* feat(ci): develop feature fills until BPO3

* fix(forks): Fix marker, add unit test

* fix(forks): Fix marker again

* chore(ci): bump eels res, fill until bpo4.

* chore(docs): changelog.

* chore(ci): revert back to use BPO3 for release currently.

* chore(ci): bump eels in tox verify.

---------

Co-authored-by: Mario Vega <[email protected]>

Author: spencer-tb

.github/configs/eels_resolutions.json

@@ -33,8 +33,20 @@
         "path": "$GITHUB_WORKSPACE/execution-specs/"
     },
     "Osaka": {
-        "git_url": "https://github.com/spencer-tb/execution-specs.git",
-        "branch": "forks/osaka",
-        "commit": "0e97247a9022b8c04c01e22cae6ec95d1b590838"
+        "git_url": "https://github.com/marioevz/execution-specs.git",
+        "branch": "forks/bpo1",
+        "commit": "3387e5f4aedfe99becfdc39b444d6371e25e0924"
+    },
+    "BPO1": {
+        "same_as": "Osaka"
+    },
+    "BPO2": {
+        "same_as": "Osaka"
+    },
+    "BPO3": {
+        "same_as": "Osaka"
+    },
+    "BPO4": {
+        "same_as": "Osaka"
     }
 }

.github/configs/feature.yaml

@@ -5,7 +5,7 @@ stable:
 
 develop:
   evm-type: develop 
-  fill-params: --until=Osaka --fill-static-tests --ignore=tests/static/state_tests/stQuadraticComplexityTest
+  fill-params: --until=BPO3 --fill-static-tests --ignore=tests/static/state_tests/stQuadraticComplexityTest
 
 benchmark:
   evm-type: benchmark # Evmone only fully supports up to Prague

.github/workflows/tox_verify.yaml

@@ -123,8 +123,8 @@ jobs:
       - name: Checkout ethereum/execution-specs for local EELS implementation
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          repository: ethereum/execution-specs
-          ref: 5a49b2f39a909be6a8c84bb70611febdc2b2fd98
+          repository: marioevz/execution-specs
+          ref: 3387e5f4aedfe99becfdc39b444d6371e25e0924
           path: execution-specs
           fetch-depth: 1
       - name: Install uv ${{ vars.UV_VERSION }} and python ${{ matrix.python }}
@@ -166,8 +166,8 @@ jobs:
       - name: Checkout ethereum/execution-specs for local EELS implementation
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          repository: ethereum/execution-specs
-          ref: 5a49b2f39a909be6a8c84bb70611febdc2b2fd98
+          repository: marioevz/execution-specs
+          ref: 3387e5f4aedfe99becfdc39b444d6371e25e0924
           path: execution-specs
           fetch-depth: 1
       - name: Install uv ${{ vars.UV_VERSION }} and python ${{ matrix.python }}

docs/CHANGELOG.md

@@ -84,6 +84,7 @@ Users can select any of the artifacts depending on their testing needs for their
 - ✨ Static tests can now be filled in every format using `--generate-all-formats` ([#2006](https://github.com/ethereum/execution-spec-tests/pull/2006)).
 - 💥 Flag `--flat-output` has been removed due to having been unneeded for an extended period of time ([#2018](https://github.com/ethereum/execution-spec-tests/pull/2018)).
 - ✨ Add support for `BlockchainEngineSyncFixture` format for tests marked with `pytest.mark.verify_sync` to enable client synchronization testing via `consume sync` command ([#2007](https://github.com/ethereum/execution-spec-tests/pull/2007)).
+- ✨ Framework is updated to include BPO ([EIP-7892](https://eips.ethereum.org/EIPS/eip-7892)) fork markers to enable the filling of BPO tests ([#2050](https://github.com/ethereum/execution-spec-tests/pull/2050)).
 
 #### `consume`
 
@@ -95,6 +96,7 @@ Users can select any of the artifacts depending on their testing needs for their
 - 🔀 Add exponential retry logic to initial fcu within consume engine ([#1815](https://github.com/ethereum/execution-spec-tests/pull/1815)).
 - ✨ Add `consume sync` command to test client synchronization capabilities by having one client sync from another via Engine API and P2P networking ([#2007](https://github.com/ethereum/execution-spec-tests/pull/2007)).
 - 💥 Removed the `consume hive` command, this was a convenience command that ran `consume rlp` and `consume engine` in one pytest session; the individual commands should now be used instead ([#2008](https://github.com/ethereum/execution-spec-tests/pull/2008)).
+- ✨ Update the hive ruleset to include BPO ([EIP-7892](https://eips.ethereum.org/EIPS/eip-7892)) forks ([#2050](https://github.com/ethereum/execution-spec-tests/pull/2050)).
 
 #### `execute`
 

src/ethereum_test_forks/__init__.py

@@ -2,6 +2,10 @@
 
 from .base_fork import ForkAttribute
 from .forks.forks import (
+    BPO1,
+    BPO2,
+    BPO3,
+    BPO4,
     ArrowGlacier,
     Berlin,
     Byzantium,
@@ -22,7 +26,11 @@
 )
 from .forks.transition import (
     BerlinToLondonAt5,
+    BPO1ToBPO2AtTime15k,
+    BPO2ToBPO3AtTime15k,
+    BPO3ToBPO4AtTime15k,
     CancunToPragueAtTime15k,
+    OsakaToBPO1AtTime15k,
     ParisToShanghaiAtTime15k,
     PragueToOsakaAtTime15k,
     ShanghaiToCancunAtTime15k,
@@ -80,6 +88,14 @@
     "Prague",
     "PragueToOsakaAtTime15k",
     "Osaka",
+    "OsakaToBPO1AtTime15k",
+    "BPO1",
+    "BPO1ToBPO2AtTime15k",
+    "BPO2",
+    "BPO2ToBPO3AtTime15k",
+    "BPO3",
+    "BPO3ToBPO4AtTime15k",
+    "BPO4",
     "get_transition_forks",
     "forks_from",
     "forks_from_until",

src/ethereum_test_forks/base_fork.py

@@ -165,6 +165,7 @@ class BaseFork(ABC, metaclass=BaseForkMeta):
     _transition_tool_name: ClassVar[Optional[str]] = None
     _solc_name: ClassVar[Optional[str]] = None
     _ignore: ClassVar[bool] = False
+    _bpo_fork: ClassVar[bool] = False
 
     # make mypy happy
     BLOB_CONSTANTS: ClassVar[Dict[str, Union[int, Literal["big"]]]] = {}
@@ -180,11 +181,13 @@ def __init_subclass__(
         transition_tool_name: Optional[str] = None,
         solc_name: Optional[str] = None,
         ignore: bool = False,
+        bpo_fork: bool = False,
     ) -> None:
         """Initialize new fork with values that don't carry over to subclass forks."""
         cls._transition_tool_name = transition_tool_name
         cls._solc_name = solc_name
         cls._ignore = ignore
+        cls._bpo_fork = bpo_fork
 
     # Header information abstract methods
     @classmethod
@@ -336,6 +339,18 @@ def max_blobs_per_block(cls, block_number: int = 0, timestamp: int = 0) -> int:
         """Return the max blobs per block at a given fork."""
         pass
 
+    @classmethod
+    @abstractmethod
+    def blob_reserve_price_active(cls, block_number: int = 0, timestamp: int = 0) -> bool:
+        """Return whether the fork uses a reserve price mechanism for blobs or not."""
+        pass
+
+    @classmethod
+    @abstractmethod
+    def blob_base_cost(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """Return the base cost of a blob at a given fork."""
+        pass
+
     @classmethod
     @abstractmethod
     def full_blob_tx_wrapper_version(cls, block_number: int = 0, timestamp: int = 0) -> int | None:
@@ -601,6 +616,12 @@ def ignore(cls) -> bool:
         """Return whether the fork should be ignored during test generation."""
         return cls._ignore
 
+    @classmethod
+    @prefer_transition_to_method
+    def bpo_fork(cls) -> bool:
+        """Return whether the fork is a BPO fork."""
+        return cls._bpo_fork
+
     @classmethod
     def parent(cls) -> Type["BaseFork"] | None:
         """Return the parent fork."""

src/ethereum_test_forks/forks/forks.py

@@ -250,6 +250,16 @@ def max_blobs_per_block(cls, block_number: int = 0, timestamp: int = 0) -> int:
         """Return the max number of blobs per block at a given fork."""
         raise NotImplementedError(f"Max blobs per block is not supported in {cls.name()}")
 
+    @classmethod
+    def blob_reserve_price_active(cls, block_number: int = 0, timestamp: int = 0) -> bool:
+        """Return whether the fork uses a reserve price mechanism for blobs or not."""
+        raise NotImplementedError(f"Blob reserve price is not supported in {cls.name()}")
+
+    @classmethod
+    def blob_base_cost(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """Return the base cost of a blob at a given fork."""
+        raise NotImplementedError(f"Blob base cost is not supported in {cls.name()}")
+
     @classmethod
     def full_blob_tx_wrapper_version(cls, block_number: int = 0, timestamp: int = 0) -> int | None:
         """Return the version of the full blob transaction wrapper."""
@@ -1052,6 +1062,11 @@ def max_blobs_per_block(cls, block_number: int = 0, timestamp: int = 0) -> int:
         """Blobs are enabled starting from Cancun, with a static max of 6 blobs per block."""
         return 6
 
+    @classmethod
+    def blob_reserve_price_active(cls, block_number: int = 0, timestamp: int = 0) -> bool:
+        """Blob reserve price is not supported in Cancun."""
+        return False
+
     @classmethod
     def full_blob_tx_wrapper_version(cls, block_number: int = 0, timestamp: int = 0) -> int | None:
         """Pre-Osaka forks don't use tx wrapper versions for full blob transactions."""
@@ -1534,6 +1549,92 @@ def max_blobs_per_tx(cls, block_number: int = 0, timestamp: int = 0) -> int:
         """Blobs in Osaka, have a static max of 6 blobs per tx. Differs from the max per block."""
         return 6
 
+    @classmethod
+    def blob_reserve_price_active(cls, block_number: int = 0, timestamp: int = 0) -> bool:
+        """Blob reserve price is supported in Osaka."""
+        return True
+
+    @classmethod
+    def blob_base_cost(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """Return the base cost of a blob at a given fork."""
+        return 2**13  # EIP-7918 new parameter
+
+
+class BPO1(Osaka, bpo_fork=True):
+    """BPO1 fork - Blob Parameter Only fork 1."""
+
+    @classmethod
+    def blob_base_fee_update_fraction(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """Return the blob base fee update fraction for BPO1."""
+        return 8832827
+
+    @classmethod
+    def target_blobs_per_block(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """Blobs in BPO1 have a target of 9 blobs per block."""
+        return 9
+
+    @classmethod
+    def max_blobs_per_block(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """Blobs in BPO1 have a max of 14 blobs per block."""
+        return 14
+
+
+class BPO2(BPO1, bpo_fork=True):
+    """BPO2 fork - Blob Parameter Only fork 2."""
+
+    @classmethod
+    def blob_base_fee_update_fraction(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """Return the blob base fee update fraction for BPO2."""
+        return 13739630
+
+    @classmethod
+    def target_blobs_per_block(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """Blobs in BPO2 have a target of 14 blobs per block."""
+        return 14
+
+    @classmethod
+    def max_blobs_per_block(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """Blobs in BPO2 have a max of 21 blobs per block."""
+        return 21
+
+
+class BPO3(BPO2, bpo_fork=True):
+    """BPO3 fork - Blob Parameter Only fork 3."""
+
+    @classmethod
+    def blob_base_fee_update_fraction(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """Return the blob base fee update fraction for BPO3."""
+        return 20609697
+
+    @classmethod
+    def target_blobs_per_block(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """Blobs in BPO3 have a target of 21 blobs per block."""
+        return 21
+
+    @classmethod
+    def max_blobs_per_block(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """Blobs in BPO3 have a max of 32 blobs per block."""
+        return 32
+
+
+class BPO4(BPO3, bpo_fork=True):
+    """BPO4 fork - Blob Parameter Only fork 4."""
+
+    @classmethod
+    def blob_base_fee_update_fraction(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """Return the blob base fee update fraction for BPO4."""
+        return 13739630
+
+    @classmethod
+    def target_blobs_per_block(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """Blobs in BPO4 have a target of 14 blobs per block."""
+        return 14
+
+    @classmethod
+    def max_blobs_per_block(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """Blobs in BPO4 have a max of 21 blobs per block."""
+        return 21
+
 
 class EOFv1(Prague, solc_name="cancun"):
     """EOF fork."""

src/ethereum_test_forks/forks/transition.py

@@ -1,7 +1,7 @@
 """List of all transition fork definitions."""
 
 from ..transition_base_fork import transition_fork
-from .forks import Berlin, Cancun, London, Osaka, Paris, Prague, Shanghai
+from .forks import BPO1, BPO2, BPO3, BPO4, Berlin, Cancun, London, Osaka, Paris, Prague, Shanghai
 
 
 # Transition Forks
@@ -38,3 +38,31 @@ class PragueToOsakaAtTime15k(Prague):
     """Prague to Osaka transition at Timestamp 15k."""
 
     pass
+
+
+@transition_fork(to_fork=BPO1, at_timestamp=15_000)
+class OsakaToBPO1AtTime15k(Osaka):
+    """Osaka to BPO1 transition at Timestamp 15k."""
+
+    pass
+
+
+@transition_fork(to_fork=BPO2, at_timestamp=15_000)
+class BPO1ToBPO2AtTime15k(BPO1):
+    """BPO1 to BPO2 transition at Timestamp 15k."""
+
+    pass
+
+
+@transition_fork(to_fork=BPO3, at_timestamp=15_000)
+class BPO2ToBPO3AtTime15k(BPO2):
+    """BPO2 to BPO3 transition at Timestamp 15k."""
+
+    pass
+
+
+@transition_fork(to_fork=BPO4, at_timestamp=15_000)
+class BPO3ToBPO4AtTime15k(BPO3):
+    """BPO3 to BPO4 transition at Timestamp 15k."""
+
+    pass

src/ethereum_test_forks/tests/test_forks.py

@@ -8,6 +8,10 @@
 from ethereum_test_base_types import BlobSchedule
 
 from ..forks.forks import (
+    BPO1,
+    BPO2,
+    BPO3,
+    BPO4,
     Berlin,
     Cancun,
     Frontier,
@@ -21,7 +25,11 @@
 )
 from ..forks.transition import (
     BerlinToLondonAt5,
+    BPO1ToBPO2AtTime15k,
+    BPO2ToBPO3AtTime15k,
+    BPO3ToBPO4AtTime15k,
     CancunToPragueAtTime15k,
+    OsakaToBPO1AtTime15k,
     ParisToShanghaiAtTime15k,
     PragueToOsakaAtTime15k,
     ShanghaiToCancunAtTime15k,
@@ -472,3 +480,15 @@ def test_blob_schedules(fork: Fork, expected_schedule: Dict | None):
         assert fork.blob_schedule() is None
     else:
         assert fork.blob_schedule() == BlobSchedule(**expected_schedule)
+
+
+def test_bpo_fork():  # noqa: D103
+    assert Osaka.bpo_fork() is False
+    assert BPO1.bpo_fork() is True
+    assert BPO2.bpo_fork() is True
+    assert BPO3.bpo_fork() is True
+    assert BPO4.bpo_fork() is True
+    assert OsakaToBPO1AtTime15k.bpo_fork() is True
+    assert BPO1ToBPO2AtTime15k.bpo_fork() is True
+    assert BPO2ToBPO3AtTime15k.bpo_fork() is True
+    assert BPO3ToBPO4AtTime15k.bpo_fork() is True

src/ethereum_test_forks/transition_base_fork.py

@@ -82,7 +82,7 @@ def transition_method(
 
             return classmethod(transition_method)
 
-        for method_name in base_fork_abstract_methods():
+        for method_name in base_fork_abstract_methods() + ["bpo_fork"]:
             setattr(
                 NewTransitionClass,
                 method_name,