From 4e6a9b029a0f8917473abe392f8006822ecb7c7e Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Thu, 7 Feb 2019 10:28:34 -0700 Subject: [PATCH] finalized -> frozen --- book/src/fork-deltas.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/src/fork-deltas.md b/book/src/fork-deltas.md index 0b67cf2ca7a14f..246fc249824dd9 100644 --- a/book/src/fork-deltas.md +++ b/book/src/fork-deltas.md @@ -33,7 +33,7 @@ The following *active forks* are in the deltas DAG ## Merging into root -A validator votes for a finalized fork. The *active fork* connecting the fork +A validator votes for a frozen fork. The *active fork* connecting the fork to the root is merged. If the *active fork* is longer than `Forks::ROLLBACK_DEPTH` the oldest two forks are merged. The oldest fork in the *active fork* is the current root, so the second oldest is a direct