Merge pull request zcash#982 from daira/nu6-cleanups

Update status of deployed ZIPs post-NU6

Author: str4d

README.rst

@@ -59,37 +59,37 @@
   <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>207</td> <td class="left"><a href="zip-0207">Funding Streams</a></td> <td>[Pre-NU6] Final, [NU6] Implemented (zcashd and zebrad)</td>
+  <tr> <td>207</td> <td class="left"><a href="zip-0207">Funding Streams</a></td> <td>[Canopy, NU6] Final</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 Chain Value Pool Balances</a></td> <td>Final</td>
   <tr> <td>211</td> <td class="left"><a href="zip-0211">Disabling Addition of New Value to the Sprout Chain Value Pool</a></td> <td>Final</td>
   <tr> <td>212</td> <td class="left"><a href="zip-0212">Allow Recipient to Derive Ephemeral Secret from Note Plaintext</a></td> <td>Final</td>
   <tr> <td>213</td> <td class="left"><a href="zip-0213">Shielded Coinbase</a></td> <td>Final</td>
-  <tr> <td>214</td> <td class="left"><a href="zip-0214">Consensus rules for a Zcash Development Fund</a></td> <td>[Revision 0] Final, [Revision 1] Implemented (zcashd and zebrad)</td>
+  <tr> <td>214</td> <td class="left"><a href="zip-0214">Consensus rules for a Zcash Development Fund</a></td> <td>[Revision 0: Canopy, Revision 1: NU6] Final</td>
   <tr> <td>215</td> <td class="left"><a href="zip-0215">Explicitly Defining and Modifying Ed25519 Validation Rules</a></td> <td>Final</td>
   <tr> <td>216</td> <td class="left"><a href="zip-0216">Require Canonical Jubjub Point Encodings</a></td> <td>Final</td>
   <tr> <td>221</td> <td class="left"><a href="zip-0221">FlyClient - Consensus-Layer Changes</a></td> <td>Final</td>
   <tr> <td>224</td> <td class="left"><a href="zip-0224">Orchard Shielded Protocol</a></td> <td>Final</td>
   <tr> <td>225</td> <td class="left"><a href="zip-0225">Version 5 Transaction Format</a></td> <td>Final</td>
-  <tr> <td>236</td> <td class="left"><a href="zip-0236">Blocks should balance exactly</a></td> <td>Implemented (zcashd and zebrad)</td>
+  <tr> <td>236</td> <td class="left"><a href="zip-0236">Blocks should balance exactly</a></td> <td>Final</td>
   <tr> <td>239</td> <td class="left"><a href="zip-0239">Relay of Version 5 Transactions</a></td> <td>Final</td>
   <tr> <td>243</td> <td class="left"><a href="zip-0243">Transaction Signature Validation for Sapling</a></td> <td>Final</td>
   <tr> <td>244</td> <td class="left"><a href="zip-0244">Transaction Identifier Non-Malleability</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>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>Implemented (zcashd and zebrad)</td>
+  <tr> <td>253</td> <td class="left"><a href="zip-0253">Deployment of the NU6 Network Upgrade</a></td> <td>Final</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>
-  <tr> <td>316</td> <td class="left"><a href="zip-0316">Unified Addresses and Unified Viewing Keys</a></td> <td>[Revision 0] Final, [Revision 1] Proposed</td>
+  <tr> <td>301</td> <td class="left"><a href="zip-0301">Zcash Stratum Protocol</a></td> <td>Active</td>
+  <tr> <td>308</td> <td class="left"><a href="zip-0308">Sprout to Sapling Migration</a></td> <td>Active</td>
+  <tr> <td>316</td> <td class="left"><a href="zip-0316">Unified Addresses and Unified Viewing Keys</a></td> <td>[Revision 0] Active, [Revision 1] Proposed</td>
   <tr> <td>317</td> <td class="left"><a href="zip-0317">Proportional Transfer Fee Mechanism</a></td> <td>Active</td>
