Fix fields with ethereum/consensus-specs#158 and ethereum/consensus-specs#164

Author: hwwhww

eth/beacon/types/blocks.py

@@ -31,7 +31,7 @@ class BaseBeaconBlock(rlp.Serializable):
         ('slot', uint64),
         # Proposer RANDAO reveal
         ('randao_reveal', hash32),
-        # Recent PoW chain reference (receipt root)
+        # Recent PoW receipt root
         ('candidate_pow_receipt_root', hash32),
         # Skip list of previous beacon block hashes
         # i'th item is the most recent ancestor whose slot is a multiple of 2**i for i = 0, ..., 31

eth/beacon/types/candidate_pow_receipt_root_records.py

@@ -0,0 +1,29 @@
+from eth_typing import (
+    Hash32,
+)
+import rlp
+
+from eth.rlp.sedes import (
+    uint64,
+    hash32,
+)
+
+
+class CandidatePoWReceiptRootRecord(rlp.Serializable):
+    """
+    Note: using RLP until we have standardized serialization format.
+    """
+    fields = [
+        # Candidate PoW receipt root
+        ('candidate_pow_receipt_root', hash32),
+        # Vote count
+        ('votes', uint64),
+    ]
+
+    def __init__(self,
+                 candidate_pow_receipt_root: Hash32,
+                 votes: int) -> None:
+        super().__init__(
+            candidate_pow_receipt_root=candidate_pow_receipt_root,
+            votes=votes,
+        )

eth/beacon/types/states.py

@@ -24,6 +24,7 @@
 )
 
 from .attestation_records import AttestationRecord
+from .candidate_pow_receipt_root_records import CandidatePoWReceiptRootRecord
 from .crosslink_records import CrosslinkRecord
 from .shard_and_committees import ShardAndCommittee
 from .shard_reassignment_records import ShardReassignmentRecord
@@ -64,10 +65,9 @@ class BeaconState(rlp.Serializable):
         ('current_exit_seq', uint64),
         # Genesis time
         ('genesis_time', uint64),
-        # PoW chain reference
-        ('known_pow_receipt_root', hash32),
-        ('candidate_pow_receipt_root', hash32),
-        ('candidate_pow_receipt_root_votes', uint64),
+        # PoW receipt root
+        ('processed_pow_receipt_root', hash32),
+        ('candidate_pow_receipt_roots', CountableList(CandidatePoWReceiptRootRecord)),
         # Parameters relevant to hard forks / versioning.
         # Should be updated only by hard forks.
         ('pre_fork_version', uint64),
@@ -91,9 +91,7 @@ def __init__(self,
                  validator_set_delta_hash_chain: Hash32,
                  current_exit_seq: int,
                  genesis_time: int,
-                 known_pow_receipt_root: Hash32,
-                 candidate_pow_receipt_root: Hash32,
-                 candidate_pow_receipt_root_votes: int,
+                 processed_pow_receipt_root: Hash32,
                  pre_fork_version: int,
                  post_fork_version: int,
                  fork_slot_number: int,
@@ -104,6 +102,7 @@ def __init__(self,
                  persistent_committees: Sequence[Sequence[int]]=None,
                  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,
                  recent_block_hashes: Sequence[Hash32]=None
                  ) -> None:
@@ -140,9 +139,8 @@ def __init__(self,
             validator_set_delta_hash_chain=validator_set_delta_hash_chain,
             current_exit_seq=current_exit_seq,
             genesis_time=genesis_time,
-            known_pow_receipt_root=known_pow_receipt_root,
-            candidate_pow_receipt_root=candidate_pow_receipt_root,
-            candidate_pow_receipt_root_votes=candidate_pow_receipt_root_votes,
+            processed_pow_receipt_root=processed_pow_receipt_root,
+            candidate_pow_receipt_roots=candidate_pow_receipt_roots,
             pre_fork_version=pre_fork_version,
             post_fork_version=post_fork_version,
             fork_slot_number=fork_slot_number,

tests/beacon/conftest.py

@@ -78,9 +78,8 @@ def sample_beacon_state_params():
         'validator_set_delta_hash_chain': b'\x55' * 32,
         'current_exit_seq': 10,
         'genesis_time': 10,
-        'known_pow_receipt_root': b'\x55' * 32,
-        'candidate_pow_receipt_root': b'\x55' * 32,
-        'candidate_pow_receipt_root_votes': 5,
+        'processed_pow_receipt_root': b'\x55' * 32,
+        'candidate_pow_receipt_roots': (),
         'pre_fork_version': 0,
         'post_fork_version': 1,
         'fork_slot_number': 10,
@@ -90,6 +89,14 @@ def sample_beacon_state_params():
     }
 
 
+@pytest.fixture
+def sample_candidate_pow_receipt_root_record_params():
+    return {
+        'candidate_pow_receipt_root': b'\x43' * 32,
+        'votes': 10,
+    }
+
+
 @pytest.fixture
 def sample_crosslink_record_params():
     return {

tests/beacon/types/test_candidate_pow_receipt_root_record.py

@@ -0,0 +1,13 @@
+from eth.beacon.types.candidate_pow_receipt_root_records import (
+    CandidatePoWReceiptRootRecord,
+)
+
+
+def test_defaults(sample_candidate_pow_receipt_root_record_params):
+    candidate_pow_receipt_roots = CandidatePoWReceiptRootRecord(
+        **sample_candidate_pow_receipt_root_record_params
+    )
+    assert candidate_pow_receipt_roots.candidate_pow_receipt_root == \
+        sample_candidate_pow_receipt_root_record_params['candidate_pow_receipt_root']
+    assert candidate_pow_receipt_roots.votes == \
+        sample_candidate_pow_receipt_root_record_params['votes']

tests/beacon/types/test_states.py

@@ -38,9 +38,8 @@ def empty_beacon_state():
         validator_set_delta_hash_chain=ZERO_HASH32,
         current_exit_seq=00,
         genesis_time=00,
-        known_pow_receipt_root=ZERO_HASH32,
-        candidate_pow_receipt_root=ZERO_HASH32,
-        candidate_pow_receipt_root_votes=0,
+        processed_pow_receipt_root=ZERO_HASH32,
+        candidate_pow_receipt_roots=(),
         pre_fork_version=0,
         post_fork_version=0,
         fork_slot_number=0,