zec
/
zips
mirror of https://github.com/zcash/zips.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use IsBlossomActivated in the definition of FounderAddressAdjustedHeight for consistency. 

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2019-05-20 11:09:19 +01:00
parent c699bd4ba1
commit 7152d677c8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
protocol/protocol.tex
View File

@ -9226,7 +9226,7 @@ Define:
\item $\FounderAddressAdjustedHeight(\BlockHeight \typecolon \Nat) :=$ \item $\FounderAddressAdjustedHeight(\BlockHeight \typecolon \Nat) :=$
\vspace{-0.5ex} \vspace{-0.5ex}
\item \tab $\begin{cases} \item \tab $\begin{cases}
\BlockHeight, &\caseif \BlockHeight < \BlossomActivationHeight, \\ \BlockHeight, &\caseif \text{ not } \IsBlossomActivated(\BlockHeight), \\
\BlossomActivationHeight + \floor{\hfrac{\BlockHeight - \BlossomActivationHeight}{\BlossomPoWTargetSpacingRatio}}, &\caseotherwise \BlossomActivationHeight + \floor{\hfrac{\BlockHeight - \BlossomActivationHeight}{\BlossomPoWTargetSpacingRatio}}, &\caseotherwise
\end{cases}$ \end{cases}$
} }
@ -9949,6 +9949,8 @@ Peter Newell's illustration of the Jubjub bird, from \cite{Carroll1902}.
\item No changes to \Sprout\notsprout{ or \Sapling}. \item No changes to \Sprout\notsprout{ or \Sapling}.
\blossom{ \blossom{
\item Minor fix to the list of integer constants in \crossref{notation}. \item Minor fix to the list of integer constants in \crossref{notation}.
\item Use $\IsBlossomActivated$ in the definition of $\FounderAddressAdjustedHeight$
for consistency.
} }
\end{itemize} \end{itemize}