@@ -103,7 +103,9 @@ def __new__(cls, value: str) -> "HeaderForkRequirement":
103103
104104 def required (self , fork : Fork , block_number : int , timestamp : int ) -> bool :
105105 """Check if the field is required for the given fork."""
106- return getattr (fork , f"header_{ self } _required" )(block_number , timestamp )
106+ return getattr (fork , f"header_{ self } _required" )(
107+ block_number = block_number , timestamp = timestamp
108+ )
107109
108110 @classmethod
109111 def get_from_annotation (cls , field_hints : Any ) -> "HeaderForkRequirement | None" :
@@ -238,9 +240,13 @@ def genesis(cls, fork: Fork, env: Environment, state_root: Hash) -> "FixtureHead
238240 environment_values ["extra_data" ] = env .extra_data
239241 extras = {
240242 "state_root" : state_root ,
241- "requests_hash" : Requests () if fork .header_requests_required (0 , 0 ) else None ,
243+ "requests_hash" : Requests ()
244+ if fork .header_requests_required (block_number = 0 , timestamp = 0 )
245+ else None ,
242246 "block_access_list_hash" : (
243- BlockAccessList ().rlp_hash if fork .header_bal_hash_required (0 , 0 ) else None
247+ BlockAccessList ().rlp_hash
248+ if fork .header_bal_hash_required (block_number = 0 , timestamp = 0 )
249+ else None
244250 ),
245251 "fork" : fork ,
246252 }
@@ -356,14 +362,18 @@ def from_fixture_header(
356362 ** kwargs ,
357363 ) -> "FixtureEngineNewPayload" :
358364 """Create `FixtureEngineNewPayload` from a `FixtureHeader`."""
359- new_payload_version = fork .engine_new_payload_version (header .number , header .timestamp )
365+ new_payload_version = fork .engine_new_payload_version (
366+ block_number = header .number , timestamp = header .timestamp
367+ )
360368 forkchoice_updated_version = fork .engine_forkchoice_updated_version (
361- header .number , header .timestamp
369+ block_number = header .number , timestamp = header .timestamp
362370 )
363371
364372 assert new_payload_version is not None , "Invalid header for engine_newPayload"
365373
366- if fork .engine_execution_payload_block_access_list (header .number , header .timestamp ):
374+ if fork .engine_execution_payload_block_access_list (
375+ block_number = header .number , timestamp = header .timestamp
376+ ):
367377 if block_access_list is None :
368378 raise ValueError (
369379 f"`block_access_list` is required in engine `ExecutionPayload` for >={ fork } ."
@@ -377,19 +387,25 @@ def from_fixture_header(
377387 )
378388
379389 params : List [Any ] = [execution_payload ]
380- if fork .engine_new_payload_blob_hashes (header .number , header .timestamp ):
390+ if fork .engine_new_payload_blob_hashes (
391+ block_number = header .number , timestamp = header .timestamp
392+ ):
381393 blob_hashes = Transaction .list_blob_versioned_hashes (transactions )
382394 if blob_hashes is None :
383395 raise ValueError (f"Blob hashes are required for ${ fork } ." )
384396 params .append (blob_hashes )
385397
386- if fork .engine_new_payload_beacon_root (header .number , header .timestamp ):
398+ if fork .engine_new_payload_beacon_root (
399+ block_number = header .number , timestamp = header .timestamp
400+ ):
387401 parent_beacon_block_root = header .parent_beacon_block_root
388402 if parent_beacon_block_root is None :
389403 raise ValueError (f"Parent beacon block root is required for ${ fork } ." )
390404 params .append (parent_beacon_block_root )
391405
392- if fork .engine_new_payload_requests (header .number , header .timestamp ):
406+ if fork .engine_new_payload_requests (
407+ block_number = header .number , timestamp = header .timestamp
408+ ):
393409 if requests is None :
394410 raise ValueError (f"Requests are required for ${ fork } ." )
395411 params .append (requests )
0 commit comments