fix deneb tests

Author: potuz

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

@@ -56,18 +56,13 @@ def run_execution_payload_processing(spec, state, execution_payload, blob_kzg_co
             message=envelope,
             signature=signature,
         )
+        body = spec.BeaconBlockBody()
     else:
         body = spec.BeaconBlockBody(
             blob_kzg_commitments=blob_kzg_commitments,
             execution_payload=execution_payload,
         )
 
-    # Before Deneb, only `body.execution_payload` matters. `BeaconBlockBody` is just a wrapper.
-    body = spec.BeaconBlockBody()
-    if not is_post_eip7732(spec):
-        body.blob_kzg_commitments = blob_kzg_commitments
-        body.execution_payload = execution_payload
-
     yield 'pre', state
     yield 'execution', {'execution_valid': execution_valid}
     yield 'body', body
@@ -127,7 +122,10 @@ def test_incorrect_blob_tx_type(spec, state):
     execution_payload.transactions = [opaque_tx]
     execution_payload.block_hash = compute_el_block_hash(spec, execution_payload, state)
 
-    state.latest_execution_payload_header.block_hash = execution_payload.block_hash
+    ## Make the first block full in EIP-7732
+    if is_post_eip7732(spec):
+        state.latest_execution_payload_header.block_hash = execution_payload.block_hash
+
     yield from run_execution_payload_processing(spec, state, execution_payload, blob_kzg_commitments)
 
 
@@ -145,7 +143,9 @@ def test_incorrect_transaction_length_1_extra_byte(spec, state):
     execution_payload.transactions = [opaque_tx]
     execution_payload.block_hash = compute_el_block_hash(spec, execution_payload, state)
 
-    state.latest_execution_payload_header.block_hash = execution_payload.block_hash
+    ## Make the first block full in EIP-7732
+    if is_post_eip7732(spec):
+        state.latest_execution_payload_header.block_hash = execution_payload.block_hash
     yield from run_execution_payload_processing(spec, state, execution_payload, blob_kzg_commitments)
 
 
@@ -163,7 +163,9 @@ def test_incorrect_transaction_length_1_byte_short(spec, state):
     execution_payload.transactions = [opaque_tx]
     execution_payload.block_hash = compute_el_block_hash(spec, execution_payload, state)
 
-    state.latest_execution_payload_header.block_hash = execution_payload.block_hash
+    ## Make the first block full in EIP-7732
+    if is_post_eip7732(spec):
+        state.latest_execution_payload_header.block_hash = execution_payload.block_hash
     yield from run_execution_payload_processing(spec, state, execution_payload, blob_kzg_commitments)
 
 
@@ -181,7 +183,9 @@ def test_incorrect_transaction_length_empty(spec, state):
     execution_payload.transactions = [opaque_tx]
     execution_payload.block_hash = compute_el_block_hash(spec, execution_payload, state)
 
-    state.latest_execution_payload_header.block_hash = execution_payload.block_hash
+    ## Make the first block full in EIP-7732
+    if is_post_eip7732(spec):
+        state.latest_execution_payload_header.block_hash = execution_payload.block_hash
     yield from run_execution_payload_processing(spec, state, execution_payload, blob_kzg_commitments)
 
 
@@ -199,7 +203,10 @@ def test_incorrect_transaction_length_32_extra_bytes(spec, state):
     execution_payload.transactions = [opaque_tx]
     execution_payload.block_hash = compute_el_block_hash(spec, execution_payload, state)
 
-    state.latest_execution_payload_header.block_hash = execution_payload.block_hash
+
+    ## Make the first block full in EIP-7732
+    if is_post_eip7732(spec):
+        state.latest_execution_payload_header.block_hash = execution_payload.block_hash
     yield from run_execution_payload_processing(spec, state, execution_payload, blob_kzg_commitments)
 
 
@@ -216,7 +223,9 @@ def test_no_transactions_with_commitments(spec, state):
     execution_payload.transactions = []
     execution_payload.block_hash = compute_el_block_hash(spec, execution_payload, state)
 
-    state.latest_execution_payload_header.block_hash = execution_payload.block_hash
+    ## Make the first block full in EIP-7732
+    if is_post_eip7732(spec):
+        state.latest_execution_payload_header.block_hash = execution_payload.block_hash
     yield from run_execution_payload_processing(spec, state, execution_payload, blob_kzg_commitments)
 
 
