From 32a0709ffccad6e3a87fd596bb18fc62279089cc Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Fri, 20 Mar 2020 15:25:19 +0000 Subject: [PATCH] Protocol spec: clarify that the transaction and header encodings should be read in the context of consensus rules in those sections. Signed-off-by: Daira Hopwood --- protocol/protocol.tex | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/protocol/protocol.tex b/protocol/protocol.tex index 7032d899..aee04c2e 100644 --- a/protocol/protocol.tex +++ b/protocol/protocol.tex @@ -8653,9 +8653,11 @@ upgrade-supporting nodes \MUST allow for this. \intropart \lsection{Consensus Changes from \BitcoinText}{consensusfrombitcoin} +\vspace{-1ex} \lsubsection{Encoding of \Transactions}{txnencoding} -The \Zcash \transaction format is as follows: +The \Zcash \transaction format is as follows (this should be read in the context +of consensus rules later in the section): \begin{center} \scalebox{\sprout{0.92}\notsprout{0.88}}{ @@ -8676,11 +8678,11 @@ $\geq 1$ & $4$ & $\headerField$ & \type{uint32} & Contains: \begin{compactitemiz $\geq 3$ & $4$ & $\nVersionGroupId\!$ & \type{uint32} & Version group ID (nonzero). \\ \hline } -$\geq 1$ & \Varies & $\txInCount$ & \compactSize & Number of \transparent inputs in this \transaction. \\ \hline +$\geq 1$ & \Varies & $\txInCount$ & \compactSize & Number of \transparent inputs. \\ \hline $\geq 1$ & \Varies & $\txIn$ & $\txIn$ & \xTransparent inputs, encoded as in \Bitcoin. \\ \hline -$\geq 1$ & \Varies & $\txOutCount$ & \compactSize & Number of \transparent outputs in this \transaction. \\ \hline +$\geq 1$ & \Varies & $\txOutCount$ & \compactSize & Number of \transparent outputs. \\ \hline $\geq 1$ & \Varies & $\txOut$ & $\txOut$ & \xTransparent outputs, encoded as in \Bitcoin. \\ \hline @@ -9046,7 +9048,8 @@ Other consensus rules applying to an \outputDescription are given in \crossref{o \introsection \lsubsection{\BlockHeader}{blockheader} -The \Zcash \blockHeader format is as follows: +The \Zcash \blockHeader format is as follows (this should be read in the context +of consensus rules later in the section): \begin{center} \hbadness=5000