Sync ethereum/consensus-specs#149

Author: hwwhww

eth/beacon/state_machines/configs.py

@@ -28,6 +28,7 @@
         ('POW_RECEIPT_ROOT_VOTING_PERIOD', int),  # slots
         ('SLASHING_WHISTLEBLOWER_REWARD_DENOMINATOR', int),
         ('BASE_REWARD_QUOTIENT', int),
+        ('INCLUDER_REWARD_SHARE_QUOTIENT', int),
         ('MAX_VALIDATOR_CHURN_QUOTIENT', int),
         ('POW_CONTRACT_MERKLE_TREE_DEPTH', int),
         ('MAX_ATTESTATION_COUNT', int),

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

@@ -15,14 +15,15 @@
     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
-    SQRT_E_DROP_TIME=2**18,  # = 262,144 slots
+    SQRT_E_DROP_TIME=2**11,  # = 2,048 cycles
     WITHDRAWALS_PER_CYCLE=2**2,  # = 4 validators
     MIN_WITHDRAWAL_PERIOD=2**13,  # = 8,192 slots
     DELETION_PERIOD=2**22,  # = 4,194,304 slots
     COLLECTIVE_PENALTY_CALCULATION_PERIOD=2**20,  # = 1,048,576 slots
     POW_RECEIPT_ROOT_VOTING_PERIOD=2**10,  # = 1024
     SLASHING_WHISTLEBLOWER_REWARD_DENOMINATOR=2**9,  # = 512
-    BASE_REWARD_QUOTIENT=2**15,  # = 32,768
+    BASE_REWARD_QUOTIENT=2**11,  # = 2,048
+    INCLUDER_REWARD_SHARE_QUOTIENT=2**3,  # = 8
     MAX_VALIDATOR_CHURN_QUOTIENT=2**5,  # = 32
     POW_CONTRACT_MERKLE_TREE_DEPTH=2**5,  # =32
     MAX_ATTESTATION_COUNT=2**7,  # 128

eth/beacon/types/attestation_records.py

@@ -2,19 +2,19 @@
     Sequence,
 )
 
-from eth_typing import (
-    Hash32,
-)
 import rlp
 from rlp.sedes import (
     binary,
     CountableList,
 )
 
 from eth.rlp.sedes import (
-    uint64,
     uint256,
-    hash32,
+)
+
+
+from .attestation_signed_data import (
+    AttestationSignedData,
 )
 
 
