Merge pull request #900 from daira/zip-253-and-rerender

ZIP 253: move to Proposed and fill in assigned ZIP number 1015

README.rst

@@ -84,6 +84,7 @@ Released ZIPs
     <tr> <td>250</td> <td class="left"><a href="zips/zip-0250.rst">Deployment of the Heartwood Network Upgrade</a></td> <td>Final</td>
     <tr> <td>251</td> <td class="left"><a href="zips/zip-0251.rst">Deployment of the Canopy Network Upgrade</a></td> <td>Final</td>
     <tr> <td>252</td> <td class="left"><a href="zips/zip-0252.rst">Deployment of the NU5 Network Upgrade</a></td> <td>Final</td>
+    <tr> <td>253</td> <td class="left"><a href="zips/zip-0253.md">Deployment of the NU6 Network Upgrade</a></td> <td>Proposed</td>
     <tr> <td>300</td> <td class="left"><a href="zips/zip-0300.rst">Cross-chain Atomic Transactions</a></td> <td>Proposed</td>
     <tr> <td>301</td> <td class="left"><a href="zips/zip-0301.rst">Zcash Stratum Protocol</a></td> <td>Final</td>
     <tr> <td>308</td> <td class="left"><a href="zips/zip-0308.rst">Sprout to Sapling Migration</a></td> <td>Final</td>
@@ -128,7 +129,6 @@ written.
     <tr> <td><span class="reserved">231</span></td> <td class="left"><a class="reserved" href="zips/zip-0231.rst">Decouple Memos from Transaction Outputs</a></td> <td>Reserved</td>
     <tr> <td>236</td> <td class="left"><a href="zips/zip-0236.rst">Blocks should balance exactly</a></td> <td>Draft</td>
     <tr> <td>245</td> <td class="left"><a href="zips/zip-0245.rst">Transaction Identifier Digests & Signature Validation for Transparent Zcash Extensions</a></td> <td>Draft</td>
-    <tr> <td>253</td> <td class="left"><a href="zips/zip-0253.md">Deployment of the NU6 Network Upgrade</a></td> <td>Draft</td>
     <tr> <td>302</td> <td class="left"><a href="zips/zip-0302.rst">Standardized Memo Field Format</a></td> <td>Draft</td>
     <tr> <td><span class="reserved">303</span></td> <td class="left"><a class="reserved" href="zips/zip-0303.rst">Sprout Payment Disclosure</a></td> <td>Reserved</td>
     <tr> <td>304</td> <td class="left"><a href="zips/zip-0304.rst">Sapling Address Signatures</a></td> <td>Draft</td>
@@ -256,7 +256,7 @@ Index of ZIPs
     <tr> <td>250</td> <td class="left"><a href="zips/zip-0250.rst">Deployment of the Heartwood Network Upgrade</a></td> <td>Final</td>
     <tr> <td>251</td> <td class="left"><a href="zips/zip-0251.rst">Deployment of the Canopy Network Upgrade</a></td> <td>Final</td>
     <tr> <td>252</td> <td class="left"><a href="zips/zip-0252.rst">Deployment of the NU5 Network Upgrade</a></td> <td>Final</td>
-    <tr> <td>253</td> <td class="left"><a href="zips/zip-0253.md">Deployment of the NU6 Network Upgrade</a></td> <td>Draft</td>
+    <tr> <td>253</td> <td class="left"><a href="zips/zip-0253.md">Deployment of the NU6 Network Upgrade</a></td> <td>Proposed</td>
     <tr> <td>300</td> <td class="left"><a href="zips/zip-0300.rst">Cross-chain Atomic Transactions</a></td> <td>Proposed</td>
     <tr> <td>301</td> <td class="left"><a href="zips/zip-0301.rst">Zcash Stratum Protocol</a></td> <td>Final</td>
     <tr> <td>302</td> <td class="left"><a href="zips/zip-0302.rst">Standardized Memo Field Format</a></td> <td>Draft</td>

rendered/draft-nuttycom-funding-allocation.html

@@ -14,7 +14,7 @@
 Credits: Daira-Emma Hopwood
          Jack Grigg
          @Peacemonger (Zcash Forum)
-Status: Draft
+Status: Withdrawn
 Category: Consensus
 Created: 2024-07-03
 License: MIT

rendered/index.html

@@ -59,6 +59,7 @@
   <tr> <td>250</td> <td class="left"><a href="zip-0250">Deployment of the Heartwood Network Upgrade</a></td> <td>Final</td>
   <tr> <td>251</td> <td class="left"><a href="zip-0251">Deployment of the Canopy Network Upgrade</a></td> <td>Final</td>
   <tr> <td>252</td> <td class="left"><a href="zip-0252">Deployment of the NU5 Network Upgrade</a></td> <td>Final</td>
