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 existing fork choce tests with new filter

This commit is contained in:
Danny Ryan 2019-11-25 15:44:22 -07:00
parent 9004bcf1a5
commit 8021f34c06
No known key found for this signature in database
GPG Key ID: 2765A792E42CE07A
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
specs/core/0_fork-choice.md
View File

@ -139,17 +139,17 @@ def get_latest_attesting_balance(store: Store, root: Root) -> Gwei:
#### `filter_block_tree` #### `filter_block_tree`
```python ```python
def filter_block_tree(store, block_root, blocks): def filter_block_tree(store: Store, block_root: Root, blocks: Dict[Root, BeaconBlock]) -> bool:
block = store.blocks[block_root] block = store.blocks[block_root]
children = [ children = [
root for root in store.blocks.keys() root for root in store.blocks.keys()
if store.blocks[root].parent_root == block if store.blocks[root].parent_root == block_root
] ]
# If any children branches contain expected finalized/justified checkpoints, # If any children branches contain expected finalized/justified checkpoints,
# add to filtered block-tree and signal viability to parent. # add to filtered block-tree and signal viability to parent.
if any(children): if any(children):
if True in [filter_block_tree(child, blocks) for child in children]: if True in [filter_block_tree(store, child, blocks) for child in children]:
blocks[block_root] = block blocks[block_root] = block
return True return True
return False return False
@ -157,10 +157,15 @@ def filter_block_tree(store, block_root, blocks):
# If leaf block, check finalized/justified checkpoints as matching latest. # If leaf block, check finalized/justified checkpoints as matching latest.
# If matching, add to viable block-tree and signal viability to parent. # If matching, add to viable block-tree and signal viability to parent.
head_state = store.block_states[block_root] head_state = store.block_states[block_root]
is_viable_branch = (
head_state.finalized_checkpoint == store.finalized_checkpoint # Handle base case where justified hasn't updated yet
and head_state.current_justified_checkpoint == store.justified_checkpoint if head_state.current_justified_checkpoint.epoch == GENESIS_EPOCH:
) is_viable_branch = True
else:
is_viable_branch = (
head_state.finalized_checkpoint == store.finalized_checkpoint
and head_state.current_justified_checkpoint == store.justified_checkpoint
)
if is_viable_branch: if is_viable_branch:
blocks[block_root] = block blocks[block_root] = block
return True return True
@ -174,8 +179,8 @@ def filter_block_tree(store, block_root, blocks):
```python ```python
def get_filtered_block_tree(store: Store) -> Dict[Root, BeaconBlock]: def get_filtered_block_tree(store: Store) -> Dict[Root, BeaconBlock]:
head = store.justified_checkpoint.root head = store.justified_checkpoint.root
blocks = {} blocks: Dict[Root, BeaconBlock] = {}
filter_block_tree(head, blocks) filter_block_tree(store, head, blocks)
return blocks return blocks
``` ```
@ -185,6 +190,8 @@ def get_filtered_block_tree(store: Store) -> Dict[Root, BeaconBlock]:
def get_head(store: Store) -> Root: def get_head(store: Store) -> Root:
# Get filtered block tree that includes viable branches # Get filtered block tree that includes viable branches
blocks = get_filtered_block_tree(store) blocks = get_filtered_block_tree(store)
print(len(blocks))
print(len(store.blocks))
# Execute the LMD-GHOST fork choice # Execute the LMD-GHOST fork choice
head = store.justified_checkpoint.root head = store.justified_checkpoint.root
justified_slot = compute_start_slot_at_epoch(store.justified_checkpoint.epoch) justified_slot = compute_start_slot_at_epoch(store.justified_checkpoint.epoch)