-  <tr> <td>320</td> <td class="left"><a href="zip-0320">Defining an Address Type to which funds can only be sent from Transparent Addresses</a></td> <td>Proposed</td>
-  <tr> <td>321</td> <td class="left"><a href="zip-0321">Payment Request URIs</a></td> <td>Proposed</td>
+  <tr> <td>320</td> <td class="left"><a href="zip-0320">Defining an Address Type to which funds can only be sent from Transparent Addresses</a></td> <td>Active</td>
+  <tr> <td>321</td> <td class="left"><a href="zip-0321">Payment Request URIs</a></td> <td>Active</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 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>1015</td> <td class="left"><a href="zip-1015">Block Subsidy Allocation for Non-Direct Development Funding</a></td> <td>Final</td>
+  <tr> <td>2001</td> <td class="left"><a href="zip-2001">Lockbox Funding Streams</a></td> <td>Final</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>
             <p>These are works-in-progress that have been assigned ZIP numbers. These will eventually become either Proposed (and thus Released), or one of Withdrawn, Rejected, or Obsolete.</p>
@@ -198,14 +198,14 @@
   <tr> <td><span class="reserved">204</span></td> <td class="left"><a class="reserved" href="zip-0204">Zcash P2P Network Protocol</a></td> <td>Reserved</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>207</td> <td class="left"><a href="zip-0207">Funding Streams</a></td> <td>[Pre-NU6] Final, [NU6] Implemented (zcashd and zebrad)</td>
+  <tr> <td>207</td> <td class="left"><a href="zip-0207">Funding Streams</a></td> <td>[Canopy, NU6] Final</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 Chain Value Pool Balances</a></td> <td>Final</td>
   <tr> <td><strike>210</strike></td> <td class="left"><strike><a href="zip-0210">Sapling Anchor Deduplication within Transactions</a></strike></td> <td>Withdrawn</td>
   <tr> <td>211</td> <td class="left"><a href="zip-0211">Disabling Addition of New Value to the Sprout Chain Value Pool</a></td> <td>Final</td>
   <tr> <td>212</td> <td class="left"><a href="zip-0212">Allow Recipient to Derive Ephemeral Secret from Note Plaintext</a></td> <td>Final</td>
   <tr> <td>213</td> <td class="left"><a href="zip-0213">Shielded Coinbase</a></td> <td>Final</td>
-  <tr> <td>214</td> <td class="left"><a href="zip-0214">Consensus rules for a Zcash Development Fund</a></td> <td>[Revision 0] Final, [Revision 1] Implemented (zcashd and zebrad)</td>
+  <tr> <td>214</td> <td class="left"><a href="zip-0214">Consensus rules for a Zcash Development Fund</a></td> <td>[Revision 0: Canopy, Revision 1: NU6] Final</td>
   <tr> <td>215</td> <td class="left"><a href="zip-0215">Explicitly Defining and Modifying Ed25519 Validation Rules</a></td> <td>Final</td>
   <tr> <td>216</td> <td class="left"><a href="zip-0216">Require Canonical Jubjub Point Encodings</a></td> <td>Final</td>
   <tr> <td><span class="reserved">217</span></td> <td class="left"><a class="reserved" href="zip-0217">Aggregate Signatures</a></td> <td>Reserved</td>
@@ -223,38 +223,38 @@
   <tr> <td>233</td> <td class="left"><a href="zip-0233">Network Sustainability Mechanism: Removing Funds From Circulation</a></td> <td>Draft</td>
   <tr> <td>234</td> <td class="left"><a href="zip-0234">Network Sustainability Mechanism: Issuance Smoothing</a></td> <td>Draft</td>
   <tr> <td>235</td> <td class="left"><a href="zip-0235">Remove 60% of Transaction Fees From Circulation</a></td> <td>Draft</td>
-  <tr> <td>236</td> <td class="left"><a href="zip-0236">Blocks should balance exactly</a></td> <td>Implemented (zcashd and zebrad)</td>
+  <tr> <td>236</td> <td class="left"><a href="zip-0236">Blocks should balance exactly</a></td> <td>Final</td>
   <tr> <td>239</td> <td class="left"><a href="zip-0239">Relay of Version 5 Transactions</a></td> <td>Final</td>
   <tr> <td>243</td> <td class="left"><a href="zip-0243">Transaction Signature Validation for Sapling</a></td> <td>Final</td>
   <tr> <td>244</td> <td class="left"><a href="zip-0244">Transaction Identifier Non-Malleability</a></td> <td>Final</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>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>Implemented (zcashd and zebrad)</td>
