Merge branch 'dev' into last-minute-cleanups

test_libs/pyspec/eth2spec/debug/encode.py

@@ -1,10 +1,10 @@
 from eth2spec.utils.ssz.ssz_impl import hash_tree_root
 from eth2spec.utils.ssz.ssz_typing import (
-    SSZValue, uint, Container, boolean
+    uint, Container, boolean
 )
 
 
-def encode(value: SSZValue, include_hash_tree_roots=False):
+def encode(value, include_hash_tree_roots=False):
     if isinstance(value, uint):
         # Larger uints are boxed and the class declares their byte length
         if value.type().byte_len > 8:

test_libs/pyspec/eth2spec/test/genesis/test_validity.py

@@ -16,13 +16,13 @@ def create_valid_beacon_state(spec):
 def run_is_valid_genesis_state(spec, state, valid=True):
     """
     Run ``is_valid_genesis_state``, yielding:
-      - state ('state')
+      - genesis ('state')
       - is_valid ('is_valid')
-    If ``valid == False``, run expecting ``AssertionError``
     """
-    yield state
+    yield 'genesis', state
     is_valid = spec.is_valid_genesis_state(state)
     yield 'is_valid', is_valid
+    assert is_valid == valid
 
 
 @with_phases(['phase0'])
@@ -39,7 +39,7 @@ def test_is_valid_genesis_state_false_invalid_timestamp(spec):
     state = create_valid_beacon_state(spec)
     state.genesis_time = spec.MIN_GENESIS_TIME - 1
 
-    yield from run_is_valid_genesis_state(spec, state, valid=True)
+    yield from run_is_valid_genesis_state(spec, state, valid=False)
 
 
 @with_phases(['phase0'])
@@ -51,13 +51,14 @@ def test_is_valid_genesis_state_true_more_balance(spec):
     yield from run_is_valid_genesis_state(spec, state, valid=True)
 
 
-@with_phases(['phase0'])
-@spectest_with_bls_switch
-def test_is_valid_genesis_state_false_not_enough_balance(spec):
-    state = create_valid_beacon_state(spec)
-    state.validators[0].effective_balance = spec.MAX_EFFECTIVE_BALANCE - 1
-
-    yield from run_is_valid_genesis_state(spec, state, valid=False)
+# TODO: not part of the genesis function yet. Erroneously merged.
+# @with_phases(['phase0'])
+# @spectest_with_bls_switch
+# def test_is_valid_genesis_state_false_not_enough_balance(spec):
+#     state = create_valid_beacon_state(spec)
+#     state.validators[0].effective_balance = spec.MAX_EFFECTIVE_BALANCE - 1
+#
+#     yield from run_is_valid_genesis_state(spec, state, valid=False)
 
 
 @with_phases(['phase0'])

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

