Merge branch 'dev' into testgen-refactor

specs/_features/eip6110/beacon-chain.md

@@ -183,7 +183,7 @@ def process_block(state: BeaconState, block: BeaconBlock) -> None:
     process_eth1_data(state, block.body)
     process_operations(state, block.body)  # [Modified in EIP6110]
     process_sync_aggregate(state, block.body.sync_aggregate)
-    process_blob_kzg_commitments(state, block.body)
+    process_blob_kzg_commitments(block.body)
 ```
 
 #### Modified `process_operations`

specs/deneb/beacon-chain.md

@@ -173,6 +173,8 @@ def tx_peek_blob_versioned_hashes(opaque_tx: Transaction) -> Sequence[VersionedH
         message_offset
         + uint32.decode_bytes(opaque_tx[(message_offset + 188):(message_offset + 192)])
     )
+    # `VersionedHash` is a 32-byte object
+    assert (len(opaque_tx) - blob_versioned_hashes_offset) % 32 == 0
     return [
         VersionedHash(opaque_tx[x:(x + 32)])
         for x in range(blob_versioned_hashes_offset, len(opaque_tx), 32)
@@ -205,7 +207,7 @@ def process_block(state: BeaconState, block: BeaconBlock) -> None:
     process_eth1_data(state, block.body)
     process_operations(state, block.body)
     process_sync_aggregate(state, block.body.sync_aggregate)
-    process_blob_kzg_commitments(state, block.body)  # [New in Deneb]
+    process_blob_kzg_commitments(block.body)  # [New in Deneb]
 ```
 
 #### Execution payload
@@ -248,8 +250,7 @@ def process_execution_payload(state: BeaconState, payload: ExecutionPayload, exe
 #### Blob KZG commitments
 
 ```python
-def process_blob_kzg_commitments(state: BeaconState, body: BeaconBlockBody) -> None:
-    # pylint: disable=unused-argument
+def process_blob_kzg_commitments(body: BeaconBlockBody) -> None:
     assert verify_kzg_commitments_against_transactions(body.execution_payload.transactions, body.blob_kzg_commitments)
 ```
 

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

@@ -1,3 +1,5 @@
+import random
+
 from eth2spec.test.helpers.state import (
     state_transition_and_sign_block
 )
@@ -16,32 +18,134 @@ from eth2spec.test.helpers.sharding import (
 )
 
 
+def run_block_with_blobs(spec, state, blob_count, excess_data_gas=1):
+    yield 'pre', state
+
+    block = build_empty_block_for_next_slot(spec, state)
+    opaque_tx, _, blob_kzg_commitments, _ = get_sample_opaque_tx(spec, blob_count=blob_count)
+    block.body.blob_kzg_commitments = blob_kzg_commitments
+    block.body.execution_payload.transactions = [opaque_tx]
+    block.body.execution_payload.excess_data_gas = excess_data_gas
+    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)
+
+    yield 'blocks', [signed_block]
+    yield 'post', state
+
+
+@with_deneb_and_later
+@spec_state_test
+def test_zero_blob(spec, state):
+    yield from run_block_with_blobs(spec, state, blob_count=0)
+
+
 @with_deneb_and_later
 @spec_state_test
 def test_one_blob(spec, state):
+    yield from run_block_with_blobs(spec, state, blob_count=1)
+
+
+@with_deneb_and_later
+@spec_state_test
+def test_max_blobs(spec, state):
+    yield from run_block_with_blobs(spec, state, blob_count=spec.MAX_BLOBS_PER_BLOCK)
+
+
+@with_deneb_and_later
+@spec_state_test
+def test_invalid_incorrect_blob_tx_type(spec, state):
+    yield 'pre', state
+
+    block = build_empty_block_for_next_slot(spec, state)
+    opaque_tx, _, blob_kzg_commitments, _ = get_sample_opaque_tx(spec)
+    block.body.blob_kzg_commitments = blob_kzg_commitments
+    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)
+
+    yield 'blocks', [signed_block]
+    yield 'post', None
+
+
+@with_deneb_and_later
+@spec_state_test
+def test_invalid_incorrect_transaction_length_1_byte(spec, state):
+    yield 'pre', state
+
+    block = build_empty_block_for_next_slot(spec, state)
+    opaque_tx, _, blob_kzg_commitments, _ = get_sample_opaque_tx(spec)
+    block.body.blob_kzg_commitments = blob_kzg_commitments
+    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)
+
+    yield 'blocks', [signed_block]
+    yield 'post', None
+
+
+@with_deneb_and_later
+@spec_state_test
+def test_invalid_incorrect_transaction_length_32_bytes(spec, state):
+    yield 'pre', state
+
+    block = build_empty_block_for_next_slot(spec, state)
+    opaque_tx, _, blob_kzg_commitments, _ = get_sample_opaque_tx(spec)
+    block.body.blob_kzg_commitments = blob_kzg_commitments
+    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)
+
+    yield 'blocks', [signed_block]
+    yield 'post', None
+
+
+@with_deneb_and_later
+@spec_state_test
+def test_invalid_incorrect_commitment(spec, state):
+    yield 'pre', state
+
+    block = build_empty_block_for_next_slot(spec, state)
+    opaque_tx, _, blob_kzg_commitments, _ = get_sample_opaque_tx(spec)
+    blob_kzg_commitments[0] = b'\x12' * 48  # incorrect commitment
+    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)
+
+    yield 'blocks', [signed_block]
+    yield 'post', None
+
+
+@with_deneb_and_later
+@spec_state_test
+def test_invalid_incorrect_commitments_order(spec, state):
+    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)
+
+    yield 'blocks', [signed_block]
+    yield 'post', None
+
+
+@with_deneb_and_later
+@spec_state_test
+def test_incorrect_block_hash(spec, state):
     yield 'pre', state
 
     block = build_empty_block_for_next_slot(spec, state)
     opaque_tx, _, blob_kzg_commitments, _ = get_sample_opaque_tx(spec)
     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)
-
-    yield 'blocks', [signed_block]
-    yield 'post', state
-
-
-@with_deneb_and_later
-@spec_state_test
-def test_max_blobs(spec, state):
-    yield 'pre', state
-
-    block = build_empty_block_for_next_slot(spec, state)
-    opaque_tx, _, blob_kzg_commitments, _ = get_sample_opaque_tx(spec, blob_count=spec.MAX_BLOBS_PER_BLOCK)
-    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)
+    block.body.execution_payload.block_hash = b'\x12' * 32  # incorrect block hash
+    # CL itself doesn't verify EL block hash
     signed_block = state_transition_and_sign_block(spec, state, block)
 
     yield 'blocks', [signed_block]

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

@@ -200,6 +200,8 @@ def build_empty_execution_payload(spec, state, randao_mix=None):
     )
     if is_post_capella(spec):
         payload.withdrawals = spec.get_expected_withdrawals(state)
+    if is_post_deneb(spec):
+        payload.excess_data_gas = 0
     if is_post_eip6110(spec):
         # just to be clear
         payload.deposit_receipts = []