From adce640cb02b59f76d4b9029d28c78286f5005dd Mon Sep 17 00:00:00 2001
From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 21 Jun 2022 16:28:57 +0100
Subject: [PATCH] Rename ExcludedPointEncodings to
 PreCanopyExcludedPointEncodings.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---
 protocol/protocol.tex | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/protocol/protocol.tex b/protocol/protocol.tex
index bafcec1f..c74db48d 100644
--- a/protocol/protocol.tex
+++ b/protocol/protocol.tex
@@ -1849,7 +1849,7 @@ electronic commerce and payment, financial privacy, proof of work, zero knowledg
 \newcommand{\EdSpecificSignature}{\EdSpecificAlg\mathsf{.Signature}}
 \newcommand{\EdSpecificBatchValidate}{\EdSpecificAlg\mathsf{.BatchValidate}}
 \newcommand{\EdSpecificBatchEntry}{\EdSpecificAlg\mathsf{.BatchEntry}}
-\newcommand{\ExcludedPointEncodings}{\mathsf{ExcludedPointEncodings}}
+\newcommand{\PreCanopyExcludedPointEncodings}{\mathsf{PreCanopyExcludedPointEncodings}}
 \newcommand{\reprBytesEdSpecific}{\reprBytes_{\GroupEdSpecific}}
 \newcommand{\abstBytesEdSpecific}{\abstBytes_{\GroupEdSpecific}}
 \newcommand{\ReprEdSpecificBytes}{\byteseq{32}}
@@ -9586,7 +9586,7 @@ $\BlakeTwobOf{256}{p, x}$ is defined in \crossref{concreteblake2}.
 \EdSpecific is a \signatureScheme as specified in \crossref{abstractsig}.
 It is used to instantiate $\JoinSplitSig$ as described in \crossref{sproutnonmalleability}.
 
-Let $\ExcludedPointEncodings \typecolon \powerset{\byteseq{32}} = \{$ \\
+Let $\PreCanopyExcludedPointEncodings \typecolon \powerset{\byteseq{32}} = \{$ \\
 \scalebox{0.615}[0.7]{
 \begin{tabular}{@{\hspace{1.5em}}l@{}}
 $\hexarray{00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00},$ \\
@@ -9669,7 +9669,7 @@ a message $M$ are:
   \item $\EdDSAReprS{}$ \MUST represent an integer less than $\ell$.
   \item $\EdDSAReprR{}$ and $\EdDSAReprA{}$ \MUST be encodings of points $\EdDSASigR{}$ and $\EdDSASigA{}$ respectively
         on the \EdSpecific curve;
-  \precanopyitem{$\EdDSAReprR{}$ \MUSTNOT be in $\ExcludedPointEncodings$;}
+  \precanopyitem{$\EdDSAReprR{}$ \MUSTNOT be in $\PreCanopyExcludedPointEncodings$;}
   \precanopyitem{The validation equation \MUST be equivalent to $\scalarmult{\EdDSASigS{}}{B} = \EdDSASigR{} + \scalarmult{\EdDSASigc{}}{\EdDSASigA{}}$.}
   \canopyonwarditem{The validation equation \MUST be equivalent to
         $\scalarmult{8}{\scalarmult{\EdDSASigS{}}{B}} = \scalarmult{8}{\EdDSASigR{}} + \scalarmult{8}{\scalarmult{\EdDSASigc{}}{\EdDSASigA{}}}$ for
@@ -9704,13 +9704,13 @@ where $\EdDSAReprR{}$ and $\EdDSAReprS{}$ are as defined in \cite{BDLSY2012}.
 \begin{pnotes}
   \item It is \emph{not} required that the integer encoding of the $y$-coordinate\footnoteref{coordinatenames}
         of the points represented by $\EdDSAReprR{}$ or $\EdDSAReprA{}$ are less than $2^{255}-19$.
-  \item It is \emph{not} required that $\EdDSAReprA{} \not\in \ExcludedPointEncodings$.
+  \item It is \emph{not} required that $\EdDSAReprA{} \not\in \PreCanopyExcludedPointEncodings$.
   \canopyonwarditem{Appendix \crossref{ed25519batchvalidate} describes an optimization that \MAY be used to speed up
 validation of batches of \EdSpecific signatures.}
 \end{pnotes}
 
 \vspace{-2.5ex}
-\nnote{The exclusion\canopy{, before \Canopy activation,} of $\ExcludedPointEncodings$
+\nnote{The exclusion\canopy{, before \Canopy activation,} of $\PreCanopyExcludedPointEncodings$
 from $\EdDSAReprR{}$ is due to a quirk of version 1.0.15 of the
 libsodium library \cite{libsodium} which was initially used to implement \EdSpecific
 signature validation in \zcashd.
@@ -14644,6 +14644,7 @@ Peter Newell's illustration of the Jubjub bird, from \cite{Carroll1902}.
     \item Correct the history entry for \historyref{2022.3.2} to include the
           entry about the calculation for \sizeProofsOrchard.
 } %nufive
+    \item Rename $\mathsf{ExcludedPointEncodings}$ to $\PreCanopyExcludedPointEncodings$.
     \item Give a full-text URL for \cite{Nakamoto2008}.
 \end{itemize}
 
@@ -15529,7 +15530,7 @@ Peter Newell's illustration of the Jubjub bird, from \cite{Carroll1902}.
     \item Incorporate changes to \Sapling \note encryption from \cite{ZIP-212}.
 } %canopy
     \item Correct an error in the specification of \EdSpecific \validatingKeys:
-          they should not have been specified to be checked against $\ExcludedPointEncodings$,
+          they should not have been specified to be checked against $\PreCanopyExcludedPointEncodings$,
           since libsodium~v1.0.15 does not do so.
 \canopy{
     \item Incorporate \EdSpecific changes for \Canopy from \cite{ZIP-215}.