PR feedback

Author: hwwhww

eth/beacon/db/chain.py

@@ -278,25 +278,25 @@ def _persist_block_chain(
             return tuple(), tuple()
         else:
             for parent, child in sliding_window(2, blocks):
-                if parent.hash != child.ancestor_hashes[0]:
+                if parent.hash != child.parent_hash:
                     raise ValidationError(
                         "Non-contiguous chain. Expected {} to have {} as parent but was {}".format(
                             encode_hex(child.hash),
                             encode_hex(parent.hash),
-                            encode_hex(child.ancestor_hashes[0]),
+                            encode_hex(child.parent_hash),
                         )
                     )
 
-            is_genesis = first_block.ancestor_hashes[0] == GENESIS_PARENT_HASH
-            if not is_genesis and not cls._block_exists(db, first_block.ancestor_hashes[0]):
+            is_genesis = first_block.parent_hash == GENESIS_PARENT_HASH
+            if not is_genesis and not cls._block_exists(db, first_block.parent_hash):
                 raise ParentNotFound(
                     "Cannot persist block ({}) with unknown parent ({})".format(
-                        encode_hex(first_block.hash), encode_hex(first_block.ancestor_hashes[0])))
+                        encode_hex(first_block.hash), encode_hex(first_block.parent_hash)))
 
             if is_genesis:
                 score = 0
             else:
