Pass new args to is_valid_block_hash too

Author: jtraglia

pysetup/spec_builders/electra.py

@@ -47,7 +47,9 @@ def get_payload(self: ExecutionEngine, payload_id: PayloadId) -> GetPayloadRespo
 
     def is_valid_block_hash(self: ExecutionEngine,
                             execution_payload: ExecutionPayload,
-                            parent_beacon_block_root: Root) -> bool:
+                            parent_beacon_block_root,
+                            execution_requests_list: Sequence[bytes],
+                            target_blobs_per_block: uint64) -> bool:
         return True
 
     def is_valid_versioned_hashes(self: ExecutionEngine, new_payload_request: NewPayloadRequest) -> bool:

specs/electra/beacon-chain.md

@@ -984,6 +984,23 @@ class NewPayloadRequest(object):
 
 #### Engine APIs
 
+##### Modified `is_valid_block_hash`
+
+*Note*: The function `is_valid_block_hash` is modified to include the additional
+`execution_requests_list` and `target_blobs_per_block` parameters in Electra.
+
+```python
+def is_valid_block_hash(self: ExecutionEngine,
+                        execution_payload: ExecutionPayload,
+                        parent_beacon_block_root: Root,
+                        execution_requests_list: Sequence[bytes],
+                        target_blobs_per_block: uint64) -> bool:
+    """
+    Return ``True`` if and only if ``execution_payload.block_hash`` is computed correctly.
+    """
+    ...
+```
+
 ##### Modified `notify_new_payload`
 
 *Note*: The function `notify_new_payload` is modified to include the additional
@@ -1005,7 +1022,8 @@ def notify_new_payload(self: ExecutionEngine,
 ##### Modified `verify_and_notify_new_payload`
 
 *Note*: The function `verify_and_notify_new_payload` is modified to pass the additional parameters
-`execution_requests_list` and `target_blobs_per_block` when calling `notify_new_payload` in Electra.
+`execution_requests_list` and `target_blobs_per_block` when calling `is_valid_block_hash` and
+`notify_new_payload` in Electra.
 
 ```python
 def verify_and_notify_new_payload(self: ExecutionEngine,
@@ -1018,7 +1036,12 @@ def verify_and_notify_new_payload(self: ExecutionEngine,
     execution_requests_list = get_execution_requests_list(new_payload_request.execution_requests)  # [New in Electra]
     target_blobs_per_block = MAX_BLOBS_PER_BLOCK // 2  # [New in Electra:EIP7742]
 
-    if not self.is_valid_block_hash(execution_payload, parent_beacon_block_root):
+    # [Modified in Electra]
+    if not self.is_valid_block_hash(
+            execution_payload,
+            parent_beacon_block_root,
+            execution_requests_list,
+            target_blobs_per_block):
         return False
 
     if not self.is_valid_versioned_hashes(new_payload_request):