Sync with the spec again

1. ethereum/consensus-specs#172 updates
2. ethereum/consensus-specs#165 updates
3. Add `BLSDomain` enum
4. Add `AttestationSignedData`

Author: hwwhww

eth/beacon/enums/bls_domain.py

@@ -0,0 +1,8 @@
+from enum import IntEnum
+
+
+class BLSDomain(IntEnum):
+    DOMAIN_DEPOSIT = 0
+    DOMAIN_ATTESTATION = 1
+    DOMAIN_PROPOSAL = 2
+    DOMAIN_LOGOUT = 3

eth/beacon/state_machines/configs.py

@@ -20,7 +20,6 @@
         ('MIN_VALIDATOR_SET_CHANGE_INTERVAL', int),  # slots
         ('SHARD_PERSISTENT_COMMITTEE_CHANGE_PERIOD', int),  # slots
         ('MIN_ATTESTATION_INCLUSION_DELAY', int),  # slots
-        ('RANDAO_SLOTS_PER_LAYER', int),  # slots
         ('SQRT_E_DROP_TIME', int),  # slots
         ('WITHDRAWALS_PER_CYCLE', int),  # validators
         ('MIN_WITHDRAWAL_PERIOD', int),  # slots
@@ -31,7 +30,7 @@
         ('BASE_REWARD_QUOTIENT', int),
         ('MAX_VALIDATOR_CHURN_QUOTIENT', int),
         ('POW_CONTRACT_MERKLE_TREE_DEPTH', int),
-        ('LOGOUT_MESSAGE', str),
+        ('MAX_ATTESTATION_COUNT', int),
         ('INITIAL_FORK_VERSION', int),
     )
 )

eth/beacon/state_machines/forks/serenity/configs.py

@@ -15,7 +15,6 @@
     MIN_VALIDATOR_SET_CHANGE_INTERVAL=2**8,  # = 256 slots
     SHARD_PERSISTENT_COMMITTEE_CHANGE_PERIOD=2**17,  # = 131,072 slots
     MIN_ATTESTATION_INCLUSION_DELAY=2**2,  # = 4 slots
-    RANDAO_SLOTS_PER_LAYER=2**12,  # = 4,096 slots
     SQRT_E_DROP_TIME=2**18,  # = 262,144 slots
     WITHDRAWALS_PER_CYCLE=2**2,  # = 4 validators
     MIN_WITHDRAWAL_PERIOD=2**13,  # = 8,192 slots
@@ -26,6 +25,6 @@
     BASE_REWARD_QUOTIENT=2**15,  # = 32,768
     MAX_VALIDATOR_CHURN_QUOTIENT=2**5,  # = 32
     POW_CONTRACT_MERKLE_TREE_DEPTH=2**5,  # =32
-    LOGOUT_MESSAGE="LOGOUT",
+    MAX_ATTESTATION_COUNT=2**7,  # 128
     INITIAL_FORK_VERSION=0,
 )

eth/beacon/types/attestation_records.py

@@ -1,6 +1,5 @@
 from typing import (
-    Iterable,
-    Tuple,
+    Sequence,
 )
 
 from eth_typing import (
@@ -55,12 +54,12 @@ def __init__(self,
                  attester_bitfield: bytes,
                  justified_slot: int,
                  justified_block_hash: Hash32,
-                 parent_hashes: Tuple[Hash32, ...]=None,
-                 aggregate_sig: Iterable[int]=None) -> None:
+                 parent_hashes: Sequence[Hash32]=None,
+                 aggregate_sig: Sequence[int]=None) -> None:
         if parent_hashes is None:
             parent_hashes = ()
         if aggregate_sig is None:
