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

Edited as per Justin's comments

This commit is contained in:
vbuterin 2018-12-30 20:42:05 -06:00 committed by GitHub
parent 4a93374025
commit 011970169c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -916,7 +916,7 @@ def get_shuffling(seed: Hash32,
return output return output
``` ```
**Invariant**: if `get_shuffling(seed, validators, shard, slot)` returns some value `x`, it should return the same value `x` for the same `seed` and `shard` and possible future modifications of `validators` forever in phase 0, and until the ~1 year deletion delay in phase 1 and in the future. **Invariant**: if `get_shuffling(seed, validators, shard, slot)` returns some value `x`, it should return the same value `x` for the same `seed` and `shard` and possible future modifications of `validators` forever in phase 0, and until the ~1 year deletion delay in phase 2 and in the future.
Here's a diagram of what is going on: Here's a diagram of what is going on:
@ -1207,7 +1207,7 @@ def get_initial_beacon_state(initial_validator_deposits: List[Deposit],
randao_commitment=deposit.deposit_data.deposit_input.randao_commitment, randao_commitment=deposit.deposit_data.deposit_input.randao_commitment,
poc_commitment=deposit.deposit_data.deposit_input.poc_commitment, poc_commitment=deposit.deposit_data.deposit_input.poc_commitment,
) )
if get_effective_balance(state, validator_index) == MAX_DEPOSIT * GWEI_PER_ETH: if get_effective_balance(state, validator_index) >= MAX_DEPOSIT * GWEI_PER_ETH:
activate_validator(state, validator_index, True) activate_validator(state, validator_index, True)
# set initial committee shuffling # set initial committee shuffling
@ -1229,9 +1229,8 @@ First, two helper functions:
def min_empty_validator_index(validators: List[ValidatorRecord], def min_empty_validator_index(validators: List[ValidatorRecord],
validator_balances: List[int], validator_balances: List[int],
current_slot: int) -> int: current_slot: int) -> int:
for i, v in enumerate(validators): # In phase 2, add logic that seeks the lowest-index validator that
if v.withdrawal_slot + ZERO_BALANCE_VALIDATOR_TTL <= current_slot: # has been withdrawn for more than ~1 year
return i
return None return None
``` ```
@ -1329,12 +1328,10 @@ def process_deposit(state: BeaconState,
_Note that all functions in this section mutate `state`_. _Note that all functions in this section mutate `state`_.
```python ```python
def activate_validator(state: BeaconState, index: int, immediate: bool) -> None: def activate_validator(state: BeaconState, index: int, genesis: bool) -> None:
validator = state.validator_registry[index] validator = state.validator_registry[index]
if validator.activation_slot <= state.slot:
return
validator.activation_slot = state.slot + (0 if immediate else ENTRY_EXIT_DELAY) validator.activation_slot = GENESIS_SLOT if genesis else (state.slot + ENTRY_EXIT_DELAY)
state.validator_registry_delta_chain_tip = hash_tree_root( state.validator_registry_delta_chain_tip = hash_tree_root(
ValidatorRegistryDeltaBlock( ValidatorRegistryDeltaBlock(
current_validator_registry_delta_chain_tip=state.validator_registry_delta_chain_tip, current_validator_registry_delta_chain_tip=state.validator_registry_delta_chain_tip,
@ -1364,13 +1361,15 @@ def exit_validator(state: BeaconState, index: int) -> None:
# The following updates only occur if not previous exited # The following updates only occur if not previous exited
state.validator_registry_exit_count += 1 state.validator_registry_exit_count += 1
validator.exit_count = state.validator_registry_exit_count validator.exit_count = state.validator_registry_exit_count
state.validator_registry_delta_chain_tip = get_new_validator_registry_delta_chain_tip( state.validator_registry_delta_chain_tip = hash_tree_root(
ValidatorRegistryDeltaBlock(
current_validator_registry_delta_chain_tip=state.validator_registry_delta_chain_tip, current_validator_registry_delta_chain_tip=state.validator_registry_delta_chain_tip,
validator_index=index, validator_index=index,
pubkey=validator.pubkey, pubkey=validator.pubkey,
slot=validator.exit_slot, slot=validator.exit_slot,
flag=EXIT, flag=EXIT,
) )
)
state.validator_registry_exit_count += 1 state.validator_registry_exit_count += 1
# Remove validator from persistent committees # Remove validator from persistent committees
@ -1384,18 +1383,20 @@ def exit_validator(state: BeaconState, index: int) -> None:
```python ```python
def penalize_validator(state: BeaconState, index: int) -> None: def penalize_validator(state: BeaconState, index: int) -> None:
exit_validator(state, index) exit_validator(state, index)
validator = state.validator_registry[index]
state.latest_penalized_exit_balances[(state.slot // EPOCH_LENGTH) % LATEST_PENALIZED_EXIT_LENGTH] += get_effective_balance(state, index) state.latest_penalized_exit_balances[(state.slot // EPOCH_LENGTH) % LATEST_PENALIZED_EXIT_LENGTH] += get_effective_balance(state, index)
whistleblower_index = get_beacon_proposer_index(state, state.slot) whistleblower_index = get_beacon_proposer_index(state, state.slot)
whistleblower_reward = get_effective_balance(state, index) // WHISTLEBLOWER_REWARD_QUOTIENT whistleblower_reward = get_effective_balance(state, index) // WHISTLEBLOWER_REWARD_QUOTIENT
state.validator_balances[whistleblower_index] += whistleblower_reward state.validator_balances[whistleblower_index] += whistleblower_reward
state.validator_balances[index] -= whistleblower_reward state.validator_balances[index] -= whistleblower_reward
state.validator_registry[index].penalized_slot = state.slot validator.penalized_slot = state.slot
``` ```
```python ```python
def prepare_validator_for_withdrawal(state: BeaconState, index: int) -> None: def prepare_validator_for_withdrawal(state: BeaconState, index: int) -> None:
state.validator_registry[index].status_flags |= WITHDRAWABLE validator = state.validator_registry[index]
validator.status_flags |= WITHDRAWABLE
``` ```
## Per-slot processing ## Per-slot processing