diff --git a/protocol/protocol.tex b/protocol/protocol.tex index ec588d7a..288b6113 100644 --- a/protocol/protocol.tex +++ b/protocol/protocol.tex @@ -12575,8 +12575,8 @@ in \cite{ZIP-239}. \nufiveonwarditem{The \transactionVersionNumber \MUST be $4$ or $5$. If the \transactionVersionNumber{} is $4$ then the \versionGroupID \MUST be $\hexint{892F2085}$. If the \transactionVersionNumber{} is $5$ then the \versionGroupID \MUST be $\hexint{26A7270A}$.} - \nufiveonwarditem{The \nConsensusBranchId{} field \MUST match the \consensusBranchID used for - \sighashTxHashes, as specified in \cite{ZIP-244}.} + \nufiveonwarditem{If $\effectiveVersion \geq 5$, the \nConsensusBranchId{} field \MUST match the + \consensusBranchID used for \sighashTxHashes, as specified in \cite{ZIP-244}.} \presaplingitem{The encoded size of the \transaction \MUST be less than or equal to $100000$ bytes.} \nufiveonwarditem{\nSpendsSapling, \nOutputsSapling, and \nActionsOrchard{} \MUST all be less @@ -14635,11 +14635,19 @@ Peter Newell's illustration of the Jubjub bird, from \cite{Carroll1902}. \intropart \lsection{Change History}{changehistory} -\historyentry{2022.3.2}{2022-05-11} +\historyentry{2022.3.2}{} \begin{itemize} - \item \nufive{Set $\NUFiveActivationHeight$ for \Testnet and \Mainnet.} +\nufive{ + \item Set $\NUFiveActivationHeight$ for \Testnet and \Mainnet. + \item An [\NUFive onward] consensus rule requiring the \nConsensusBranchId{} + field to match the \consensusBranchID used for \sighashTxHashes, should + apply only when $\effectiveVersion \geq 5$ (since v4 \transactions did + not explicitly encode the \nConsensusBranchId{} field). +} + \item No changes before \NUFive. \end{itemize} + \historyentry{2022.3.1}{2022-04-28} \begin{itemize} \nufive{