+  <tr> <td>253</td> <td class="left"><a href="zip-0253">Deployment of the NU6 Network Upgrade</a></td> <td>Proposed</td>
   <tr> <td>300</td> <td class="left"><a href="zip-0300">Cross-chain Atomic Transactions</a></td> <td>Proposed</td>
   <tr> <td>301</td> <td class="left"><a href="zip-0301">Zcash Stratum Protocol</a></td> <td>Final</td>
   <tr> <td>308</td> <td class="left"><a href="zip-0308">Sprout to Sapling Migration</a></td> <td>Final</td>
@@ -93,7 +94,6 @@
   <tr> <td><span class="reserved">231</span></td> <td class="left"><a class="reserved" href="zip-0231">Decouple Memos from Transaction Outputs</a></td> <td>Reserved</td>
   <tr> <td>236</td> <td class="left"><a href="zip-0236">Blocks should balance exactly</a></td> <td>Draft</td>
   <tr> <td>245</td> <td class="left"><a href="zip-0245">Transaction Identifier Digests & Signature Validation for Transparent Zcash Extensions</a></td> <td>Draft</td>
-  <tr> <td>253</td> <td class="left"><a href="zip-0253">Deployment of the NU6 Network Upgrade</a></td> <td>Draft</td>
   <tr> <td>302</td> <td class="left"><a href="zip-0302">Standardized Memo Field Format</a></td> <td>Draft</td>
   <tr> <td><span class="reserved">303</span></td> <td class="left"><a class="reserved" href="zip-0303">Sprout Payment Disclosure</a></td> <td>Reserved</td>
   <tr> <td>304</td> <td class="left"><a href="zip-0304">Sapling Address Signatures</a></td> <td>Draft</td>
@@ -202,7 +202,7 @@
   <tr> <td>250</td> <td class="left"><a href="zip-0250">Deployment of the Heartwood Network Upgrade</a></td> <td>Final</td>
   <tr> <td>251</td> <td class="left"><a href="zip-0251">Deployment of the Canopy Network Upgrade</a></td> <td>Final</td>
   <tr> <td>252</td> <td class="left"><a href="zip-0252">Deployment of the NU5 Network Upgrade</a></td> <td>Final</td>
-  <tr> <td>253</td> <td class="left"><a href="zip-0253">Deployment of the NU6 Network Upgrade</a></td> <td>Draft</td>
+  <tr> <td>253</td> <td class="left"><a href="zip-0253">Deployment of the NU6 Network Upgrade</a></td> <td>Proposed</td>
   <tr> <td>300</td> <td class="left"><a href="zip-0300">Cross-chain Atomic Transactions</a></td> <td>Proposed</td>
   <tr> <td>301</td> <td class="left"><a href="zip-0301">Zcash Stratum Protocol</a></td> <td>Final</td>
   <tr> <td>302</td> <td class="left"><a href="zip-0302">Standardized Memo Field Format</a></td> <td>Draft</td>

rendered/zip-0253.html

@@ -10,7 +10,7 @@
 <pre><code>ZIP: 253
 Title: Deployment of the NU6 Network Upgrade
 Owners: Arya &lt;arya@zfnd.org&gt;
-Status: Draft
+Status: Proposed
 Category: Consensus / Network
 Created: 2024-07-17
 License: MIT
@@ -31,7 +31,6 @@ <h1 id="abstract">Abstract</h1>
 <p>This proposal defines the deployment of the NU6 network upgrade.</p>
 <h1 id="specification">Specification</h1>
 <h2 id="nu6-deployment">NU6 deployment</h2>
-<!-- TODO: Update these references once ZIP numbers are assigned to the draft ZIPs -->
 <p>The primary sources of information about NU6 consensus protocol
 changes are:</p>
 <ul>
@@ -43,7 +42,7 @@ <h2 id="nu6-deployment">NU6 deployment</h2>
 <li>ZIP 236: Blocks should balance exactly <a href="#fn6"
 class="footnote-ref" id="fnref6"
 role="doc-noteref"><sup>6</sup></a>.</li>
-<li>ZIP ???: Block Reward Allocation for Non-Direct Development Funding
+<li>ZIP 1015: Block Reward Allocation for Non-Direct Development Funding
 <a href="#fn7" class="footnote-ref" id="fnref7"
 role="doc-noteref"><sup>7</sup></a>.</li>
 <li>ZIP 2001: Lockbox Funding Streams <a href="#fn8"
@@ -104,52 +103,50 @@ <h1 id="backward-compatibility">Backward compatibility</h1>
 valid across the NU6 activation, since signatures MUST use the
 appropriate consensus branch ID.</p>
 <h1 id="references">References</h1>
-<section class="footnotes footnotes-end-of-document"
+<aside id="footnotes" class="footnotes footnotes-end-of-document"
 role="doc-endnotes">
 <hr />
 <ol>
-<li id="fn1" role="doc-endnote"><p><a
+<li id="fn1"><p><a
 href="https://www.rfc-editor.org/info/bcp14">Information on BCP 14 —
 “RFC 2119: Key words for use in RFCs to Indicate Requirement Levels” and
 “RFC 8174: Ambiguity of Uppercase vs Lowercase in RFC 2119 Key
 Words”</a><a href="#fnref1" class="footnote-back"
 role="doc-backlink">↩︎</a></p></li>
