Tests with signatures, fixes #1074

scripts/phase0/build_spec.py

@@ -13,7 +13,7 @@ def build_phase0_spec(sourcefile, outfile):
     Tuple,
 )
 from eth2spec.utils.minimal_ssz import *
-from eth2spec.utils.bls_stub import *
+from eth2spec.utils.bls import *
 
 """)
     for i in (1, 2, 3, 4, 8, 32, 48, 96):

test_libs/pyspec/eth2spec/test/block_processing/test_process_attestation.py

@@ -1,22 +1,23 @@
 from copy import deepcopy
 
 import eth2spec.phase0.spec as spec
-
-from eth2spec.phase0.state_transition import (
-    state_transition,
-)
 from eth2spec.phase0.spec import (
     get_current_epoch,
     process_attestation
 )
-from eth2spec.test.helpers import (
-    build_empty_block_for_next_slot,
+from eth2spec.phase0.state_transition import (
+    state_transition_to,
+)
+from eth2spec.test.context import spec_state_test, expect_assertion_error
+from eth2spec.test.helpers.attestations import (
     get_valid_attestation,
+    sign_attestation,
+)
+from eth2spec.test.helpers.state import (
     next_epoch,
     next_slot,
 )
-
-from eth2spec.test.context import spec_state_test, expect_assertion_error
+from eth2spec.test.helpers.block import apply_empty_block
 
 
 def run_attestation_processing(state, attestation, valid=True):
@@ -56,37 +57,35 @@ def run_attestation_processing(state, attestation, valid=True):
 
 @spec_state_test
 def test_success(state):
-    attestation = get_valid_attestation(state)
+    attestation = get_valid_attestation(state, signed=True)
     state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY
 
     yield from run_attestation_processing(state, attestation)
 
 
 @spec_state_test
 def test_success_previous_epoch(state):
-    attestation = get_valid_attestation(state)
-    block = build_empty_block_for_next_slot(state)
-    block.slot = state.slot + spec.SLOTS_PER_EPOCH
-    state_transition(state, block)
+    attestation = get_valid_attestation(state, signed=True)
+    next_epoch(state)
+    apply_empty_block(state)
 
     yield from run_attestation_processing(state, attestation)
 
 
 @spec_state_test
 def test_before_inclusion_delay(state):
-    attestation = get_valid_attestation(state)
+    attestation = get_valid_attestation(state, signed=True)
     # do not increment slot to allow for inclusion delay
 
     yield from run_attestation_processing(state, attestation, False)
 
 
 @spec_state_test
 def test_after_epoch_slots(state):
-    attestation = get_valid_attestation(state)
-    block = build_empty_block_for_next_slot(state)
+    attestation = get_valid_attestation(state, signed=True)
     # increment past latest inclusion slot
-    block.slot = state.slot + spec.SLOTS_PER_EPOCH + 1
-    state_transition(state, block)
+    state_transition_to(state, state.slot + spec.SLOTS_PER_EPOCH + 1)
+    apply_empty_block(state)
 
     yield from run_attestation_processing(state, attestation, False)
 
@@ -97,44 +96,52 @@ def test_old_source_epoch(state):
     state.finalized_epoch = 2
     state.previous_justified_epoch = 3
     state.current_justified_epoch = 4
-    attestation = get_valid_attestation(state, slot=(spec.SLOTS_PER_EPOCH * 3) + 1)
+    attestation = get_valid_attestation(state, slot=(spec.SLOTS_PER_EPOCH * 3) + 1, signed=False)
 
     # test logic sanity check: make sure the attestation is pointing to oldest known source epoch
     assert attestation.data.source_epoch == state.previous_justified_epoch
 
     # Now go beyond that, it will be invalid
     attestation.data.source_epoch -= 1
 
+    sign_attestation(state, attestation)
+
     yield from run_attestation_processing(state, attestation, False)
 
 
 @spec_state_test
 def test_wrong_shard(state):
-    attestation = get_valid_attestation(state)
+    attestation = get_valid_attestation(state, signed=False)
     state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY
 
     attestation.data.shard += 1
 
+    sign_attestation(state, attestation)
+
     yield from run_attestation_processing(state, attestation, False)
 
 
 @spec_state_test
 def test_new_source_epoch(state):
-    attestation = get_valid_attestation(state)
+    attestation = get_valid_attestation(state, signed=False)
     state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY
 
     attestation.data.source_epoch += 1
 
+    sign_attestation(state, attestation)
+
     yield from run_attestation_processing(state, attestation, False)
 
 
 @spec_state_test
 def test_source_root_is_target_root(state):
-    attestation = get_valid_attestation(state)
+    attestation = get_valid_attestation(state, signed=False)
     state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY
 
     attestation.data.source_root = attestation.data.target_root
 
+    sign_attestation(state, attestation)
+
     yield from run_attestation_processing(state, attestation, False)
 
 
@@ -149,7 +156,7 @@ def test_invalid_current_source_root(state):
     state.current_justified_epoch = 4
     state.current_justified_root = b'\xff' * 32
 
-    attestation = get_valid_attestation(state, slot=(spec.SLOTS_PER_EPOCH * 3) + 1)
+    attestation = get_valid_attestation(state, slot=(spec.SLOTS_PER_EPOCH * 3) + 1, signed=False)
     state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY
 
     # Test logic sanity checks:
@@ -159,35 +166,44 @@ def test_invalid_current_source_root(state):
     # Make attestation source root invalid: should be previous justified, not current one
     attestation.data.source_root = state.current_justified_root
 
+    sign_attestation(state, attestation)
+
     yield from run_attestation_processing(state, attestation, False)
 
 
 @spec_state_test
 def test_bad_source_root(state):
-    attestation = get_valid_attestation(state)
+    attestation = get_valid_attestation(state, signed=False)
     state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY
 
     attestation.data.source_root = b'\x42' * 32
 
+    sign_attestation(state, attestation)
+
     yield from run_attestation_processing(state, attestation, False)
 
 
 @spec_state_test
 def test_non_zero_crosslink_data_root(state):
-    attestation = get_valid_attestation(state)
+    attestation = get_valid_attestation(state, signed=False)
     state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY
 
     attestation.data.crosslink_data_root = b'\x42' * 32
 
+    sign_attestation(state, attestation)
+
     yield from run_attestation_processing(state, attestation, False)
 
 
 @spec_state_test
 def test_bad_previous_crosslink(state):
     next_epoch(state)
-    attestation = get_valid_attestation(state)
+    apply_empty_block(state)
+
+    attestation = get_valid_attestation(state, signed=True)
     for _ in range(spec.MIN_ATTESTATION_INCLUSION_DELAY):
         next_slot(state)
+    apply_empty_block(state)
 
     state.current_crosslinks[attestation.data.shard].epoch += 10
 
@@ -196,19 +212,23 @@ def test_bad_previous_crosslink(state):
 
 @spec_state_test
 def test_non_empty_custody_bitfield(state):
-    attestation = get_valid_attestation(state)
+    attestation = get_valid_attestation(state, signed=False)
     state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY
 
     attestation.custody_bitfield = deepcopy(attestation.aggregation_bitfield)
+
+    sign_attestation(state, attestation)
 
     yield from run_attestation_processing(state, attestation, False)
 
 
 @spec_state_test
 def test_empty_aggregation_bitfield(state):
-    attestation = get_valid_attestation(state)
+    attestation = get_valid_attestation(state, signed=False)
     state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY
 
     attestation.aggregation_bitfield = b'\x00' * len(attestation.aggregation_bitfield)
 
+    sign_attestation(state, attestation)
+
     yield from run_attestation_processing(state, attestation, False)

test_libs/pyspec/eth2spec/test/block_processing/test_process_attester_slashing.py

@@ -3,14 +3,15 @@
     get_beacon_proposer_index,
     process_attester_slashing,
 )
-from eth2spec.test.helpers import (
+from eth2spec.test.context import spec_state_test, expect_assertion_error
+from eth2spec.test.helpers.attestations import sign_indexed_attestation
+from eth2spec.test.helpers.attester_slashings import get_valid_attester_slashing
+from eth2spec.test.helpers.block import apply_empty_block
+from eth2spec.test.helpers.state import (
     get_balance,
-    get_valid_attester_slashing,
     next_epoch,
 )
 
-from eth2spec.test.context import spec_state_test, expect_assertion_error
-
 
 def run_attester_slashing_processing(state, attester_slashing, valid=True):
     """
