Skip to content

Commit

Permalink
Merge pull request #2881 from ethereum/mkalinin-patch-2
Browse files Browse the repository at this point in the history
Remove justified block from optimistic candidate conditions
  • Loading branch information
mkalinin authored Apr 29, 2022
2 parents 83ac38c + 706f417 commit 83bf20c
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions sync/optimistic.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,6 @@ def is_optimistic_candidate_block(opt_store: OptimisticStore, current_slot: Slot
if is_execution_block(opt_store.blocks[block.parent_root]):
return True

justified_root = opt_store.block_states[opt_store.head_block_root].current_justified_checkpoint.root
if is_execution_block(opt_store.blocks[justified_root]):
return True

if block.slot + SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY <= current_slot:
return True

Expand All @@ -111,7 +107,6 @@ This ensures that blocks are only optimistically imported if one or more of the
following are true:

1. The parent of the block has execution enabled.
1. The justified checkpoint has execution enabled.
1. The current slot (as per the system clock) is at least
`SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY` ahead of the slot of the block being
imported.
Expand Down

0 comments on commit 83bf20c

Please sign in to comment.