Update README to list NU5-relevant ZIPs.

Signed-off-by: Daira Hopwood <[email protected]>
ZcashFoundation · Apr 23, 2021 · 4f39174 · 4f39174
1 parent 76c8a46
commit 4f39174
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 32 deletions.
diff --git a/README.rst b/README.rst
@@ -39,18 +39,20 @@ Use ``make`` to check that you are using correct
 and double-check the generated ``draft-*.html`` file before filing a Pull Request.
 
 
-Canopy ZIPs
------------
-
-This is the list of ZIPs that were included in `Canopy (Network Upgrade 4) <https://z.cash/upgrade/canopy/>`_,
-which activated on mainnet on November 18, 2020.
-
-- `ZIP 207: Funding Streams <zip-0207.rst>`__
-- `ZIP 211: Disabling Addition of New Value to the Sprout Value Pool <zip-0211.rst>`__
-- `ZIP 212: Allow Recipient to Derive Sapling Ephemeral Secret from Note Plaintext <zip-0212.rst>`__
-- `ZIP 214: Consensus rules for a Zcash Development Fund <zip-0214.rst>`__
-- `ZIP 215: Explicitly Defining and Modifying Ed25519 Validation Rules <zip-0215.rst>`__
-- `ZIP 251: Deployment of the Canopy Network Upgrade <zip-0251.rst>`__
+NU5 ZIPs
+--------
+
+This is the list of ZIPs relevant to the proposed NU5 Upgrade, which
+is planned to activate on Mainnet at the beginning of October 2021:
+
+- `ZIP 32: Shielded Hierarchical Deterministic Wallets <zip-0032.rst>`__ (updated)
+- `ZIP 216: Require Canonical Jubjub Point Encodings <zip-0216.rst>`__
+- `ZIP 221: FlyClient - Consensus-Layer Changes <zip-0221.rst>`__ (updated)
+- `ZIP 224: Orchard Shielded Protocol <zip-0224.rst>`__
+- `ZIP 225: Version 5 Transaction Format <zip-0225.rst>`__
+- `ZIP 244: Transaction Identifier Non-Malleability <zip-0244.rst>`__
+- `ZIP 252: Deployment of the NU5 Network Upgrade <zip-0252.rst>`__
+- `ZIP 316: Unified Addresses <zip-0316.rst>`__
 
 
 License

diff --git a/README.template b/README.template
@@ -39,18 +39,20 @@ Use ``make`` to check that you are using correct
 and double-check the generated ``draft-*.html`` file before filing a Pull Request.
 
 
-Canopy ZIPs
------------
-
-This is the list of ZIPs that were included in `Canopy (Network Upgrade 4) <https://z.cash/upgrade/canopy/>`_,
-which activated on mainnet on November 18, 2020.
-
-- `ZIP 207: Funding Streams <zip-0207.rst>`__
-- `ZIP 211: Disabling Addition of New Value to the Sprout Value Pool <zip-0211.rst>`__
-- `ZIP 212: Allow Recipient to Derive Sapling Ephemeral Secret from Note Plaintext <zip-0212.rst>`__
-- `ZIP 214: Consensus rules for a Zcash Development Fund <zip-0214.rst>`__
-- `ZIP 215: Explicitly Defining and Modifying Ed25519 Validation Rules <zip-0215.rst>`__
-- `ZIP 251: Deployment of the Canopy Network Upgrade <zip-0251.rst>`__
+NU5 ZIPs
+--------
+
+This is the list of ZIPs relevant to the proposed NU5 Upgrade, which
+is planned to activate on Mainnet at the beginning of October 2021:
+
+- `ZIP 32: Shielded Hierarchical Deterministic Wallets <zip-0032.rst>`__ (updated)
+- `ZIP 216: Require Canonical Jubjub Point Encodings <zip-0216.rst>`__
+- `ZIP 221: FlyClient - Consensus-Layer Changes <zip-0221.rst>`__ (updated)
+- `ZIP 224: Orchard Shielded Protocol <zip-0224.rst>`__
+- `ZIP 225: Version 5 Transaction Format <zip-0225.rst>`__
+- `ZIP 244: Transaction Identifier Non-Malleability <zip-0244.rst>`__
+- `ZIP 252: Deployment of the NU5 Network Upgrade <zip-0252.rst>`__
+- `ZIP 316: Unified Addresses <zip-0316.rst>`__
 
 
 License

