Moving requests out of execution_payload into beacon_block.body

pysetup/spec_builders/electra.py

@@ -19,3 +19,41 @@ def hardcoded_ssz_dep_constants(cls) -> Dict[str, str]:
  'CURRENT_SYNC_COMMITTEE_GINDEX_ELECTRA': 'GeneralizedIndex(86)',
  'NEXT_SYNC_COMMITTEE_GINDEX_ELECTRA': 'GeneralizedIndex(87)',
  }
+
+
+ @classmethod
+ def execution_engine_cls(cls) -> str:
+ return """
+class NoopExecutionEngine(ExecutionEngine):
+
+ def notify_new_payload(self: ExecutionEngine,
+ execution_payload: ExecutionPayload,
+ execution_requests: ExecutionRequests,
+ parent_beacon_block_root: Root) -> bool:
+ return True
+
+ def notify_forkchoice_updated(self: ExecutionEngine,
+ head_block_hash: Hash32,
+ safe_block_hash: Hash32,
+ finalized_block_hash: Hash32,
+ payload_attributes: Optional[PayloadAttributes]) -> Optional[PayloadId]:
+ pass
+
+ def get_payload(self: ExecutionEngine, payload_id: PayloadId) -> GetPayloadResponse:
+ # pylint: disable=unused-argument
+ raise NotImplementedError("no default block production")
+
+ def is_valid_block_hash(self: ExecutionEngine,
+ execution_payload: ExecutionPayload,
+ parent_beacon_block_root: Root) -> bool:
+ return True
+
+ def is_valid_versioned_hashes(self: ExecutionEngine, new_payload_request: NewPayloadRequest) -> bool:
+ return True
+
+ def verify_and_notify_new_payload(self: ExecutionEngine,
+ new_payload_request: NewPayloadRequest) -> bool:
+ return True
+
+
+EXECUTION_ENGINE = NoopExecutionEngine()"""

specs/_features/eip7732/beacon-chain.md

@@ -156,6 +156,7 @@ class SignedExecutionPayloadHeader(Container):
 ```python
 class ExecutionPayloadEnvelope(Container):
  payload: ExecutionPayload
+ execution_requests: ExecutionRequests
  builder_index: ValidatorIndex
  beacon_block_root: Root
  blob_kzg_commitments: List[KZGCommitment, MAX_BLOB_COMMITMENTS_PER_BLOCK]
@@ -175,7 +176,7 @@ class SignedExecutionPayloadEnvelope(Container):
 
 #### `BeaconBlockBody`
 
-**Note:** The Beacon Block body is modified to contain a `Signed ExecutionPayloadHeader`. The containers `BeaconBlock` and `SignedBeaconBlock` are modified indirectly.
+**Note:** The Beacon Block body is modified to contain a `Signed ExecutionPayloadHeader`. The containers `BeaconBlock` and `SignedBeaconBlock` are modified indirectly. The field `execution_requests` is removed from the beacon block body and moved into the signed execution payload envelope. 
 
 ```python
 class BeaconBlockBody(Container):
@@ -191,8 +192,9 @@ class BeaconBlockBody(Container):
  sync_aggregate: SyncAggregate
  # Execution
  # Removed execution_payload [Removed in EIP-7732]
- # Removed blob_kzg_commitments [Removed in EIP-7732]
  bls_to_execution_changes: List[SignedBLSToExecutionChange, MAX_BLS_TO_EXECUTION_CHANGES]
+ # Removed blob_kzg_commitments [Removed in EIP-7732]
+ # Removed execution_requests [Removed in EIP-7732]
  # PBS
  signed_execution_payload_header: SignedExecutionPayloadHeader # [New in EIP-7732]
  payload_attestations: List[PayloadAttestation, MAX_PAYLOAD_ATTESTATIONS] # [New in EIP-7732]
