status-im/eth2.0-specs
2
0
Fork 0
mirror of https://github.com/status-im/eth2.0-specs.git synced 2025-01-27 10:54:47 +00:00
Code Issues Projects Releases Wiki Activity

ValidatorFlags -> ValidatorFlag

Browse Source
This commit is contained in:
Danny Ryan 2021-02-04 08:45:25 -07:00
parent 1c1ba5cba2
commit 34cea67b91
No known key found for this signature in database
GPG Key ID: 2765A792E42CE07A
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
specs/lightclient/beacon-chain.md
View File

@ -60,23 +60,23 @@ This is a patch implementing the first hard fork to the beacon chain, tentativel
| Name | SSZ equivalent | Description | | Name | SSZ equivalent | Description |
| - | - | - | | - | - | - |
| `ValidatorFlags` | `uint8` | Bitflags to track validator actions with | | `ValidatorFlag` | `uint8` | Bitflags to track validator actions with |
## Constants ## Constants
### Validator action flags ### Validator action flags
This is formatted as an enum, with values `2**i` that can be combined as bit-flags. This is formatted as an enum, with values `2**i` that can be combined as bit-flags.
The `0` value is reserved as default. Remaining bits in `ValidatorFlags` may be used in future hardforks. The `0` value is reserved as default. Remaining bits in `ValidatorFlag` may be used in future hardforks.
**Note**: Unlike Phase0, a `TIMELY_TARGET_FLAG` does not necessarily imply a `TIMELY_SOURCE_FLAG` **Note**: Unlike Phase0, a `TIMELY_TARGET_FLAG` does not necessarily imply a `TIMELY_SOURCE_FLAG`
due to the varying slot delay requirements of each. due to the varying slot delay requirements of each.
| Name | Value | | Name | Value |
| - | - | | - | - |
| `TIMELY_HEAD_FLAG` | `ValidatorFlags(2**0)` (= 1) | | `TIMELY_HEAD_FLAG` | `ValidatorFlag(2**0)` (= 1) |
| `TIMELY_SOURCE_FLAG` | `ValidatorFlags(2**1)` (= 2) | | `TIMELY_SOURCE_FLAG` | `ValidatorFlag(2**1)` (= 2) |
| `TIMELY_TARGET_FLAG` | `ValidatorFlags(2**2)` (= 4) | | `TIMELY_TARGET_FLAG` | `ValidatorFlag(2**2)` (= 4) |
### Participation rewards ### Participation rewards
@ -158,8 +158,8 @@ class BeaconState(Container):
# Slashings # Slashings
slashings: Vector[Gwei, EPOCHS_PER_SLASHINGS_VECTOR] # Per-epoch sums of slashed effective balances slashings: Vector[Gwei, EPOCHS_PER_SLASHINGS_VECTOR] # Per-epoch sums of slashed effective balances
# Participation # Participation
previous_epoch_participation: List[ValidatorFlags, VALIDATOR_REGISTRY_LIMIT] previous_epoch_participation: List[ValidatorFlag, VALIDATOR_REGISTRY_LIMIT]
current_epoch_participation: List[ValidatorFlags, VALIDATOR_REGISTRY_LIMIT] current_epoch_participation: List[ValidatorFlag, VALIDATOR_REGISTRY_LIMIT]
# Finality # Finality
justification_bits: Bitvector[JUSTIFICATION_BITS_LENGTH] # Bit set for every recent justified epoch justification_bits: Bitvector[JUSTIFICATION_BITS_LENGTH] # Bit set for every recent justified epoch
previous_justified_checkpoint: Checkpoint previous_justified_checkpoint: Checkpoint
@ -201,7 +201,7 @@ def eth2_fast_aggregate_verify(pubkeys: Sequence[BLSPubkey], message: Bytes32, s
#### `flags_and_numerators` #### `flags_and_numerators`
```python ```python
def get_flags_and_numerators() -> Sequence[Tuple[ValidatorFlags, int]]: def get_flags_and_numerators() -> Sequence[Tuple[ValidatorFlag, int]]:
return ( return (
(TIMELY_HEAD_FLAG, TIMELY_HEAD_NUMERATOR), (TIMELY_HEAD_FLAG, TIMELY_HEAD_NUMERATOR),
(TIMELY_SOURCE_FLAG, TIMELY_SOURCE_NUMERATOR), (TIMELY_SOURCE_FLAG, TIMELY_SOURCE_NUMERATOR),
@ -210,12 +210,12 @@ def get_flags_and_numerators() -> Sequence[Tuple[ValidatorFlags, int]]:
``` ```
```python ```python
def add_flags(flags: ValidatorFlags, add: ValidatorFlags) -> ValidatorFlags: def add_flags(flags: ValidatorFlag, add: ValidatorFlag) -> ValidatorFlag:
return flags | add return flags | add
``` ```
```python ```python
def has_flags(flags: ValidatorFlags, has: ValidatorFlags) -> bool: def has_flags(flags: ValidatorFlag, has: ValidatorFlag) -> bool:
return flags & has == has return flags & has == has
``` ```
@ -277,7 +277,7 @@ def get_base_reward(state: BeaconState, index: ValidatorIndex) -> Gwei:
#### `get_unslashed_participating_indices` #### `get_unslashed_participating_indices`
```python ```python
def get_unslashed_participating_indices(state: BeaconState, flags: ValidatorFlags, epoch: Epoch) -> Set[ValidatorIndex]: def get_unslashed_participating_indices(state: BeaconState, flags: ValidatorFlag, epoch: Epoch) -> Set[ValidatorIndex]:
""" """
Retrieve the active validator indices of the given epoch, which are not slashed, and have all of the given flags. Retrieve the active validator indices of the given epoch, which are not slashed, and have all of the given flags.
""" """
@ -297,7 +297,7 @@ def get_unslashed_participating_indices(state: BeaconState, flags: ValidatorFlag
```python ```python
def get_flag_deltas(state: BeaconState, def get_flag_deltas(state: BeaconState,
flag: ValidatorFlags, flag: ValidatorFlag,
numerator: uint64) -> Tuple[Sequence[Gwei], Sequence[Gwei]]: numerator: uint64) -> Tuple[Sequence[Gwei], Sequence[Gwei]]:
""" """
Compute the rewards and penalties associated with a particular duty, by scanning through the participation Compute the rewards and penalties associated with a particular duty, by scanning through the participation
@ -457,8 +457,8 @@ def process_deposit(state: BeaconState, deposit: Deposit) -> None:
state.validators.append(get_validator_from_deposit(state, deposit)) state.validators.append(get_validator_from_deposit(state, deposit))
state.balances.append(amount) state.balances.append(amount)
# [Added in hf-1] Initialize empty participation flags for new validator # [Added in hf-1] Initialize empty participation flags for new validator
state.previous_epoch_participation.append(ValidatorFlags(0)) state.previous_epoch_participation.append(ValidatorFlag(0))
state.current_epoch_participation.append(ValidatorFlags(0)) state.current_epoch_participation.append(ValidatorFlag(0))
else: else:
# Increase balance by deposit amount # Increase balance by deposit amount
index = ValidatorIndex(validator_pubkeys.index(pubkey)) index = ValidatorIndex(validator_pubkeys.index(pubkey))
@ -597,5 +597,5 @@ def process_participation_flag_updates(state: BeaconState) -> None:
Call to ``process_participation_flag_updates`` added to ``process_epoch`` in HF1 Call to ``process_participation_flag_updates`` added to ``process_epoch`` in HF1
""" """
state.previous_epoch_participation = state.current_epoch_participation state.previous_epoch_participation = state.current_epoch_participation
state.current_epoch_participation = [ValidatorFlags(0) for _ in range(len(state.validators))] state.current_epoch_participation = [ValidatorFlag(0) for _ in range(len(state.validators))]
``` ```

4
specs/lightclient/lightclient-fork.md
View File

@ -67,8 +67,8 @@ def upgrade_to_lightclient_patch(pre: phase0.BeaconState) -> BeaconState:
# Slashings # Slashings
slashings=pre.slashings, slashings=pre.slashings,
# Attestations # Attestations
previous_epoch_participation=[ValidatorFlags(0) for _ in range(len(pre.validators))], previous_epoch_participation=[ValidatorFlag(0) for _ in range(len(pre.validators))],
current_epoch_participation=[ValidatorFlags(0) for _ in range(len(pre.validators))], current_epoch_participation=[ValidatorFlag(0) for _ in range(len(pre.validators))],
# Finality # Finality
justification_bits=pre.justification_bits, justification_bits=pre.justification_bits,
previous_justified_checkpoint=pre.previous_justified_checkpoint, previous_justified_checkpoint=pre.previous_justified_checkpoint,

6
tests/core/pyspec/eth2spec/test/helpers/rewards.py
View File

@ -314,7 +314,7 @@ def run_test_full_but_partial_participation(spec, state, rng=Random(5522)):
else: else:
for index in range(len(state.validators)): for index in range(len(state.validators)):
if rng.choice([True, False]): if rng.choice([True, False]):
state.previous_epoch_participation[index] = spec.ValidatorFlags(0) state.previous_epoch_participation[index] = spec.ValidatorFlag(0)
yield from run_deltas(spec, state) yield from run_deltas(spec, state)
@ -328,7 +328,7 @@ def run_test_partial(spec, state, fraction_filled):
state.previous_epoch_attestations = state.previous_epoch_attestations[:num_attestations] state.previous_epoch_attestations = state.previous_epoch_attestations[:num_attestations]
else: else:
for index in range(int(len(state.validators) * fraction_filled)): for index in range(int(len(state.validators) * fraction_filled)):
state.previous_epoch_participation[index] = spec.ValidatorFlags(0) state.previous_epoch_participation[index] = spec.ValidatorFlag(0)
yield from run_deltas(spec, state) yield from run_deltas(spec, state)
@ -394,7 +394,7 @@ def run_test_some_very_low_effective_balances_that_did_not_attest(spec, state):
else: else:
index = 0 index = 0
state.validators[index].effective_balance = 1 state.validators[index].effective_balance = 1
state.previous_epoch_participation[index] = spec.ValidatorFlags(0) state.previous_epoch_participation[index] = spec.ValidatorFlag(0)
yield from run_deltas(spec, state) yield from run_deltas(spec, state)