diff --git a/index.html b/index.html
@@ -24,15 +24,17 @@
             <p>To start contributing, first read <a href="zip-0000">ZIP 0</a> which documents the ZIP process. Then clone <a href="https://github.com/zcash/zips">this repo</a> from GitHub, and start adding your draft ZIP, formatted either as reStructuredText or as Markdown.</p>
             <p>For example, if using reStructuredText, use a filename matching <code>draft-*.rst</code>. Use <code>make</code> to check that you are using correct <a href="https://docutils.sourceforge.io/rst.html">reStructuredText</a> or <a href="https://pandoc.org/MANUAL.html#pandocs-markdown">Markdown</a> syntax, and double-check the generated <code>draft-*.html</code> file before filing a Pull Request.</p>
         </section>
-        <section id="canopy-zips"><h2><span class="section-heading">Canopy ZIPs</span><span class="section-anchor"> <a rel="bookmark" href="#canopy-zips"><img width="24" height="24" src="assets/images/section-anchor.png" alt=""></a></span></h2>
-            <p>This is the list of ZIPs that were included in <a href="https://z.cash/upgrade/canopy/">Canopy (Network Upgrade 4)</a>, which activated on mainnet on November 18, 2020.</p>
+        <section id="nu5-zips"><h2><span class="section-heading">NU5 ZIPs</span><span class="section-anchor"> <a rel="bookmark" href="#nu5-zips"><img width="24" height="24" src="assets/images/section-anchor.png" alt=""></a></span></h2>
+            <p>This is the list of ZIPs relevant to the proposed NU5 Upgrade, which is planned to activate on Mainnet at the beginning of October 2021:</p>
             <ul>
-                <li><a href="zip-0207">ZIP 207: Funding Streams</a></li>
-                <li><a href="zip-0211">ZIP 211: Disabling Addition of New Value to the Sprout Value Pool</a></li>
-                <li><a href="zip-0212">ZIP 212: Allow Recipient to Derive Sapling Ephemeral Secret from Note Plaintext</a></li>
-                <li><a href="zip-0214">ZIP 214: Consensus rules for a Zcash Development Fund</a></li>
-                <li><a href="zip-0215">ZIP 215: Explicitly Defining and Modifying Ed25519 Validation Rules</a></li>
-                <li><a href="zip-0251">ZIP 251: Deployment of the Canopy Network Upgrade</a></li>
+                <li><a href="zip-0032">ZIP 32: Shielded Hierarchical Deterministic Wallets</a> (updated)</li>
+                <li><a href="zip-0216">ZIP 216: Require Canonical Jubjub Point Encodings</a></li>
+                <li><a href="zip-0221">ZIP 221: FlyClient - Consensus-Layer Changes</a> (updated)</li>
+                <li><a href="zip-0224">ZIP 224: Orchard Shielded Protocol</a></li>
+                <li><a href="zip-0225">ZIP 225: Version 5 Transaction Format</a></li>
+                <li><a href="zip-0244">ZIP 244: Transaction Identifier Non-Malleability</a></li>
+                <li><a href="zip-0252">ZIP 252: Deployment of the NU5 Network Upgrade</a></li>
+                <li><a href="zip-0316">ZIP 316: Unified Addresses</a></li>
             </ul>
         </section>
         <section id="license"><h2><span class="section-heading">License</span><span class="section-anchor"> <a rel="bookmark" href="#license"><img width="24" height="24" src="assets/images/section-anchor.png" alt=""></a></span></h2>