Merge pull request #3967 from jtraglia/move-execution-requests-to-end

Move `execution_requests` after `parent_beacon_block_root`
This commit is contained in:
Justin Traglia 2024-10-08 12:59:15 -05:00 committed by GitHub
commit 6e194dea4a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 9 deletions

View File

@ -28,8 +28,8 @@ class NoopExecutionEngine(ExecutionEngine):
def notify_new_payload(self: ExecutionEngine,
execution_payload: ExecutionPayload,
execution_requests: ExecutionRequests,
parent_beacon_block_root: Root) -> bool:
parent_beacon_block_root: Root,
execution_requests: ExecutionRequests) -> bool:
return True
def notify_forkchoice_updated(self: ExecutionEngine,

View File

@ -990,8 +990,8 @@ class NewPayloadRequest(object):
```python
def notify_new_payload(self: ExecutionEngine,
execution_payload: ExecutionPayload,
execution_requests: ExecutionRequests,
parent_beacon_block_root: Root) -> bool:
parent_beacon_block_root: Root,
execution_requests: ExecutionRequests) -> bool:
"""
Return ``True`` if and only if ``execution_payload`` and ``execution_requests``
are valid with respect to ``self.execution_state``.
@ -1011,8 +1011,8 @@ def verify_and_notify_new_payload(self: ExecutionEngine,
Return ``True`` if and only if ``new_payload_request`` is valid with respect to ``self.execution_state``.
"""
execution_payload = new_payload_request.execution_payload
execution_requests = new_payload_request.execution_requests # [New in Electra]
parent_beacon_block_root = new_payload_request.parent_beacon_block_root
execution_requests = new_payload_request.execution_requests # [New in Electra]
if not self.is_valid_block_hash(execution_payload, parent_beacon_block_root):
return False
@ -1022,9 +1022,8 @@ def verify_and_notify_new_payload(self: ExecutionEngine,
# [Modified in Electra]
if not self.notify_new_payload(
execution_payload,
execution_requests,
parent_beacon_block_root):
parent_beacon_block_root,
execution_requests):
return False
return True
@ -1160,9 +1159,9 @@ def process_execution_payload(state: BeaconState, body: BeaconBlockBody, executi
assert execution_engine.verify_and_notify_new_payload(
NewPayloadRequest(
execution_payload=payload,
execution_requests=body.execution_requests, # [New in Electra]
versioned_hashes=versioned_hashes,
parent_beacon_block_root=state.latest_block_header.parent_root,
execution_requests=body.execution_requests, # [New in Electra]
)
)
# Cache execution payload header