-<li id="fn2" role="doc-endnote"><p><a href="zip-0200">ZIP 200:
-Network Upgrade Mechanism</a><a href="#fnref2" class="footnote-back"
+<li id="fn2"><p><a href="zip-0200">ZIP 200: Network Upgrade
+Mechanism</a><a href="#fnref2" class="footnote-back"
 role="doc-backlink">↩︎</a></p></li>
-<li id="fn3" role="doc-endnote"><p><a
-href="protocol/protocol.pdf#networks">Zcash Protocol Specification,
-Version v2023.4.0 or later. Section 3.12: Mainnet and Testnet</a><a
-href="#fnref3" class="footnote-back" role="doc-backlink">↩︎</a></p></li>
-<li id="fn4" role="doc-endnote"><p><a href="protocol/protocol.pdf">Zcash
-Protocol Specification, Version v2023.4.0 or later</a><a href="#fnref4"
+<li id="fn3"><p><a href="protocol/protocol.pdf#networks">Zcash Protocol
+Specification, Version v2023.4.0 or later. Section 3.12: Mainnet and
+Testnet</a><a href="#fnref3" class="footnote-back"
+role="doc-backlink">↩︎</a></p></li>
+<li id="fn4"><p><a href="protocol/protocol.pdf">Zcash Protocol
+Specification, Version v2023.4.0 or later</a><a href="#fnref4"
 class="footnote-back" role="doc-backlink">↩︎</a></p></li>
-<li id="fn5" role="doc-endnote"><p><a href="zip-0200">ZIP 200:
-Network Upgrade Mechanism</a><a href="#fnref5" class="footnote-back"
+<li id="fn5"><p><a href="zip-0200">ZIP 200: Network Upgrade
+Mechanism</a><a href="#fnref5" class="footnote-back"
 role="doc-backlink">↩︎</a></p></li>
-<li id="fn6" role="doc-endnote"><p><a href="zip-0236">ZIP 236:
-Blocks should balance exactly</a><a href="#fnref6" class="footnote-back"
+<li id="fn6"><p><a href="zip-0236">ZIP 236: Blocks should balance
+exactly</a><a href="#fnref6" class="footnote-back"
 role="doc-backlink">↩︎</a></p></li>
-<li id="fn7" role="doc-endnote"><p><a
-href="draft-nuttycom-funding-allocation.rst">ZIP ???: Block Reward
-Allocation for Non-Direct Development Funding</a><a href="#fnref7"
+<li id="fn7"><p><a href="zip-1015">ZIP 1015: Block Reward Allocation
+for Non-Direct Development Funding</a><a href="#fnref7"
 class="footnote-back" role="doc-backlink">↩︎</a></p></li>
-<li id="fn8" role="doc-endnote"><p><a href="zip-2001">ZIP 2001:
-Lockbox Funding Streams</a><a href="#fnref8" class="footnote-back"
+<li id="fn8"><p><a href="zip-2001">ZIP 2001: Lockbox Funding
+Streams</a><a href="#fnref8" class="footnote-back"
 role="doc-backlink">↩︎</a></p></li>
-<li id="fn9" role="doc-endnote"><p><a href="zip-0201">ZIP 201:
-Network Peer Management for Overwinter</a><a href="#fnref9"
-class="footnote-back" role="doc-backlink">↩︎</a></p></li>
-<li id="fn10" role="doc-endnote"><p><a href="zip-0207">ZIP 207:
-Funding Streams</a><a href="#fnref10" class="footnote-back"
+<li id="fn9"><p><a href="zip-0201">ZIP 201: Network Peer Management
+for Overwinter</a><a href="#fnref9" class="footnote-back"
 role="doc-backlink">↩︎</a></p></li>
-<li id="fn11" role="doc-endnote"><p><a href="zip-0214">ZIP 214:
-Consensus rules for a Zcash Development Fund</a><a href="#fnref11"
-class="footnote-back" role="doc-backlink">↩︎</a></p></li>
-<li id="fn12" role="doc-endnote"><p><a href="zip-0200">ZIP 200:
-Network Upgrade Mechanism</a><a href="#fnref12" class="footnote-back"
+<li id="fn10"><p><a href="zip-0207">ZIP 207: Funding Streams</a><a
+href="#fnref10" class="footnote-back" role="doc-backlink">↩︎</a></p></li>
+<li id="fn11"><p><a href="zip-0214">ZIP 214: Consensus rules for a
+Zcash Development Fund</a><a href="#fnref11" class="footnote-back"
+role="doc-backlink">↩︎</a></p></li>
+<li id="fn12"><p><a href="zip-0200">ZIP 200: Network Upgrade
+Mechanism</a><a href="#fnref12" class="footnote-back"
 role="doc-backlink">↩︎</a></p></li>
 </ol>
-</section>
+</aside>
 </body>
 </html>