diff --git a/protocol/protocol.tex b/protocol/protocol.tex index d2ef388f..24229786 100644 --- a/protocol/protocol.tex +++ b/protocol/protocol.tex @@ -2943,10 +2943,10 @@ The following integer constants will be instantiated in \crossref{constants}: \end{flushleft} \end{formulae} -The rational constants $\FoundersFraction$, $\PoWMaxAdjustDown$, and $\PoWMaxAdjustUp$, and -the bit sequence constants $\Uncommitted{Sprout} \typecolon \bitseq{\MerkleHashLength{Sprout}}$, -\sapling{$\Uncommitted{Sapling} \typecolon \bitseq{\MerkleHashLength{Sapling}}$,} -\nufive{and $\Uncommitted{Orchard} \typecolon$ $\MerkleHashOrchard$,} will also be defined in that section. +The rational constants $\FoundersFraction$, $\PoWMaxAdjustDown$, and $\PoWMaxAdjustUp$;\notnufive{ and} +the bit sequence constants $\Uncommitted{Sprout} \typecolon \bitseq{\smash{\MerkleHashLength{Sprout}}}$\sapling{ and +$\Uncommitted{Sapling} \typecolon \bitseq{\smash{\MerkleHashLength{Sapling}}}$}\nufive{; and the constant +$\Uncommitted{Orchard} \typecolon \MerkleHashOrchard$} will also be defined in that section. We use the abbreviation ``\defining{\xCtEdwards}'' to refer to \completeTwistedEdwardsEllipticCurves and coordinates (see \crossref{jubjub}). @@ -14646,6 +14646,8 @@ Peter Newell's illustration of the Jubjub bird, from \cite{Carroll1902}. 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 Correction in \crossref{constants}: + $\Uncommitted{Orchard} \typecolon \MerkleHashOrchard$ is not a bit sequence. } \item Make \crossref{overview} more precise about \chainValuePools. \end{itemize}