Merge pull request #332 from daira/zip-0251

[ZIPs 207, 214, 251] Consensus ZIPs for Zcash Development Fund
zcash · Apr 21, 2020 · df126fb · df126fb
2 parents 9f8ddba + 3693c9e
commit df126fb
Show file tree

Hide file tree

Showing 15 changed files with 1,455 additions and 714 deletions.
diff --git a/README.rst b/README.rst
@@ -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>

diff --git a/css/style.css b/css/style.css
@@ -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 {
@@ -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;
 }
@@ -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;
   }
 }
@@ -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;
   }
 }
@@ -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;
   }
 }
@@ -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;
   }
 }
 
@@ -265,7 +280,7 @@ td:first-child {
       width: 1200px;
   }
   pre, div.math {
-      font-size: 0.9375rem;
+      font-size: 0.75rem;
   }
   table {
       font-size: 1rem;

diff --git a/index.html b/index.html
@@ -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>

diff --git a/protocol/protocol.tex b/protocol/protocol.tex
@@ -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
@@ -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}
 
@@ -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}

diff --git a/protocol/zcash.bib b/protocol/zcash.bib
@@ -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},
@@ -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},