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

Apply code review from @djrtwo

This commit is contained in:
Aditya Asgaonkar 2022-03-03 11:43:52 -08:00
parent 7f31c80b8f
commit 37b8a89bb1
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
specs/phase0/fork-choice.md
View File

@ -102,7 +102,7 @@ class Store(object):
finalized_checkpoint: Checkpoint finalized_checkpoint: Checkpoint
best_justified_checkpoint: Checkpoint best_justified_checkpoint: Checkpoint
proposer_boost_root: Root proposer_boost_root: Root
has_equivocated: Set[ValidatorIndex] equivocating_indices: Set[ValidatorIndex]
blocks: Dict[Root, BeaconBlock] = field(default_factory=dict) blocks: Dict[Root, BeaconBlock] = field(default_factory=dict)
block_states: Dict[Root, BeaconState] = field(default_factory=dict) block_states: Dict[Root, BeaconState] = field(default_factory=dict)
checkpoint_states: Dict[Checkpoint, BeaconState] = field(default_factory=dict) checkpoint_states: Dict[Checkpoint, BeaconState] = field(default_factory=dict)
@ -131,7 +131,7 @@ def get_forkchoice_store(anchor_state: BeaconState, anchor_block: BeaconBlock) -
finalized_checkpoint=finalized_checkpoint, finalized_checkpoint=finalized_checkpoint,
best_justified_checkpoint=justified_checkpoint, best_justified_checkpoint=justified_checkpoint,
proposer_boost_root=proposer_boost_root, proposer_boost_root=proposer_boost_root,
has_equivocated=set(), equivocating_indices=set(),
blocks={anchor_root: copy(anchor_block)}, blocks={anchor_root: copy(anchor_block)},
block_states={anchor_root: copy(anchor_state)}, block_states={anchor_root: copy(anchor_state)},
checkpoint_states={justified_checkpoint: copy(anchor_state)}, checkpoint_states={justified_checkpoint: copy(anchor_state)},
@ -182,7 +182,7 @@ def get_latest_attesting_balance(store: Store, root: Root) -> Gwei:
attestation_score = Gwei(sum( attestation_score = Gwei(sum(
state.validators[i].effective_balance for i in active_indices state.validators[i].effective_balance for i in active_indices
if (i in store.latest_messages if (i in store.latest_messages
and i not in store.has_equivocated and i not in store.equivocating_indices
and get_ancestor(store, store.latest_messages[i].root, store.blocks[root].slot) == root) and get_ancestor(store, store.latest_messages[i].root, store.blocks[root].slot) == root)
)) ))
if store.proposer_boost_root == Root(): if store.proposer_boost_root == Root():
@ -361,8 +361,8 @@ def store_target_checkpoint_state(store: Store, target: Checkpoint) -> None:
def update_latest_messages(store: Store, attesting_indices: Sequence[ValidatorIndex], attestation: Attestation) -> None: def update_latest_messages(store: Store, attesting_indices: Sequence[ValidatorIndex], attestation: Attestation) -> None:
target = attestation.data.target target = attestation.data.target
beacon_block_root = attestation.data.beacon_block_root beacon_block_root = attestation.data.beacon_block_root
for i in attesting_indices: non_equivocating_attesting_indices = [i for i in attesting_indices if i not in store.equivocating_indices]
if i not in store.has_equivocated: for i in non_equivocating_attesting_indices:
if i not in store.latest_messages or target.epoch > store.latest_messages[i].epoch: if i not in store.latest_messages or target.epoch > store.latest_messages[i].epoch:
store.latest_messages[i] = LatestMessage(epoch=target.epoch, root=beacon_block_root) store.latest_messages[i] = LatestMessage(epoch=target.epoch, root=beacon_block_root)
``` ```
@ -481,6 +481,6 @@ def on_attester_slashing(store: Store, attester_slashing: AttesterSlashing) -> N
assert is_valid_indexed_attestation(state, attestation_2) assert is_valid_indexed_attestation(state, attestation_2)
indices = set(attestation_1.attesting_indices).intersection(attestation_2.attesting_indices) indices = set(attestation_1.attesting_indices).intersection(attestation_2.attesting_indices)
for index in sorted(indices): for index in indices:
store.has_equivocated.add(index) store.equivocating_indices.add(index)
``` ```