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

Correct and improve presentation of \crossref{networkupgrades}. 

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2022-06-06 20:14:34 +01:00
parent 22b7191bc3
commit 17042258cd
2 changed files with 30 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
protocol/protocol.tex
View File

@ -12238,56 +12238,43 @@ It is derived as described in \cite{Bowe2018}:
\lsection{Network Upgrades}{networkupgrades}
\Zcash launched with a protocol revision that we call \defining{\Sprout}.
A first \networkUpgrade, called \defining{\Overwinter}, activated on \Mainnet on 26~June, 2018
at \blockHeight $347500$ \cite{Swihart2018} \cite{ZIP-201}.
A second upgrade, called \defining{\Sapling}, activated on \Mainnet on 28~October, 2018
at \blockHeight $419200$ \cite{Hamdon2018} \cite{ZIP-205}.
A third upgrade, called \defining{\Blossom}, activated on \Mainnet on 11~December, 2019
at \blockHeight $653600$ \cite{Zcash-Blossom} \cite{ZIP-206}.
A fourth upgrade, called \defining{\Heartwood}, activated on \Mainnet on 16~July, 2020
at \blockHeight $903000$ \cite{Zcash-Heartwd} \cite{ZIP-250}.
A fifth upgrade, called \defining{\Canopy}, activated on \Mainnet on 18~November, 2020
\overwinter{A first upgrade, called \defining{\Overwinter}, activated on \Mainnet on 26~June, 2018
at \blockHeight $347500$ \cite{Swihart2018}. Its specifications are
described in this document, \cite{ZIP-201}, \cite{ZIP-202}, \cite{ZIP-203}, and \cite{ZIP-143}.}
\sapling{A second upgrade, called \defining{\Sapling}, activated on \Mainnet on 28~October, 2018
at \blockHeight $419200$ \cite{Hamdon2018}. Its specifications are
described in this document, \cite{ZIP-205}, and \cite{ZIP-243}.}
\blossom{A third upgrade, called \defining{\Blossom}, activated on \Mainnet on 11~December, 2019
at \blockHeight $653600$ \cite{Zcash-Blossom}. Its specifications are
described in this document, \cite{ZIP-206}, and \cite{ZIP-208}.}
\heartwood{A fourth upgrade, called \defining{\Heartwood}, activated on \Mainnet on 16~July, 2020
at \blockHeight $903000$ \cite{Zcash-Heartwd}. Its specifications are
described in this document, \cite{ZIP-250}, \cite{ZIP-213}, and \cite{ZIP-221}.}
\canopy{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
(for which activation heights have not yet been set).
} %nufive
This section summarizes the strategy for upgrading from \Sprout to subsequent versions
of the protocol (\Overwinter, \Sapling, \Blossom, \Heartwood, and \Canopy), and for
future upgrades.
\defining{The \networkUpgrade mechanism is described in \cite{ZIP-200}.}
\overwinter{The specifications of the \Overwinter upgrade are described in this document,
\cite{ZIP-201}, \cite{ZIP-202}, \cite{ZIP-203}, and \cite{ZIP-143}.}
\sapling{The specifications of the \Sapling upgrade are described in this document,
\cite{ZIP-205}, and \cite{ZIP-243}.}
\blossom{The specifications of the \Blossom upgrade are described in this document,
\cite{ZIP-206}, and \cite{ZIP-208}.}
\heartwood{The specifications of the \Heartwood upgrade are described in this document,
\cite{ZIP-250}, \cite{ZIP-213}, and \cite{ZIP-221}.}
\canopy{The specifications of the \Canopy upgrade are described in this document,
\cite{Zcash-Canopy}. Its specifications 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 are described in this document,
\nufive{A sixth upgrade, called \defining{\NUFive}, activated on \Mainnet on 31~May, 2022
at \blockHeight $1687104$ \cite{Zcash-Nu5}. Its specifications are described in this document,
\cite{ZIP-252}, \cite{ZIP-216}, \cite{ZIP-221}, \cite{ZIP-224}, \cite{ZIP-225}, \cite{ZIP-239},
\cite{ZIP-244}, and \cite{ZIP-316}, with updates to \cite{ZIP-32}, \cite{ZIP-203}, \cite{ZIP-209},
\cite{ZIP-212}, \cite{ZIP-213}, and \cite{ZIP-221}.
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.}
Additional information and rationale is given in \cite{Zcash-Orchard} and \cite{Zcash-halo2}.}
\vspace{1ex}
\introlist
\vspace{1ex}
This section summarizes the strategy for upgrading from \Sprout to subsequent versions
of the protocol (\Overwinter, \Sapling, \Blossom, \Heartwood, \Canopy, and \NUFive),
and for future upgrades.
\defining{The \networkUpgrade mechanism is described in \cite{ZIP-200}.}
Each \networkUpgrade is introduced as a
\definingquotedterm{bilateral consensus rule change}. In this kind of upgrade,

2
protocol/zcash.bib
View File

@ -1710,7 +1710,7 @@ generic composition paradigm},
@misc{Zcash-Nu5,
presort={Zcash-Nu5},
author={Electric Coin Company},
title={Nu5},
title={Network Upgrade 5},
date={2022-05-31},
url={https://z.cash/upgrade/nu5/},
urldate={2022-05-11}