Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include recently slashed churn in exit churn queue #785

Merged
merged 7 commits into from
Mar 19, 2019
Merged

Include recently slashed churn in exit churn queue #785

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e912ed7
Include recently slashed churn in churn queue
JustinDrake Mar 15, 2019
1236e8e
Update 0_beacon-chain.md
JustinDrake Mar 15, 2019
709e0df
Update 0_beacon-chain.md
JustinDrake Mar 15, 2019
e5ff0d5
Update 0_beacon-chain.md
JustinDrake Mar 16, 2019
cf06cb5
Merge branch 'dev' into JustinDrake-patch-13
djrtwo Mar 19, 2019
23ef802
fix small bug in sytax
djrtwo Mar 19, 2019
24f1139
add explicit test that ensures exists are blocked when too long since…
djrtwo Mar 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions specs/core/0_beacon-chain.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2102,16 +2102,21 @@ def update_validator_registry(state: BeaconState) -> None:
activate_validator(state, index, is_genesis=False)

# Exit validators within the allowable balance churn
balance_churn = 0
for index, validator in enumerate(state.validator_registry):
if validator.exit_epoch == FAR_FUTURE_EPOCH and validator.initiated_exit:
# Check the balance churn would be within the allowance
balance_churn += get_effective_balance(state, index)
if balance_churn > max_balance_churn:
break
if state.current_epoch < state.validator_registry_update_epoch + LATEST_SLASHED_EXIT_LENGTH:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you blocking exits if there have been LATEST_SLASHED_EXIT_LENGTH epochs since last registry update?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See discussing here. It's a simplification to avoid caching a slashed_balance.

balance_churn = (
state.latest_slashed_balances[state.validator_registry_update_epoch % LATEST_SLASHED_EXIT_LENGTH] -
state.latest_slashed_balances[current_epoch % LATEST_SLASHED_EXIT_LENGTH]
)

# Exit validator
exit_validator(state, index)
for index, validator in enumerate(state.validator_registry):
if validator.exit_epoch == FAR_FUTURE_EPOCH and validator.initiated_exit:
# Check the balance churn would be within the allowance
balance_churn += get_effective_balance(state, index)
if balance_churn > max_balance_churn:
break

# Exit validator
exit_validator(state, index)

state.validator_registry_update_epoch = current_epoch
```
Expand Down