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

Use merge consistently

This commit is contained in:
Paul Hauner 2022-03-02 19:03:06 +11:00
parent f071931e46
commit bf25d323fc
No known key found for this signature in database
GPG Key ID: 5E2CFF9B75FA63DF
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sync/optimistic.md
View File

@ -118,8 +118,8 @@ following are true:
In effect, there are restrictions on when a *merge block* can be optimistically
imported. The merge block is the first block in any chain where
`is_execution_block(block) == True`. Any descendant of a transition block may
be imported optimistically at any time.
`is_execution_block(block) == True`. Any descendant of a merge block may be
imported optimistically at any time.
*See [Fork Choice Poisoning](#fork-choice-poisoning) for the motivations behind
these conditions.*