From bf25d323fc77535f7a168452756257b92b78a54e Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Wed, 2 Mar 2022 19:03:06 +1100 Subject: [PATCH] Use merge consistently --- sync/optimistic.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sync/optimistic.md b/sync/optimistic.md index 8b3c1a730..3237c3f65 100644 --- a/sync/optimistic.md +++ b/sync/optimistic.md @@ -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.*