+  <tr> <td>253</td> <td class="left"><a href="zip-0253">Deployment of the NU6 Network Upgrade</a></td> <td>Final</td>
   <tr> <td>254</td> <td class="left"><a href="zip-0254">Deployment of the NU7 Network Upgrade</a></td> <td>Draft</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>301</td> <td class="left"><a href="zip-0301">Zcash Stratum Protocol</a></td> <td>Active</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>
   <tr> <td><span class="reserved">305</span></td> <td class="left"><a class="reserved" href="zip-0305">Best Practices for Hardware Wallets supporting Sapling</a></td> <td>Reserved</td>
   <tr> <td><span class="reserved">306</span></td> <td class="left"><a class="reserved" href="zip-0306">Security Considerations for Anchor Selection</a></td> <td>Reserved</td>
   <tr> <td>307</td> <td class="left"><a href="zip-0307">Light Client Protocol for Payment Detection</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>308</td> <td class="left"><a href="zip-0308">Sprout to Sapling Migration</a></td> <td>Active</td>
   <tr> <td><span class="reserved">309</span></td> <td class="left"><a class="reserved" href="zip-0309">Blind Off-chain Lightweight Transactions (BOLT)</a></td> <td>Reserved</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>311</td> <td class="left"><a href="zip-0311">Zcash Payment Disclosures</a></td> <td>Draft</td>
   <tr> <td>312</td> <td class="left"><a href="zip-0312">FROST for Spend Authorization Multisignatures</a></td> <td>Draft</td>
   <tr> <td><strike>313</strike></td> <td class="left"><strike><a href="zip-0313">Reduce Conventional Transaction Fee to 1000 zatoshis</a></strike></td> <td>Obsolete</td>
   <tr> <td><span class="reserved">314</span></td> <td class="left"><a class="reserved" href="zip-0314">Privacy upgrades to the Zcash light client protocol</a></td> <td>Reserved</td>
   <tr> <td>315</td> <td class="left"><a href="zip-0315">Best Practices for Wallet Implementations</a></td> <td>Draft</td>
-  <tr> <td>316</td> <td class="left"><a href="zip-0316">Unified Addresses and Unified Viewing Keys</a></td> <td>[Revision 0] Final, [Revision 1] Proposed</td>
+  <tr> <td>316</td> <td class="left"><a href="zip-0316">Unified Addresses and Unified Viewing Keys</a></td> <td>[Revision 0] Active, [Revision 1] Proposed</td>
   <tr> <td>317</td> <td class="left"><a href="zip-0317">Proportional Transfer Fee Mechanism</a></td> <td>Active</td>
   <tr> <td><span class="reserved">318</span></td> <td class="left"><a class="reserved" href="zip-0318">Associated Payload Encryption</a></td> <td>Reserved</td>
   <tr> <td><span class="reserved">319</span></td> <td class="left"><a class="reserved" href="zip-0319">Options for Shielded Pool Retirement</a></td> <td>Reserved</td>
-  <tr> <td>320</td> <td class="left"><a href="zip-0320">Defining an Address Type to which funds can only be sent from Transparent Addresses</a></td> <td>Proposed</td>
-  <tr> <td>321</td> <td class="left"><a href="zip-0321">Payment Request URIs</a></td> <td>Proposed</td>
+  <tr> <td>320</td> <td class="left"><a href="zip-0320">Defining an Address Type to which funds can only be sent from Transparent Addresses</a></td> <td>Active</td>
+  <tr> <td>321</td> <td class="left"><a href="zip-0321">Payment Request URIs</a></td> <td>Active</td>
   <tr> <td><span class="reserved">322</span></td> <td class="left"><a class="reserved" href="zip-0322">Generic Signed Message Format</a></td> <td>Reserved</td>
   <tr> <td><span class="reserved">323</span></td> <td class="left"><a class="reserved" href="zip-0323">Specification of getblocktemplate for Zcash</a></td> <td>Reserved</td>
   <tr> <td>324</td> <td class="left"><a href="zip-0324">URI-Encapsulated Payments</a></td> <td>Draft</td>
