feat(forks,specs,tests): EIP-7691, EIP-4844: Refactor to use dynamic parameters (#1023)

* fix(fixtures,forks): Disable EIP-7742 on Prague

* fix(tests): EIP-4844: Rollback EIP-7742 changes

* feat(forks): New methods for EIP-7691+EIP-7762

* fixup(forks): Return instead of error raise in `blob_gas_per_blob`

* fix(specs): Replace EIP-4844 constants with `Fork` method calls

* fixup(forks): Remove EIP-7762 change

* fix(tests): EIP-4844, EIP-7691: Refactor EIP-4844 tests to use dynamic blob parameters

* new(tests): EIP-4844: Add blob count combinations to some tests

* docs: changelog

* fix(docs): Spelling

* fix(forks): tox

* fix(tests): tox

* refactor(tests): parametrize_by_fork rename

Author: marioevz

docs/CHANGELOG.md

@@ -24,6 +24,7 @@ Test fixtures for use by clients are available for each release on the [Github r
 - 🔀 Update EIP-7251 according to [spec updates](https://github.com/ethereum/EIPs/pull/9127) ([#1024](https://github.com/ethereum/execution-spec-tests/pull/1024)).
 - 🔀 Update EIP-7002 according to [spec updates](https://github.com/ethereum/EIPs/pull/9119) ([#1024](https://github.com/ethereum/execution-spec-tests/pull/1024)).
 - 🔀 Update EIP-2935 according to [spec updates](https://github.com/ethereum/EIPs/pull/9144) ([#1046](https://github.com/ethereum/execution-spec-tests/pull/1046))
+- ✨ [EIP-7691](https://eips.ethereum.org/EIPS/eip-7691) Blob throughput increase tests by parametrization of existing EIP-4844 tests ([#1023](https://github.com/ethereum/execution-spec-tests/pull/1023))
 
 ### 🛠️ Framework
 
@@ -71,6 +72,7 @@ Test fixtures for use by clients are available for each release on the [Github r
 - ✨ Slow tests now have greater timeout when making a request to the T8N server ([#1037](https://github.com/ethereum/execution-spec-tests/pull/1037)).
 - ✨ Introduce [`pytest.mark.parametrize_by_fork`](https://ethereum.github.io/execution-spec-tests/main/writing_tests/test_markers/#pytestmarkfork_parametrize) helper marker ([#1019](https://github.com/ethereum/execution-spec-tests/pull/1019), [#1057](https://github.com/ethereum/execution-spec-tests/pull/1057)).
 - 🐞 fix(consume): allow absolute paths with `--evm-bin` ([#1052](https://github.com/ethereum/execution-spec-tests/pull/1052)).
+- ✨ Disable EIP-7742 framework changes for Prague ([#1023](https://github.com/ethereum/execution-spec-tests/pull/1023)).
 
 ### 🔧 EVM Tools
 

src/ethereum_test_fixtures/blockchain.py

@@ -229,7 +229,6 @@ def from_fixture_header(
     List[Hash],
     Hash,
     List[Bytes],
-    HexNumber,
 ]
 
 # Important: We check EngineNewPayloadV3Parameters first as it has more fields, and pydantic

src/ethereum_test_fixtures/tests/test_blockchain.py

@@ -14,7 +14,6 @@
     Bytes,
     Hash,
     HeaderNonce,
-    HexNumber,
     TestPrivateKey,
     ZeroPaddedHexNumber,
     to_json,
@@ -667,7 +666,6 @@
                     excess_blob_gas=18,
                     parent_beacon_block_root=19,
                     requests_hash=20,
-                    target_blobs_per_block=21,
                 ),
                 transactions=[
                     Transaction(
@@ -729,7 +727,7 @@
                         "blobGasUsed": hex(17),
                         "excessBlobGas": hex(18),
                         "blockHash": (
-                            "0x9f6459fb2eca2b75ee861e97d679ba91457bb446c8484a7ad76d1675a7f78fde"
+                            "0x93bd662d8a80a1f54bffc6d140b83d6cda233209998809f9540be51178b4d0b6"
                         ),
                         "transactions": [
                             Transaction(
@@ -787,9 +785,8 @@
                             ),
                         ).requests_list
                     ],
-                    HexNumber(21).hex(),
                 ],
-                "forkchoiceUpdatedVersion": "4",
+                "forkchoiceUpdatedVersion": "3",
                 "newPayloadVersion": "4",
                 "validationError": "BlockException.INCORRECT_BLOCK_FORMAT"
                 "|TransactionException.INTRINSIC_GAS_TOO_LOW",
@@ -824,7 +821,6 @@
                     excess_blob_gas=18,
                     parent_beacon_block_root=19,
                     requests_hash=20,
-                    target_blobs_per_block=21,
                 ),
                 transactions=[
                     Transaction(
@@ -885,7 +881,7 @@
                         "blobGasUsed": hex(17),
                         "excessBlobGas": hex(18),
                         "blockHash": (
-                            "0x9f6459fb2eca2b75ee861e97d679ba91457bb446c8484a7ad76d1675a7f78fde"
+                            "0x93bd662d8a80a1f54bffc6d140b83d6cda233209998809f9540be51178b4d0b6"
                         ),
                         "transactions": [
                             Transaction(
@@ -943,10 +939,9 @@
                             ),
                         ).requests_list
                     ],
-                    HexNumber(21).hex(),
                 ],
                 "newPayloadVersion": "4",
-                "forkchoiceUpdatedVersion": "4",
+                "forkchoiceUpdatedVersion": "3",
                 "validationError": "BlockException.INCORRECT_BLOCK_FORMAT"
                 "|TransactionException.INTRINSIC_GAS_TOO_LOW",
             },
@@ -1224,7 +1219,6 @@ def test_json_deserialization(
                         target_pubkey=BLSPublicKey(2),
                     ),
                 ).requests_list,
-                HexNumber(9),
             ),
             [
                 {
@@ -1290,7 +1284,6 @@ def test_json_deserialization(
                         ),
                     ).requests_list
                 ],
-                HexNumber(9).hex(),
             ],
             id="fixture_engine_new_payload_parameters_v4",
         ),

src/ethereum_test_forks/base_fork.py

@@ -22,15 +22,15 @@ def __call__(self, block_number: int = 0, timestamp: int = 0) -> Any:
 
 
 class MemoryExpansionGasCalculator(Protocol):
-    """A protocol to calculate the gas cost of memory expansion for a given fork."""
+    """A protocol to calculate the gas cost of memory expansion at a given fork."""
 
     def __call__(self, *, new_bytes: int, previous_bytes: int = 0) -> int:
         """Return gas cost of expanding the memory by the given length."""
         pass
 
 
 class CalldataGasCalculator(Protocol):
-    """A protocol to calculate the transaction gas cost of calldata for a given fork."""
+    """A protocol to calculate the transaction gas cost of calldata at a given fork."""
 
     def __call__(self, *, data: BytesConvertible, floor: bool = False) -> int:
         """Return the transaction gas cost of calldata given its contents."""
@@ -46,7 +46,7 @@ def __call__(self, *, data: BytesConvertible) -> int:
 
 
 class TransactionIntrinsicCostCalculator(Protocol):
-    """A protocol to calculate the intrinsic gas cost of a transaction for a given fork."""
+    """A protocol to calculate the intrinsic gas cost of a transaction at a given fork."""
 
     def __call__(
         self,
@@ -78,6 +78,29 @@ def __call__(
         pass
 
 
+class BlobGasPriceCalculator(Protocol):
+    """A protocol to calculate the blob gas price given the excess blob gas at a given fork."""
+
+    def __call__(self, *, excess_blob_gas: int) -> int:
+        """Return the blob gas price given the excess blob gas."""
+        pass
+
+
+class ExcessBlobGasCalculator(Protocol):
+    """A protocol to calculate the excess blob gas for a block at a given fork."""
+
+    def __call__(
+        self,
+        *,
+        parent_excess_blob_gas: int | None = None,
+        parent_excess_blobs: int | None = None,
+        parent_blob_gas_used: int | None = None,
+        parent_blob_count: int | None = None,
+    ) -> int:
+        """Return the excess blob gas given the parent's excess blob gas and blob gas used."""
+        pass
+
+
 class BaseForkMeta(ABCMeta):
     """Metaclass for BaseFork."""
 
@@ -171,16 +194,24 @@ def header_blob_gas_used_required(cls, block_number: int = 0, timestamp: int = 0
 
     @classmethod
     @abstractmethod
-    def header_beacon_root_required(cls, block_number: int, timestamp: int) -> bool:
+    def header_beacon_root_required(cls, block_number: int = 0, timestamp: int = 0) -> bool:
         """Return true if the header must contain parent beacon block root."""
         pass
 
     @classmethod
     @abstractmethod
-    def header_requests_required(cls, block_number: int, timestamp: int) -> bool:
+    def header_requests_required(cls, block_number: int = 0, timestamp: int = 0) -> bool:
         """Return true if the header must contain beacon chain requests."""
         pass
 
+    @classmethod
+    @abstractmethod
+    def header_target_blobs_per_block_required(
+        cls, block_number: int = 0, timestamp: int = 0
+    ) -> bool:
+        """Return true if the header must contain target blobs per block."""
+        pass
+
     # Gas related abstract methods
 
     @classmethod
@@ -226,26 +257,48 @@ def transaction_intrinsic_cost_calculator(
 
     @classmethod
     @abstractmethod
-    def header_target_blobs_per_block_required(cls, block_number: int, timestamp: int) -> bool:
-        """Return true if the header must contain target blobs per block."""
+    def blob_gas_price_calculator(
+        cls, block_number: int = 0, timestamp: int = 0
+    ) -> BlobGasPriceCalculator:
+        """Return a callable that calculates the blob gas price at a given fork."""
+        pass
+
+    @classmethod
+    @abstractmethod
+    def excess_blob_gas_calculator(
+        cls, block_number: int = 0, timestamp: int = 0
+    ) -> ExcessBlobGasCalculator:
+        """Return a callable that calculates the excess blob gas for a block at a given fork."""
+        pass
+
+    @classmethod
+    @abstractmethod
+    def min_base_fee_per_blob_gas(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """Return the minimum base fee per blob gas at a given fork."""
+        pass
+
+    @classmethod
+    @abstractmethod
+    def blob_gas_per_blob(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """Return the amount of blob gas used per blob at a given fork."""
         pass
 
     @classmethod
     @abstractmethod
-    def blob_gas_per_blob(cls, block_number: int, timestamp: int) -> int:
-        """Return amount of blob gas used per blob for a given fork."""
+    def blob_base_fee_update_fraction(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """Return the blob base fee update fraction at a given fork."""
         pass
 
     @classmethod
     @abstractmethod
-    def target_blobs_per_block(cls, block_number: int, timestamp: int) -> int:
-        """Return target blobs per block for a given fork."""
+    def target_blobs_per_block(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """Return the target blobs per block at a given fork."""
         pass
 
     @classmethod
     @abstractmethod
-    def max_blobs_per_block(cls, block_number: int, timestamp: int) -> int:
-        """Return max blobs per block for a given fork."""
+    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