@@ -234,7 +243,9 @@ def test_incorrect_commitment(spec, state):
     execution_payload.transactions = [opaque_tx]
     execution_payload.block_hash = compute_el_block_hash(spec, execution_payload, state)
 
-    state.latest_execution_payload_header.block_hash = execution_payload.block_hash
+    ## Make the first block full in EIP-7732
+    if is_post_eip7732(spec):
+        state.latest_execution_payload_header.block_hash = execution_payload.block_hash
     yield from run_execution_payload_processing(spec, state, execution_payload, blob_kzg_commitments)
 
 
@@ -252,7 +263,9 @@ def test_incorrect_commitments_order(spec, state):
     execution_payload.transactions = [opaque_tx]
     execution_payload.block_hash = compute_el_block_hash(spec, execution_payload, state)
 
-    state.latest_execution_payload_header.block_hash = execution_payload.block_hash
+    ## Make the first block full in EIP-7732
+    if is_post_eip7732(spec):
+        state.latest_execution_payload_header.block_hash = execution_payload.block_hash
     yield from run_execution_payload_processing(spec, state, execution_payload, blob_kzg_commitments)
 
 
@@ -267,7 +280,9 @@ def test_incorrect_block_hash(spec, state):
     execution_payload.block_hash = b'\x12' * 32  # incorrect block hash
 
     # CL itself doesn't verify EL block hash
-    state.latest_execution_payload_header.block_hash = execution_payload.block_hash
+    ## Make the first block full in EIP-7732
+    if is_post_eip7732(spec):
+        state.latest_execution_payload_header.block_hash = execution_payload.block_hash
     yield from run_execution_payload_processing(spec, state, execution_payload, blob_kzg_commitments)
 
 
@@ -285,7 +300,9 @@ def test_zeroed_commitment(spec, state):
     execution_payload.transactions = [opaque_tx]
     execution_payload.block_hash = compute_el_block_hash(spec, execution_payload, state)
 
-    state.latest_execution_payload_header.block_hash = execution_payload.block_hash
+    ## Make the first block full in EIP-7732
+    if is_post_eip7732(spec):
+        state.latest_execution_payload_header.block_hash = execution_payload.block_hash
     yield from run_execution_payload_processing(spec, state, execution_payload, blob_kzg_commitments)
 
 
@@ -302,7 +319,9 @@ def test_invalid_correct_input__execution_invalid(spec, state):
     execution_payload.transactions = [opaque_tx]
     execution_payload.block_hash = compute_el_block_hash(spec, execution_payload, state)
 
-    state.latest_execution_payload_header.block_hash = execution_payload.block_hash
+    ## Make the first block full in EIP-7732
+    if is_post_eip7732(spec):
+        state.latest_execution_payload_header.block_hash = execution_payload.block_hash
     yield from run_execution_payload_processing(spec, state, execution_payload, blob_kzg_commitments,
                                                 valid=False, execution_valid=False)
 
@@ -317,5 +336,7 @@ def test_invalid_exceed_max_blobs_per_block(spec, state):
     execution_payload.transactions = [opaque_tx]
     execution_payload.block_hash = compute_el_block_hash(spec, execution_payload, state)
 
-    state.latest_execution_payload_header.block_hash = execution_payload.block_hash
+    ## Make the first block full in EIP-7732
+    if is_post_eip7732(spec):
+        state.latest_execution_payload_header.block_hash = execution_payload.block_hash
     yield from run_execution_payload_processing(spec, state, execution_payload, blob_kzg_commitments, valid=False)

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

@@ -34,7 +34,7 @@ def _get_sample_sidecars(spec, state, rng):
     else:
         block.body.blob_kzg_commitments = blob_kzg_commitments_1 + blob_kzg_commitments_2
         block.body.execution_payload.transactions = [opaque_tx_1, opaque_tx_2]
-        block.body.execution_payload.block_hash = compute_el_block_hash(spec, block.body.execution_payload)
+        block.body.execution_payload.block_hash = compute_el_block_hash(spec, block.body.execution_payload, state)
 
     blobs = blobs_1 + blobs_2
     proofs = proofs_1 + proofs_2