Minor updates to ZIP titles. Also add a reference to ZIP 316 from ZIP…

… 252.

Signed-off-by: Daira Hopwood <[email protected]>

README.rst

@@ -52,7 +52,7 @@ is planned to activate on Mainnet at the beginning of October 2021:
 - `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>`__
+- `ZIP 316: Unified Addresses and Unified Viewing Keys <zip-0316.rst>`__
 
 
 License
@@ -129,7 +129,7 @@ Index of ZIPs
     <tr> <td><span class="reserved">323</span></td> <td class="left"><a class="reserved" href="zip-0323.rst">Specification of getblocktemplate for Zcash</a></td> <td>Reserved</td>
     <tr> <td><span class="reserved">339</span></td> <td class="left"><a class="reserved" href="zip-0339.rst">Wallet Recovery Words</a></td> <td>Reserved</td>
     <tr> <td>400</td> <td class="left"><a href="zip-0400.rst">Wallet.dat format</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>
+    <tr> <td>401</td> <td class="left"><a href="zip-0401.rst">Addressing Mempool Denial-of-Service</a></td> <td>Final</td>
     <tr> <td><span class="reserved">402</span></td> <td class="left"><a class="reserved" href="zip-0402.rst">New Wallet Database Format</a></td> <td>Reserved</td>
     <tr> <td><span class="reserved">403</span></td> <td class="left"><a class="reserved" href="zip-0403.rst">Verification Behaviour of zcashd</a></td> <td>Reserved</td>
     <tr> <td><span class="reserved">416</span></td> <td class="left"><a class="reserved" href="zip-0416.rst">RPC support for Unified Addresses in zcashd</a></td> <td>Reserved</td>

README.template

@@ -52,7 +52,7 @@ is planned to activate on Mainnet at the beginning of October 2021:
 - `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>`__
+- `ZIP 316: Unified Addresses and Unified Viewing Keys <zip-0316.rst>`__
 
 
 License

index.html

@@ -34,7 +34,7 @@
                 <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>
+                <li><a href="zip-0316">ZIP 316: Unified Addresses and Unified Viewing Keys</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>
@@ -102,7 +102,7 @@
   <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><span class="reserved">339</span></td> <td class="left"><a class="reserved" href="zip-0339">Wallet Recovery Words</a></td> <td>Reserved</td>
   <tr> <td>400</td> <td class="left"><a href="zip-0400">Wallet.dat format</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>
+  <tr> <td>401</td> <td class="left"><a href="zip-0401">Addressing Mempool Denial-of-Service</a></td> <td>Final</td>
   <tr> <td><span class="reserved">402</span></td> <td class="left"><a class="reserved" href="zip-0402">New Wallet Database Format</a></td> <td>Reserved</td>
   <tr> <td><span class="reserved">403</span></td> <td class="left"><a class="reserved" href="zip-0403">Verification Behaviour of zcashd</a></td> <td>Reserved</td>
   <tr> <td><span class="reserved">416</span></td> <td class="left"><a class="reserved" href="zip-0416">RPC support for Unified Addresses in zcashd</a></td> <td>Reserved</td>

zip-0252.html

@@ -35,11 +35,11 @@
                     <li>ZIP 224: Orchard Shielded Protocol <a id="id8" class="footnote_reference" href="#zip-0224">9</a></li>
                     <li>ZIP 225: Version 5 Transaction Format <a id="id9" class="footnote_reference" href="#zip-0225">10</a></li>
                     <li>ZIP 244: Transaction Identifier Non-Malleability <a id="id10" class="footnote_reference" href="#zip-0244">11</a></li>
-                    <li>The Orchard Book <a id="id11" class="footnote_reference" href="#orchard-book">12</a></li>
-                    <li>The halo2 Book <a id="id12" class="footnote_reference" href="#halo2-book">13</a></li>
+                    <li>The Orchard Book <a id="id11" class="footnote_reference" href="#orchard-book">13</a></li>
+                    <li>The halo2 Book <a id="id12" class="footnote_reference" href="#halo2-book">14</a></li>
                 </ul>
