Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ZIPs 207, 214, 251] Consensus ZIPs for Zcash Development Fund #332

Merged
merged 26 commits into from
Apr 21, 2020
Merged

[ZIPs 207, 214, 251] Consensus ZIPs for Zcash Development Fund #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3fc7a9a
ZIP 207: line wrapping (to reduce the subsequent diff).
daira Mar 10, 2020
811fb7e
Reintroduce ZIP 207.
daira Mar 10, 2020
6526ebb
Add ZIPs 214 and 251.
daira Mar 10, 2020
272f085
ZIP 251: Add wording about transaction digest algorithm and reference…
daira Mar 10, 2020
0fdd5de
ZIP 214: Update version in Protocol Specification reference.
daira Mar 10, 2020
45833a1
ZIP 251: remove trailing whitespace.
daira Mar 11, 2020
83abb5f
ZIP 207: s/founders reward/Founders' Reward/
daira Mar 11, 2020
e73e517
ZIP 214 is applicable only to Zcash.
daira Mar 13, 2020
624ce6d
ZIP 207: add definitions of "branch" and "network upgrade".
daira Mar 13, 2020
0a26121
ZIP 214: state explicitly that start height is inclusive and end heig…
daira Mar 13, 2020
4fd8f06
ZIP 214: change wording to reflect the fact that ZEC != TAZ.
daira Mar 13, 2020
0bd8548
ZIP 214: add rationale section.
daira Mar 13, 2020
1f77e08
"branch" -> "consensus branch"
daira Mar 16, 2020
3cca1cc
Scrunch pre and math blocks a bit more.
daira Mar 17, 2020
c9ae7af
ZIP 207: simplify wording about using a proportion of block subsidy.
daira Mar 17, 2020
b70ba34
ZIP 207: use math markup.
daira Mar 17, 2020
1ec5ac7
ZIP 207: in the example implementation, ensure that multiplication by…
daira Mar 17, 2020
9ce78b0
ZIP 207: be more explicit about which consensus rule is no longer act…
daira Mar 17, 2020
9ac5984
ZIP 207: reference fix and HTML.
daira Mar 17, 2020
edc4390
Protocol spec: clarify note about hashFinalSaplingRoot/hashLightClien…
daira Mar 24, 2020
5fa56e8
Protocol spec: add references for the NU4 upgrade.
daira Mar 24, 2020
d3784f6
ZIP 214: blockchains -> block chains.
daira Mar 24, 2020
27accd4
ZIP 214: allow addresses within a funding stream to be repeated.
daira Mar 24, 2020
5182e21
ZIP 207: improvements to the pseudocode.
daira Mar 27, 2020
ec7b435
ZIPs 208, 250 and 251: keep `NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PE…
daira Mar 27, 2020
3693c9e
ZIP 251: update versions of zcashd that are planned to support NU4.
daira Apr 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,16 @@ Index of ZIPs
<tr> <td>203</td> <td class="left"><a href="zip-0203.rst">Transaction Expiry</a></td> <td>Final</td>
<tr> <td>205</td> <td class="left"><a href="zip-0205.rst">Deployment of the Sapling Network Upgrade</a></td> <td>Final</td>
<tr> <td>206</td> <td class="left"><a href="zip-0206.rst">Deployment of the Blossom Network Upgrade</a></td> <td>Final</td>
<tr> <td><strike>207</strike></td> <td class="left"><strike><a href="zip-0207.rst">Split Founders' Reward</a></strike></td> <td>Withdrawn</td>
<tr> <td>207</td> <td class="left"><a href="zip-0207.rst">Funding Streams</a></td> <td>Draft</td>
<tr> <td>208</td> <td class="left"><a href="zip-0208.rst">Shorter Block Target Spacing</a></td> <td>Final</td>
<tr> <td>209</td> <td class="left"><a href="zip-0209.rst">Prohibit Negative Shielded Value Pool</a></td> <td>Final</td>
<tr> <td>210</td> <td class="left"><a href="zip-0210.rst">Sapling Anchor Deduplication within Transactions</a></td> <td>Draft</td>
<tr> <td>213</td> <td class="left"><a href="zip-0213.rst">Shielded Coinbase</a></td> <td>Implemented (zcashd)</td>
<tr> <td>214</td> <td class="left"><a href="zip-0214.rst">Consensus rules for a Zcash Development Fund</a></td> <td>Draft</td>
<tr> <td>221</td> <td class="left"><a href="zip-0221.rst">FlyClient - Consensus-Layer Changes</a></td> <td>Proposed</td>
<tr> <td>243</td> <td class="left"><a href="zip-0243.rst">Transaction Signature Verification for Sapling</a></td> <td>Final</td>
<tr> <td>250</td> <td class="left"><a href="zip-0250.rst">Deployment of the Heartwood Network Upgrade</a></td> <td>Draft</td>
<tr> <td>251</td> <td class="left"><a href="zip-0251.rst">Deployment of the ${NU4} Network Upgrade</a></td> <td>Draft</td>
<tr> <td>308</td> <td class="left"><a href="zip-0308.rst">Sprout to Sapling Migration</a></td> <td>Final</td>
<tr> <td>310</td> <td class="left"><a href="zip-0310.rst">Security Properties of Sapling Viewing Keys</a></td> <td>Draft</td>
<tr> <td>401</td> <td class="left"><a href="zip-0401.rst">Addressing mempool denial-of-service</a></td> <td>Final</td>
Expand Down
47 changes: 31 additions & 16 deletions css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ div.math {
margin: 0 1rem 1rem 1rem;
text-align: center;
padding: 0;
font-size: 0.9375rem;
font-size: 0.75rem;
}

a, a:visited {
Expand Down Expand Up @@ -170,15 +170,6 @@ table {
border: 0 none transparent;
}

@media (max-width: 576px) {
table:not(.footnote) {
display: block;
}
pre, div.math, table {
font-size: 0.6rem;
}
}

th, td {
border: 1px solid #212529;
}
Expand Down Expand Up @@ -221,12 +212,27 @@ td:first-child {
content: "]";
}

@media (max-width: 576px) {
table:not(.footnote) {
display: block;
}
pre, div.math {
font-size: 0.5rem;
}
table {
font-size: 0.6rem;
}
}

@media (min-width: 576px) {
body > section {
max-width: initial;
width: 510px;
}
pre, div.math, table {
pre, div.math {
font-size: 0.5rem;
}
table {
font-size: 0.6rem;
}
}
Expand All @@ -235,7 +241,10 @@ td:first-child {
body > section {
width: 690px;
}
pre, div.math, table {
pre, div.math {
font-size: 0.55rem;
}
table {
font-size: 0.7rem;
}
}
Expand All @@ -244,7 +253,10 @@ td:first-child {
body > section {
width: 770px;
}
pre, div.math, table {
pre, div.math {
font-size: 0.6rem;
}
table {
font-size: 0.8rem;
}
}
Expand All @@ -254,8 +266,11 @@ td:first-child {
max-width: initial;
width: 920px;
}
pre, div.math, table {
font-size: 0.9375rem;
pre, div.math {
font-size: 0.68rem;
}
table {
font-size: 0.85rem;
}
}

Expand All @@ -265,7 +280,7 @@ td:first-child {
width: 1200px;
}
pre, div.math {
font-size: 0.9375rem;
font-size: 0.75rem;
}
table {
font-size: 1rem;
Expand Down
4 changes: 3 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,16 @@
<tr> <td>203</td> <td class="left"><a href="zip-0203">Transaction Expiry</a></td> <td>Final</td>
<tr> <td>205</td> <td class="left"><a href="zip-0205">Deployment of the Sapling Network Upgrade</a></td> <td>Final</td>
<tr> <td>206</td> <td class="left"><a href="zip-0206">Deployment of the Blossom Network Upgrade</a></td> <td>Final</td>
<tr> <td><strike>207</strike></td> <td class="left"><strike><a href="zip-0207">Split Founders' Reward</a></strike></td> <td>Withdrawn</td>
<tr> <td>207</td> <td class="left"><a href="zip-0207">Funding Streams</a></td> <td>Draft</td>
<tr> <td>208</td> <td class="left"><a href="zip-0208">Shorter Block Target Spacing</a></td> <td>Final</td>
<tr> <td>209</td> <td class="left"><a href="zip-0209">Prohibit Negative Shielded Value Pool</a></td> <td>Final</td>
<tr> <td>210</td> <td class="left"><a href="zip-0210">Sapling Anchor Deduplication within Transactions</a></td> <td>Draft</td>
<tr> <td>213</td> <td class="left"><a href="zip-0213">Shielded Coinbase</a></td> <td>Implemented (zcashd)</td>
<tr> <td>214</td> <td class="left"><a href="zip-0214">Consensus rules for a Zcash Development Fund</a></td> <td>Draft</td>
<tr> <td>221</td> <td class="left"><a href="zip-0221">FlyClient - Consensus-Layer Changes</a></td> <td>Proposed</td>
<tr> <td>243</td> <td class="left"><a href="zip-0243">Transaction Signature Verification for Sapling</a></td> <td>Final</td>
<tr> <td>250</td> <td class="left"><a href="zip-0250">Deployment of the Heartwood Network Upgrade</a></td> <td>Draft</td>
<tr> <td>251</td> <td class="left"><a href="zip-0251">Deployment of the ${NU4} Network Upgrade</a></td> <td>Draft</td>
<tr> <td>308</td> <td class="left"><a href="zip-0308">Sprout to Sapling Migration</a></td> <td>Final</td>
<tr> <td>310</td> <td class="left"><a href="zip-0310">Security Properties of Sapling Viewing Keys</a></td> <td>Draft</td>
<tr> <td>401</td> <td class="left"><a href="zip-0401">Addressing mempool denial-of-service</a></td> <td>Final</td>
Expand Down
20 changes: 18 additions & 2 deletions protocol/protocol.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8644,6 +8644,9 @@
\heartwood{The specifications of the \Heartwood upgrade are described in this document,
\cite{ZIP-250}, \cite{ZIP-213}, and \cite{ZIP-221}.}

\nufour{The specifications of the \Nufour upgrade are described in this document,
\cite{ZIP-251}, \cite{ZIP-207}, and \cite{ZIP-214}.}

\vspace{1ex}
\introlist
Each \networkUpgrade is introduced as a
Expand Down Expand Up @@ -9225,8 +9228,8 @@
\item There are no changes to the \blockVersionNumber or format for \Blossom.
}
\heartwood{
\item The $\hashFinalSaplingRoot$ field is renamed to $\hashLightClientRoot$, and
its semantics changed according to \cite{ZIP-221}.
\item For \Heartwood, the $\hashFinalSaplingRoot$ field is renamed to $\hashLightClientRoot$.
Once \Heartwood activates, the meaning of this field changes according to \cite{ZIP-221}.
}
\end{pnotes}

Expand Down Expand Up @@ -10386,6 +10389,19 @@
\intropart
\lsection{Change History}{changehistory}

\historyentry{2020.1.3}{}

\begin{itemize}
\item No changes to \Sprout, \Sapling, or \Blossom.
\heartwood{
\item Minor wording clarifications.
}
\nufour{
\item Reference \cite{ZIP-251}, \cite{ZIP-207}, and \cite{ZIP-214} for the \Nufour upgrade.
}
\end{itemize}


\historyentry{2020.1.2}{2020-03-20}

\begin{itemize}
Expand Down
18 changes: 18 additions & 0 deletions protocol/zcash.bib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,6 +927,15 @@ @misc{ZIP-213
urldate={2020-03-20}
}

@misc{ZIP-214,
presort={ZIP-0214},
author={Daira Hopwood},
title={Consensus rules for a Zcash Development Fund},
howpublished={Zcash Improvement Proposal 214. Created February~28, 2020.},
url={https://zips.z.cash/zip-0214},
urldate={2020-03-24}
}

@misc{ZIP-221,
presort={ZIP-0221},
author={Jack Grigg},
Expand Down Expand Up @@ -954,6 +963,15 @@ @misc{ZIP-250
urldate={2020-03-20}
}

@misc{ZIP-251,
presort={ZIP-0251},
author={Daira Hopwood},
title={Deployment of the \$\{NU4\} Network Upgrade},
howpublished={Zcash Improvement Proposal 251. Created February~28, 2020.},
url={https://zips.z.cash/zip-0251},
urldate={2020-03-24}
}

@misc{ZIP-302,
presort={ZIP-0302},
author={Jay Graber and Jack Grigg},
Expand Down
Loading