zec
/
zips
mirror of https://github.com/zcash/zips.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Expand the set of ZIPs associated with NU5 in \crossref{networkupgrades}, and reference the Orchard and halo2 books there. 

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2021-03-31 21:18:41 +01:00
parent 6c3099843d
commit 3a312dc5a9
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
protocol/protocol.tex
View File

@ -11974,8 +11974,8 @@ at \blockHeight $1046400$ (coinciding with the first \blockSubsidy \halving)
\cite{Zcash-Canopy} \cite{ZIP-251}.
\nufive{
This draft specification describes a set of changes codenamed \NUFive, which are
proposed to activate in a future \networkUpgrade.
This draft specification describes the set of changes proposed for the \NUFive \networkUpgrade
(for which activation heights have not yet been set).
} %nufive
This section summarizes the strategy for upgrading from \Sprout to subsequent versions
@ -11999,9 +11999,10 @@ future upgrades.
\canopy{The specifications of the \Canopy upgrade are described in this document,
\cite{ZIP-251}, \cite{ZIP-207}, \cite{ZIP-211}, \cite{ZIP-212}, \cite{ZIP-214}, and \cite{ZIP-215}.}
\nufive{The specifications of the \NUFive upgrade will be described in this document,
\cite{ZIP-216}, \cite{ZIP-224}, \cite{ZIP-225}, and \cite{ZIP-244}. The contents of
this \networkUpgrade are subject to change as a result of discussions in the
\nufive{The specifications of the \NUFive upgrade are described in this document,
\cite{ZIP-252}, \cite{ZIP-216}, \cite{ZIP-221}, \cite{ZIP-224}, \cite{ZIP-225}, and \cite{ZIP-244}.
Additional information and rationale is given in \cite{Zcash-Orchard} and \cite{Zcash-halo2}.
The contents of this \networkUpgrade are subject to change as a result of discussions in the
Network Upgrade Process and the results of audits.}
\vspace{1ex}
@ -14210,6 +14211,8 @@ Peter Newell's illustration of the Jubjub bird, from \cite{Carroll1902}.
spent in an \actionTransfer.
\item Add a caveat in \crossref{orchardkeycomponents} about reuse of $\CommitIvkRandom$
between $\PRFexpand{}$ and $\CommitIvk{}$.
\item Expand the set of ZIPs associated with \NUFive in \crossref{networkupgrades}, and
reference \cite{Zcash-Orchard} and \cite{Zcash-halo2} there.
\item Section \crossref{concreteorchardkdf} should be in \nufivecolorname.
} %nufive
\item Correct the set of inputs to $\PRFexpand{}$ used for \cite{ZIP-32}\nufive{ and \Orchard}