PR feedback

Author: hwwhww

eth/beacon/deposit_helpers.py

@@ -1,7 +1,3 @@
-from typing import (
-    Tuple,
-)
-
 from eth_typing import (
     Hash32,
 )
@@ -66,19 +62,16 @@ def validate_proof_of_possession(state: BeaconState,
 
 def add_pending_validator(state: BeaconState,
                           validator: ValidatorRecord,
-                          amount: Gwei) -> Tuple[BeaconState, int]:
+                          amount: Gwei) -> BeaconState:
     """
     Add a validator to ``state``.
     """
-    validator_registry = state.validator_registry + (validator,)
     state = state.copy(
-        validator_registry=validator_registry,
-        validator_balances=state.validator_balances + (amount, )
+        validator_registry=state.validator_registry + (validator,),
+        validator_balances=state.validator_balances + (amount, ),
     )
 
-    index = len(state.validator_registry) - 1
-
-    return state, index
+    return state
 
 
 def process_deposit(*,
@@ -114,7 +107,7 @@ def process_deposit(*,
 
         # Note: In phase 2 registry indices that has been withdrawn for a long time
         # will be recycled.
-        state, index = add_pending_validator(
+        state = add_pending_validator(
             state,
             validator,
             amount,

eth/beacon/helpers.py

@@ -155,13 +155,13 @@ def get_shard_committees_at_slot(state: 'BeaconState',
 
 
 def get_active_validator_indices(validators: Sequence['ValidatorRecord'],
-                                 slot: SlotNumber) -> Tuple[int, ...]:
+                                 slot: SlotNumber) -> Tuple[ValidatorIndex, ...]:
     """
     Get indices of active validators from ``validators``.
     """
     return tuple(
-        i for i, v in enumerate(validators)
-        if v.is_active(slot)
+        ValidatorIndex(index) for index, validator in enumerate(validators)
+        if validator.is_active(slot)
     )
 
 

eth/beacon/state_machines/configs.py

@@ -42,7 +42,6 @@
         ('SLOT_DURATION', Second),
         ('MIN_ATTESTATION_INCLUSION_DELAY', int),
         ('EPOCH_LENGTH', int),
-        ('MIN_VALIDATOR_REGISTRY_CHANGE_INTERVAL', int),
         ('SEED_LOOKAHEAD', int),
         ('ENTRY_EXIT_DELAY', int),
         ('POW_RECEIPT_ROOT_VOTING_PERIOD', int),

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

@@ -29,13 +29,12 @@
     # Initial values
     GENESIS_FORK_VERSION=0,
     GENESIS_SLOT=SlotNumber(0),
-    FAR_FUTURE_SLOT=SlotNumber(2**63),
+    FAR_FUTURE_SLOT=SlotNumber(2**64 - 1),
     BLS_WITHDRAWAL_PREFIX_BYTE=b'\x00',
     # Time parameters
     SLOT_DURATION=Second(6),  # seconds
     MIN_ATTESTATION_INCLUSION_DELAY=2**2,  # (= 4) slots
     EPOCH_LENGTH=2**6,  # (= 64) slots
-    MIN_VALIDATOR_REGISTRY_CHANGE_INTERVAL=2**8,  # (= 256) slots
     SEED_LOOKAHEAD=2**6,  # (= 64) slots
     ENTRY_EXIT_DELAY=2**8,  # (= 256) slots
     POW_RECEIPT_ROOT_VOTING_PERIOD=2**10,  # (= 1,024) slots

eth/beacon/types/states.py

@@ -184,6 +184,9 @@ def num_crosslinks(self) -> int:
     def update_validator_registry(self,
                                   validator_index: ValidatorIndex,
                                   validator: ValidatorRecord) -> 'BeaconState':
+        """
+        Replace ``self.validator_registry[validator_index]`` with ``validator``.
+        """
         if validator_index >= self.num_validators or validator_index < 0:
             raise IndexError("Incorrect validator index")
 

eth/beacon/types/validator_records.py

@@ -79,7 +79,8 @@ def __init__(self,
 
     def is_active(self, slot: int) -> bool:
         """
-        Return ``True`` if the validator is active.
+        Return ``True`` if the validator is active.Return ``True``
+        if the validator is active during the slot, ``slot``.
         """
         return self.activation_slot <= slot < self.exit_slot
 

tests/beacon/conftest.py

@@ -4,6 +4,9 @@
 from eth.constants import (
     ZERO_HASH32,
 )
+from eth_utils import (
+    to_tuple,
+)
 
 import eth._utils.bls as bls
 from eth.beacon._utils.hash import hash_eth2
@@ -514,11 +517,6 @@ def epoch_length():
     return SERENITY_CONFIG.EPOCH_LENGTH
 
 
-@pytest.fixture
-def min_validator_registry_change_interval():
-    return SERENITY_CONFIG.MIN_VALIDATOR_REGISTRY_CHANGE_INTERVAL
-
-
 @pytest.fixture
 def seed_lookahead():
     return SERENITY_CONFIG.SEED_LOOKAHEAD
@@ -641,15 +639,14 @@ def initial_validators(init_validator_pubkeys,
     )
 
 
+@to_tuple
 @pytest.fixture
 def activated_genesis_validators(initial_validators, genesis_slot):
     """
     Active
     """
-    validators = tuple()
     for validator in initial_validators:
-        validators += (validator.copy(activation_slot=genesis_slot),)
-    return validators
+        yield validator.copy(activation_slot=genesis_slot)
 
 
 @pytest.fixture

tests/beacon/helpers.py

@@ -8,6 +8,12 @@
 from eth.beacon.constants import (
     EMPTY_SIGNATURE,
 )
+from eth.beacon.enums import (
+    SignatureDomain,
+)
+from eth.beacon.helpers import (
+    get_domain,
+)
 from eth.beacon.types.deposit_input import DepositInput
 from eth.beacon.types.validator_records import (
     ValidatorRecord,
@@ -52,7 +58,12 @@ def get_pseudo_chain(length, genesis_block):
         yield block
 
 
-def sign_proof_of_possession(deposit_input, privkey, domain):
+def sign_proof_of_possession(deposit_input, privkey, fork_data, slot):
+    domain = get_domain(
+        fork_data,
+        slot,
+        SignatureDomain.DOMAIN_DEPOSIT,
+    )
     return bls.sign(deposit_input.root, privkey, domain)
 
 

tests/beacon/state_machines/conftest.py

@@ -28,7 +28,6 @@ def config(
         slot_duration,
         min_attestation_inclusion_delay,
         epoch_length,
-        min_validator_registry_change_interval,
         seed_lookahead,
         entry_exit_delay,
         pow_receipt_root_voting_period,
@@ -64,7 +63,6 @@ def config(
         SLOT_DURATION=slot_duration,
         MIN_ATTESTATION_INCLUSION_DELAY=min_attestation_inclusion_delay,
         EPOCH_LENGTH=epoch_length,
-        MIN_VALIDATOR_REGISTRY_CHANGE_INTERVAL=min_validator_registry_change_interval,
         SEED_LOOKAHEAD=seed_lookahead,
         ENTRY_EXIT_DELAY=entry_exit_delay,
         POW_RECEIPT_ROOT_VOTING_PERIOD=pow_receipt_root_voting_period,

tests/beacon/test_deposit_helpers.py

@@ -12,12 +12,6 @@
     process_deposit,
     validate_proof_of_possession,
 )
-from eth.beacon.enums import (
-    SignatureDomain,
-)
-from eth.beacon.helpers import (
-    get_domain,
-)
 from eth.beacon.types.states import BeaconState
 from eth.beacon.types.validator_records import ValidatorRecord
 
@@ -40,13 +34,13 @@ def test_add_pending_validator(sample_beacon_state_params,
     )
     validator = ValidatorRecord(**sample_validator_record_params)
     amount = 5566
-    state, index = add_pending_validator(
+    state = add_pending_validator(
         state,
         validator,
         amount,
     )
-    assert index == validator_registry_len
-    assert state.validator_registry[index] == validator
+
+    assert state.validator_registry[-1] == validator
 
 
 @pytest.mark.parametrize(
@@ -64,11 +58,6 @@ def test_validate_proof_of_possession(sample_beacon_state_params, pubkeys, privk
     withdrawal_credentials = b'\x34' * 32
     custody_commitment = b'\x12' * 32
     randao_commitment = b'\x56' * 32
-    domain = get_domain(
-        state.fork_data,
-        state.slot,
-        SignatureDomain.DOMAIN_DEPOSIT,
-    )
 
     deposit_input = make_deposit_input(
         pubkey=pubkey,
@@ -77,7 +66,12 @@ def test_validate_proof_of_possession(sample_beacon_state_params, pubkeys, privk
         custody_commitment=custody_commitment,
     )
     if expected is True:
-        proof_of_possession = sign_proof_of_possession(deposit_input, privkey, domain)
+        proof_of_possession = sign_proof_of_possession(
+            deposit_input,
+            privkey,
+            state.fork_data,
+            state.slot,
+        )
 
         validate_proof_of_possession(
             state=state,
@@ -116,19 +110,20 @@ def test_process_deposit(sample_beacon_state_params,
     withdrawal_credentials = b'\x34' * 32
     custody_commitment = b'\x11' * 32
     randao_commitment = b'\x56' * 32
-    domain = get_domain(
-        state.fork_data,
-        state.slot,
-        SignatureDomain.DOMAIN_DEPOSIT,
-    )
 
     deposit_input = make_deposit_input(
         pubkey=pubkey_1,
         withdrawal_credentials=withdrawal_credentials,
         randao_commitment=randao_commitment,
         custody_commitment=custody_commitment,
     )
-    proof_of_possession = sign_proof_of_possession(deposit_input, privkey_1, domain)
+    proof_of_possession = sign_proof_of_possession(
+        deposit_input,
+        privkey_1,
+        state.fork_data,
+        state.slot,
+    )
+
     # Add the first validator
     result_state = process_deposit(
         state=state,
@@ -159,7 +154,12 @@ def test_process_deposit(sample_beacon_state_params,
         randao_commitment=randao_commitment,
         custody_commitment=custody_commitment,
     )
-    proof_of_possession = sign_proof_of_possession(deposit_input, privkey_2, domain)
+    proof_of_possession = sign_proof_of_possession(
+        deposit_input,
+        privkey_2,
+        state.fork_data,
+        state.slot,
+    )
     result_state = process_deposit(
         state=result_state,
         pubkey=pubkey_2,