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

Correct "block chain branch" to "consensus branch" to match ZIP 200. 

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2022-04-27 21:50:54 +01:00
parent deafb410de
commit 3c3da6d6dc
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
protocol/protocol.tex
View File

@ -1036,8 +1036,8 @@ electronic commerce and payment, financial privacy, proof of work, zero knowledg
\newcommand{\bestValidBlockChain}{\term{best valid block chain}} \newcommand{\bestValidBlockChain}{\term{best valid block chain}}
\newcommand{\blockChainReorganization}{\term{block chain reorganization}} \newcommand{\blockChainReorganization}{\term{block chain reorganization}}
\newcommand{\blockChainReorganizations}{\terms{block chain reorganization}} \newcommand{\blockChainReorganizations}{\terms{block chain reorganization}}
\newcommand{\blockChainBranch}{\term{block chain branch}} \newcommand{\consensusBranch}{\term{consensus branch}}
\newcommand{\blockChainBranches}{\termes{block chain branch}} \newcommand{\consensusBranches}{\termes{consensus branch}}
\newcommand{\mempool}{\term{mempool}} \newcommand{\mempool}{\term{mempool}}
\newcommand{\treestate}{\term{treestate}} \newcommand{\treestate}{\term{treestate}}
\newcommand{\treestates}{\terms{treestate}} \newcommand{\treestates}{\terms{treestate}}
@ -12678,7 +12678,7 @@ each \spendDescription\, (\crossref{spendencodingandconsensus}),\,\notnufive{ an
\transactions \SHOULD take this into account. \transactions \SHOULD take this into account.
\overwinteronwarditem{The purpose of \defining{\versionGroupID} is to allow unambiguous parsing of \overwinteronwarditem{The purpose of \defining{\versionGroupID} is to allow unambiguous parsing of
\quotedtermnoindex{loose} \transactions, independent of the context of a \blockChain. \quotedtermnoindex{loose} \transactions, independent of the context of a \blockChain.
Code that parses \transactions is likely to be reused between \defining{\blockChainBranches} Code that parses \transactions is likely to be reused between \defining{\consensusBranches}
as defined in \cite{ZIP-200}, and in that case the \fOverwintered{} and \versionField{} as defined in \cite{ZIP-200}, and in that case the \fOverwintered{} and \versionField{}
fields alone may be insufficient to determine the format to be used for parsing.} fields alone may be insufficient to determine the format to be used for parsing.}
\item A \transactionVersionNumber of $2$ does not have the same meaning as in \item A \transactionVersionNumber of $2$ does not have the same meaning as in
@ -14610,6 +14610,8 @@ Peter Newell's illustration of the Jubjub bird, from \cite{Carroll1902}.
\historyentry{2022.3.1}{} \historyentry{2022.3.1}{}
\begin{itemize} \begin{itemize}
\item Correct ``block chain branch'' to ``~\!\!\consensusBranch'' to match
\cite{ZIP-200}.
\item Add an acknowledgement to Josh Cincinnati for discussions on the Zcash protocol. \item Add an acknowledgement to Josh Cincinnati for discussions on the Zcash protocol.
\item Add acknowledgements to more people associated with the ZK Podcast. \item Add acknowledgements to more people associated with the ZK Podcast.
\end{itemize} \end{itemize}