@@ -45,62 +46,73 @@ def run_attester_slashing_processing(state, attester_slashing, valid=True):
     assert slashed_validator.exit_epoch < spec.FAR_FUTURE_EPOCH
     assert slashed_validator.withdrawable_epoch < spec.FAR_FUTURE_EPOCH
 
-    # lost whistleblower reward
-    assert (
-        get_balance(state, slashed_index) <
-        pre_slashed_balance
-    )
-
-    # gained whistleblower reward
-    assert (
-        get_balance(state, proposer_index) >
-        pre_proposer_balance
-    )
+    if slashed_index != proposer_index:
+        # lost whistleblower reward
+        assert (
+                get_balance(state, slashed_index) <
+                pre_slashed_balance
+        )
+
+        # gained whistleblower reward
+        assert (
+                get_balance(state, proposer_index) >
+                pre_proposer_balance
+        )
+    else:
+        # gained rewards for all slashings, which may include others. And only lost that of themselves.
+        # Netto at least 0, if more people where slashed, a balance increase.
+        assert get_balance(state, slashed_index) >= pre_slashed_balance
 
     yield 'post', state
 
 
 @spec_state_test
 def test_success_double(state):
-    attester_slashing = get_valid_attester_slashing(state)
+    attester_slashing = get_valid_attester_slashing(state, signed_1=True, signed_2=True)
 
     yield from run_attester_slashing_processing(state, attester_slashing)
 
 
 @spec_state_test
 def test_success_surround(state):
     next_epoch(state)
