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

fix lint problems

This commit is contained in:
protolambda 2019-11-20 05:11:19 +01:00 committed by Danny Ryan
parent 1623d40b6d
commit 72a9dfc430
No known key found for this signature in database
GPG Key ID: 2765A792E42CE07A
3 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
specs/core/1_beacon-chain.md
View File

@ -34,18 +34,18 @@ Configuration is not namespaced. Instead it is strictly an extension;
| - | - | - | - | | - | - | - | - |
| `MAX_SHARDS` | `2**10` (= 1024) | | `MAX_SHARDS` | `2**10` (= 1024) |
| `ACTIVE_SHARDS` | `2**6` (= 64) | | `ACTIVE_SHARDS` | `2**6` (= 64) |
| `ONLINE_PERIOD` | `2**3` (= 8) | epochs | ~51 min | | `ONLINE_PERIOD` | `Epoch(2**3)` (= 8) | epochs | ~51 min |
| `LIGHT_CLIENT_COMMITTEE_SIZE` | `2**7` (= 128) | | `LIGHT_CLIENT_COMMITTEE_SIZE` | `2**7` (= 128) |
| `LIGHT_CLIENT_COMMITTEE_PERIOD` | `2**8` (= 256) | epochs | ~27 hours | | `LIGHT_CLIENT_COMMITTEE_PERIOD` | `Epoch(2**8)` (= 256) | epochs | ~27 hours |
| `SHARD_COMMITTEE_PERIOD` | `2**8` (= 256) | epochs | ~27 hours | | `SHARD_COMMITTEE_PERIOD` | `Epoch(2**8)` (= 256) | epochs | ~27 hours |
| `SHARD_BLOCK_CHUNK_SIZE` | `2**18` (= 262,144) | | | `SHARD_BLOCK_CHUNK_SIZE` | `2**18` (= 262,144) | |
| `MAX_SHARD_BLOCK_CHUNKS` | `2**2` (= 4) | | | `MAX_SHARD_BLOCK_CHUNKS` | `2**2` (= 4) | |
| `TARGET_SHARD_BLOCK_SIZE` | `3 * 2**16` (= 196,608) | | | `TARGET_SHARD_BLOCK_SIZE` | `3 * 2**16` (= 196,608) | |
| `SHARD_BLOCK_OFFSETS` | `[1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233]` | | | `SHARD_BLOCK_OFFSETS` | `[1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233]` | |
| `MAX_SHARD_BLOCKS_PER_ATTESTATION` | `len(SHARD_BLOCK_OFFSETS)` | | | `MAX_SHARD_BLOCKS_PER_ATTESTATION` | `len(SHARD_BLOCK_OFFSETS)` | |
| `EMPTY_CHUNK_ROOT` | `hash_tree_root(BytesN[SHARD_BLOCK_CHUNK_SIZE]())` | | | `EMPTY_CHUNK_ROOT` | `hash_tree_root(BytesN[SHARD_BLOCK_CHUNK_SIZE]())` | |
| `MAX_GASPRICE` | `2**14` (= 16,384) | Gwei | | | `MAX_GASPRICE` | `Gwei(2**14)` (= 16,384) | Gwei | |
| `MIN_GASPRICE` | `2**5` (= 32) | Gwei | | | `MIN_GASPRICE` | `Gwei(2**5)` (= 32) | Gwei | |
| `GASPRICE_ADJUSTMENT_COEFFICIENT` | `2**3` (= 8) | | | `GASPRICE_ADJUSTMENT_COEFFICIENT` | `2**3` (= 8) | |
| `DOMAIN_LIGHT_CLIENT` | `192` | | | `DOMAIN_LIGHT_CLIENT` | `192` | |
| `DOMAIN_SHARD_COMMITTEE` | `192` | | | `DOMAIN_SHARD_COMMITTEE` | `192` | |
@ -313,7 +313,7 @@ def committee_to_compact_committee(state: BeaconState, committee: Sequence[Valid
#### `chunks_to_body_root` #### `chunks_to_body_root`
```python ```python
def chunks_to_body_root(chunks): def chunks_to_body_root(chunks: List[Hash, MAX_SHARD_BLOCK_CHUNKS]) -> Hash:
return hash_tree_root(Vector[Hash, MAX_SHARD_BLOCK_CHUNKS]( return hash_tree_root(Vector[Hash, MAX_SHARD_BLOCK_CHUNKS](
chunks + [EMPTY_CHUNK_ROOT] * (MAX_SHARD_BLOCK_CHUNKS - len(chunks)) chunks + [EMPTY_CHUNK_ROOT] * (MAX_SHARD_BLOCK_CHUNKS - len(chunks))
)) ))
@ -321,6 +321,16 @@ def chunks_to_body_root(chunks):
### Beacon state accessors ### Beacon state accessors
#### `get_previous_slot`
```python
def get_previous_slot(state: BeaconState) -> Slot:
if state.slot > 0:
return Slot(state.slot - 1)
else:
return Slot(0)
```
#### `get_online_validator_indices` #### `get_online_validator_indices`
```python ```python
@ -403,7 +413,7 @@ def get_shard(state: BeaconState, attestation: Attestation) -> Shard:
```python ```python
def get_offset_slots(state: BeaconState, start_slot: Slot) -> Sequence[Slot]: def get_offset_slots(state: BeaconState, start_slot: Slot) -> Sequence[Slot]:
return [start_slot + x for x in SHARD_BLOCK_OFFSETS if start_slot + x < state.slot] return [Slot(start_slot + x) for x in SHARD_BLOCK_OFFSETS if start_slot + x < state.slot]
``` ```
@ -503,7 +513,7 @@ def validate_attestation(state: BeaconState, attestation: Attestation) -> None:
# Correct data root count # Correct data root count
assert len(attestation.custody_bits) == len(get_offset_slots(state, state.shard_next_slots[shard])) assert len(attestation.custody_bits) == len(get_offset_slots(state, state.shard_next_slots[shard]))
# Correct parent block root # Correct parent block root
assert data.beacon_block_root == get_block_root_at_slot(state, state.slot - 1) assert data.beacon_block_root == get_block_root_at_slot(state, get_previous_slot(state))
# Type 2: delayed attestations # Type 2: delayed attestations
else: else:
assert state.slot - compute_start_slot_at_epoch(compute_epoch_at_slot(data.slot)) < SLOTS_PER_EPOCH assert state.slot - compute_start_slot_at_epoch(compute_epoch_at_slot(data.slot)) < SLOTS_PER_EPOCH
@ -535,7 +545,7 @@ def apply_shard_transition(state: BeaconState, shard: Shard, transition: ShardTr
if any(transition.shard_data_roots): if any(transition.shard_data_roots):
headers.append(ShardSignableHeader( headers.append(ShardSignableHeader(
shard_parent_root=shard_parent_root, shard_parent_root=shard_parent_root,
parent_hash=get_block_root_at_slot(state, state.slot - 1), parent_hash=get_block_root_at_slot(state, get_previous_slot(state)),
slot=offset_slots[i], slot=offset_slots[i],
body_root=chunks_to_body_root(transition.shard_data_roots[i]) body_root=chunks_to_body_root(transition.shard_data_roots[i])
)) ))
@ -576,7 +586,7 @@ def process_attestations(state: BeaconState, block_body: BeaconBlockBody, attest
# Process crosslinks # Process crosslinks
online_indices = get_online_validator_indices(state) online_indices = get_online_validator_indices(state)
winners = set() winners = set()
for shard in range(ACTIVE_SHARDS): for shard in map(Shard, range(ACTIVE_SHARDS)):
success = False success = False
# All attestations in the block for this shard # All attestations in the block for this shard
this_shard_attestations = [ this_shard_attestations = [
@ -588,7 +598,7 @@ def process_attestations(state: BeaconState, block_body: BeaconBlockBody, attest
# Loop over all shard transition roots # Loop over all shard transition roots
shard_transition_roots = set([a.data.shard_transition_root for a in this_shard_attestations]) shard_transition_roots = set([a.data.shard_transition_root for a in this_shard_attestations])
for shard_transition_root in sorted(shard_transition_roots): for shard_transition_root in sorted(shard_transition_roots):
all_participants = set() all_participants: Set[ValidatorIndex] = set()
participating_attestations = [] participating_attestations = []
for attestation in this_shard_attestations: for attestation in this_shard_attestations:
participating_attestations.append(attestation) participating_attestations.append(attestation)
@ -611,11 +621,11 @@ def process_attestations(state: BeaconState, block_body: BeaconBlockBody, attest
# Apply proposer reward and cost # Apply proposer reward and cost
beacon_proposer_index = get_beacon_proposer_index(state) beacon_proposer_index = get_beacon_proposer_index(state)
estimated_attester_reward = sum([get_base_reward(state, attester) for attester in all_participants]) estimated_attester_reward = sum([get_base_reward(state, attester) for attester in all_participants])
proposer_reward = estimated_attester_reward // PROPOSER_REWARD_QUOTIENT proposer_reward = Gwei(estimated_attester_reward // PROPOSER_REWARD_QUOTIENT)
increase_balance(state, beacon_proposer_index, proposer_reward) increase_balance(state, beacon_proposer_index, proposer_reward)
states_slots_lengths = zip( states_slots_lengths = zip(
block_body.shard_transition.shard_states, block_body.shard_transition.shard_states,
get_offset_slots(state, state.shard_next_slots[get_shard(attestation)]), get_offset_slots(state, state.shard_next_slots[get_shard(state, attestation)]),
block_body.shard_transition.shard_block_lengths block_body.shard_transition.shard_block_lengths
) )
for shard_state, slot, length in states_slots_lengths: for shard_state, slot, length in states_slots_lengths:
@ -666,11 +676,11 @@ def process_light_client_signatures(state: BeaconState, block_body: BeaconBlockB
increase_balance(state, committee[i], get_base_reward(state, committee[i])) increase_balance(state, committee[i], get_base_reward(state, committee[i]))
total_reward += get_base_reward(state, committee[i]) total_reward += get_base_reward(state, committee[i])
increase_balance(state, get_beacon_proposer_index(state), total_reward // PROPOSER_REWARD_QUOTIENT) increase_balance(state, get_beacon_proposer_index(state), Gwei(total_reward // PROPOSER_REWARD_QUOTIENT))
assert bls_verify( assert bls_verify(
pubkey=bls_aggregate_pubkeys(signer_keys), pubkey=bls_aggregate_pubkeys(signer_keys),
message_hash=get_block_root_at_slot(state, state.slot - 1), message_hash=get_block_root_at_slot(state, get_previous_slot(state)),
signature=block_body.light_client_signature, signature=block_body.light_client_signature,
domain=DOMAIN_LIGHT_CLIENT domain=DOMAIN_LIGHT_CLIENT
) )

8
specs/core/1_custody-game.md
View File

@ -380,7 +380,7 @@ def process_custody_slashing(state: BeaconState, custody_slashing: CustodySlashi
# Verify the malefactor custody key # Verify the malefactor custody key
epoch_to_sign = get_randao_epoch_for_custody_period( epoch_to_sign = get_randao_epoch_for_custody_period(
get_custody_period_for_validator(state, custody_slashing.malefactor_index, attestation.data.target.epoch), get_custody_period_for_validator(custody_slashing.malefactor_index, attestation.data.target.epoch),
custody_slashing.malefactor_index, custody_slashing.malefactor_index,
) )
domain = get_domain(state, DOMAIN_RANDAO, epoch_to_sign) domain = get_domain(state, DOMAIN_RANDAO, epoch_to_sign)
@ -398,7 +398,8 @@ def process_custody_slashing(state: BeaconState, custody_slashing: CustodySlashi
if claimed_custody_bit != computed_custody_bit: if claimed_custody_bit != computed_custody_bit:
# Slash the malefactor, reward the other committee members # Slash the malefactor, reward the other committee members
slash_validator(state, custody_slashing.malefactor_index) slash_validator(state, custody_slashing.malefactor_index)
whistleblower_reward = Gwei(malefactor.effective_balance // WHISTLEBLOWER_REWARD_QUOTIENT) // len(attesters - 1) others_count = len(committee) - 1
whistleblower_reward = Gwei(malefactor.effective_balance // WHISTLEBLOWER_REWARD_QUOTIENT // others_count)
for attester_index in attesters: for attester_index in attesters:
if attester_index != custody_slashing.malefactor_index: if attester_index != custody_slashing.malefactor_index:
increase_balance(state, attester_index, whistleblower_reward) increase_balance(state, attester_index, whistleblower_reward)
@ -417,8 +418,9 @@ Run `process_reveal_deadlines(state)` after `process_registry_updates(state)`:
```python ```python
def process_reveal_deadlines(state: BeaconState) -> None: def process_reveal_deadlines(state: BeaconState) -> None:
epoch = get_current_epoch(state)
for index, validator in enumerate(state.validators): for index, validator in enumerate(state.validators):
if get_custody_period_for_validator(state, ValidatorIndex(index)) > validator.next_custody_secret_to_reveal: if get_custody_period_for_validator(ValidatorIndex(index), epoch) > validator.next_custody_secret_to_reveal:
slash_validator(state, ValidatorIndex(index)) slash_validator(state, ValidatorIndex(index))
``` ```

8
specs/core/1_phase1-fork.md
View File

@ -64,9 +64,9 @@ def upgrade_to_phase1(pre: phase0.BeaconState) -> BeaconState:
activation_epoch=phase0_validator.activation_eligibility_epoch, activation_epoch=phase0_validator.activation_eligibility_epoch,
exit_epoch=phase0_validator.exit_epoch, exit_epoch=phase0_validator.exit_epoch,
withdrawable_epoch=phase0_validator.withdrawable_epoch, withdrawable_epoch=phase0_validator.withdrawable_epoch,
next_custody_secret_to_reveal=get_custody_period_for_validator(validator_index, epoch), next_custody_secret_to_reveal=get_custody_period_for_validator(ValidatorIndex(i), epoch),
max_reveal_lateness=0, # TODO custody refactor. Outdated? max_reveal_lateness=0, # TODO custody refactor. Outdated?
) for validator_index, phase0_validator in enumerate(pre.validators) ) for i, phase0_validator in enumerate(pre.validators)
), ),
balances=pre.balances, balances=pre.balances,
# Randomness # Randomness
@ -102,7 +102,7 @@ def upgrade_to_phase1(pre: phase0.BeaconState) -> BeaconState:
exposed_derived_secrets=Vector[List[ValidatorIndex, MAX_EARLY_DERIVED_SECRET_REVEALS * SLOTS_PER_EPOCH], exposed_derived_secrets=Vector[List[ValidatorIndex, MAX_EARLY_DERIVED_SECRET_REVEALS * SLOTS_PER_EPOCH],
EARLY_DERIVED_SECRET_PENALTY_MAX_FUTURE_EPOCHS]() EARLY_DERIVED_SECRET_PENALTY_MAX_FUTURE_EPOCHS]()
) )
post.current_light_committee = get_light_client_committee(post, post.epoch) post.current_light_committee = committee_to_compact_committee(post, get_light_client_committee(post, post.epoch))
post.next_light_committee = get_light_client_committee(post, post.epoch + 1) post.next_light_committee = committee_to_compact_committee(post, get_light_client_committee(post, post.epoch + 1))
return post return post
``` ```