Fix tests

specs/_features/eip6110/beacon-chain.md

@@ -249,7 +249,9 @@ def process_execution_payload(state: BeaconState, body: BeaconBlockBody, executi
     assert payload.timestamp == compute_timestamp_at_slot(state, state.slot)
     # Verify the execution payload is valid
     versioned_hashes = [kzg_commitment_to_versioned_hash(commitment) for commitment in body.blob_kzg_commitments]
-    assert execution_engine.notify_new_payload(NewPayloadRequest(execution_payload=payload))
+    assert execution_engine.notify_new_payload(
+        NewPayloadRequest(execution_payload=payload, versioned_hashes=versioned_hashes)
+    )
     # Cache execution payload header
     state.latest_execution_payload_header = ExecutionPayloadHeader(
         parent_hash=payload.parent_hash,

specs/deneb/beacon-chain.md

@@ -217,8 +217,11 @@ def process_execution_payload(state: BeaconState, body: BeaconBlockBody, executi
     # Verify timestamp
     assert payload.timestamp == compute_timestamp_at_slot(state, state.slot)
     # Verify the execution payload is valid
+    # [Modified in Deneb]
     versioned_hashes = [kzg_commitment_to_versioned_hash(commitment) for commitment in body.blob_kzg_commitments]
-    assert execution_engine.notify_new_payload(NewPayloadRequest(execution_payload=payload, versioned_hashes=versioned_hashes))
+    assert execution_engine.notify_new_payload(
+        NewPayloadRequest(execution_payload=payload, versioned_hashes=versioned_hashes)
+    )
 
     # Cache execution payload header
     state.latest_execution_payload_header = ExecutionPayloadHeader(

specs/deneb/validator.md

@@ -94,13 +94,9 @@ via `get_payload(payload_id).blobs_bundle`.
 2. Validate `blobs` and `blob_kzg_commitments`:
 
 ```python
-def validate_blobs_and_kzg_commitments(execution_payload: ExecutionPayload,
-                                       blobs: Sequence[Blob],
+def validate_blobs_and_kzg_commitments(blobs: Sequence[Blob],
                                        blob_kzg_commitments: Sequence[KZGCommitment],
                                        blob_kzg_proofs: Sequence[KZGProof]) -> None:
-    # TODO: can we just remove it?
-    # assert verify_kzg_commitments_against_transactions(execution_payload.transactions, blob_kzg_commitments)
-
     # Optionally sanity-check that the KZG commitments match the blobs (as produced by the execution engine)
     assert len(blob_kzg_commitments) == len(blobs) == len(blob_kzg_proofs)
     assert verify_blob_kzg_proof_batch(blobs, blob_kzg_commitments, blob_kzg_proofs)

tests/core/pyspec/eth2spec/test/bellatrix/block_processing/test_process_execution_payload.py

@@ -21,33 +21,35 @@ def run_execution_payload_processing(spec, state, execution_payload, valid=True,
       - post-state ('post').
     If ``valid == False``, run expecting ``AssertionError``
     """
+    # Before Deneb, only `body.execution_payload` matters. `BeaconBlockBody` is just a wrapper.
+    body = spec.BeaconBlockBody(execution_payload=execution_payload)
 
     yield 'pre', state
     yield 'execution', {'execution_valid': execution_valid}
-    yield 'execution_payload', execution_payload
+    yield 'body', body
 
     called_new_block = False
 
     class TestEngine(spec.NoopExecutionEngine):
         def notify_new_payload(self, new_payload_request) -> bool:
             nonlocal called_new_block, execution_valid
             called_new_block = True
-            assert new_payload_request.execution_payload == execution_payload
+            assert new_payload_request.execution_payload == body.execution_payload
             return execution_valid
 
     if not valid:
-        expect_assertion_error(lambda: spec.process_execution_payload(state, execution_payload, TestEngine()))
+        expect_assertion_error(lambda: spec.process_execution_payload(state, body, TestEngine()))
         yield 'post', None
         return
 
-    spec.process_execution_payload(state, execution_payload, TestEngine())
+    spec.process_execution_payload(state, body, TestEngine())
 
     # Make sure we called the engine
     assert called_new_block
 
     yield 'post', state
 
-    assert state.latest_execution_payload_header == get_execution_payload_header(spec, execution_payload)
+    assert state.latest_execution_payload_header == get_execution_payload_header(spec, body.execution_payload)
 
 
 def run_success_test(spec, state):

tests/core/pyspec/eth2spec/test/capella/block_processing/test_process_withdrawals.py

@@ -56,7 +56,7 @@ def verify_post_state(state, spec, expected_withdrawals,
 def run_withdrawals_processing(spec, state, execution_payload, num_expected_withdrawals=None,
                                fully_withdrawable_indices=None, partial_withdrawals_indices=None, valid=True):
     """
-    Run ``process_execution_payload``, yielding:
+    Run ``process_withdrawals``, yielding:
       - pre-state ('pre')
       - execution payload ('execution_payload')
       - post-state ('post').

tests/core/pyspec/eth2spec/test/deneb/sanity/test_blocks.py

@@ -53,7 +53,10 @@ def test_max_blobs(spec, state):
 
 @with_deneb_and_later
 @spec_state_test
-def test_invalid_incorrect_blob_tx_type(spec, state):
+def test_incorrect_blob_tx_type(spec, state):
+    """
+    The versioned hashes are wrong, but the testing ExecutionEngine returns VALID by default.
+    """
     yield 'pre', state
 
     block = build_empty_block_for_next_slot(spec, state)
@@ -62,15 +65,18 @@ def test_invalid_incorrect_blob_tx_type(spec, state):
     opaque_tx = b'\x04' + opaque_tx[1:]  # incorrect tx type
     block.body.execution_payload.transactions = [opaque_tx]
     block.body.execution_payload.block_hash = compute_el_block_hash(spec, block.body.execution_payload)
-    signed_block = state_transition_and_sign_block(spec, state, block, expect_fail=True)
+    signed_block = state_transition_and_sign_block(spec, state, block)
 
     yield 'blocks', [signed_block]
-    yield 'post', None
+    yield 'post', state
 
 
 @with_deneb_and_later
 @spec_state_test
-def test_invalid_incorrect_transaction_length_1_byte(spec, state):
+def test_incorrect_transaction_length_1_byte(spec, state):
+    """
+    The versioned hashes are wrong, but the testing ExecutionEngine returns VALID by default.
+    """
     yield 'pre', state
 
     block = build_empty_block_for_next_slot(spec, state)
@@ -79,15 +85,18 @@ def test_invalid_incorrect_transaction_length_1_byte(spec, state):
     opaque_tx = opaque_tx + b'\x12'  # incorrect tx length
     block.body.execution_payload.transactions = [opaque_tx]
     block.body.execution_payload.block_hash = compute_el_block_hash(spec, block.body.execution_payload)
-    signed_block = state_transition_and_sign_block(spec, state, block, expect_fail=True)
+    signed_block = state_transition_and_sign_block(spec, state, block)
 
     yield 'blocks', [signed_block]
-    yield 'post', None
+    yield 'post', state
 
 
 @with_deneb_and_later
 @spec_state_test
-def test_invalid_incorrect_transaction_length_32_bytes(spec, state):
+def test_incorrect_transaction_length_32_bytes(spec, state):
+    """
+    The versioned hashes are wrong, but the testing ExecutionEngine returns VALID by default.
+    """
     yield 'pre', state
 
     block = build_empty_block_for_next_slot(spec, state)
@@ -96,15 +105,18 @@ def test_invalid_incorrect_transaction_length_32_bytes(spec, state):
     opaque_tx = opaque_tx + b'\x12' * 32  # incorrect tx length
     block.body.execution_payload.transactions = [opaque_tx]
     block.body.execution_payload.block_hash = compute_el_block_hash(spec, block.body.execution_payload)
-    signed_block = state_transition_and_sign_block(spec, state, block, expect_fail=True)
+    signed_block = state_transition_and_sign_block(spec, state, block)
 
     yield 'blocks', [signed_block]
-    yield 'post', None
+    yield 'post', state
 
 
 @with_deneb_and_later
 @spec_state_test
-def test_invalid_incorrect_commitment(spec, state):
+def test_incorrect_commitment(spec, state):
+    """
+    The versioned hashes are wrong, but the testing ExecutionEngine returns VALID by default.
+    """
     yield 'pre', state
 
     block = build_empty_block_for_next_slot(spec, state)
@@ -113,26 +125,29 @@ def test_invalid_incorrect_commitment(spec, state):
     block.body.blob_kzg_commitments = blob_kzg_commitments
     block.body.execution_payload.transactions = [opaque_tx]
     block.body.execution_payload.block_hash = compute_el_block_hash(spec, block.body.execution_payload)
-    signed_block = state_transition_and_sign_block(spec, state, block, expect_fail=True)
+    signed_block = state_transition_and_sign_block(spec, state, block)
 
     yield 'blocks', [signed_block]
-    yield 'post', None
+    yield 'post', state
 
 
 @with_deneb_and_later
 @spec_state_test
-def test_invalid_incorrect_commitments_order(spec, state):
+def test_incorrect_commitments_order(spec, state):
+    """
+    The versioned hashes are wrong, but the testing ExecutionEngine returns VALID by default.
+    """
     yield 'pre', state
 
     block = build_empty_block_for_next_slot(spec, state)
     opaque_tx, _, blob_kzg_commitments, _ = get_sample_opaque_tx(spec, blob_count=2, rng=random.Random(1111))
     block.body.blob_kzg_commitments = [blob_kzg_commitments[1], blob_kzg_commitments[0]]  # incorrect order
     block.body.execution_payload.transactions = [opaque_tx]
     block.body.execution_payload.block_hash = compute_el_block_hash(spec, block.body.execution_payload)
-    signed_block = state_transition_and_sign_block(spec, state, block, expect_fail=True)
+    signed_block = state_transition_and_sign_block(spec, state, block)
 
     yield 'blocks', [signed_block]
-    yield 'post', None
+    yield 'post', state
 
 
 @with_deneb_and_later

tests/core/pyspec/eth2spec/test/deneb/unittests/validator/test_validator.py

@@ -31,8 +31,7 @@ def test_validate_blobs_and_kzg_commitments(spec, state):
     block.body.execution_payload.transactions = [opaque_tx]
     block.body.execution_payload.block_hash = compute_el_block_hash(spec, block.body.execution_payload)
 
-    spec.validate_blobs_and_kzg_commitments(block.body.execution_payload,
-                                            blobs,
+    spec.validate_blobs_and_kzg_commitments(blobs,
                                             blob_kzg_commitments,
                                             proofs)
 
@@ -52,7 +51,6 @@ def test_validate_blobs_and_kzg_commitments_missing_blob(spec, state):
 
     expect_assertion_error(
         lambda: spec.validate_blobs_and_kzg_commitments(
-            block.body.execution_payload,
             blobs[:-1],
             blob_kzg_commitments,
             proofs
@@ -75,7 +73,6 @@ def test_validate_blobs_and_kzg_commitments_missing_proof(spec, state):
 
     expect_assertion_error(
         lambda: spec.validate_blobs_and_kzg_commitments(
-            block.body.execution_payload,
             blobs,
             blob_kzg_commitments,
             proofs[:-1]
@@ -100,7 +97,6 @@ def test_validate_blobs_and_kzg_commitments_incorrect_blob(spec, state):
 
     expect_assertion_error(
         lambda: spec.validate_blobs_and_kzg_commitments(
-            block.body.execution_payload,
             blobs,
             blob_kzg_commitments,
             proofs

tests/formats/operations/README.md

@@ -42,7 +42,7 @@ Operations:
 | `proposer_slashing`       | `ProposerSlashing`           | `proposer_slashing` | `process_proposer_slashing(state, proposer_slashing)`                            |
 | `voluntary_exit`          | `SignedVoluntaryExit`        | `voluntary_exit`    | `process_voluntary_exit(state, voluntary_exit)`                                  |
 | `sync_aggregate`          | `SyncAggregate`              | `sync_aggregate`    | `process_sync_aggregate(state, sync_aggregate)` (new in Altair)                  |
-| `execution_payload`       | `ExecutionPayload`           | `execution_payload` | `process_execution_payload(state, execution_payload)` (new in Bellatrix)         |
+| `execution_payload`       | `BeaconBlockBody`            | **`body`**          | `process_execution_payload(state, body)` (new in Bellatrix)         |
 | `withdrawals`             | `ExecutionPayload`           | `execution_payload` | `process_withdrawals(state, execution_payload)` (new in Capella)                 |
 | `bls_to_execution_change` | `SignedBLSToExecutionChange` | `address_change`    | `process_bls_to_execution_change(state, address_change)` (new in Capella) |
 | `deposit_receipt`         | `DepositReceipt`             | `deposit_receipt`   | `process_deposit_receipt(state, deposit_receipt)` (new in EIP6110)               |