status-im
/
eth2.0-specs
mirror of https://github.com/status-im/eth2.0-specs.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #992 from ethereum/eth1-period-bug 

off by one error for eth1 data voting
This commit is contained in:
Danny Ryan 2019-04-24 13:22:30 -06:00 committed by GitHub
parent 677fd64903 bd50960740
commit 06965f29dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
specs/core/0_beacon-chain.md
View File

@ -1726,7 +1726,7 @@ def process_final_updates(state: BeaconState) -> None:
current_epoch = get_current_epoch(state) current_epoch = get_current_epoch(state)
next_epoch = current_epoch + 1 next_epoch = current_epoch + 1
# Reset eth1 data votes # Reset eth1 data votes
if state.slot % SLOTS_PER_ETH1_VOTING_PERIOD == 0: if (state.slot + 1) % SLOTS_PER_ETH1_VOTING_PERIOD == 0:
state.eth1_data_votes = [] state.eth1_data_votes = []
# Update effective balances with hysteresis # Update effective balances with hysteresis
for index, validator in enumerate(state.validator_registry): for index, validator in enumerate(state.validator_registry):

47
test_libs/pyspec/tests/test_sanity.py
View File

@ -376,17 +376,15 @@ def test_transfer(state):
def test_balance_driven_status_transitions(state): def test_balance_driven_status_transitions(state):
pre_state = deepcopy(state) current_epoch = get_current_epoch(state)
validator_index = get_active_validator_indices(state, current_epoch)[-1]
current_epoch = get_current_epoch(pre_state) assert state.validator_registry[validator_index].exit_epoch == spec.FAR_FUTURE_EPOCH
validator_index = get_active_validator_indices(pre_state, current_epoch)[-1]
assert pre_state.validator_registry[validator_index].exit_epoch == spec.FAR_FUTURE_EPOCH
# set validator balance to below ejection threshold # set validator balance to below ejection threshold
pre_state.validator_registry[validator_index].effective_balance = spec.EJECTION_BALANCE state.validator_registry[validator_index].effective_balance = spec.EJECTION_BALANCE
post_state = deepcopy(pre_state) post_state = deepcopy(state)
# #
# trigger epoch transition # trigger epoch transition
# #
@ -396,14 +394,13 @@ def test_balance_driven_status_transitions(state):
assert post_state.validator_registry[validator_index].exit_epoch < spec.FAR_FUTURE_EPOCH assert post_state.validator_registry[validator_index].exit_epoch < spec.FAR_FUTURE_EPOCH
return pre_state, [block], post_state return state, [block], post_state
def test_historical_batch(state): def test_historical_batch(state):
pre_state = deepcopy(state) state.slot += spec.SLOTS_PER_HISTORICAL_ROOT - (state.slot % spec.SLOTS_PER_HISTORICAL_ROOT) - 1
pre_state.slot += spec.SLOTS_PER_HISTORICAL_ROOT - (pre_state.slot % spec.SLOTS_PER_HISTORICAL_ROOT) - 1
post_state = deepcopy(pre_state) post_state = deepcopy(state)
block = build_empty_block_for_next_slot(post_state) block = build_empty_block_for_next_slot(post_state)
@ -411,6 +408,30 @@ def test_historical_batch(state):
assert post_state.slot == block.slot assert post_state.slot == block.slot
assert get_current_epoch(post_state) % (spec.SLOTS_PER_HISTORICAL_ROOT // spec.SLOTS_PER_EPOCH) == 0 assert get_current_epoch(post_state) % (spec.SLOTS_PER_HISTORICAL_ROOT // spec.SLOTS_PER_EPOCH) == 0
assert len(post_state.historical_roots) == len(pre_state.historical_roots) + 1 assert len(post_state.historical_roots) == len(state.historical_roots) + 1
return pre_state, [block], post_state return state, [block], post_state
def test_eth1_data_votes(state):
post_state = deepcopy(state)
expected_votes = 0
assert len(state.eth1_data_votes) == expected_votes
blocks = []
for _ in range(spec.SLOTS_PER_ETH1_VOTING_PERIOD - 1):
block = build_empty_block_for_next_slot(post_state)
state_transition(post_state, block)
expected_votes += 1
assert len(post_state.eth1_data_votes) == expected_votes
blocks.append(block)
block = build_empty_block_for_next_slot(post_state)
state_transition(post_state, block)
blocks.append(block)
assert post_state.slot % spec.SLOTS_PER_ETH1_VOTING_PERIOD == 0
assert len(post_state.eth1_data_votes) == 1
return state, blocks, post_state