Merge pull request #951 from daira/editorial-fixes

Editorial fixes, mainly to NU7 Candidate ZIPs

README.rst

@@ -123,7 +123,7 @@ Released ZIPs
     <tr> <td>321</td> <td class="left"><a href="zips/zip-0321.rst">Payment Request URIs</a></td> <td>Proposed</td>
     <tr> <td>401</td> <td class="left"><a href="zips/zip-0401.rst">Addressing Mempool Denial-of-Service</a></td> <td>Active</td>
     <tr> <td>1014</td> <td class="left"><a href="zips/zip-1014.rst">Establishing a Dev Fund for ECC, ZF, and Major Grants</a></td> <td>Active</td>
-    <tr> <td>1015</td> <td class="left"><a href="zips/zip-1015.rst">Block Reward Allocation for Non-Direct Development Funding</a></td> <td>Proposed</td>
+    <tr> <td>1015</td> <td class="left"><a href="zips/zip-1015.rst">Block Subsidy Allocation for Non-Direct Development Funding</a></td> <td>Proposed</td>
     <tr> <td>2001</td> <td class="left"><a href="zips/zip-2001.rst">Lockbox Funding Streams</a></td> <td>Implemented (zcashd and zebrad)</td>
   </table></embed>
 
@@ -342,7 +342,7 @@ Index of ZIPs
     <tr> <td><strike>1012</strike></td> <td class="left"><strike><a href="zips/zip-1012.rst">Dev Fund to ECC + ZF + Major Grants</a></strike></td> <td>Obsolete</td>
     <tr> <td><strike>1013</strike></td> <td class="left"><strike><a href="zips/zip-1013.rst">Keep It Simple, Zcashers: 10% to ECC, 10% to ZF</a></strike></td> <td>Obsolete</td>
     <tr> <td>1014</td> <td class="left"><a href="zips/zip-1014.rst">Establishing a Dev Fund for ECC, ZF, and Major Grants</a></td> <td>Active</td>
-    <tr> <td>1015</td> <td class="left"><a href="zips/zip-1015.rst">Block Reward Allocation for Non-Direct Development Funding</a></td> <td>Proposed</td>
+    <tr> <td>1015</td> <td class="left"><a href="zips/zip-1015.rst">Block Subsidy Allocation for Non-Direct Development Funding</a></td> <td>Proposed</td>
     <tr> <td>2001</td> <td class="left"><a href="zips/zip-2001.rst">Lockbox Funding Streams</a></td> <td>Implemented (zcashd and zebrad)</td>
     <tr> <td>2002</td> <td class="left"><a href="zips/zip-2002.rst">Explicit Fees</a></td> <td>Draft</td>
     <tr> <td>2003</td> <td class="left"><a href="zips/zip-2003.rst">Disallow version 4 transactions</a></td> <td>Draft</td>

protocol/protocol.tex

