Remove references to the persistent committees (#376)
* Remove references to the persistent committees
This commit is contained in:
parent
6b84dae09e
commit
1a4973171f
|
@ -197,7 +197,6 @@ Unless otherwise indicated, code appearing in `this style` is to be interpreted
|
||||||
| `MIN_ATTESTATION_INCLUSION_DELAY` | `2**2` (= 4) | slots | 24 seconds |
|
| `MIN_ATTESTATION_INCLUSION_DELAY` | `2**2` (= 4) | slots | 24 seconds |
|
||||||
| `EPOCH_LENGTH` | `2**6` (= 64) | slots | 6.4 minutes |
|
| `EPOCH_LENGTH` | `2**6` (= 64) | slots | 6.4 minutes |
|
||||||
| `POW_RECEIPT_ROOT_VOTING_PERIOD` | `2**10` (= 1,024) | slots | ~1.7 hours |
|
| `POW_RECEIPT_ROOT_VOTING_PERIOD` | `2**10` (= 1,024) | slots | ~1.7 hours |
|
||||||
| `SHARD_PERSISTENT_COMMITTEE_CHANGE_PERIOD` | `2**17` (= 131,072) | slots | ~9 days |
|
|
||||||
| `COLLECTIVE_PENALTY_CALCULATION_PERIOD` | `2**20` (= 1,048,576) | slots | ~73 days |
|
| `COLLECTIVE_PENALTY_CALCULATION_PERIOD` | `2**20` (= 1,048,576) | slots | ~73 days |
|
||||||
| `ZERO_BALANCE_VALIDATOR_TTL` | `2**22` (= 4,194,304) | slots | ~291 days |
|
| `ZERO_BALANCE_VALIDATOR_TTL` | `2**22` (= 4,194,304) | slots | ~291 days |
|
||||||
|
|
||||||
|
@ -482,8 +481,6 @@ Unless otherwise indicated, code appearing in `this style` is to be interpreted
|
||||||
'latest_randao_mixes': ['hash32'],
|
'latest_randao_mixes': ['hash32'],
|
||||||
'latest_vdf_outputs': ['hash32'],
|
'latest_vdf_outputs': ['hash32'],
|
||||||
'shard_committees_at_slots': [[ShardCommittee]],
|
'shard_committees_at_slots': [[ShardCommittee]],
|
||||||
'persistent_committees': [['uint24']],
|
|
||||||
'persistent_committee_reassignments': [ShardReassignmentRecord],
|
|
||||||
|
|
||||||
# Proof of custody
|
# Proof of custody
|
||||||
# Placeholders for now; ProofOfCustodyChallenge is defined in phase 1, implementers can
|
# Placeholders for now; ProofOfCustodyChallenge is defined in phase 1, implementers can
|
||||||
|
@ -1181,8 +1178,6 @@ def get_initial_beacon_state(initial_validator_deposits: List[Deposit],
|
||||||
latest_randao_mixes=[ZERO_HASH for _ in range(LATEST_RANDAO_MIXES_LENGTH)],
|
latest_randao_mixes=[ZERO_HASH for _ in range(LATEST_RANDAO_MIXES_LENGTH)],
|
||||||
latest_vdf_outputs=[ZERO_HASH for _ in range(LATEST_RANDAO_MIXES_LENGTH // EPOCH_LENGTH)],
|
latest_vdf_outputs=[ZERO_HASH for _ in range(LATEST_RANDAO_MIXES_LENGTH // EPOCH_LENGTH)],
|
||||||
shard_committees_at_slots=[],
|
shard_committees_at_slots=[],
|
||||||
persistent_committees=[],
|
|
||||||
persistent_committee_reassignments=[],
|
|
||||||
|
|
||||||
# Proof of custody
|
# Proof of custody
|
||||||
poc_challenges=[],
|
poc_challenges=[],
|
||||||
|
@ -1223,10 +1218,6 @@ def get_initial_beacon_state(initial_validator_deposits: List[Deposit],
|
||||||
initial_shuffling = get_new_shuffling(ZERO_HASH, state.validator_registry, 0)
|
initial_shuffling = get_new_shuffling(ZERO_HASH, state.validator_registry, 0)
|
||||||
state.shard_committees_at_slots = initial_shuffling + initial_shuffling
|
state.shard_committees_at_slots = initial_shuffling + initial_shuffling
|
||||||
|
|
||||||
# set initial persistent shuffling
|
|
||||||
active_validator_indices = get_active_validator_indices(state.validator_registry)
|
|
||||||
state.persistent_committees = split(shuffle(active_validator_indices, ZERO_HASH), SHARD_COUNT)
|
|
||||||
|
|
||||||
return state
|
return state
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -1424,13 +1415,6 @@ def exit_validator(state: BeaconState,
|
||||||
pubkey=validator.pubkey,
|
pubkey=validator.pubkey,
|
||||||
flag=EXIT,
|
flag=EXIT,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Remove validator from persistent committees
|
|
||||||
for committee in state.persistent_committees:
|
|
||||||
for i, validator_index in committee:
|
|
||||||
if validator_index == index:
|
|
||||||
committee.pop(i)
|
|
||||||
break
|
|
||||||
```
|
```
|
||||||
|
|
||||||
## Per-slot processing
|
## Per-slot processing
|
||||||
|
@ -1575,7 +1559,6 @@ For each `exit` in `block.body.exits`:
|
||||||
* Let `validator = state.validator_registry[exit.validator_index]`.
|
* Let `validator = state.validator_registry[exit.validator_index]`.
|
||||||
* Verify that `validator.status == ACTIVE`.
|
* Verify that `validator.status == ACTIVE`.
|
||||||
* Verify that `state.slot >= exit.slot`.
|
* Verify that `state.slot >= exit.slot`.
|
||||||
* Verify that `state.slot >= validator.latest_status_change_slot + SHARD_PERSISTENT_COMMITTEE_CHANGE_PERIOD`.
|
|
||||||
* Verify that `bls_verify(pubkey=validator.pubkey, message=ZERO_HASH, signature=exit.signature, domain=get_domain(state.fork_data, exit.slot, DOMAIN_EXIT))`.
|
* Verify that `bls_verify(pubkey=validator.pubkey, message=ZERO_HASH, signature=exit.signature, domain=get_domain(state.fork_data, exit.slot, DOMAIN_EXIT))`.
|
||||||
* Run `update_validator_status(state, validator_index, new_status=ACTIVE_PENDING_EXIT)`.
|
* Run `update_validator_status(state, validator_index, new_status=ACTIVE_PENDING_EXIT)`.
|
||||||
|
|
||||||
|
@ -1803,33 +1786,6 @@ If a validator registry update does _not_ happen do the following:
|
||||||
* Let `start_shard = state.shard_committees_at_slots[0][0].shard`.
|
* Let `start_shard = state.shard_committees_at_slots[0][0].shard`.
|
||||||
* If `epochs_since_last_registry_change` is an exact power of 2, set `state.shard_committees_at_slots[EPOCH_LENGTH:] = get_new_shuffling(state.latest_randao_mixes[(state.slot - EPOCH_LENGTH) % LATEST_RANDAO_MIXES_LENGTH], state.validator_registry, start_shard)`. Note that `start_shard` is not changed from the last epoch.
|
* If `epochs_since_last_registry_change` is an exact power of 2, set `state.shard_committees_at_slots[EPOCH_LENGTH:] = get_new_shuffling(state.latest_randao_mixes[(state.slot - EPOCH_LENGTH) % LATEST_RANDAO_MIXES_LENGTH], state.validator_registry, start_shard)`. Note that `start_shard` is not changed from the last epoch.
|
||||||
|
|
||||||
### Proposer reshuffling
|
|
||||||
|
|
||||||
Run the following code to update the shard proposer set:
|
|
||||||
|
|
||||||
```python
|
|
||||||
active_validator_indices = get_active_validator_indices(state.validator_registry)
|
|
||||||
num_validators_to_reshuffle = len(active_validator_indices) // SHARD_PERSISTENT_COMMITTEE_CHANGE_PERIOD
|
|
||||||
for i in range(num_validators_to_reshuffle):
|
|
||||||
# Multiplying i to 2 to ensure we have different input to all the required hashes in the shuffling
|
|
||||||
# and none of the hashes used for entropy in this loop will be the same
|
|
||||||
validator_index = active_validator_indices[hash(state.latest_randao_mixes[state.slot % LATEST_RANDAO_MIXES_LENGTH] + bytes8(i * 2)) % len(active_validator_indices)]
|
|
||||||
new_shard = hash(state.latest_randao_mixes[state.slot % LATEST_RANDAO_MIXES_LENGTH] + bytes8(i * 2 + 1)) % SHARD_COUNT
|
|
||||||
shard_reassignment_record = ShardReassignmentRecord(
|
|
||||||
validator_index=validator_index,
|
|
||||||
shard=new_shard,
|
|
||||||
slot=s + SHARD_PERSISTENT_COMMITTEE_CHANGE_PERIOD
|
|
||||||
)
|
|
||||||
state.persistent_committee_reassignments.append(shard_reassignment_record)
|
|
||||||
|
|
||||||
while len(state.persistent_committee_reassignments) > 0 and state.persistent_committee_reassignments[0].slot <= s:
|
|
||||||
reassignment = state.persistent_committee_reassignments.pop(0)
|
|
||||||
for committee in state.persistent_committees:
|
|
||||||
if reassignment.validator_index in committee:
|
|
||||||
committee.pop(committee.index(reassignment.validator_index))
|
|
||||||
state.persistent_committees[reassignment.shard].append(reassignment.validator_index)
|
|
||||||
```
|
|
||||||
|
|
||||||
### Final updates
|
### Final updates
|
||||||
|
|
||||||
* Remove any `attestation` in `state.latest_attestations` such that `attestation.data.slot < state.slot - EPOCH_LENGTH`.
|
* Remove any `attestation` in `state.latest_attestations` such that `attestation.data.slot < state.slot - EPOCH_LENGTH`.
|
||||||
|
|
Loading…
Reference in New Issue