From a25f2b92a7ff1c3fac9ae46fb7436f9f6697c1d1 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 11 May 2022 15:10:06 -0600
Subject: [PATCH] Set NU5 activation height in the protocol specification.

---
 protocol/protocol.tex | 17 ++++++++++++++++-
 protocol/zcash.bib    |  9 +++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/protocol/protocol.tex b/protocol/protocol.tex
index f4ac6188..5eab9584 100644
--- a/protocol/protocol.tex
+++ b/protocol/protocol.tex
@@ -1751,6 +1751,7 @@ electronic commerce and payment, financial privacy, proof of work, zero knowledg
 \newcommand{\BlossomActivationHeight}{\mathsf{BlossomActivationHeight}}
 \newcommand{\IsBlossomActivated}{\mathsf{IsBlossomActivated}}
 \newcommand{\CanopyActivationHeight}{\mathsf{CanopyActivationHeight}}
+\newcommand{\NUFiveActivationHeight}{\mathsf{NUFiveActivationHeight}}
 \newcommand{\ZIPTwoOneTwoGracePeriod}{\mathsf{ZIP212GracePeriod}}
 
 \newcommand{\PoWLimit}{\mathsf{PoWLimit}}
@@ -2932,7 +2933,7 @@ The following integer constants will be instantiated in \crossref{constants}:
     $\PRFOutputLengthNfSapling$,} $\NoteCommitRandLengthSprout$, $\RandomSeedLength$, $\AuthPrivateLength$,
     $\NoteUniquePreRandLength$,\sapling{ $\SpendingKeyLength$, $\DiversifierLength$,\nufive{ $\DiversifierKeyLength$,}
     $\InViewingKeyLength{Sapling}$, $\OutViewingKeyLength$, $\ScalarLength{Sapling}$,\nufive{ $\ScalarLength{Orchard}$, $\BaseLength{Orchard}$,}}
-    $\MAXMONEY$,\blossom{ $\BlossomActivationHeight$,}\strut\canopy{ $\CanopyActivationHeight$, $\ZIPTwoOneTwoGracePeriod$,}
+    $\MAXMONEY$,\blossom{ $\BlossomActivationHeight$,}\strut\canopy{ $\CanopyActivationHeight$, $\ZIPTwoOneTwoGracePeriod$,}\strut\nufive{ $\NUFiveActivationHeight$,}
     $\SlowStartInterval$, $\PreBlossomHalvingInterval$, $\MaxBlockSubsidy$, $\NumFounderAddresses$,
     $\PoWLimit$, $\PoWAveragingWindow$, $\PoWMedianBlockSpan$, $\PoWDampingFactor$,
     \notblossom{and }$\PreBlossomPoWTargetSpacing$\blossom{, and $\PostBlossomPoWTargetSpacing$}.
@@ -8059,6 +8060,12 @@ Define:
         \end{cases}$
   \item $\ZIPTwoOneTwoGracePeriod \typecolon \Nat := 32256$
 } %canopy
+\nufive{
+  \item $\NUFiveActivationHeight \typecolon \Nat := \begin{cases}
+          1687104,&\squash\text{for \Mainnet} \\
+          1842420,&\squash\text{for \Testnet}
+        \end{cases}$
+} %nufive
   \item $\SlowStartInterval \typecolon \Nat := 20000$
   \item $\PreBlossomHalvingInterval \typecolon \Nat := 840000$
   \item $\MaxBlockSubsidy \typecolon \Nat := 1.25 \smult 10^9$ (\zatoshi)
@@ -12242,6 +12249,8 @@ at \blockHeight $903000$ \cite{Zcash-Heartwd} \cite{ZIP-250}.
 A fifth upgrade, called \defining{\Canopy}, activated on \Mainnet on 18~November, 2020
 at \blockHeight $1046400$ (coinciding with the first \blockSubsidy \halving)
 \cite{Zcash-Canopy} \cite{ZIP-251}.
+A sixth upgrade, called \defining{\NUFive}, activated on \Mainnet on 31~May, 2022
+at \blockHeight $1687104$ \cite{Zcash-Nu5} \cite{ZIP-252}.
 
 \nufive{
 This draft specification describes the set of changes proposed for the \NUFive \networkUpgrade
@@ -14639,6 +14648,12 @@ Peter Newell's illustration of the Jubjub bird, from \cite{Carroll1902}.
 \intropart
 \lsection{Change History}{changehistory}
 
+\historyentry{2022.3.2}{2022-05-11}
+\begin{itemize}
+\nufive{
+    \item Set $\NUFiveActivationHeight$ for \Testnet and \Mainnet.
+} %nufive
+\end{itemize}
 
 \historyentry{2022.3.1}{2022-04-28}
 \begin{itemize}
diff --git a/protocol/zcash.bib b/protocol/zcash.bib
index 58abbf30..e2a556bc 100644
--- a/protocol/zcash.bib
+++ b/protocol/zcash.bib
@@ -1707,6 +1707,15 @@ generic composition paradigm},
    urldate={2021-01-10}
 }
 
+@misc{Zcash-Nu5,
+   presort={Zcash-Nu5},
+   author={Electric Coin Company},
+   title={Nu5},
+   date={2022-05-31},
+   url={https://z.cash/upgrade/nu5/},
+   urldate={2022-05-11}
+}
+
 @misc{WCBTV2015,
    presort={WCBTV2015},
    author={Zooko Wilcox and Alessandro Chiesa and Eli Ben-Sasson and Eran Tromer and Madars Virza},