-                score = cls._get_score(db, first_block.ancestor_hashes[0])
+                score = cls._get_score(db, first_block.parent_hash)
 
         for block in blocks:
             db.set(
@@ -389,10 +389,10 @@ def _find_new_ancestors(cls, db: BaseDB, block: BaseBeaconBlock) -> Iterable[Bas
             # Found a new ancestor
             yield block
 
-            if block.ancestor_hashes[0] == GENESIS_PARENT_HASH:
+            if block.parent_hash == GENESIS_PARENT_HASH:
                 break
             else:
-                block = cls._get_block_by_hash(db, block.ancestor_hashes[0])
+                block = cls._get_block_by_hash(db, block.parent_hash)
 
     @staticmethod
     def _add_block_slot_to_hash_lookup(db: BaseDB, block: BaseBeaconBlock) -> None:

eth/beacon/types/blocks.py

@@ -54,7 +54,9 @@ def __init__(self,
                  state_root: Hash32,
                  attestations: Sequence[AttestationRecord],
                  specials: Sequence[SpecialRecord],
-                 proposer_signature: Sequence[int]) -> None:
+                 proposer_signature: Sequence[int]=None) -> None:
+        if proposer_signature is None:
+            proposer_signature = (0, 0)
         super().__init__(
             slot=slot,
             randao_reveal=randao_reveal,
@@ -83,3 +85,10 @@ def hash(self) -> Hash32:
     @property
     def num_attestations(self) -> int:
         return len(self.attestations)
+
+    @property
+    def parent_hash(self) -> Hash32:
+        if not self.ancestor_hashes:
+            return None
+        else:
+            return self.ancestor_hashes[0]

eth/beacon/types/validator_records.py

@@ -1,13 +1,9 @@
 from eth_typing import (
-    Address,
     Hash32,
 )
 import rlp
 
 from eth.rlp.sedes import (
-    address,
-    uint8,
-    uint16,
     uint64,
     uint256,
     hash32,
@@ -21,18 +17,16 @@ class ValidatorRecord(rlp.Serializable):
     fields = [
         # BLS public key
         ('pubkey', uint256),
-        # Withdrawal shard number
-        ('withdrawal_shard', uint16),
-        # Withdrawal address
-        ('withdrawal_address', address),
+        # Withdrawal credentials
+        ('withdrawal_credentials', hash32),
         # RANDAO commitment
         ('randao_commitment', hash32),
         # Slot the RANDAO commitment was last changed
         ('randao_last_change', uint64),
         # Balance in Gwei
         ('balance', uint64),
         # Status code
-        ('status', uint8),
+        ('status', uint64),
         # Slot when validator last changed status (or 0)
         ('last_status_change_slot', uint64),
         # Sequence number when validator exited (or 0)
@@ -41,8 +35,7 @@ class ValidatorRecord(rlp.Serializable):
 
     def __init__(self,
                  pubkey: int,
-                 withdrawal_shard: int,
-                 withdrawal_address: Address,
+                 withdrawal_credentials: Hash32,
                  randao_commitment: Hash32,
                  randao_last_change: int,
                  balance: int,
@@ -51,8 +44,7 @@ def __init__(self,
                  exit_seq: int) -> None:
         super().__init__(
             pubkey=pubkey,
-            withdrawal_shard=withdrawal_shard,
-            withdrawal_address=withdrawal_address,
+            withdrawal_credentials=withdrawal_credentials,
             randao_commitment=randao_commitment,
             randao_last_change=randao_last_change,
             balance=balance,

eth/rlp/sedes.py

@@ -11,11 +11,8 @@
 address = Binary.fixed_length(20, allow_empty=True)
 collation_body = Binary.fixed_length(COLLATION_SIZE)
 hash32 = Binary.fixed_length(32)
-uint8 = BigEndianInt(8)
-uint16 = BigEndianInt(16)
 uint24 = BigEndianInt(24)
 uint32 = BigEndianInt(32)
 uint64 = BigEndianInt(64)
-uint128 = BigEndianInt(128)
 uint256 = BigEndianInt(256)
 trie_root = Binary.fixed_length(32, allow_empty=True)

tests/beacon/conftest.py

@@ -56,7 +56,7 @@ def sample_beacon_block_params():
         'state_root': b'\x55' * 32,
         'attestations': (),
         'specials': (),
-        'proposer_signature': (),
+        'proposer_signature': (0, 0),
     }
 
 
@@ -108,7 +108,6 @@ def sample_crosslink_record_params():
 @pytest.fixture
 def sample_proposal_signed_data_params():
     return {
-        'fork_version': 9,
         'slot': 10,
         'shard': 12,
         'block_hash': b'\x43' * 32,
@@ -153,8 +152,7 @@ def sample_special_params():
 def sample_validator_record_params():
     return {
         'pubkey': 123,
-        'withdrawal_shard': 10,
-        'withdrawal_address': b'\x01' * 20,
+        'withdrawal_credentials': b'\x01' * 32,
         'randao_commitment': b'\x01' * 32,
         'randao_last_change': 1,
         'balance': 100,

tests/beacon/helpers.py

@@ -9,8 +9,7 @@
 def mock_validator_record(pubkey, deposit_size, default_end_dynasty, start_dynasty=0):
     return ValidatorRecord(
         pubkey=pubkey,
-        withdrawal_shard=0,
-        withdrawal_address=pubkey.to_bytes(32, 'big')[-20:],
+        withdrawal_credentials=b'\x44' * 32,
         randao_commitment=b'\x55' * 32,
         balance=deposit_size,
         start_dynasty=start_dynasty,

tests/beacon/types/test_block.py

@@ -30,3 +30,17 @@ def test_update_attestations(sample_attestation_record_params, sample_beacon_blo
 def test_hash(sample_beacon_block_params):
     block = BaseBeaconBlock(**sample_beacon_block_params)
     assert block.hash == blake(rlp.encode(block))
+
+
+def test_parent_hash(sample_beacon_block_params):
+    block = BaseBeaconBlock(**sample_beacon_block_params)
+    block = block.copy(
+        ancestor_hashes=(),
+    )
+    assert block.parent_hash is None
+
+    sample_parent_hash = b'\x01' * 32
+    block = block.copy(
+        ancestor_hashes=(sample_parent_hash,),
+    )
+    assert block.parent_hash == sample_parent_hash

tests/beacon/types/test_proposal_signed_data.py

@@ -5,7 +5,6 @@
 
 def test_defaults(sample_proposal_signed_data_params):
     proposal_signed_data = ProposalSignedData(**sample_proposal_signed_data_params)
-    assert proposal_signed_data.fork_version == sample_proposal_signed_data_params['fork_version']
     assert proposal_signed_data.slot == sample_proposal_signed_data_params['slot']
     assert proposal_signed_data.shard == sample_proposal_signed_data_params['shard']
     assert proposal_signed_data.block_hash == sample_proposal_signed_data_params['block_hash']

tests/beacon/types/test_validator_record.py

@@ -6,4 +6,5 @@
 def test_defaults(sample_validator_record_params):
     validator = ValidatorRecord(**sample_validator_record_params)
     assert validator.pubkey == sample_validator_record_params['pubkey']
-    assert validator.withdrawal_shard == sample_validator_record_params['withdrawal_shard']
+    assert validator.withdrawal_credentials == \
+        sample_validator_record_params['withdrawal_credentials']