-            aggregate_sig = [0, 0]
+            aggregate_sig = (0, 0)
 
         super().__init__(
             slot=slot,

eth/beacon/types/attestation_signed_data.py

@@ -0,0 +1,59 @@
+from typing import (
+    Sequence,
+)
+
+from eth_typing import (
+    Hash32,
+)
+import rlp
+from rlp.sedes import (
+    CountableList,
+)
+
+from eth.rlp.sedes import (
+    uint64,
+    hash32,
+)
+
+
+class AttestationSignedData(rlp.Serializable):
+    """
+    Note: using RLP until we have standardized serialization format.
+    """
+    fields = [
+        # Slot number
+        ('slot', uint64),
+        # Shard number
+        ('shard', uint64),
+        # CYCLE_LENGTH parent hashes
+        ('parent_hashes', CountableList(hash32)),
+        # Shard block hash being attested to
+        ('shard_block_hash', hash32),
+        # Last crosslink hash
+        ('last_crosslink_hash', hash32),
+        # Root of data between last hash and this one
+        ('shard_block_combined_data_root', hash32),
+        # Hash of last justified beacon block
+        ('justified_slot', uint64),
+    ]
+
+    def __init__(self,
+                 slot: int,
+                 shard: int,
+                 shard_block_hash: Hash32,
+                 last_crosslink_hash: Hash32,
+                 shard_block_combined_data_root: Hash32,
+                 justified_slot: int,
+                 parent_hashes: Sequence[Hash32]=None) -> None:
+        if parent_hashes is None:
+            parent_hashes = ()
+
+        super().__init__(
+            slot=slot,
+            shard=shard,
+            parent_hashes=parent_hashes,
+            shard_block_hash=shard_block_hash,
+            last_crosslink_hash=last_crosslink_hash,
+            shard_block_combined_data_root=shard_block_combined_data_root,
+            justified_slot=justified_slot
+        )

eth/beacon/types/proposal_signed_data.py

@@ -14,7 +14,6 @@ class ProposalSignedData(rlp.Serializable):
     Note: using RLP until we have standardized serialization format.
     """
     fields = [
-        # Fork version
         # Slot number
         ('slot', uint64),
         # Shard number (or `2**64 - 1` for beacon chain)

eth/beacon/types/validator_records.py

@@ -21,8 +21,8 @@ class ValidatorRecord(rlp.Serializable):
         ('withdrawal_credentials', hash32),
         # RANDAO commitment
         ('randao_commitment', hash32),
-        # Slot the RANDAO commitment was last changed
-        ('randao_last_change', uint64),
+        # Slot the proposer has skipped (ie. layers of RANDAO expected)
+        ('randao_skips', uint64),
         # Balance in Gwei
         ('balance', uint64),
         # Status code
@@ -37,7 +37,7 @@ def __init__(self,
                  pubkey: int,
                  withdrawal_credentials: Hash32,
                  randao_commitment: Hash32,
-                 randao_last_change: int,
+                 randao_skips: int,
                  balance: int,
                  status: int,
                  last_status_change_slot: int,
@@ -46,7 +46,7 @@ def __init__(self,
             pubkey=pubkey,
             withdrawal_credentials=withdrawal_credentials,
             randao_commitment=randao_commitment,
-            randao_last_change=randao_last_change,
+            randao_skips=randao_skips,
             balance=balance,
             status=status,
             last_status_change_slot=last_status_change_slot,

tests/beacon/conftest.py

@@ -46,6 +46,19 @@ def sample_attestation_record_params():
     }
 
 
+@pytest.fixture
+def sample_attestation_signed_data_params():
+    return {
+        'slot': 10,
+        'shard': 12,
+        'parent_hashes': [b'\x11' * 32],
+        'shard_block_hash': b'\x22' * 32,
+        'last_crosslink_hash': b'\x33' * 32,
+        'shard_block_combined_data_root': b'\x44' * 32,
+        'justified_slot': 5,
+    }
+
+
 @pytest.fixture
 def sample_beacon_block_params():
     return {
@@ -154,7 +167,7 @@ def sample_validator_record_params():
         'pubkey': 123,
         'withdrawal_credentials': b'\x01' * 32,
         'randao_commitment': b'\x01' * 32,
-        'randao_last_change': 1,
+        'randao_skips': 1,
         'balance': 100,
         'status': 1,
         'last_status_change_slot': 0,
@@ -243,11 +256,6 @@ def min_attestation_inclusion_delay():
     return SERENITY_CONFIG.MIN_ATTESTATION_INCLUSION_DELAY
 
 
-@pytest.fixture
-def randao_slots_per_layer():
-    return SERENITY_CONFIG.RANDAO_SLOTS_PER_LAYER
-
-
 @pytest.fixture
 def sqrt_e_drop_time():
     return SERENITY_CONFIG.SQRT_E_DROP_TIME
@@ -299,8 +307,8 @@ def pow_contract_merkle_tree_depth():
 
 
 @pytest.fixture
-def logout_message():
-    return SERENITY_CONFIG.LOGOUT_MESSAGE
+def max_attestation_count():
+    return SERENITY_CONFIG.MAX_ATTESTATION_COUNT
 
 
 @pytest.fixture

tests/beacon/types/test_attestation_signed_data.py

@@ -0,0 +1,18 @@
+import pytest
+
+from eth.beacon.types.attestation_signed_data import (
+    AttestationSignedData,
+)
+
+
+@pytest.mark.parametrize(
+    'param,default_value',
+    [
+        ('parent_hashes', ()),
+    ]
+)
+def test_defaults(param, default_value, sample_attestation_signed_data_params):
+    del sample_attestation_signed_data_params[param]
+    attestation_signed_data = AttestationSignedData(**sample_attestation_signed_data_params)
+
+    assert getattr(attestation_signed_data, param) == default_value