mirror of https://github.com/zcash/zips.git
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:
parent
6c3099843d
commit
3a312dc5a9
|
@ -11974,8 +11974,8 @@ at \blockHeight $1046400$ (coinciding with the first \blockSubsidy \halving)
|
||||||
\cite{Zcash-Canopy} \cite{ZIP-251}.
|
\cite{Zcash-Canopy} \cite{ZIP-251}.
|
||||||
|
|
||||||
\nufive{
|
\nufive{
|
||||||
This draft specification describes a set of changes codenamed \NUFive, which are
|
This draft specification describes the set of changes proposed for the \NUFive \networkUpgrade
|
||||||
proposed to activate in a future \networkUpgrade.
|
(for which activation heights have not yet been set).
|
||||||
} %nufive
|
} %nufive
|
||||||
|
|
||||||
This section summarizes the strategy for upgrading from \Sprout to subsequent versions
|
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,
|
\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}.}
|
\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,
|
\nufive{The specifications of the \NUFive upgrade are described in this document,
|
||||||
\cite{ZIP-216}, \cite{ZIP-224}, \cite{ZIP-225}, and \cite{ZIP-244}. The contents of
|
\cite{ZIP-252}, \cite{ZIP-216}, \cite{ZIP-221}, \cite{ZIP-224}, \cite{ZIP-225}, and \cite{ZIP-244}.
|
||||||
this \networkUpgrade are subject to change as a result of discussions in the
|
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.}
|
Network Upgrade Process and the results of audits.}
|
||||||
|
|
||||||
\vspace{1ex}
|
\vspace{1ex}
|
||||||
|
@ -14210,6 +14211,8 @@ Peter Newell's illustration of the Jubjub bird, from \cite{Carroll1902}.
|
||||||
spent in an \actionTransfer.
|
spent in an \actionTransfer.
|
||||||
\item Add a caveat in \crossref{orchardkeycomponents} about reuse of $\CommitIvkRandom$
|
\item Add a caveat in \crossref{orchardkeycomponents} about reuse of $\CommitIvkRandom$
|
||||||
between $\PRFexpand{}$ and $\CommitIvk{}$.
|
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.
|
\item Section \crossref{concreteorchardkdf} should be in \nufivecolorname.
|
||||||
} %nufive
|
} %nufive
|
||||||
\item Correct the set of inputs to $\PRFexpand{}$ used for \cite{ZIP-32}\nufive{ and \Orchard}
|
\item Correct the set of inputs to $\PRFexpand{}$ used for \cite{ZIP-32}\nufive{ and \Orchard}
|
||||||
|
|
Loading…
Reference in New Issue