Merge branch 'master' into feat/eip8025-optional-engines-v3

Author: frisitano

specs/gloas/beacon-chain.md

@@ -289,6 +289,7 @@ class ExecutionPayloadEnvelope(Container):
     execution_requests: ExecutionRequests
     builder_index: BuilderIndex
     beacon_block_root: Root
+    parent_beacon_block_root: Root
 ```
 
 #### `SignedExecutionPayloadEnvelope`

specs/gloas/builder.md

@@ -244,6 +244,7 @@ alias `bid` to be the committed `ExecutionPayloadBid` in
 3. Set `envelope.builder_index` to be the index of the builder performing these
    steps. This field **MUST** be `bid.builder_index`.
 4. Set `envelope.beacon_block_root` to be `hash_tree_root(block)`.
+5. Set `envelope.parent_beacon_block_root` to be `block.parent_root`.
 
 After preparing the `envelope` the builder signs it using:
 

specs/gloas/fork-choice.md

@@ -788,6 +788,7 @@ def verify_execution_payload_envelope(
     header = copy(state.latest_block_header)
     header.state_root = hash_tree_root(state)
     assert envelope.beacon_block_root == hash_tree_root(header)
+    assert envelope.parent_beacon_block_root == state.latest_block_header.parent_root
 
     # Verify consistency with the committed bid
     bid = state.latest_execution_payload_bid
@@ -809,7 +810,7 @@ def verify_execution_payload_envelope(
                 kzg_commitment_to_versioned_hash(commitment)
                 for commitment in bid.blob_kzg_commitments
             ],
-            parent_beacon_block_root=state.latest_block_header.parent_root,
+            parent_beacon_block_root=envelope.parent_beacon_block_root,
             execution_requests=envelope.execution_requests,
         )
     )

tests/core/pyspec/eth_consensus_specs/test/gloas/fork_choice/test_on_execution_payload_envelope.py

@@ -56,10 +56,13 @@ def _build_invalid_envelope(spec, state, block_root, signed_block, **overrides):
             setattr(payload, key, overrides.pop(key))
 
     envelope = spec.ExecutionPayloadEnvelope(
-        beacon_block_root=overrides.pop("beacon_block_root", block_root),
         payload=payload,
         execution_requests=overrides.pop("execution_requests", spec.ExecutionRequests()),
         builder_index=overrides.pop("builder_index", builder_index),
+        beacon_block_root=overrides.pop("beacon_block_root", block_root),
+        parent_beacon_block_root=overrides.pop(
+            "parent_beacon_block_root", state.latest_block_header.parent_root
+        ),
     )
 
     if overrides.pop("valid_signature", True):
@@ -191,6 +194,33 @@ def test_on_execution_payload_envelope__wrong_beacon_block_root(spec, state):
     yield "steps", test_steps
 
 
+@with_gloas_and_later
+@spec_state_test
+def test_on_execution_payload_envelope__wrong_parent_beacon_block_root(spec, state):
+    test_steps = []
+    store, anchor_block = get_genesis_forkchoice_store_and_block(spec, state)
+    yield "anchor_state", state
+    yield "anchor_block", anchor_block
+
+    current_time = state.slot * (spec.config.SLOT_DURATION_MS // 1000) + store.genesis_time
+    on_tick_and_append_step(spec, store, current_time, test_steps)
+
+    signed_block, block_root = yield from _add_block_and_get_root(spec, state, store, test_steps)
+
+    envelope = _build_invalid_envelope(
+        spec,
+        state,
+        block_root,
+        signed_block,
+        parent_beacon_block_root=spec.Root(b"\x42" * 32),
+    )
+    yield from add_execution_payload(spec, store, envelope, test_steps, valid=False)
+
+    assert block_root not in store.payloads
+
+    yield "steps", test_steps
+
+
 @with_gloas_and_later
 @spec_state_test
 def test_on_execution_payload_envelope__wrong_slot(spec, state):

tests/core/pyspec/eth_consensus_specs/test/gloas/sanity/test_blocks.py

@@ -101,6 +101,7 @@ def _attempt_payload_with_withdrawals(spec, state, withdrawals):
         execution_requests=spec.ExecutionRequests(),
         builder_index=committed_bid.builder_index,
         beacon_block_root=header.hash_tree_root(),
+        parent_beacon_block_root=test_state.latest_block_header.parent_root,
     )
 
     if envelope.builder_index == spec.BUILDER_INDEX_SELF_BUILD:

tests/core/pyspec/eth_consensus_specs/test/helpers/execution_payload.py

@@ -466,10 +466,11 @@ def build_signed_execution_payload_envelope(
 
     # Create the execution payload envelope message
     envelope_message = spec.ExecutionPayloadEnvelope(
-        beacon_block_root=block_root,
         payload=payload,
         execution_requests=execution_requests,
         builder_index=builder_index,
+        beacon_block_root=block_root,
+        parent_beacon_block_root=signed_block.message.parent_root,
     )
 
     # Sign the envelope: self-builds use proposer key, external builds use builder key

tests/generators/compliance_runners/fork_choice/instantiators/block_tree.py

@@ -565,7 +565,9 @@ def _generate_block_tree(
     block_index = 1
     block_tree_tips = set([0])
     in_block_attester_slashings = []
-    attester_slashings_count = 0
+    # Tracks every validator selected for a generated attester slashing in this
+    # scenario, so later selections cannot target the same validator again.
+    validators_to_be_slashed = set()
     out_of_block_attestation_messages = []
     out_of_block_pa_messages = []
     out_of_block_attester_slashing_messages = []
@@ -736,10 +738,18 @@ def split_list(lst, n):
                     )
 
         # Create attester slashing
-        if with_attester_slashings and attester_slashings_count < MAX_ATTESTER_SLASHINGS:
+        if with_attester_slashings and len(validators_to_be_slashed) < MAX_ATTESTER_SLASHINGS:
             if rnd.randint(0, 99) < ATTESTER_SLASHINGS_RATE:
                 state = post_states[attesting_tips[0]]
-                indices = [rnd.randint(0, len(state.validators) - 1)]
+
+                assert len(validators_to_be_slashed) < len(state.validators)
+                while True:
+                    validator_to_slash = rnd.randint(0, len(state.validators) - 1)
+                    # avoid slashing a validator who might be slashed already
+                    if validator_to_slash not in validators_to_be_slashed:
+                        break
+
+                indices = [validator_to_slash]
                 attester_slashing = get_valid_attester_slashing_by_indices(
                     spec, state, indices, slot=current_slot, signed_1=True, signed_2=True
                 )
@@ -755,7 +765,7 @@ def split_list(lst, n):
                     spoil_fn=lambda msg: _spoil_attester_slashing(spec, rnd, msg),
                 )
 
-                attester_slashings_count += 1
+                validators_to_be_slashed.update(indices)
 
         # Next slot
         current_slot += 1