@@ -280,8 +280,8 @@
   <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 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>1015</td> <td class="left"><a href="zip-1015">Block Subsidy Allocation for Non-Direct Development Funding</a></td> <td>Final</td>
+  <tr> <td>2001</td> <td class="left"><a href="zip-2001">Lockbox Funding Streams</a></td> <td>Final</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>
   <tr> <td>2004</td> <td class="left"><a href="zip-2004">Remove the dependency of consensus on note encryption</a></td> <td>Draft</td>

rendered/index.html

@@ -13,7 +13,7 @@
 Title: Funding Streams
 Owners: Jack Grigg <str4d@electriccoin.co>
         Daira-Emma Hopwood <daira-emma@electriccoin.co>
-Status: [Pre-NU6] Final, [NU6] Implemented (zcashd and zebrad)
+Status: [Canopy, NU6] Final
 Category: Consensus
 Created: 2019-01-04
 License: MIT</pre>
@@ -276,7 +276,7 @@
         </section>
         <section id="deployment"><h2><span class="section-heading">Deployment</span><span class="section-anchor"> <a rel="bookmark" href="#deployment"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h2>
             <p>This proposal was initially deployed with Canopy. <a id="footnote-reference-29" class="footnote_reference" href="#zip-0251">18</a></p>
-            <p>Changes to support deferred funding streams are to be deployed with NU6. <a id="footnote-reference-30" class="footnote_reference" href="#zip-0253">19</a></p>
+            <p>Changes to support deferred funding streams were deployed with NU6. <a id="footnote-reference-30" class="footnote_reference" href="#zip-0253">19</a></p>
         </section>
         <section id="backward-compatibility"><h2><span class="section-heading">Backward compatibility</span><span class="section-anchor"> <a rel="bookmark" href="#backward-compatibility"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h2>
             <p>This proposal intentionally creates what is known as a "bilateral consensus rule change". Use of this mechanism requires that all network participants upgrade their software to a compatible version within the upgrade window. Older software will treat post-upgrade blocks as invalid, and will follow any pre-upgrade consensus branch that persists.</p>

rendered/zip-0207.html

@@ -10,7 +10,7 @@
 Title: Consensus rules for a Zcash Development Fund
 Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
         Kris Nuttycombe <kris@nutty.land>
-Status: [Revision 0] Final, [Revision 1] Implemented (zcashd and zebrad)
+Status: [Revision 0: Canopy, Revision 1: NU6] Final
 Category: Consensus
 Created: 2020-02-28
 License: MIT
@@ -356,7 +356,8 @@ <h2>Rationale for <a href="#revision-0">Revision 0</a></h2>
             <p>It was judged to be unnecessary to have a mechanism to update funding stream definitions (in case of security breach or changes to direct grant recipients) other than at network upgrades.</p>
         </section>
         <section id="deployment"><h2><span class="section-heading">Deployment</span><span class="section-anchor"> <a rel="bookmark" href="#deployment"><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 proposal was deployed with Canopy. <a id="footnote-reference-21" class="footnote_reference" href="#zip-0251">11</a> <a href="#revision-1">Revision 1</a> of this proposal is intended to be deployed with NU6. <a id="footnote-reference-22" class="footnote_reference" href="#zip-0253">12</a></p>
+            <p><a href="#revision-0">Revision 0</a> of this proposal was deployed with Canopy. <a id="footnote-reference-21" class="footnote_reference" href="#zip-0251">11</a></p>
+            <p><a href="#revision-1">Revision 1</a> of this proposal was deployed with NU6. <a id="footnote-reference-22" class="footnote_reference" href="#zip-0253">12</a></p>
         </section>
         <section id="references"><h2><span class="section-heading">References</span><span class="section-anchor"> <a rel="bookmark" href="#references"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h2>
             <table id="bcp14" class="footnote">