fix(types,tests): EIP-7685 fixes for devnet-5 (ethereum#990)

* fix(forks): Update EIP-7002, EIP-7251 contracts

* fix(types): Remove empty requests from list

* fix(tests): Remove empty requests from lists in all tests

* chore: tox black fix.

---------

Co-authored-by: spencer-tb <[email protected]>

Author: marioevz

prague/eip6110_deposits/conftest.py

@@ -75,12 +75,10 @@ def blocks(
             header_verify=Header(
                 requests_hash=Requests(
                     *included_requests,
-                    max_request_type=fork.max_request_type(block_number=1, timestamp=1),
                 ),
             ),
             requests=Requests(
                 *block_body_override_requests,
-                max_request_type=fork.max_request_type(block_number=1, timestamp=1),
             ).requests_list
             if block_body_override_requests is not None
             else None,

prague/eip7002_el_triggerable_withdrawals/conftest.py

@@ -95,16 +95,14 @@ def blocks(
         included_requests,
         fillvalue=[],
     ):
-        max_request_type = fork.max_request_type(
+        header_verify: Header | None = None
+        if fork.header_requests_required(
             block_number=len(blocks) + 1,
             timestamp=timestamp,
-        )
-        header_verify: Header | None = None
-        if max_request_type > -1:
+        ):
             header_verify = Header(
                 requests_hash=Requests(
                     *block_included_requests,
-                    max_request_type=max_request_type,
                 )
             )
         else:
@@ -120,14 +118,7 @@ def blocks(
 
     return blocks + [
         Block(
-            header_verify=Header(
-                requests_hash=Requests(
-                    max_request_type=fork.max_request_type(
-                        block_number=len(blocks) + 1,
-                        timestamp=timestamp,
-                    )
-                )
-            ),
+            header_verify=Header(requests_hash=Requests()),
             timestamp=timestamp,
         )
     ]  # Add an empty block at the end to verify that no more withdrawal requests are included

prague/eip7002_el_triggerable_withdrawals/test_withdrawal_requests.py

@@ -711,13 +711,11 @@ def test_withdrawal_requests_negative(
                 header_verify=Header(
                     requests_hash=Requests(
                         *included_requests,
-                        max_request_type=fork.max_request_type(block_number=1, timestamp=1),
                     ),
                 ),
                 requests=(
                     Requests(
                         *block_body_override_requests,
-                        max_request_type=fork.max_request_type(block_number=1, timestamp=1),
                     ).requests_list
                     if block_body_override_requests is not None
                     else None

prague/eip7251_consolidations/conftest.py

@@ -96,18 +96,12 @@ def blocks(
         included_requests,
         fillvalue=[],
     ):
-        max_request_type = fork.max_request_type(
+        header_verify: Header | None = None
+        if fork.header_requests_required(
             block_number=len(blocks) + 1,
             timestamp=timestamp,
-        )
-        header_verify: Header | None = None
-        if max_request_type > -1:
-            header_verify = Header(
-                requests_hash=Requests(
-                    *block_included_requests,
-                    max_request_type=max_request_type,
-                )
-            )
+        ):
+            header_verify = Header(requests_hash=Requests(*block_included_requests))
         else:
             assert not block_included_requests
         blocks.append(
@@ -121,14 +115,7 @@ def blocks(
 
     return blocks + [
         Block(
-            header_verify=Header(
-                requests_hash=Requests(
-                    max_request_type=fork.max_request_type(
-                        block_number=len(blocks) + 1,
-                        timestamp=timestamp,
-                    )
-                )
-            ),
+            header_verify=Header(requests_hash=Requests()),
             timestamp=timestamp,
         )
     ]  # Add an empty block at the end to verify that no more consolidation requests are included

prague/eip7251_consolidations/test_consolidations.py

@@ -760,16 +760,10 @@ def test_consolidation_requests_negative(
             Block(
                 txs=sum((r.transactions() for r in requests), []),
                 header_verify=Header(
-                    requests_hash=Requests(
-                        *included_requests,
-                        max_request_type=fork.max_request_type(block_number=1, timestamp=1),
-                    ),
+                    requests_hash=Requests(*included_requests),
                 ),
                 requests=(
-                    Requests(
-                        *block_body_override_requests,
-                        max_request_type=fork.max_request_type(block_number=1, timestamp=1),
-                    ).requests_list
+                    Requests(*block_body_override_requests).requests_list
                     if block_body_override_requests is not None
                     else None
                 ),

prague/eip7685_general_purpose_el_requests/conftest.py

@@ -80,10 +80,7 @@ def blocks(
         elif isinstance(r, ConsolidationRequestInteractionBase):
             valid_requests_list += r.valid_requests(consolidation_request_fee)
 
-    valid_requests = Requests(
-        *valid_requests_list,
-        max_request_type=fork.max_request_type(block_number=1, timestamp=1),
-    )
+    valid_requests = Requests(*valid_requests_list)
 
     if block_body_override_requests is None and block_body_extra_requests is not None:
         block_body_override_requests = valid_requests.requests_list + block_body_extra_requests
@@ -96,9 +93,7 @@ def blocks(
     return [
         Block(
             txs=sum((r.transactions() for r in requests), []),
-            header_verify=Header(
-                requests_hash=valid_requests,
-            ),
+            header_verify=Header(requests_hash=valid_requests),
             requests=block_body_override_requests,
             exception=exception,
             rlp_modifier=rlp_modifier,

prague/eip7685_general_purpose_el_requests/test_deposits_withdrawals_consolidations.py

@@ -314,7 +314,6 @@ def test_valid_deposit_withdrawal_consolidation_request_from_same_tx(
                             request.with_source_address(contract_address)
                             for request in sorted(requests, key=lambda r: r.type)
                         ],
-                        max_request_type=fork.max_request_type(block_number=1, timestamp=1),
                     )
                 ),
             )

prague/eip7702_set_code_tx/test_set_code_txs.py

@@ -2884,9 +2884,7 @@ def test_set_code_to_system_contract(
         blocks=[
             Block(
                 txs=txs,
-                requests_hash=Requests(
-                    max_request_type=fork.max_request_type(block_number=1)
-                ),  # Verify nothing slipped into the requests trie
+                requests_hash=Requests(),  # Verify nothing slipped into the requests trie
             )
         ],
         post={