From fd2416d9ea4dff51e09e435ce1af5b412a4fabc7 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Tue, 11 Aug 2020 01:48:59 +0100 Subject: [PATCH] Set CanopyActivationHeight for Testnet. Signed-off-by: Daira Hopwood --- protocol/protocol.tex | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/protocol/protocol.tex b/protocol/protocol.tex index 168cff06..ab1c941d 100644 --- a/protocol/protocol.tex +++ b/protocol/protocol.tex @@ -6085,7 +6085,7 @@ Define: \canopy{ \item $\CanopyActivationHeight \typecolon \Nat := \begin{cases} 1046400,&\squash\text{for \Mainnet} \\ - \todo{},&\squash\text{for \Testnet} + 1028500,&\squash\text{for \Testnet} \end{cases}$ \item $\ZIPTwoOneTwoGracePeriod \typecolon \Nat := 32256$ } %canopy @@ -10785,6 +10785,14 @@ Peter Newell's illustration of the Jubjub bird, from \cite{Carroll1902}. \lsection{Change History}{changehistory} +\historyentry{2020.1.13}{2020-08-11} +\begin{itemize} +\canopy{ + \item Set $\CanopyActivationHeight$ for \Testnet. +} %canopy +\end{itemize} + + \historyentry{2020.1.12}{2020-08-03} \begin{itemize} \item Include \bigShaHash in \crossref{concretesha}.