-                <p>The network handshake and peer management mechanisms defined in ZIP 201 <a id="id13" class="footnote_reference" href="#zip-0201">6</a> also apply to this upgrade.</p>
-                <p>The following network upgrade constants <a id="id14" class="footnote_reference" href="#zip-0200">5</a> are defined for the NU5 upgrade:</p>
+                <p>The network handshake and peer management mechanisms defined in ZIP 201 <a id="id13" class="footnote_reference" href="#zip-0201">6</a> also apply to this upgrade. Unified addresses and viewing keys are described in ZIP 316 <a id="id14" class="footnote_reference" href="#zip-0316">12</a>.</p>
+                <p>The following network upgrade constants <a id="id15" class="footnote_reference" href="#zip-0200">5</a> are defined for the NU5 upgrade:</p>
                 <dl>
                     <dt>CONSENSUS_BRANCH_ID</dt>
                     <dd><code>0xF919A198</code></dd>
@@ -66,7 +66,7 @@
         <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" src="assets/images/section-anchor.png" alt=""></a></span></h2>
             <p>Prior to the network upgrade activating on each network, NU5 and pre-NU5 nodes are compatible and can connect to each other.</p>
             <p>Once the network upgrades, even though pre-NU5 nodes can still accept the numerically larger protocol version used by NU5 as being valid, NU5 nodes will always disconnect peers using lower protocol versions.</p>
-            <p>Unlike Blossom, Heartwood, and Canopy, and like Overwinter and Sapling, NU5 defines a new transaction version. Therefore, NU5 transactions MAY be in the new v5 format specified by <a id="id15" class="footnote_reference" href="#zip-0225">10</a>. Unlike previous transaction version updates, the existing v4 transaction format remains valid after NU5 activation. Both transaction formats MUST be accepted by NU5 nodes.</p>
+            <p>Unlike Blossom, Heartwood, and Canopy, and like Overwinter and Sapling, NU5 defines a new transaction version. Therefore, NU5 transactions MAY be in the new v5 format specified by <a id="id16" class="footnote_reference" href="#zip-0225">10</a>. Unlike previous transaction version updates, the existing v4 transaction format remains valid after NU5 activation. Both transaction formats MUST be accepted by NU5 nodes.</p>
         </section>
         <section id="support-in-zcashd"><h2><span class="section-heading">Support in zcashd</span><span class="section-anchor"> <a rel="bookmark" href="#support-in-zcashd"><img width="24" height="24" src="assets/images/section-anchor.png" alt=""></a></span></h2>
             <p><strong>TODO: Update as needed</strong></p>
@@ -81,7 +81,7 @@
  * This was three days for upgrades up to and including Blossom, and is 1.5 days from Heartwood onward.
  */
 static const int NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD = 1728;</pre>
-                <p>The implementation is similar to that for Overwinter which was described in <a id="id16" class="footnote_reference" href="#zip-0201">6</a>.</p>
+                <p>The implementation is similar to that for Overwinter which was described in <a id="id17" class="footnote_reference" href="#zip-0201">6</a>.</p>
                 <p>However, NU5 nodes will have a preference for connecting to other NU5 nodes, so pre-NU5 nodes will gradually be disconnected in the run up to activation.</p>
             </section>
         </section>
@@ -189,18 +189,26 @@
                     </tr>
                 </tbody>
             </table>
-            <table id="orchard-book" class="footnote">
+            <table id="zip-0316" class="footnote">
                 <tbody>
                     <tr>
                         <th>12</th>