@@ -650,7 +650,11 @@
 \newcommand{\labelcolor}{cream}
 
 \iftoggle{isnusix}{
-  \providecommand{\baseurl}{https://zips.z.cash/protocol/protocol.pdf}
+  \iftoggle{darkmode}{
+    \providecommand{\baseurl}{https://zips.z.cash/protocol/protocol-dark.pdf}
+  }{
+    \providecommand{\baseurl}{https://zips.z.cash/protocol/protocol.pdf}
+  }
   \toggletrue{isnufive}
   \newcommand{\setnusix}{\color{\nusixcolor}}
   \newcommand{\nusix}[1]{\texorpdfstring{{\setnusix{#1}}}{#1}}

protocol/zcash.bib

@@ -1519,7 +1519,7 @@ @misc{ZIP-1014
 @misc{ZIP-1015,
    presort={ZIP-1015},
    author={Jason McGee and @Peacemonger and Kris Nuttycombe},
-   title={Block Reward Allocation for Non-Direct Development Funding},
+   title={Block Subsidy Allocation for Non-Direct Development Funding},
    howpublished={Zcash Improvement Proposal 1015. Created August~26, 2024.},
    url={https://zips.z.cash/zip-1015},
    urldate={2024-09-24}

rendered/index.html

@@ -88,7 +88,7 @@
   <tr> <td>321</td> <td class="left"><a href="zip-0321">Payment Request URIs</a></td> <td>Proposed</td>
   <tr> <td>401</td> <td class="left"><a href="zip-0401">Addressing Mempool Denial-of-Service</a></td> <td>Active</td>
   <tr> <td>1014</td> <td class="left"><a href="zip-1014">Establishing a Dev Fund for ECC, ZF, and Major Grants</a></td> <td>Active</td>
-  <tr> <td>1015</td> <td class="left"><a href="zip-1015">Block Reward Allocation for Non-Direct Development Funding</a></td> <td>Proposed</td>
+  <tr> <td>1015</td> <td class="left"><a href="zip-1015">Block Subsidy Allocation for Non-Direct Development Funding</a></td> <td>Proposed</td>
   <tr> <td>2001</td> <td class="left"><a href="zip-2001">Lockbox Funding Streams</a></td> <td>Implemented (zcashd and zebrad)</td>
 </table></embed></section>
         <section id="draft-zips"><h2><span class="section-heading">Draft ZIPs</span><span class="section-anchor"> <a rel="bookmark" href="#draft-zips"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h2>
@@ -278,7 +278,7 @@
   <tr> <td><strike>1012</strike></td> <td class="left"><strike><a href="zip-1012">Dev Fund to ECC + ZF + Major Grants</a></strike></td> <td>Obsolete</td>
   <tr> <td><strike>1013</strike></td> <td class="left"><strike><a href="zip-1013">Keep It Simple, Zcashers: 10% to ECC, 10% to ZF</a></strike></td> <td>Obsolete</td>
   <tr> <td>1014</td> <td class="left"><a href="zip-1014">Establishing a Dev Fund for ECC, ZF, and Major Grants</a></td> <td>Active</td>
-  <tr> <td>1015</td> <td class="left"><a href="zip-1015">Block Reward Allocation for Non-Direct Development Funding</a></td> <td>Proposed</td>
+  <tr> <td>1015</td> <td class="left"><a href="zip-1015">Block Subsidy Allocation for Non-Direct Development Funding</a></td> <td>Proposed</td>
   <tr> <td>2001</td> <td class="left"><a href="zip-2001">Lockbox Funding Streams</a></td> <td>Implemented (zcashd and zebrad)</td>
   <tr> <td>2002</td> <td class="left"><a href="zip-2002">Explicit Fees</a></td> <td>Draft</td>
   <tr> <td>2003</td> <td class="left"><a href="zip-2003">Disallow version 4 transactions</a></td> <td>Draft</td>

rendered/zip-0207.html

@@ -36,7 +36,7 @@
         <section id="motivation"><h2><span class="section-heading">Motivation</span><span class="section-anchor"> <a rel="bookmark" href="#motivation"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h2>
             <p>Motivation for the Zcash Development Fund is considered in ZIP 1014 <a id="footnote-reference-9" class="footnote_reference" href="#zip-1014">20</a>.</p>
             <p>This ZIP 207 was originally proposed for the Blossom network upgrade, as a means of splitting the original Founders' Reward into several streams. It was then withdrawn when such splitting was judged to be unnecessary at the consensus level. Since the capabilities of the funding stream mechanism match the requirements for the Zcash Development Fund, the ZIP was reintroduced for that purpose in the Canopy upgrade in order to reuse specification, analysis, and implementation effort.</p>
-            <p>As of NU6, ZIP 1015 <a id="footnote-reference-10" class="footnote_reference" href="#zip-1015">21</a> directs part of the block reward to a reserve, the distribution of which is to be determined via a future ZIP. ZIP 2001 <a id="footnote-reference-11" class="footnote_reference" href="#zip-2001">22</a> modified this ZIP to augment the funding stream mechanism with a common mechanism to implement this proposal.</p>
+            <p>As of NU6, ZIP 1015 <a id="footnote-reference-10" class="footnote_reference" href="#zip-1015">21</a> directs part of the block subsidy to a reserve, the distribution of which is to be determined via a future ZIP. ZIP 2001 <a id="footnote-reference-11" class="footnote_reference" href="#zip-2001">22</a> modified this ZIP to augment the funding stream mechanism with a common mechanism to implement this proposal.</p>
         </section>
         <section id="requirements"><h2><span class="section-heading">Requirements</span><span class="section-anchor"> <a rel="bookmark" href="#requirements"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h2>
             <p>The primary requirement of this ZIP is to provide a mechanism for specifying the funding streams that are used in ZIP 214 <a id="footnote-reference-12" class="footnote_reference" href="#zip-0214">17</a> to implement the Zcash Development Fund. It should be sufficiently expressive to handle both the main three "slices" (BP, ZF, and MG) defined in ZIP 1014 <a id="footnote-reference-13" class="footnote_reference" href="#zip-1014">20</a>, and also (with additional funding stream definitions) the "direct grant option" described in that ZIP.</p>
@@ -451,7 +451,7 @@
                 <tbody>
                     <tr>
                         <th>21</th>
-                        <td><cite>ZIP 1015: Block Reward Allocation for Non-Direct Development Funding &lt;zip-1015.rst&gt;</cite></td>
+                        <td><cite>ZIP 1015: Block Subsidy Allocation for Non-Direct Development Funding &lt;zip-1015.rst&gt;</cite></td>
                     </tr>
                 </tbody>
             </table>

rendered/zip-0213.html

@@ -23,7 +23,7 @@
             <p>This proposal defines modifications to the Zcash consensus rules that enable coinbase funds to be mined to Sapling (and later Orchard) addresses. It does not disable the use of transparent addresses in coinbase transactions.</p>
         </section>
         <section id="motivation"><h2><span class="section-heading">Motivation</span><span class="section-anchor"> <a rel="bookmark" href="#motivation"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h2>
-            <p>Zcash inherited the concept of "coinbase transactions" from Bitcoin: special transactions inside each block that are allowed to have no inputs. These transactions are created by miners during block creation, and collect the block reward and transaction fees into new transparent outputs that can then be spent. They are also leveraged in Zcash for the Founders' Reward (and potentially for funding streams <a id="footnote-reference-5" class="footnote_reference" href="#zip-0207">4</a>).</p>
+            <p>Zcash inherited the concept of "coinbase transactions" from Bitcoin: special transactions inside each block that are allowed to have no inputs. These transactions are created by miners during block creation, and collect the block subsidy and transaction fees into new transparent outputs that can then be spent. They are also leveraged in Zcash for the Founders' Reward (and potentially for funding streams <a id="footnote-reference-5" class="footnote_reference" href="#zip-0207">4</a>).</p>
             <p>On the path to deprecating and removing Bitcoin-inherited transparent addresses within the Zcash network, a required step is to be able to create coinbase transactions that have no transparent outputs. However, Zcash was launched with a consensus rule preventing coinbase transactions from containing shielded outputs, instead enforcing that coinbase funds could not be spent in transactions with transparent outputs. This was partly in order to reduce the complexity of the original Zcash modifications to the Bitcoin Core codebase, but also because at the time, shielded transactions required significant memory and CPU resources to create.</p>
             <p>The Sapling network upgrade <a id="footnote-reference-6" class="footnote_reference" href="#zip-0205">3</a> deployed architectural changes and performance improvements that make shielding funds directly in the coinbase transaction feasible. In order to reduce the complexity of the Sapling network upgrade, the existing consensus rules preventing coinbase transactions from containing shielded outputs were extended to cover Sapling outputs. Therefore, it is now necessary to modify the consensus rules in order to enable miners to start using Sapling addresses. It will also be possible for miners to use Orchard addresses starting from activation of the NU5 upgrade <a id="footnote-reference-7" class="footnote_reference" href="#zip-0252">6</a>.</p>
         </section>

rendered/zip-0214.html

@@ -29,7 +29,7 @@
         </section>
         <section id="abstract"><h2><span class="section-heading">Abstract</span><span class="section-anchor"> <a rel="bookmark" href="#abstract"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h2>
             <p><a href="#revision-0">Revision 0</a> of this ZIP describes consensus rule changes interpreting the proposed structure of the Zcash Development Fund, which is to be enacted in Network Upgrade 4 and last for 4 years.</p>
-            <p><a href="#revision-1">Revision 1</a> of this ZIP describes consensus rule changes related to funding of Zcash development via block rewards, to be enacted at Network Upgrade 6 and lasting for 1 year.</p>
+            <p><a href="#revision-1">Revision 1</a> of this ZIP describes consensus rule changes related to funding of Zcash development via block subsidies, to be enacted at Network Upgrade 6 and lasting for 1 year.</p>
         </section>
         <section id="applicability"><h2><span class="section-heading">Applicability</span><span class="section-anchor"> <a rel="bookmark" href="#applicability"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h2>
             <p>This ZIP concerns the Zcash Mainnet and Testnet, and is not intended to be applicable to other block chains using Zcash technology.</p>
@@ -467,7 +467,7 @@ <h2>Rationale for <a href="#revision-0">Revision 0</a></h2>
                 <tbody>
                     <tr>
                         <th>14</th>
-                        <td><a href="zip-1015">ZIP 1015: Block Reward Allocation for Non-Direct Development Funding</a></td>
+                        <td><a href="zip-1015">ZIP 1015: Block Subsidy Allocation for Non-Direct Development Funding</a></td>
                     </tr>
                 </tbody>
             </table>