@@ -1,6 +1,7 @@
 from eth2spec.test.context import spec_state_test, expect_assertion_error, always_bls, with_all_phases, with_phases
 from eth2spec.test.helpers.attestations import (
     get_valid_attestation,
+    sign_aggregate_attestation,
     sign_attestation,
 )
 from eth2spec.test.helpers.state import (
@@ -59,6 +60,7 @@ def test_success(spec, state):
 @spec_state_test
 def test_success_previous_epoch(spec, state):
     attestation = get_valid_attestation(spec, state, signed=True)
+    state.slot = spec.SLOTS_PER_EPOCH - 1
     next_epoch(spec, state)
     apply_empty_block(spec, state)
 
@@ -68,6 +70,9 @@ def test_success_previous_epoch(spec, state):
 @with_all_phases
 @spec_state_test
 def test_success_since_max_epochs_per_crosslink(spec, state):
+    # Do not run mainnet (64 epochs), that would mean the equivalent of ~7 hours chain simulation.
+    if spec.MAX_EPOCHS_PER_CROSSLINK > 4:
+        return
     for _ in range(spec.MAX_EPOCHS_PER_CROSSLINK + 2):
         next_epoch(spec, state)
     apply_empty_block(spec, state)
@@ -87,6 +92,9 @@ def test_success_since_max_epochs_per_crosslink(spec, state):
 @with_all_phases
 @spec_state_test
 def test_wrong_end_epoch_with_max_epochs_per_crosslink(spec, state):
+    # Do not run mainnet (64 epochs), that would mean the equivalent of ~7 hours chain simulation.
+    if spec.MAX_EPOCHS_PER_CROSSLINK > 4:
+        return
     for _ in range(spec.MAX_EPOCHS_PER_CROSSLINK + 2):
         next_epoch(spec, state)
     apply_empty_block(spec, state)
@@ -130,8 +138,9 @@ def test_before_inclusion_delay(spec, state):
 @spec_state_test
 def test_after_epoch_slots(spec, state):
     attestation = get_valid_attestation(spec, state, signed=True)
+    state.slot = spec.SLOTS_PER_EPOCH - 1
     # increment past latest inclusion slot
-    spec.process_slots(state, state.slot + spec.SLOTS_PER_EPOCH + 1)
+    spec.process_slots(state, state.slot + 2)
     apply_empty_block(spec, state)
 
     yield from run_attestation_processing(spec, state, attestation, False)
@@ -203,10 +212,17 @@ def test_future_target_epoch(spec, state):
 
     attestation = get_valid_attestation(spec, state)
 
-    state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY
-
+    participants = spec.get_attesting_indices(
+        state,
+        attestation.data,
+        attestation.aggregation_bits
+    )
     attestation.data.target.epoch = spec.get_current_epoch(state) + 1  # target epoch will be too new to handle
-    sign_attestation(spec, state, attestation)
+
+    # manually add signature for correct participants
+    attestation.signature = sign_aggregate_attestation(spec, state, attestation.data, participants)
+
+    state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY
 
     yield from run_attestation_processing(spec, state, attestation, False)
 
@@ -290,15 +306,17 @@ def test_non_zero_crosslink_data_root(spec, state):
 @with_all_phases
 @spec_state_test
 def test_bad_parent_crosslink(spec, state):
+    state.slot = spec.SLOTS_PER_EPOCH - 1
     next_epoch(spec, state)
     apply_empty_block(spec, state)
 
-    attestation = get_valid_attestation(spec, state, signed=True)
+    attestation = get_valid_attestation(spec, state, signed=False)
     for _ in range(spec.MIN_ATTESTATION_INCLUSION_DELAY):
         next_slot(spec, state)
     apply_empty_block(spec, state)
 
     attestation.data.crosslink.parent_root = b'\x27' * 32
+    sign_attestation(spec, state, attestation)
 
     yield from run_attestation_processing(spec, state, attestation, False)
 
@@ -306,15 +324,17 @@ def test_bad_parent_crosslink(spec, state):
 @with_all_phases
 @spec_state_test
 def test_bad_crosslink_start_epoch(spec, state):
+    state.slot = spec.SLOTS_PER_EPOCH - 1
     next_epoch(spec, state)
     apply_empty_block(spec, state)
 
-    attestation = get_valid_attestation(spec, state, signed=True)
+    attestation = get_valid_attestation(spec, state, signed=False)
     for _ in range(spec.MIN_ATTESTATION_INCLUSION_DELAY):
         next_slot(spec, state)
     apply_empty_block(spec, state)
 
     attestation.data.crosslink.start_epoch += 1
+    sign_attestation(spec, state, attestation)
 
     yield from run_attestation_processing(spec, state, attestation, False)
 
@@ -322,15 +342,17 @@ def test_bad_crosslink_start_epoch(spec, state):
 @with_all_phases
 @spec_state_test
 def test_bad_crosslink_end_epoch(spec, state):
+    state.slot = spec.SLOTS_PER_EPOCH - 1
     next_epoch(spec, state)
     apply_empty_block(spec, state)
 
-    attestation = get_valid_attestation(spec, state, signed=True)
+    attestation = get_valid_attestation(spec, state, signed=False)
     for _ in range(spec.MIN_ATTESTATION_INCLUSION_DELAY):
         next_slot(spec, state)
     apply_empty_block(spec, state)
 
     attestation.data.crosslink.end_epoch += 1
+    sign_attestation(spec, state, attestation)
 
     yield from run_attestation_processing(spec, state, attestation, False)
 

test_libs/pyspec/eth2spec/test/sanity/test_blocks.py

@@ -188,8 +188,8 @@ def test_attester_slashing(spec, state):
     pre_state = deepcopy(state)
 
     attester_slashing = get_valid_attester_slashing(spec, state, signed_1=True, signed_2=True)
-    validator_index = (attester_slashing.attestation_1.custody_bit_0_indices +
-                       attester_slashing.attestation_1.custody_bit_1_indices)[0]
+    validator_index = (attester_slashing.attestation_1.custody_bit_0_indices
+                       + attester_slashing.attestation_1.custody_bit_1_indices)[0]
 
     assert not state.validators[validator_index].slashed
 

test_libs/pyspec/eth2spec/test/utils.py

@@ -1,6 +1,6 @@
 from typing import Dict, Any, Callable, Iterable
 from eth2spec.debug.encode import encode
-from eth2spec.utils.ssz.ssz_typing import Container
+from eth2spec.utils.ssz.ssz_typing import SSZValue
 
 
 def spectest(description: str = None):
@@ -29,10 +29,12 @@ def spectest(description: str = None):
                         (key, value, typ) = data
                         out[key] = encode(value, typ)
                     else:
-                        # Otherwise, try to infer the type, but keep it as-is if it's not a SSZ container.
+                        # Otherwise, try to infer the type, but keep it as-is if it's not a SSZ type or bytes.
                         (key, value) = data
-                        if isinstance(value, Container):
-                            out[key] = encode(value, value.__class__)
+                        if isinstance(value, (SSZValue, bytes)):
+                            out[key] = encode(value)
+                        elif isinstance(value, list) and all([isinstance(el, (SSZValue, bytes)) for el in value]):
+                            out[key] = [encode(el) for el in value]
                         else:
                             # not a ssz value.
                             # It could be vector or bytes still, but it is a rare case,