min total balance is now EFFECTIVE_BALANCE_INCREMENT. update testing
This commit is contained in:
parent
8c532c0e9a
commit
e2ef4365e2
|
@ -996,10 +996,11 @@ def get_beacon_proposer_index(state: BeaconState) -> ValidatorIndex:
|
||||||
```python
|
```python
|
||||||
def get_total_balance(state: BeaconState, indices: Set[ValidatorIndex]) -> Gwei:
|
def get_total_balance(state: BeaconState, indices: Set[ValidatorIndex]) -> Gwei:
|
||||||
"""
|
"""
|
||||||
Return the combined effective balance of the ``indices``. (1 Gwei minimum to avoid divisions by zero.)
|
Return the combined effective balance of the ``indices``.
|
||||||
|
``EFFECTIVE_BALANCE_INCREMENT`` Gwei minimum to avoid divisions by zero.
|
||||||
Math safe up to ~10B ETH, afterwhich this overflows uint64.
|
Math safe up to ~10B ETH, afterwhich this overflows uint64.
|
||||||
"""
|
"""
|
||||||
return Gwei(max(1, sum([state.validators[index].effective_balance for index in indices])))
|
return Gwei(max(EFFECTIVE_BALANCE_INCREMENT, sum([state.validators[index].effective_balance for index in indices])))
|
||||||
```
|
```
|
||||||
|
|
||||||
#### `get_total_active_balance`
|
#### `get_total_active_balance`
|
||||||
|
|
|
@ -71,6 +71,14 @@ def default_activation_threshold(spec):
|
||||||
return spec.MAX_EFFECTIVE_BALANCE
|
return spec.MAX_EFFECTIVE_BALANCE
|
||||||
|
|
||||||
|
|
||||||
|
def zero_activation_threshold(spec):
|
||||||
|
"""
|
||||||
|
Helper method to use the default balance activation threshold for state creation for tests.
|
||||||
|
Usage: `@with_custom_state(threshold_fn=one_gwei_activation_threshold, ...)`
|
||||||
|
"""
|
||||||
|
return 0
|
||||||
|
|
||||||
|
|
||||||
def default_balances(spec):
|
def default_balances(spec):
|
||||||
"""
|
"""
|
||||||
Helper method to create a series of default balances.
|
Helper method to create a series of default balances.
|
||||||
|
@ -104,6 +112,14 @@ def misc_balances(spec):
|
||||||
return [spec.MAX_EFFECTIVE_BALANCE] * num_validators + [spec.MIN_DEPOSIT_AMOUNT] * num_misc_validators
|
return [spec.MAX_EFFECTIVE_BALANCE] * num_validators + [spec.MIN_DEPOSIT_AMOUNT] * num_misc_validators
|
||||||
|
|
||||||
|
|
||||||
|
def low_single_balance(spec):
|
||||||
|
"""
|
||||||
|
Helper method to create a single of balance of 1 Gwei.
|
||||||
|
Usage: `@with_custom_state(balances_fn=low_single_balance, ...)`
|
||||||
|
"""
|
||||||
|
return [1]
|
||||||
|
|
||||||
|
|
||||||
def single_phase(fn):
|
def single_phase(fn):
|
||||||
"""
|
"""
|
||||||
Decorator that filters out the phases data.
|
Decorator that filters out the phases data.
|
||||||
|
|
|
@ -39,7 +39,7 @@ def build_attestation_data(spec, state, slot, index):
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def get_valid_attestation(spec, state, slot=None, index=None, signed=False):
|
def get_valid_attestation(spec, state, slot=None, index=None, empty=False, signed=False):
|
||||||
if slot is None:
|
if slot is None:
|
||||||
slot = state.slot
|
slot = state.slot
|
||||||
if index is None:
|
if index is None:
|
||||||
|
@ -59,7 +59,8 @@ def get_valid_attestation(spec, state, slot=None, index=None, signed=False):
|
||||||
aggregation_bits=aggregation_bits,
|
aggregation_bits=aggregation_bits,
|
||||||
data=attestation_data,
|
data=attestation_data,
|
||||||
)
|
)
|
||||||
fill_aggregate_attestation(spec, state, attestation)
|
if not empty:
|
||||||
|
fill_aggregate_attestation(spec, state, attestation)
|
||||||
if signed:
|
if signed:
|
||||||
sign_attestation(spec, state, attestation)
|
sign_attestation(spec, state, attestation)
|
||||||
return attestation
|
return attestation
|
||||||
|
|
|
@ -292,14 +292,12 @@ def test_bad_source_root(spec, state):
|
||||||
@with_all_phases
|
@with_all_phases
|
||||||
@spec_state_test
|
@spec_state_test
|
||||||
def test_empty_aggregation_bits(spec, state):
|
def test_empty_aggregation_bits(spec, state):
|
||||||
attestation = get_valid_attestation(spec, state)
|
attestation = get_valid_attestation(spec, state, empty=True)
|
||||||
state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY
|
state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY
|
||||||
|
|
||||||
attestation.aggregation_bits = Bitlist[spec.MAX_VALIDATORS_PER_COMMITTEE](
|
assert attestation.aggregation_bits == Bitlist[spec.MAX_VALIDATORS_PER_COMMITTEE](
|
||||||
*([0b0] * len(attestation.aggregation_bits)))
|
*([0b0] * len(attestation.aggregation_bits)))
|
||||||
|
|
||||||
sign_attestation(spec, state, attestation)
|
|
||||||
|
|
||||||
yield from run_attestation_processing(spec, state, attestation)
|
yield from run_attestation_processing(spec, state, attestation)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,9 @@ from copy import deepcopy
|
||||||
|
|
||||||
from eth2spec.test.context import (
|
from eth2spec.test.context import (
|
||||||
spec_state_test, with_all_phases, spec_test,
|
spec_state_test, with_all_phases, spec_test,
|
||||||
misc_balances, with_custom_state, default_activation_threshold,
|
misc_balances, low_single_balance,
|
||||||
|
with_custom_state,
|
||||||
|
default_activation_threshold, zero_activation_threshold,
|
||||||
single_phase,
|
single_phase,
|
||||||
)
|
)
|
||||||
from eth2spec.test.helpers.state import (
|
from eth2spec.test.helpers.state import (
|
||||||
|
@ -60,12 +62,12 @@ def test_genesis_epoch_full_attestations_no_rewards(spec, state):
|
||||||
assert state.balances[index] == pre_state.balances[index]
|
assert state.balances[index] == pre_state.balances[index]
|
||||||
|
|
||||||
|
|
||||||
def prepare_state_with_full_attestations(spec, state):
|
def prepare_state_with_full_attestations(spec, state, empty=False):
|
||||||
attestations = []
|
attestations = []
|
||||||
for slot in range(spec.SLOTS_PER_EPOCH + spec.MIN_ATTESTATION_INCLUSION_DELAY):
|
for slot in range(spec.SLOTS_PER_EPOCH + spec.MIN_ATTESTATION_INCLUSION_DELAY):
|
||||||
# create an attestation for each slot in epoch
|
# create an attestation for each slot in epoch
|
||||||
if slot < spec.SLOTS_PER_EPOCH:
|
if slot < spec.SLOTS_PER_EPOCH:
|
||||||
attestation = get_valid_attestation(spec, state, signed=True)
|
attestation = get_valid_attestation(spec, state, empty=empty, signed=True)
|
||||||
attestations.append(attestation)
|
attestations.append(attestation)
|
||||||
# fill each created slot in state after inclusion delay
|
# fill each created slot in state after inclusion delay
|
||||||
if slot - spec.MIN_ATTESTATION_INCLUSION_DELAY >= 0:
|
if slot - spec.MIN_ATTESTATION_INCLUSION_DELAY >= 0:
|
||||||
|
@ -143,6 +145,20 @@ def test_full_attestations_misc_balances(spec, state):
|
||||||
assert state.balances[index] == pre_state.balances[index]
|
assert state.balances[index] == pre_state.balances[index]
|
||||||
|
|
||||||
|
|
||||||
|
@with_all_phases
|
||||||
|
@spec_test
|
||||||
|
@with_custom_state(balances_fn=low_single_balance, threshold_fn=zero_activation_threshold)
|
||||||
|
@single_phase
|
||||||
|
def test_full_attestations_one_validaor_one_gwei(spec, state):
|
||||||
|
attestations = prepare_state_with_full_attestations(spec, state)
|
||||||
|
|
||||||
|
yield from run_process_rewards_and_penalties(spec, state)
|
||||||
|
|
||||||
|
# Few assertions. Mainly to check that this extreme case can run without exception
|
||||||
|
attesting_indices = spec.get_unslashed_attesting_indices(state, attestations)
|
||||||
|
assert len(attesting_indices) == 1
|
||||||
|
|
||||||
|
|
||||||
@with_all_phases
|
@with_all_phases
|
||||||
@spec_state_test
|
@spec_state_test
|
||||||
def test_no_attestations_all_penalties(spec, state):
|
def test_no_attestations_all_penalties(spec, state):
|
||||||
|
@ -157,6 +173,22 @@ def test_no_attestations_all_penalties(spec, state):
|
||||||
assert state.balances[index] < pre_state.balances[index]
|
assert state.balances[index] < pre_state.balances[index]
|
||||||
|
|
||||||
|
|
||||||
|
@with_all_phases
|
||||||
|
@spec_state_test
|
||||||
|
def test_empty_attestations(spec, state):
|
||||||
|
attestations = prepare_state_with_full_attestations(spec, state, empty=True)
|
||||||
|
|
||||||
|
pre_state = deepcopy(state)
|
||||||
|
|
||||||
|
yield from run_process_rewards_and_penalties(spec, state)
|
||||||
|
|
||||||
|
attesting_indices = spec.get_unslashed_attesting_indices(state, attestations)
|
||||||
|
assert len(attesting_indices) == 0
|
||||||
|
|
||||||
|
for index in range(len(pre_state.validators)):
|
||||||
|
assert state.balances[index] < pre_state.balances[index]
|
||||||
|
|
||||||
|
|
||||||
@with_all_phases
|
@with_all_phases
|
||||||
@spec_state_test
|
@spec_state_test
|
||||||
def test_duplicate_attestation(spec, state):
|
def test_duplicate_attestation(spec, state):
|
||||||
|
|
Loading…
Reference in New Issue