@@ -650,11 +652,13 @@ def process_execution_payload(state: BeaconState,
  # Verify the execution payload is valid
  versioned_hashes = [kzg_commitment_to_versioned_hash(commitment) 
  for commitment in envelope.blob_kzg_commitments]
+ requests = envelope.execution_requests
  assert execution_engine.verify_and_notify_new_payload(
  NewPayloadRequest(
  execution_payload=payload,
  versioned_hashes=versioned_hashes,
  parent_beacon_block_root=state.latest_block_header.parent_root,
+ execution_requests=requests,
  )
  )
 
@@ -663,9 +667,9 @@ def process_execution_payload(state: BeaconState,
  for operation in operations:
  fn(state, operation)
 
- for_ops(payload.deposit_requests, process_deposit_request)
- for_ops(payload.withdrawal_requests, process_withdrawal_request)
- for_ops(payload.consolidation_requests, process_consolidation_request)
+ for_ops(requests.deposit_requests, process_deposit_request)
+ for_ops(requests.withdrawal_requests, process_withdrawal_request)
+ for_ops(requests.consolidation_requests, process_consolidation_request)
 
  # Cache the execution payload header and proposer
  state.latest_block_hash = payload.block_hash

specs/electra/beacon-chain.md

@@ -30,14 +30,13 @@
  - [`WithdrawalRequest`](#withdrawalrequest)
  - [`ConsolidationRequest`](#consolidationrequest)
  - [`PendingConsolidation`](#pendingconsolidation)
+ - [`ExecutionRequests`](#executionrequests)
  - [Modified Containers](#modified-containers)
  - [`AttesterSlashing`](#attesterslashing)
+ - [`BeaconBlockBody`](#beaconblockbody)
  - [Extended Containers](#extended-containers)
  - [`Attestation`](#attestation)
  - [`IndexedAttestation`](#indexedattestation)
- - [`BeaconBlockBody`](#beaconblockbody)
- - [`ExecutionPayload`](#executionpayload)
- - [`ExecutionPayloadHeader`](#executionpayloadheader)
  - [`BeaconState`](#beaconstate)
 - [Helper functions](#helper-functions)
  - [Predicates](#predicates)
@@ -74,6 +73,12 @@
  - [New `process_pending_balance_deposits`](#new-process_pending_balance_deposits)
  - [New `process_pending_consolidations`](#new-process_pending_consolidations)
  - [Modified `process_effective_balance_updates`](#modified-process_effective_balance_updates)
+ - [Execution engine](#execution-engine)
+ - [Request data](#request-data)
+ - [Modified `NewPayloadRequest`](#modified-newpayloadrequest)
+ - [Engine APIs](#engine-apis)
+ - [Modified `notify_new_payload`](#modified-notify_new_payload)
+ - [Modified `verify_and_notify_new_payload`](#modified-verify_and_notify_new_payload)
  - [Block processing](#block-processing)
  - [Withdrawals](#withdrawals)
  - [Modified `get_expected_withdrawals`](#modified-get_expected_withdrawals)
@@ -258,36 +263,27 @@ class PendingConsolidation(Container):
  target_index: ValidatorIndex
 ```
 
-### Modified Containers
+#### `ExecutionRequests`
 
-#### `AttesterSlashing`
+*Note*: This container holds requests from the execution layer that are received in [
+`ExecutionPayloadV4`](https://github.com/ethereum/execution-apis/blob/main/src/engine/prague.md#executionpayloadv4) via
+the Engine API. These requests are required for CL state transition (see `BeaconBlockBody`).
 
 ```python
-class AttesterSlashing(Container):
- attestation_1: IndexedAttestation # [Modified in Electra:EIP7549]
- attestation_2: IndexedAttestation # [Modified in Electra:EIP7549]
+class ExecutionRequests(Container):
+ deposits: List[DepositRequest, MAX_DEPOSIT_REQUESTS_PER_PAYLOAD] # [New in Electra:EIP6110]
+ withdrawals: List[WithdrawalRequest, MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD] # [New in Electra:EIP7002:EIP7251]
+ consolidations: List[ConsolidationRequest, MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD] # [New in Electra:EIP7251]
 ```
 
-### Extended Containers
-
-#### `Attestation`
-
-```python
-class Attestation(Container):
- aggregation_bits: Bitlist[MAX_VALIDATORS_PER_COMMITTEE * MAX_COMMITTEES_PER_SLOT] # [Modified in Electra:EIP7549]
- data: AttestationData
- signature: BLSSignature
- committee_bits: Bitvector[MAX_COMMITTEES_PER_SLOT] # [New in Electra:EIP7549]
-```
+### Modified Containers
 
-#### `IndexedAttestation`
+#### `AttesterSlashing`
 
 ```python
-class IndexedAttestation(Container):
- # [Modified in Electra:EIP7549]
- attesting_indices: List[ValidatorIndex, MAX_VALIDATORS_PER_COMMITTEE * MAX_COMMITTEES_PER_SLOT]
- data: AttestationData
- signature: BLSSignature
+class AttesterSlashing(Container):
+ attestation_1: IndexedAttestation # [Modified in Electra:EIP7549]
+ attestation_2: IndexedAttestation # [Modified in Electra:EIP7549]
 ```
 
 #### `BeaconBlockBody`
@@ -305,67 +301,32 @@ class BeaconBlockBody(Container):
  voluntary_exits: List[SignedVoluntaryExit, MAX_VOLUNTARY_EXITS]
  sync_aggregate: SyncAggregate
  # Execution
- execution_payload: ExecutionPayload # [Modified in Electra:EIP6110:EIP7002]
+ execution_payload: ExecutionPayload
  bls_to_execution_changes: List[SignedBLSToExecutionChange, MAX_BLS_TO_EXECUTION_CHANGES]
  blob_kzg_commitments: List[KZGCommitment, MAX_BLOB_COMMITMENTS_PER_BLOCK]
+ execution_requests: ExecutionRequests # [New in Electra]
 ```
 
-#### `ExecutionPayload`
+### Extended Containers
+
+#### `Attestation`
 
 ```python
-class ExecutionPayload(Container):
- # Execution block header fields
- parent_hash: Hash32
- fee_recipient: ExecutionAddress
- state_root: Bytes32
- receipts_root: Bytes32
- logs_bloom: ByteVector[BYTES_PER_LOGS_BLOOM]
- prev_randao: Bytes32
- block_number: uint64
- gas_limit: uint64
- gas_used: uint64
- timestamp: uint64
- extra_data: ByteList[MAX_EXTRA_DATA_BYTES]
- base_fee_per_gas: uint256
- # Extra payload fields
- block_hash: Hash32
- transactions: List[Transaction, MAX_TRANSACTIONS_PER_PAYLOAD]
- withdrawals: List[Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD]
- blob_gas_used: uint64
- excess_blob_gas: uint64
- deposit_requests: List[DepositRequest, MAX_DEPOSIT_REQUESTS_PER_PAYLOAD] # [New in Electra:EIP6110]
- # [New in Electra:EIP7002:EIP7251]
- withdrawal_requests: List[WithdrawalRequest, MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD]
- # [New in Electra:EIP7251]
- consolidation_requests: List[ConsolidationRequest, MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD]
+class Attestation(Container):
+ aggregation_bits: Bitlist[MAX_VALIDATORS_PER_COMMITTEE * MAX_COMMITTEES_PER_SLOT] # [Modified in Electra:EIP7549]
+ data: AttestationData
+ signature: BLSSignature
+ committee_bits: Bitvector[MAX_COMMITTEES_PER_SLOT] # [New in Electra:EIP7549]
 ```
 
-#### `ExecutionPayloadHeader`
+#### `IndexedAttestation`
 
 ```python
-class ExecutionPayloadHeader(Container):
- # Execution block header fields
- parent_hash: Hash32
- fee_recipient: ExecutionAddress
- state_root: Bytes32
- receipts_root: Bytes32
- logs_bloom: ByteVector[BYTES_PER_LOGS_BLOOM]
- prev_randao: Bytes32
- block_number: uint64
- gas_limit: uint64
- gas_used: uint64
- timestamp: uint64
- extra_data: ByteList[MAX_EXTRA_DATA_BYTES]
- base_fee_per_gas: uint256
- # Extra payload fields
- block_hash: Hash32
- transactions_root: Root
- withdrawals_root: Root
- blob_gas_used: uint64
- excess_blob_gas: uint64
- deposit_requests_root: Root # [New in Electra:EIP6110]
- withdrawal_requests_root: Root # [New in Electra:EIP7002:EIP7251]
- consolidation_requests_root: Root # [New in Electra:EIP7251]
+class IndexedAttestation(Container):
+ # [Modified in Electra:EIP7549]
+ attesting_indices: List[ValidatorIndex, MAX_VALIDATORS_PER_COMMITTEE * MAX_COMMITTEES_PER_SLOT]
+ data: AttestationData
+ signature: BLSSignature
 ```
 
 #### `BeaconState`
@@ -875,7 +836,7 @@ def process_pending_balance_deposits(state: BeaconState) -> None:
  if processed_amount + deposit.amount > available_for_processing:
  break
  # Deposit fits in the churn, process it. Increase balance and consume churn.
- else: 
+ else:
  increase_balance(state, deposit.index, deposit.amount)
  processed_amount += deposit.amount
  # Regardless of how the deposit was handled, we move on in the queue.
@@ -941,6 +902,70 @@ def process_effective_balance_updates(state: BeaconState) -> None:
  validator.effective_balance = min(balance - balance % EFFECTIVE_BALANCE_INCREMENT, EFFECTIVE_BALANCE_LIMIT)
 ```
 
+### Execution engine
+
+#### Request data
+
+##### Modified `NewPayloadRequest`
+
+```python
+@dataclass
+class NewPayloadRequest(object):
+ execution_payload: ExecutionPayload
+ versioned_hashes: Sequence[VersionedHash]
+ parent_beacon_block_root: Root
+ execution_requests: ExecutionRequests # [New in Electra]
+```
+
+#### Engine APIs
+
+##### Modified `notify_new_payload`
+
+*Note*: The function `notify_new_payload` is modified to include the additional `execution_requests` parameter in Electra.
+
+```python
+def notify_new_payload(self: ExecutionEngine,
+ execution_payload: ExecutionPayload,
+ execution_requests: ExecutionRequests,
+ parent_beacon_block_root: Root) -> bool:
+ """
+ Return ``True`` if and only if ``execution_payload`` and ``execution_requests`` 
+ are valid with respect to ``self.execution_state``.
+ """
+ ...
+```
+
+##### Modified `verify_and_notify_new_payload`
+
+*Note*: The function `verify_and_notify_new_payload` is modified to pass the additional parameter `execution_requests`
+when calling `notify_new_payload` in Electra.
+
+```python
+def verify_and_notify_new_payload(self: ExecutionEngine,
+ new_payload_request: NewPayloadRequest) -> bool:
+ """
+ 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
+
+ if not self.is_valid_block_hash(execution_payload, parent_beacon_block_root):
+ return False
+
+ if not self.is_valid_versioned_hashes(new_payload_request):
+ return False
+
+ # [Modified in Electra]
+ if not self.notify_new_payload(
+ execution_payload, 
+ execution_requests, 
+ parent_beacon_block_root):
+ return False
+
+ return True
+```
+
 ### Block processing
 
 ```python
@@ -1051,7 +1076,7 @@ def process_withdrawals(state: BeaconState, payload: ExecutionPayload) -> None:
 
 ##### Modified `process_execution_payload`
 
-*Note*: The function `process_execution_payload` is modified to use the new `ExecutionPayloadHeader` type.
+*Note*: The function `process_execution_payload` is modified to pass `execution_requests` into `execution_engine.verify_and_notify_new_payload` (via the updated `NewPayloadRequest`).
 
 ```python
 def process_execution_payload(state: BeaconState, body: BeaconBlockBody, execution_engine: ExecutionEngine) -> None:
@@ -1070,6 +1095,7 @@ 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,
  )
@@ -1093,9 +1119,6 @@ def process_execution_payload(state: BeaconState, body: BeaconBlockBody, executi
  withdrawals_root=hash_tree_root(payload.withdrawals),
  blob_gas_used=payload.blob_gas_used,
  excess_blob_gas=payload.excess_blob_gas,
- deposit_requests_root=hash_tree_root(payload.deposit_requests), # [New in Electra:EIP6110]
- withdrawal_requests_root=hash_tree_root(payload.withdrawal_requests), # [New in Electra:EIP7002:EIP7251]
- consolidation_requests_root=hash_tree_root(payload.consolidation_requests), # [New in Electra:EIP7251]
  )
 ```
 
@@ -1125,11 +1148,9 @@ def process_operations(state: BeaconState, body: BeaconBlockBody) -> None:
  for_ops(body.deposits, process_deposit) # [Modified in Electra:EIP7251]
  for_ops(body.voluntary_exits, process_voluntary_exit) # [Modified in Electra:EIP7251]
  for_ops(body.bls_to_execution_changes, process_bls_to_execution_change)
- for_ops(body.execution_payload.deposit_requests, process_deposit_request) # [New in Electra:EIP6110]
- # [New in Electra:EIP7002:EIP7251]
- for_ops(body.execution_payload.withdrawal_requests, process_withdrawal_request)
- # [New in Electra:EIP7251]
- for_ops(body.execution_payload.consolidation_requests, process_consolidation_request)
+ for_ops(body.execution_requests.deposits, process_deposit_request) # [New in Electra:EIP6110]
+ for_ops(body.execution_requests.withdrawals, process_withdrawal_request) # [New in Electra:EIP7002:EIP7251]
+ for_ops(body.execution_requests.consolidations, process_consolidation_request) # [New in Electra:EIP7251]
 ```
 
 ##### Attestations