Put validator balances into a separate list in the state

Author: hwwhww

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/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,7 +1,5 @@
 import pytest
 
-from eth_utils import denoms
-
 from eth.constants import (
     ZERO_HASH32,
 )
@@ -131,6 +129,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,
@@ -287,7 +286,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
@@ -498,7 +496,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,

tests/beacon/test_deposit_helpers.py

@@ -60,24 +60,30 @@ def test_get_min_empty_validator_index(sample_validator_record_params,
                                        latest_status_change_slot,
                                        zero_balance_validator_ttl,
                                        current_slot,
+                                       max_deposit,
                                        expected):
     validators = [
         ValidatorRecord(**sample_validator_record_params).copy(
-            balance=balance,
             latest_status_change_slot=latest_status_change_slot,
         )
         for _ in range(10)
     ]
+    validator_balances = [
+        balance
+        for _ in range(10)
+    ]
     if isinstance(expected, Exception):
         with pytest.raises(MinEmptyValidatorIndexNotFound):
             get_min_empty_validator_index(
                 validators=validators,
+                validator_balances=validator_balances,
                 current_slot=current_slot,
                 zero_balance_validator_ttl=zero_balance_validator_ttl,
             )
     else:
         result = get_min_empty_validator_index(
             validators=validators,
+            validator_balances=validator_balances,
             current_slot=current_slot,
             zero_balance_validator_ttl=zero_balance_validator_ttl,
         )
@@ -103,6 +109,7 @@ def test_add_pending_validator(monkeypatch,
     from eth.beacon import deposit_helpers
 
     def mock_get_min_empty_validator_index(validators,
+                                           validator_balances,
                                            current_slot,
                                            zero_balance_validator_ttl):
         if min_empty_validator_index_result is None:
@@ -118,18 +125,20 @@ def mock_get_min_empty_validator_index(validators,
 
     state = BeaconState(**sample_beacon_state_params).copy(
         validator_registry=[
-            ValidatorRecord(**sample_validator_record_params).copy(
-                balance=100,
-            )
+            ValidatorRecord(**sample_validator_record_params)
             for _ in range(validator_registry_len)
-        ]
-    )
-    validator = ValidatorRecord(**sample_validator_record_params).copy(
-        balance=5566,
+        ],
+        validator_balances=[
+            100
+            for _ in range(validator_registry_len)
+        ],
     )
+    validator = ValidatorRecord(**sample_validator_record_params)
+    deposit = 5566
     state, index = add_pending_validator(
         state,
         validator,
+        deposit,
         zero_balance_validator_ttl=0,  # it's for `get_min_empty_validator_index`
     )
     assert index == expected_index
@@ -225,7 +234,7 @@ def test_process_deposit(sample_beacon_state_params,
     assert result_state.validator_registry[0].pubkey == pubkey_1
     assert result_state.validator_registry[index].withdrawal_credentials == withdrawal_credentials
     assert result_state.validator_registry[index].randao_commitment == randao_commitment
-    assert result_state.validator_registry[index].balance == deposit
+    assert result_state.validator_balances[index] == deposit
     # test immutable
     assert len(state.validator_registry) == 0
 
@@ -254,11 +263,11 @@ def test_process_deposit(sample_beacon_state_params,
     result_state = result_state.copy(
         validator_registry=(
             result_state.validator_registry[0].copy(
-                balance=0,
                 latest_status_change_slot=0,
             ),
             result_state.validator_registry[1],
-        )
+        ),
+        validator_balances=(0,) + result_state.validator_balances[1:]
     )
 
     # Add the third validator.

tests/beacon/test_helpers.py

@@ -606,10 +606,8 @@ def mock_get_shard_committees_at_slot(state,
     ]
 )
 def test_get_effective_balance(balance, max_deposit, expected, sample_validator_record_params):
-    validator = ValidatorRecord(**sample_validator_record_params).copy(
-        balance=balance,
-    )
-    result = get_effective_balance(validator, max_deposit)
+    balances = (balance,)
+    result = get_effective_balance(balances, 0, max_deposit)
     assert result == expected
 
 

tests/beacon/types/test_states.py

@@ -65,15 +65,17 @@ def test_defaults(sample_beacon_state_params):
 def test_num_validators(expected,
                         max_deposit,
                         empty_beacon_state):
-    validator_registry = [
-        mock_validator_record(
-            pubkey,
-            max_deposit,
-        )
-        for pubkey in range(expected)
-    ]
     state = empty_beacon_state.copy(
-        validator_registry=validator_registry,
+        validator_registry=[
+            mock_validator_record(
+                pubkey,
+            )
+            for pubkey in range(expected)
+        ],
+        validator_balances=(
+            max_deposit
+            for _ in range(10)
+        )
     )
 
     assert state.num_validators == expected
@@ -106,17 +108,26 @@ def test_update_validator(sample_beacon_state_params, sample_validator_record_pa
         validator_registry=[
             mock_validator_record(
                 pubkey,
-                max_deposit,
             )
             for pubkey in range(10)
-        ]
+        ],
+        validator_balances=(
+            max_deposit
+            for _ in range(10)
+        )
     )
 
     new_pubkey = 100
     validator_index = 5
+    balance = 5566
     validator = state.validator_registry[validator_index].copy(
         pubkey=new_pubkey,
     )
-    result_state = state.update_validator(validator_index=validator_index, validator=validator)
+    result_state = state.update_validator(
+        validator_index=validator_index,
+        validator=validator,
+        balance=balance,
+    )
+    assert result_state.validator_balances[validator_index] == balance
     assert result_state.validator_registry[validator_index].pubkey == new_pubkey
     assert state.validator_registry[validator_index].pubkey != new_pubkey