OutputIndex is no longer needed.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2018-04-21 05:46:57 +01:00
parent b447deaac8
commit 65c6bef43a
1 changed files with 5 additions and 14 deletions

View File

@ -1110,8 +1110,6 @@ electronic commerce and payment, financial privacy, proof of work, zero knowledg
\newcommand{\NoteAddressRandNew}[1]{\NoteAddressRand^\mathsf{new}_{#1}}
\newcommand{\NoteAddressPreRand}{\mathsf{\upvarphi}}
\newcommand{\NoteAddressPreRandLength}{\mathsf{\ell_{\NoteAddressPreRand}}}
\newcommand{\OutputIndex}{\mathsf{idx}}
\newcommand{\OutputIndexType}{\mathsf{OutputIndex}}
\newcommand{\NoteCommitS}{\mathsf{s}}
\newcommand{\cv}{\mathsf{cv}}
\newcommand{\cvOld}[1]{\cv^\mathsf{old}_{#1}}
@ -2819,8 +2817,6 @@ This is not considered to be a significant security weakness.}
} %sprout
\notsprout{
\sapling{Let $\OutputIndexType$ be as defined in \crossref{saplingsend}.}
\introlist
The inputs to the \keyDerivationFunction differ between the \Sprout and
\Sapling KDFs:
@ -3787,16 +3783,14 @@ Then the encoded \transaction including $\joinSplitSig$ is submitted to the netw
In order to send \Sapling{} \shielded value, the sender constructs a \transaction
containing one or more \shieldedOutputs{}.
Let $\OutputIndexType$ be the type $\binaryrange{32}$.
Let $\ValueCommitAlg$ and $\NoteCommitSaplingAlg$ be as specified in \crossref{abstractcommit}.
Let $\ValueCommitAlg$ be as defined in \crossref{concretevaluecommit}.
Let $\NoteCommitSaplingAlg$ be as defined in \crossref{concretesaplingnotecommit}.
Let $\ParamJ{h}$ be the cofactor of the \jubjubCurve, defined in \crossref{jubjub}.
\introlist
For each \outputDescription with index $\OutputIndex \typecolon \OutputIndexType$, the sender
selects a value $\ValueNew{}$ and a destination \Sapling \paymentAddress
$(\Diversifier, \DiversifiedTransmitPublic)$, and then performs the following steps:
For each \outputDescription, the sender selects a value $\ValueNew{}$ and a destination
\Sapling \paymentAddress $(\Diversifier, \DiversifiedTransmitPublic)$, and then performs
the following steps:
\begin{enumerate}
\item Check that $\DiversifiedTransmitPublic \typecolon \KASaplingPublic$ is a
@ -4667,8 +4661,6 @@ and let $\DiversifiedTransmitBaseNew \typecolon \KASaplingPublic$ be the corresp
described in \crossref{saplingsend}, we may assume that $\DiversifiedTransmitBaseNew$
has already been calculated and is not $\bot$.)
Let $\OutputIndex$ be the index in a \transaction of the \outputDescription for
this \shieldedOutput.
Let $\NotePlaintext{}$ be the \Sapling{} \notePlaintext as defined in \crossref{notept}.
@ -5787,7 +5779,6 @@ the type of $\JubjubCurve$ secret keys. \todo{expand this}
\begin{lrbox}{\kdfsaplinginputbox}
\setsapling
\begin{bytefield}[bitwidth=0.07em]{544}
\sbitbox{80}{$32$-bit $\OutputIndex$} &
\sbitbox{256}{$\LEBStoOSPOf{256}{\reprJOf{\DHSecret{}}\hairspace}$} &
\sbitbox{256}{$\LEBStoOSPOf{256}{\reprJOf{\EphemeralPublic}\hairspace}$}
\end{bytefield}