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

Added handling for withdrawn validators

This commit is contained in:
vbuterin 2018-11-27 12:07:30 -05:00 committed by GitHub
parent 0d1b63bca3
commit 9a20ecb9e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -760,11 +760,7 @@ def add_validator(state: State,
msg=hash(signed_message), msg=hash(signed_message),
sig=proof_of_possession, sig=proof_of_possession,
domain=get_domain(state, current_slot, DOMAIN_DEPOSIT)) domain=get_domain(state, current_slot, DOMAIN_DEPOSIT))
# Pubkey uniqueness rec = ValidatorRecord(
validator_pubkeys = [v.pubkey for v in state.validators]
if pubkey not in validator_pubkeys:
assert deposit_size == DEPOSIT_SIZE
rec = ValidatorRecord(
pubkey=pubkey, pubkey=pubkey,
withdrawal_credentials=withdrawal_credentials, withdrawal_credentials=withdrawal_credentials,
randao_commitment=randao_commitment, randao_commitment=randao_commitment,
@ -773,7 +769,12 @@ def add_validator(state: State,
status=status, status=status,
last_status_change_slot=current_slot, last_status_change_slot=current_slot,
exit_seq=0 exit_seq=0
) )
# Pubkey uniqueness
validator_pubkeys = [v.pubkey for v in state.validators]
if pubkey not in validator_pubkeys:
assert deposit_size == DEPOSIT_SIZE
index = min_empty_validator(state.validators) index = min_empty_validator(state.validators)
if index is None: if index is None:
state.validators.append(rec) state.validators.append(rec)
@ -787,6 +788,9 @@ def add_validator(state: State,
assert val.withdrawal_credentials == withdrawal_credentials assert val.withdrawal_credentials == withdrawal_credentials
assert deposit_size >= MIN_TOPUP_SIZE assert deposit_size >= MIN_TOPUP_SIZE
val.balance += deposit_size val.balance += deposit_size
# If the validator is withdrawn, overwrite it with the new validator data
if val.status == WITHDRAWN:
state.validators[index] = rec
return index return index
``` ```