mirror of https://github.com/zcash/zips.git
Remove anchorSapling field when there are no Spends.
This corresponds to e0b08fd576
in ZIP 225.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
parent
49f3b206f5
commit
1eec1f9832
|
@ -12154,7 +12154,7 @@ $\bindingSig{} \rightarrow \bindingSig{Sapling}$.
|
||||||
\introlist
|
\introlist
|
||||||
The \Zcash{} \defining{\transaction} format for \transactionVersion 5 is as follows
|
The \Zcash{} \defining{\transaction} format for \transactionVersion 5 is as follows
|
||||||
(this should be read in the context of consensus rules later in the section):
|
(this should be read in the context of consensus rules later in the section):
|
||||||
\vspace{-1.8ex}
|
\vspace{-1ex}
|
||||||
\begin{center}
|
\begin{center}
|
||||||
\scalebox{0.77}{
|
\scalebox{0.77}{
|
||||||
\renewcommand{\arraystretch}{1.28}
|
\renewcommand{\arraystretch}{1.28}
|
||||||
|
@ -12257,10 +12257,12 @@ An \orchardBindingSignature on the \sighashTxHash, validated per \crossref{concr
|
||||||
\vspace{-0.3ex}
|
\vspace{-0.3ex}
|
||||||
\scalebox{0.87}{
|
\scalebox{0.87}{
|
||||||
\begin{tabularx}{1.14\textwidth}{@{\!\!}l@{\hskip 1em}X@{}}
|
\begin{tabularx}{1.14\textwidth}{@{\!\!}l@{\hskip 1em}X@{}}
|
||||||
$\ddagger$ & \valueBalance{Sapling}, \anchorField{Sapling}, and \bindingSig{Sapling}
|
$\ddagger$ & The fields \valueBalance{Sapling} and \bindingSig{Sapling}
|
||||||
are present if and only if $\nSpendsSapling + \nOutputsSapling > 0$. If \valueBalance{Sapling}
|
are present if and only if $\nSpendsSapling + \nOutputsSapling > 0$. If \valueBalance{Sapling}
|
||||||
is not present, then $\vBalance{Sapling}$ is defined to be $0$. \\[-0.5ex]
|
is not present, then $\vBalance{Sapling}$ is defined to be $0$. \\[-0.5ex]
|
||||||
|
|
||||||
|
& The field \anchorField{Sapling} is present if and only if $\nSpendsSapling > 0$. \\
|
||||||
|
|
||||||
$\mathsection$ & The fields \flagsOrchard, \valueBalance{Orchard}, \anchorField{Orchard},
|
$\mathsection$ & The fields \flagsOrchard, \valueBalance{Orchard}, \anchorField{Orchard},
|
||||||
\sizeProofsOrchard, \proofsOrchard, and \bindingSig{Orchard} are present if and only if
|
\sizeProofsOrchard, \proofsOrchard, and \bindingSig{Orchard} are present if and only if
|
||||||
$\nActionsOrchard > 0$. If \valueBalance{Orchard} is not present, then $\vBalance{Orchard}$
|
$\nActionsOrchard > 0$. If \valueBalance{Orchard} is not present, then $\vBalance{Orchard}$
|
||||||
|
@ -12268,12 +12270,10 @@ is defined to be $0$.
|
||||||
\end{tabularx}
|
\end{tabularx}
|
||||||
} %scalebox
|
} %scalebox
|
||||||
\end{center}
|
\end{center}
|
||||||
\vspace{-2ex}
|
\vspace{-1.6ex}
|
||||||
\scalebox{0.87}{
|
\scalebox{0.87}{
|
||||||
\raggedright\!\!\Transactionversion 5 does not support \joinSplitTransfers.
|
\raggedright\!\!\Transactionversion 5 does not support \joinSplitTransfers.
|
||||||
Several fields are reordered and/or renamed relative to prior versions.
|
Several fields are reordered and/or renamed relative to prior versions.}} %scalebox %nufive
|
||||||
} %scalebox
|
|
||||||
} %nufive
|
|
||||||
|
|
||||||
\begin{consensusrules}
|
\begin{consensusrules}
|
||||||
\item The \defining{\transactionVersionNumber} \MUST be greater than or equal to $1$.
|
\item The \defining{\transactionVersionNumber} \MUST be greater than or equal to $1$.
|
||||||
|
@ -14215,6 +14215,8 @@ Peter Newell's illustration of the Jubjub bird, from \cite{Carroll1902}.
|
||||||
reference \cite{Zcash-Orchard} and \cite{Zcash-halo2} there.
|
reference \cite{Zcash-Orchard} and \cite{Zcash-halo2} there.
|
||||||
\item Section \crossref{concreteorchardkdf} should be in \nufivecolorname.
|
\item Section \crossref{concreteorchardkdf} should be in \nufivecolorname.
|
||||||
\item Explicitly note that the end of the \cite{ZIP-212} grace period precedes \NUFive activation.
|
\item Explicitly note that the end of the \cite{ZIP-212} grace period precedes \NUFive activation.
|
||||||
|
\item Change the condition for presence of $\anchorField{Sapling}$ in a version 5 \transaction
|
||||||
|
to $\vSpendsSapling > 0$.
|
||||||
} %nufive
|
} %nufive
|
||||||
\sapling{
|
\sapling{
|
||||||
\item Fix type error in $\kdfinput$ for $\KDF{Sapling}$\nufive{ and $\KDF{Orchard}$}
|
\item Fix type error in $\kdfinput$ for $\KDF{Sapling}$\nufive{ and $\KDF{Orchard}$}
|
||||||
|
|
Loading…
Reference in New Issue