@@ -23,53 +23,26 @@ class AttestationRecord(rlp.Serializable):
     Note: using RLP until we have standardized serialization format.
     """
     fields = [
-        # Slot number
-        ('slot', uint64),
-        # Shard number
-        ('shard', uint64),
-        # Beacon block hashes not part of the current chain, oldest to newest
-        ('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),
-        # Attester participation bitfield (1 bit per attester)
+        ('data', AttestationSignedData),
+        # Attester participation bitfield
         ('attester_bitfield', binary),
-        # Hash of last justified beacon block
-        ('justified_slot', uint64),
-        # Slot of last justified beacon block
-        ('justified_block_hash', hash32),
+        # Proof of custody bitfield
+        ('poc_bitfield', binary),
         # BLS aggregate signature
         ('aggregate_sig', CountableList(uint256)),
     ]
 
     def __init__(self,
-                 slot: int,
-                 shard: int,
-                 shard_block_hash: Hash32,
-                 last_crosslink_hash: Hash32,
-                 shard_block_combined_data_root: Hash32,
+                 data: AttestationSignedData,
                  attester_bitfield: bytes,
-                 justified_slot: int,
-                 justified_block_hash: Hash32,
-                 parent_hashes: Sequence[Hash32]=None,
+                 poc_bitfield: bytes,
                  aggregate_sig: Sequence[int]=None) -> None:
-        if parent_hashes is None:
-            parent_hashes = ()
         if aggregate_sig is None:
             aggregate_sig = (0, 0)
 
         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,
+            data=data,
             attester_bitfield=attester_bitfield,
-            justified_slot=justified_slot,
-            justified_block_hash=justified_block_hash,
+            poc_bitfield=poc_bitfield,
             aggregate_sig=aggregate_sig,
         )

eth/beacon/types/attestation_signed_data.py

@@ -1,14 +1,7 @@
-from typing import (
-    Sequence,
-)
-
 from eth_typing import (
     Hash32,
 )
 import rlp
-from rlp.sedes import (
-    CountableList,
-)
 
 from eth.rlp.sedes import (
     uint64,
@@ -25,35 +18,36 @@ class AttestationSignedData(rlp.Serializable):
         ('slot', uint64),
         # Shard number
         ('shard', uint64),
-        # CYCLE_LENGTH parent hashes
-        ('parent_hashes', CountableList(hash32)),
+        # Hash of the block we're signing
+        ('block_hash', hash32),
+        # Hash of the ancestor at the cycle boundary
+        ('cycle_boundary_hash', 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
+        # Slot of last justified beacon block
         ('justified_slot', uint64),
+        # Hash of last justified beacon block
+        ('justified_block_hash', hash32),
     ]
 
     def __init__(self,
                  slot: int,
                  shard: int,
+                 block_hash: Hash32,
+                 cycle_boundary_hash: Hash32,
                  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 = ()
-
+                 justified_block_hash: Hash32) -> None:
         super().__init__(
             slot=slot,
             shard=shard,
-            parent_hashes=parent_hashes,
+            block_hash=block_hash,
+            cycle_boundary_hash=cycle_boundary_hash,
             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
+            justified_slot=justified_slot,
+            justified_block_hash=justified_block_hash,
         )

eth/beacon/types/processed_attestation.py

@@ -0,0 +1,41 @@
+import rlp
+from rlp.sedes import (
+    binary,
+)
+
+from eth.rlp.sedes import (
+    uint64,
+)
+
+
+from .attestation_signed_data import (
+    AttestationSignedData,
+)
+
+
+class ProcessedAttestation(rlp.Serializable):
+    """
+    Note: using RLP until we have standardized serialization format.
+    """
+    fields = [
+        # Signed data
+        ('data', AttestationSignedData),
+        # Attester participation bitfield
+        ('attester_bitfield', binary),
+        # Proof of custody bitfield
+        ('poc_bitfield', binary),
+        # Slot in which it was included
+        ('slot_included', uint64),
+    ]
+
+    def __init__(self,
+                 data: AttestationSignedData,
+                 attester_bitfield: bytes,
+                 poc_bitfield: bytes,
+                 slot_included: int) -> None:
+        super().__init__(
+            data=data,
+            attester_bitfield=attester_bitfield,
+            poc_bitfield=poc_bitfield,
+            slot_included=slot_included,
+        )

eth/beacon/types/states.py

@@ -23,7 +23,7 @@
     blake,
 )
 
-from .attestation_records import AttestationRecord
+from .processed_attestation import ProcessedAttestation
 from .candidate_pow_receipt_root_records import CandidatePoWReceiptRootRecord
 from .crosslink_records import CrosslinkRecord
 from .shard_and_committees import ShardAndCommittee
@@ -46,10 +46,11 @@ class BeaconState(rlp.Serializable):
         ('last_state_recalculation_slot', uint64),
         # Last finalized slot
         ('last_finalized_slot', uint64),
-        # Last justified slot
-        ('last_justified_slot', uint64),
-        # Number of consecutive justified slots
-        ('justified_streak', uint64),
+        # Justification source
+        ('justification_source', uint64),
+        ('prev_cycle_justification_source', uint64),
+        # Recent justified slot bitmask
+        ('justified_slot_bitfield', uint64),
         # Committee members and their assigned shard, per slot
         ('shard_and_committee_for_slots', CountableList(CountableList(ShardAndCommittee))),
         # Persistent shard committees
@@ -74,7 +75,7 @@ class BeaconState(rlp.Serializable):
         ('post_fork_version', uint64),
         ('fork_slot_number', uint64),
         # Attestations not yet processed
-        ('pending_attestations', CountableList(AttestationRecord)),
+        ('pending_attestations', CountableList(ProcessedAttestation)),
         # recent beacon block hashes needed to process attestations, older to newer
         ('recent_block_hashes', CountableList(hash32)),
         # RANDAO state
@@ -85,8 +86,9 @@ def __init__(self,
                  validator_set_change_slot: int,
                  last_state_recalculation_slot: int,
                  last_finalized_slot: int,
-                 last_justified_slot: int,
-                 justified_streak: int,
+                 justification_source: int,
+                 prev_cycle_justification_source: int,
+                 justified_slot_bitfield: int,
                  next_shuffling_seed: Hash32,
                  validator_set_delta_hash_chain: Hash32,
                  current_exit_seq: int,
@@ -103,7 +105,7 @@ def __init__(self,
                  persistent_committee_reassignments: Sequence[ShardReassignmentRecord]=None,
                  deposits_penalized_in_period: Sequence[int]=None,
                  candidate_pow_receipt_roots: Sequence[CandidatePoWReceiptRootRecord]=None,
-                 pending_attestations: Sequence[AttestationRecord]=None,
+                 pending_attestations: Sequence[ProcessedAttestation]=None,
                  recent_block_hashes: Sequence[Hash32]=None
                  ) -> None:
         if validators is None:
@@ -129,8 +131,9 @@ def __init__(self,
             crosslinks=crosslinks,
             last_state_recalculation_slot=last_state_recalculation_slot,
             last_finalized_slot=last_finalized_slot,
-            last_justified_slot=last_justified_slot,
-            justified_streak=justified_streak,
+            justification_source=justification_source,
+            prev_cycle_justification_source=prev_cycle_justification_source,
+            justified_slot_bitfield=justified_slot_bitfield,
             shard_and_committee_for_slots=shard_and_committee_for_slots,
             persistent_committees=persistent_committees,
             persistent_committee_reassignments=persistent_committee_reassignments,

tests/beacon/conftest.py

@@ -5,6 +5,11 @@
 
 from eth.beacon.state_machines.forks.serenity.configs import SERENITY_CONFIG
 
+from eth.beacon.types.attestation_signed_data import (
+    AttestationSignedData,
+)
+
+
 DEFAULT_SHUFFLING_SEED = b'\00' * 32
 DEFAULT_RANDAO = b'\45' * 32
 DEFAULT_NUM_VALIDATORS = 40
@@ -31,17 +36,11 @@ def pubkeys(keymap):
 
 
 @pytest.fixture
-def sample_attestation_record_params():
+def sample_attestation_record_params(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,
-        'attester_bitfield': b'\x33\x1F',
-        'justified_slot': 5,
-        'justified_block_hash': b'\x33' * 32,
+        'data': AttestationSignedData(**sample_attestation_signed_data_params),
+        'attester_bitfield': b'\12' * 16,
+        'poc_bitfield': b'\34' * 16,
         'aggregate_sig': [0, 0],
     }
 
@@ -51,11 +50,12 @@ 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,
+        'block_hash': b'\x11' * 32,
+        'cycle_boundary_hash': b'\x22' * 32,
+        'shard_block_hash': b'\x33' * 32,
+        'last_crosslink_hash': b'\x44' * 32,
         'justified_slot': 5,
+        'justified_block_hash': b'\x55' * 32,
     }
 
 
@@ -81,8 +81,9 @@ def sample_beacon_state_params():
         'crosslinks': (),
         'last_state_recalculation_slot': 1,
         'last_finalized_slot': 2,
-        'last_justified_slot': 2,
-        'justified_streak': 2,
+        'prev_cycle_justification_source': 2,
+        'justification_source': 2,
+        'justified_slot_bitfield': 2,
         'shard_and_committee_for_slots': (),
         'persistent_committees': (),
         'persistent_committee_reassignments': (),
@@ -127,6 +128,16 @@ def sample_fork_data_params():
     }
 
 
+@pytest.fixture
+def sample_processed_attestation_params(sample_attestation_signed_data_params):
+    return {
+        'data': AttestationSignedData(**sample_attestation_signed_data_params),
+        'attester_bitfield': b'\12' * 16,
+        'poc_bitfield': b'\34' * 16,
+        'slot_included': 0,
+    }
+
+
 @pytest.fixture
 def sample_proposal_signed_data_params():
     return {
@@ -270,6 +281,11 @@ def sqrt_e_drop_time():
     return SERENITY_CONFIG.SQRT_E_DROP_TIME
 
 
+@pytest.fixture
+def includer_reward_share_quotient():
+    return SERENITY_CONFIG.INCLUDER_REWARD_SHARE_QUOTIENT
+
+
 @pytest.fixture
 def withdrawals_per_cycle():
     return SERENITY_CONFIG.WITHDRAWALS_PER_CYCLE

tests/beacon/types/test_attestation_processed_attestation.py

@@ -0,0 +1,12 @@
+from eth.beacon.types.processed_attestation import (
+    ProcessedAttestation,
+)
+
+
+def test_defaults(sample_processed_attestation_params):
+    attestation_record = ProcessedAttestation(**sample_processed_attestation_params)
+
+    assert attestation_record.data == sample_processed_attestation_params['data']
+    assert attestation_record.attester_bitfield == sample_processed_attestation_params['attester_bitfield']  # noqa: E501
+    assert attestation_record.poc_bitfield == sample_processed_attestation_params['poc_bitfield']
+    assert attestation_record.slot_included == sample_processed_attestation_params['slot_included']

tests/beacon/types/test_attestation_record.py

@@ -8,7 +8,6 @@
 @pytest.mark.parametrize(
     'param,default_value',
     [
-        ('parent_hashes', ()),
         ('aggregate_sig', (0, 0)),
     ]
 )