diff --git a/protocol/Makefile b/protocol/Makefile index 1bb8d796..9ba78e94 100644 --- a/protocol/Makefile +++ b/protocol/Makefile @@ -38,7 +38,7 @@ endif .PHONY: linkcheck linkcheck: - ./links_and_dests.py --check nu5.pdf protocol.pdf heartwood.pdf blossom.pdf sapling.pdf + ./links_and_dests.py --check protocol.pdf canopy.pdf heartwood.pdf blossom.pdf sapling.pdf .Makefile.uptodate: Makefile $(MAKE) clean @@ -106,7 +106,6 @@ auxcanopy: canopy: $(MAKE) auxcanopy mv -f aux/canopy.pdf . - cp -f canopy.pdf protocol.pdf .PHONY: auxnu5 auxnu5: @@ -119,6 +118,7 @@ auxnu5: nu5: $(MAKE) auxnu5 mv -f aux/nu5.pdf . + cp -f nu5.pdf protocol.pdf .PHONY: nolatexmk-sapling nolatexmk-sapling: diff --git a/protocol/protocol.tex b/protocol/protocol.tex index f90343c7..6a2afd82 100644 --- a/protocol/protocol.tex +++ b/protocol/protocol.tex @@ -562,7 +562,7 @@ electronic commerce and payment, financial privacy, proof of work, zero knowledg \newcommand{\labelcolor}{yellow!20} \iftoggle{isnufive}{ - \providecommand{\baseurl}{https://zips.z.cash/protocol/nu5.pdf} + \providecommand{\baseurl}{https://zips.z.cash/protocol/protocol.pdf} \toggletrue{iscanopy} \newcommand{\setnufive}{\color{\nufivecolor}} \newcommand{\nufive}[1]{\texorpdfstring{{\setnufive{#1}}}{#1}} @@ -576,7 +576,7 @@ electronic commerce and payment, financial privacy, proof of work, zero knowledg } \iftoggle{iscanopy}{ - \providecommand{\baseurl}{https://zips.z.cash/protocol/protocol.pdf} + \providecommand{\baseurl}{https://zips.z.cash/protocol/canopy.pdf} \toggletrue{isheartwood} \newcommand{\setcanopy}{\color{\canopycolor}} \newcommand{\canopy}[1]{\texorpdfstring{{\setcanopy{#1}}}{#1}} @@ -14390,6 +14390,7 @@ Peter Newell's illustration of the Jubjub bird, from \cite{Carroll1902}. in $\cite{BDLSY2012}$ are not sufficiently well-specified for a consensus protocol; it should have been deleted earlier when explicit definitions for $\reprBytesEdSpecific$ and $\abstBytesEdSpecific$ were added. + \item Make the \NUFive specification the default. \end{itemize}