From 3c3da6d6dc5189f39be7bbaaf8a15d06948a5485 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Wed, 27 Apr 2022 21:50:54 +0100 Subject: [PATCH] Correct "block chain branch" to "consensus branch" to match ZIP 200. Signed-off-by: Daira Hopwood --- protocol/protocol.tex | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/protocol/protocol.tex b/protocol/protocol.tex index ecfc5336..eefbced5 100644 --- a/protocol/protocol.tex +++ b/protocol/protocol.tex @@ -1036,8 +1036,8 @@ electronic commerce and payment, financial privacy, proof of work, zero knowledg \newcommand{\bestValidBlockChain}{\term{best valid block chain}} \newcommand{\blockChainReorganization}{\term{block chain reorganization}} \newcommand{\blockChainReorganizations}{\terms{block chain reorganization}} -\newcommand{\blockChainBranch}{\term{block chain branch}} -\newcommand{\blockChainBranches}{\termes{block chain branch}} +\newcommand{\consensusBranch}{\term{consensus branch}} +\newcommand{\consensusBranches}{\termes{consensus branch}} \newcommand{\mempool}{\term{mempool}} \newcommand{\treestate}{\term{treestate}} \newcommand{\treestates}{\terms{treestate}} @@ -12678,7 +12678,7 @@ each \spendDescription\, (\crossref{spendencodingandconsensus}),\,\notnufive{ an \transactions \SHOULD take this into account. \overwinteronwarditem{The purpose of \defining{\versionGroupID} is to allow unambiguous parsing of \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{} 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 @@ -14610,6 +14610,8 @@ Peter Newell's illustration of the Jubjub bird, from \cite{Carroll1902}. \historyentry{2022.3.1}{} \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 acknowledgements to more people associated with the ZK Podcast. \end{itemize}