diff --git a/protocol/protocol.tex b/protocol/protocol.tex index c76fc39b..82b26368 100644 --- a/protocol/protocol.tex +++ b/protocol/protocol.tex @@ -10595,23 +10595,8 @@ Each \Sapling \notePlaintext (denoted $\NotePlaintext{}$) consists of: $\Memo$ is a $\MemoByteLength$-byte \memo associated with this \note. \introlist -The usage of the \memo is by agreement between the sender and recipient of the -\note. The \memo \SHOULD be encoded as one of: - -\begin{itemize} - \item a UTF-8 human-readable string \cite{Unicode}, padded by appending zero bytes; or - \item the byte $\hexint{F6}$ followed by $511$ $\hexint{00}$ bytes, indicating ``no memo''; or - \item any other sequence of $\MemoByteLength$ bytes starting with a byte value $\hexint{F5}$ - or greater (which is therefore not a valid UTF-8 string), as specified in \cite{ZIP-302}. -\end{itemize} - -When the first byte value is less than $\hexint{F5}$, wallet software is expected to strip any -trailing zero bytes and then display the resulting \mbox{UTF-8} string to the recipient user, -where applicable. Incorrect UTF-8-encoded byte sequences \SHOULD be displayed as replacement -characters (\ReplacementCharacter). - -In other cases, the contents of the \memo \SHOULDNOT be displayed unless otherwise specified -by \cite{ZIP-302}. +The usage of the \memo is by agreement between the sender and recipient of the \note. +Non-consensus constraints on the \memo contents are specified in \cite{ZIP-302}. Other fields are as defined in \crossref{notes}. @@ -13569,6 +13554,7 @@ Peter Newell's illustration of the Jubjub bird, from \cite{Carroll1902}. \begin{itemize} \item Correct the description of $\lengthField$ in \crossref{unifiedpaymentaddrencoding}. \item Correct the type signature of $\DiversifyHash{Orchard}$ in \crossref{abstracthashes}. + \item Remove specification of \memo contents, which will be in \cite{ZIP-302}. \item Remove support for building the \Sprout-only specification (\texttt{sprout.pdf}). \item Remove magenta highlighting of differences from \Zerocash. \end{itemize}