+                        <td><a href="zip-0316">ZIP 316: Unified Addresses and Unified Viewing Keys</a></td>
+                    </tr>
+                </tbody>
+            </table>
+            <table id="orchard-book" class="footnote">
+                <tbody>
+                    <tr>
+                        <th>13</th>
                         <td><a href="https://zcash.github.io/orchard/">The Orchard Book</a></td>
                     </tr>
                 </tbody>
             </table>
             <table id="halo2-book" class="footnote">
                 <tbody>
                     <tr>
-                        <th>13</th>
+                        <th>14</th>
                         <td><a href="https://zcash.github.io/halo2/">The halo2 Book</a></td>
                     </tr>
                 </tbody>

zip-0252.rst

@@ -35,7 +35,7 @@ Specification
 =============
 
 NU5 deployment
------------------
+--------------
 
 The primary sources of information about NU5 consensus protocol changes are:
 
@@ -50,7 +50,8 @@ The primary sources of information about NU5 consensus protocol changes are:
 - The halo2 Book [#halo2-book]_
 
 The network handshake and peer management mechanisms defined in ZIP 201 [#zip-0201]_
-also apply to this upgrade.
+also apply to this upgrade. Unified addresses and viewing keys are described in
+ZIP 316 [#zip-0316]_.
 
 
 The following network upgrade constants [#zip-0200]_ are defined for the NU5
@@ -187,5 +188,6 @@ References
 .. [#zip-0224] `ZIP 224: Orchard Shielded Protocol <zip-0224.rst>`_
 .. [#zip-0225] `ZIP 225: Version 5 Transaction Format <zip-0225.rst>`_
 .. [#zip-0244] `ZIP 244: Transaction Identifier Non-Malleability <zip-0244.rst>`_
+.. [#zip-0316] `ZIP 316: Unified Addresses and Unified Viewing Keys <zip-0316.rst>`_
 .. [#orchard-book] `The Orchard Book <https://zcash.github.io/orchard/>`_
 .. [#halo2-book] `The halo2 Book <https://zcash.github.io/halo2/>`_

zip-0313.html

@@ -138,7 +138,7 @@
                 <tbody>
                     <tr>
                         <th>8</th>
-                        <td><a href="zip-0401">ZIP 401: Addressing mempool denial-of-service</a></td>
+                        <td><a href="zip-0401">ZIP 401: Addressing Mempool Denial-of-Service</a></td>
                     </tr>
                 </tbody>
             </table>

zip-0313.rst

@@ -195,4 +195,4 @@ References
 .. [#zcash-4916] `Reduce default fee to 1000 zatoshis <https://github.com/zcash/zcash/pull/4916>`_
 .. [#zcash-2942] `Ecosystem-wide standard transaction fee <https://github.com/zcash/zcash/pull/2942>`_
 .. [#zcash-relaying] `zcashd commit e6a44ff: Always allow transactions paying at least DEFAULT_FEE to be relayed <https://github.com/zcash/zcash/pull/4916/commits/e6a44ff833bce280a30115d10ef0070ad4d52b38>`_
-.. [#zip-0401] `ZIP 401: Addressing mempool denial-of-service <zip-0401.rst>`_
+.. [#zip-0401] `ZIP 401: Addressing Mempool Denial-of-Service <zip-0401.rst>`_

zip-0401.html

@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>ZIP 401: Addressing mempool denial-of-service</title>
+    <title>ZIP 401: Addressing Mempool Denial-of-Service</title>
     <meta charset="utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1"><link rel="stylesheet" href="css/style.css"></head>
 <body>
     <section>
         <pre>ZIP: 401
-Title: Addressing mempool denial-of-service
+Title: Addressing Mempool Denial-of-Service
 Owners: Daira Hopwood &lt;[email protected]&gt;
 Status: Final
 Category: Network

zip-0401.rst

@@ -1,7 +1,7 @@
 ::
 
   ZIP: 401
-  Title: Addressing mempool denial-of-service
+  Title: Addressing Mempool Denial-of-Service
   Owners: Daira Hopwood <[email protected]>
   Status: Final
   Category: Network