Fix and add more attestation tests

Author: mkalinin

tests/core/pyspec/eth2spec/test/electra/block_processing/test_process_attestation.py

@@ -10,7 +10,8 @@
     get_valid_attestation,
     sign_attestation,
     build_attestation_data,
-    fill_aggregate_attestation,
+    get_valid_attestation_at_slot,
+    get_empty_eip7549_aggregation_bits,
 )
 from eth2spec.test.helpers.state import (
     next_slots,
@@ -39,7 +40,7 @@ def test_invalid_attestation_data_index_not_zero(spec, state):
 @with_electra_and_later
 @spec_state_test
 @always_bls
-def test_invalid_committe_index(spec, state):
+def test_invalid_committee_index(spec, state):
     """
     EIP-7549 test
     """
@@ -57,7 +58,7 @@ def test_invalid_committe_index(spec, state):
 
 @with_electra_and_later
 @spec_state_test
-def test_invalid_too_many_committe_bits(spec, state):
+def test_invalid_too_many_committee_bits(spec, state):
     """
     EIP-7549 test
     """
@@ -72,7 +73,7 @@ def test_invalid_too_many_committe_bits(spec, state):
 
 @with_electra_and_later
 @spec_state_test
-def test_invalid_nonset_committe_bits(spec, state):
+def test_invalid_nonset_committee_bits(spec, state):
     """
     EIP-7549 test
     """
@@ -85,18 +86,51 @@ def test_invalid_nonset_committe_bits(spec, state):
     yield from run_attestation_processing(spec, state, attestation, valid=False)
 
 
+@with_electra_and_later
+@spec_state_test
+def test_invalid_nonset_multiple_committee_bits(spec, state):
+    """
+    EIP-7549 test
+    """
+    attestation_data = build_attestation_data(spec, state, slot=state.slot, index=0)
+    attestation = spec.Attestation(data=attestation_data)
+
+    # a single attestation with all committees of a slot, but with unset aggregation_bits
+    committees_per_slot = spec.get_committee_count_per_slot(state, spec.get_current_epoch(state))
+    for index in range(committees_per_slot):
+        attestation.committee_bits[index] = True
+
+    attestation.aggregation_bits = get_empty_eip7549_aggregation_bits(
+        spec, state, attestation.committee_bits, attestation.data.slot
+    )
+
+    next_slots(spec, state, spec.MIN_ATTESTATION_INCLUSION_DELAY)
+
+    yield from run_attestation_processing(spec, state, attestation, valid=False)
+
+
 @with_electra_and_later
 @spec_state_test
 @with_presets([MINIMAL], "need multiple committees per slot")
 @always_bls
 def test_multiple_committees(spec, state):
+    """
+    EIP-7549 test
+    """
     attestation_data = build_attestation_data(spec, state, slot=state.slot, index=0)
     attestation = spec.Attestation(data=attestation_data)
 
-    # fill the attestation with two committees
-    fill_aggregate_attestation(spec, state, attestation, signed=True, committee_index=0)
-    fill_aggregate_attestation(spec, state, attestation, signed=True, committee_index=1)
+    # a single attestation with all committees of a slot
+    attestation = get_valid_attestation_at_slot(state, spec, state.slot)
+
+    # check that all committees are presented in a single attestation
+    attesting_indices = set()
+    committees_per_slot = spec.get_committee_count_per_slot(state, spec.get_current_epoch(state))
+    for index in range(committees_per_slot):
+        attesting_indices.update(spec.get_beacon_committee(state, state.slot, index))
+    assert spec.get_attesting_indices(state, attestation) == attesting_indices
 
+    # advance a slot
     next_slots(spec, state, spec.MIN_ATTESTATION_INCLUSION_DELAY)
 
     yield from run_attestation_processing(spec, state, attestation)
@@ -107,6 +141,9 @@ def test_multiple_committees(spec, state):
 @with_presets([MINIMAL], "need multiple committees per slot")
 @always_bls
 def test_one_committee_with_gap(spec, state):
+    """
+    EIP-7549 test
+    """
     attestation = get_valid_attestation(spec, state, index=1, signed=True)
     next_slots(spec, state, spec.MIN_ATTESTATION_INCLUSION_DELAY)