+    apply_empty_block(state)
+
     state.current_justified_epoch += 1
-    attester_slashing = get_valid_attester_slashing(state)
+    attester_slashing = get_valid_attester_slashing(state, signed_1=False, signed_2=True)
 
     # set attestion1 to surround attestation 2
     attester_slashing.attestation_1.data.source_epoch = attester_slashing.attestation_2.data.source_epoch - 1
     attester_slashing.attestation_1.data.target_epoch = attester_slashing.attestation_2.data.target_epoch + 1
 
+    sign_indexed_attestation(state, attester_slashing.attestation_1)
+
     yield from run_attester_slashing_processing(state, attester_slashing)
 
 
 @spec_state_test
 def test_same_data(state):
-    attester_slashing = get_valid_attester_slashing(state)
+    attester_slashing = get_valid_attester_slashing(state, signed_1=False, signed_2=True)
 
     attester_slashing.attestation_1.data = attester_slashing.attestation_2.data
+    sign_indexed_attestation(state, attester_slashing.attestation_1)
 
     yield from run_attester_slashing_processing(state, attester_slashing, False)
 
 
 @spec_state_test
 def test_no_double_or_surround(state):
-    attester_slashing = get_valid_attester_slashing(state)
+    attester_slashing = get_valid_attester_slashing(state, signed_1=False, signed_2=True)
 
     attester_slashing.attestation_1.data.target_epoch += 1
+    sign_indexed_attestation(state, attester_slashing.attestation_1)
 
     yield from run_attester_slashing_processing(state, attester_slashing, False)
 
 
 @spec_state_test
 def test_participants_already_slashed(state):
-    attester_slashing = get_valid_attester_slashing(state)
+    attester_slashing = get_valid_attester_slashing(state, signed_1=True, signed_2=True)
 
     # set all indices to slashed
     attestation_1 = attester_slashing.attestation_1
@@ -113,10 +125,11 @@ def test_participants_already_slashed(state):
 
 @spec_state_test
 def test_custody_bit_0_and_1(state):
-    attester_slashing = get_valid_attester_slashing(state)
+    attester_slashing = get_valid_attester_slashing(state, signed_1=False, signed_2=True)
 
     attester_slashing.attestation_1.custody_bit_1_indices = (
         attester_slashing.attestation_1.custody_bit_0_indices
     )
+    sign_indexed_attestation(state, attester_slashing.attestation_1)
 
     yield from run_attester_slashing_processing(state, attester_slashing, False)