Merge branch 'master' into attestation-validation

Author: djrtwo

eth/beacon/deposit_helpers.py

@@ -30,11 +30,12 @@
 
 
 def get_min_empty_validator_index(validators: Sequence[ValidatorRecord],
+                                  validator_balances: Sequence[int],
                                   current_slot: int,
                                   zero_balance_validator_ttl: int) -> int:
-    for index, validator in enumerate(validators):
+    for index, (validator, balance) in enumerate(zip(validators, validator_balances)):
         is_empty = (
-            validator.balance == 0 and
+            balance == 0 and
             validator.latest_status_change_slot + zero_balance_validator_ttl <= current_slot
         )
         if is_empty:
@@ -74,6 +75,7 @@ def validate_proof_of_possession(state: BeaconState,
 
 def add_pending_validator(state: BeaconState,
                           validator: ValidatorRecord,
+                          deposit: int,
                           zero_balance_validator_ttl: int) -> Tuple[BeaconState, int]:
     """
     Add a validator to the existing minimum empty validator index or
@@ -83,6 +85,7 @@ def add_pending_validator(state: BeaconState,
     try:
         index = get_min_empty_validator_index(
             state.validator_registry,
+            state.validator_balances,
             state.slot,
             zero_balance_validator_ttl,
         )
@@ -93,11 +96,12 @@ def add_pending_validator(state: BeaconState,
         validator_registry = state.validator_registry + (validator,)
         state = state.copy(
             validator_registry=validator_registry,
+            validator_balances=state.validator_balances + (deposit, )
         )
         index = len(state.validator_registry) - 1
     else:
         # Use the empty validator index
-        state = state.update_validator(index, validator)
+        state = state.update_validator(index, validator, deposit)
 
     return state, index
 
@@ -127,13 +131,13 @@ def process_deposit(*,
             pubkey=pubkey,
             withdrawal_credentials=withdrawal_credentials,
             randao_commitment=randao_commitment,
-            balance=deposit,
             latest_status_change_slot=state.slot,
         )
 
         state, index = add_pending_validator(
             state,
             validator,
+            deposit,
             zero_balance_validator_ttl,
         )
     else:
@@ -151,9 +155,10 @@ def process_deposit(*,
             )
 
         # Update validator's balance and state
-        validator = validator.copy(
-            balance=validator.balance + deposit,
+        state = state.update_validator(
+            validator_index=index,
+            validator=validator,
+            balance=state.validator_balances[index] + deposit,
         )
-        state = state.update_validator(index, validator)
 
     return state, index

eth/beacon/helpers.py

@@ -350,11 +350,12 @@ def get_attestation_participants(state: 'BeaconState',
 #
 # Misc
 #
-def get_effective_balance(validator: 'ValidatorRecord', max_deposit: int) -> int:
+def get_effective_balance(validator_balances: Sequence[int], index: int, max_deposit: int) -> int:
     """
-    Return the effective balance (also known as "balance at stake") for the ``validator``.
+    Return the effective balance (also known as "balance at stake") for a
+    ``validator`` with the given ``index``.
     """
-    return min(validator.balance, max_deposit * denoms.gwei)
+    return min(validator_balances[index], max_deposit * denoms.gwei)
 
 
 def get_new_validator_registry_delta_chain_tip(current_validator_registry_delta_chain_tip: Hash32,

eth/beacon/state_machines/validation.py

@@ -0,0 +1,52 @@
+from eth_utils import (
+    ValidationError,
+)
+
+from eth.beacon.enums import (
+    SignatureDomain,
+)
+from eth.beacon.helpers import (
+    get_beacon_proposer_index,
+    get_domain,
+)
+from eth.beacon.types.blocks import (
+    BaseBeaconBlock,
+)
+from eth.beacon.types.proposal_signed_data import (
+    ProposalSignedData,
+)
+from eth.beacon.types.states import (
+    BeaconState,
+)
+
+from eth._utils.bls import (
+    verify,
+)
+
+
+def validate_proposer_signature(state: BeaconState,
+                                block: BaseBeaconBlock,
+                                beacon_chain_shard_number: int,
+                                epoch_length: int) -> None:
+    block_without_signature_root = block.block_without_signature_root
+
+    # TODO: Replace this root with tree hash root
+    proposal_root = ProposalSignedData(
+        state.slot,
+        beacon_chain_shard_number,
+        block_without_signature_root
+    ).root
+
+    # Get the public key of proposer
+    beacon_proposer_index = get_beacon_proposer_index(state, state.slot, epoch_length)
+    proposer_pubkey = state.validator_registry[beacon_proposer_index].pubkey
+
+    is_valid_signature = verify(
+        pubkey=proposer_pubkey,
+        message=proposal_root,
+        signature=block.signature,
+        domain=get_domain(state.fork_data, state.slot, SignatureDomain.DOMAIN_PROPOSAL)
+    )
+
+    if not is_valid_signature:
+        raise ValidationError("Invalid Proposer Signature on block")

eth/beacon/types/blocks.py

@@ -19,6 +19,8 @@
     uint64,
     uint384,
 )
+
+from eth.beacon.constants import EMPTY_SIGNATURE
 from eth.beacon._utils.hash import hash_eth2
 
 from .attestations import Attestation
@@ -111,3 +113,9 @@ def root(self) -> Hash32:
     @property
     def num_attestations(self) -> int:
         return len(self.body.attestations)
+
+    @property
+    def block_without_signature_root(self) -> Hash32:
+        return self.copy(
+            signature=EMPTY_SIGNATURE
+        ).root

eth/beacon/types/proposal_signed_data.py

@@ -3,6 +3,8 @@
 )
 import rlp
 
+from eth.beacon._utils.hash import hash_eth2
+
 from eth.rlp.sedes import (
     uint64,
     hash32,
@@ -31,3 +33,17 @@ def __init__(self,
             shard,
             block_root,
         )
+
+    _hash = None
+
+    @property
+    def hash(self) -> Hash32:
+        if self._hash is None:
+            self._hash = hash_eth2(rlp.encode(self))
+        return self._hash
+
+    @property
+    def root(self) -> Hash32:
+        # Alias of `hash`.
+        # Using flat hash, might change to SSZ tree hash.
+        return self.hash

eth/beacon/types/states.py

@@ -44,6 +44,7 @@ class BeaconState(rlp.Serializable):
 
         # Validator registry
         ('validator_registry', CountableList(ValidatorRecord)),
+        ('validator_balances', CountableList(uint64)),
         ('validator_registry_latest_change_slot', uint64),
         ('validator_registry_exit_count', uint64),
         ('validator_registry_delta_chain_tip', hash32),  # For light clients to easily track delta
@@ -89,6 +90,7 @@ def __init__(
             finalized_slot: int,
             processed_pow_receipt_root: Hash32,
             validator_registry: Sequence[ValidatorRecord]=(),
+            validator_balances: Sequence[int]=(),
             shard_committees_at_slots: Sequence[Sequence[ShardCommittee]]=(),
             persistent_committees: Sequence[Sequence[int]]=(),
             persistent_committee_reassignments: Sequence[ShardReassignmentRecord]=(),
@@ -106,6 +108,7 @@ def __init__(
             fork_data=fork_data,
             # Validator registry
             validator_registry=validator_registry,
+            validator_balances=validator_balances,
             validator_registry_latest_change_slot=validator_registry_latest_change_slot,
             validator_registry_exit_count=validator_registry_exit_count,
             validator_registry_delta_chain_tip=validator_registry_delta_chain_tip,
@@ -160,10 +163,16 @@ def num_crosslinks(self) -> int:
 
     def update_validator(self,
                          validator_index: int,
-                         validator: ValidatorRecord) -> 'BeaconState':
+                         validator: ValidatorRecord,
+                         balance: int) -> 'BeaconState':
         validator_registry = list(self.validator_registry)
         validator_registry[validator_index] = validator
+
+        validator_balances = list(self.validator_balances)
+        validator_balances[validator_index] = balance
+
         updated_state = self.copy(
             validator_registry=tuple(validator_registry),
+            validator_balances=tuple(validator_balances),
         )
         return updated_state

eth/beacon/types/validator_records.py

@@ -32,8 +32,6 @@ class ValidatorRecord(rlp.Serializable):
         ('randao_commitment', hash32),
         # Slot the proposer has skipped (ie. layers of RANDAO expected)
         ('randao_layers', uint64),
-        # Balance in Gwei
-        ('balance', uint64),
         # Status code
         ('status', uint64),
         # Slot when validator last changed status (or 0)
@@ -47,7 +45,6 @@ def __init__(self,
                  withdrawal_credentials: Hash32,
                  randao_commitment: Hash32,
                  randao_layers: int,
-                 balance: int,
                  status: int,
                  latest_status_change_slot: int,
                  exit_count: int) -> None:
@@ -56,7 +53,6 @@ def __init__(self,
             withdrawal_credentials=withdrawal_credentials,
             randao_commitment=randao_commitment,
             randao_layers=randao_layers,
-            balance=balance,
             status=status,
             latest_status_change_slot=latest_status_change_slot,
             exit_count=exit_count,
@@ -74,7 +70,6 @@ def get_pending_validator(cls,
                               pubkey: int,
                               withdrawal_credentials: Hash32,
                               randao_commitment: Hash32,
-                              balance: int,
                               latest_status_change_slot: int) -> 'ValidatorRecord':
         """
         Return a new pending ``ValidatorRecord`` with the given fields.
@@ -84,7 +79,6 @@ def get_pending_validator(cls,
             withdrawal_credentials=withdrawal_credentials,
             randao_commitment=randao_commitment,
             randao_layers=0,
-            balance=balance,
             status=ValidatorStatusCode.PENDING_ACTIVATION,
             latest_status_change_slot=latest_status_change_slot,
             exit_count=0,

tests/beacon/conftest.py

@@ -1,8 +1,6 @@
 import pytest
 import rlp
 
-from eth_utils import denoms
-
 from eth.constants import (
     ZERO_HASH32,
 )
@@ -149,6 +147,7 @@ def sample_beacon_state_params(sample_fork_data_params):
         'genesis_time': 0,
         'fork_data': ForkData(**sample_fork_data_params),
         'validator_registry': (),
+        'validator_balances': (),
         'validator_registry_latest_change_slot': 10,
         'validator_registry_exit_count': 10,
         'validator_registry_delta_chain_tip': b'\x55' * 32,
@@ -305,7 +304,6 @@ def sample_validator_record_params():
         'withdrawal_credentials': b'\x01' * 32,
         'randao_commitment': b'\x01' * 32,
         'randao_layers': 1,
-        'balance': 100,
         'status': 1,
         'latest_status_change_slot': 0,
         'exit_count': 0
@@ -547,7 +545,6 @@ def genesis_validators(init_validator_keys,
             withdrawal_credentials=ZERO_HASH32,
             randao_commitment=init_randao,
             randao_layers=0,
-            balance=max_deposit * denoms.gwei,
             status=ValidatorStatusCode.ACTIVE,
             latest_status_change_slot=0,
             exit_count=0,

tests/beacon/helpers.py

@@ -8,13 +8,12 @@
 from eth_utils import to_tuple
 
 
-def mock_validator_record(pubkey, max_deposit):
+def mock_validator_record(pubkey):
     return ValidatorRecord(
         pubkey=pubkey,
         withdrawal_credentials=b'\x44' * 32,
         randao_commitment=b'\x55' * 32,
         randao_layers=0,
-        balance=max_deposit,
         status=ValidatorStatusCode.ACTIVE,
         latest_status_change_slot=0,
         exit_count=0,