zcash · hhanh00 · May 28, 2024 · May 28, 2024 · May 28, 2024 · May 28, 2024
diff --git a/index.html b/index.html
diff --git a/protocol/blossom.pdf b/protocol/blossom.pdf
diff --git a/protocol/canopy.pdf b/protocol/canopy.pdf
diff --git a/protocol/heartwood.pdf b/protocol/heartwood.pdf
diff --git a/protocol/nu5.pdf b/protocol/nu5.pdf
diff --git a/protocol/protocol.pdf b/protocol/protocol.pdf
diff --git a/protocol/sapling.pdf b/protocol/sapling.pdf
diff --git a/zip-0216.html b/zip-0216.html
@@ -29,9 +29,9 @@
                 <span class="math">\(u\!\)</span>
             -coordinate is zero, there are two encodings that will be accepted:</p>
             <pre data-language="rust"><span class="c1">// Fix the sign of `u` if necessary</span>
-<span class="kd">let</span><span class="w"> </span><span class="n">flip_sign</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">Choice</span>::<span class="n">from</span><span class="p">((</span><span class="n">u</span><span class="p">.</span><span class="n">to_bytes</span><span class="p">()[</span><span class="mi">0</span><span class="p">]</span><span class="w"> </span><span class="o">^</span><span class="w"> </span><span class="n">sign</span><span class="p">)</span><span class="w"> </span><span class="o">&amp;</span><span class="w"> </span><span class="mi">1</span><span class="p">);</span>
+<span class="kd">let</span><span class="w"> </span><span class="n">flip_sign</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">Choice</span><span class="p">::</span><span class="n">from</span><span class="p">((</span><span class="n">u</span><span class="p">.</span><span class="n">to_bytes</span><span class="p">()[</span><span class="mi">0</span><span class="p">]</span><span class="w"> </span><span class="o">^</span><span class="w"> </span><span class="n">sign</span><span class="p">)</span><span class="w"> </span><span class="o">&amp;</span><span class="w"> </span><span class="mi">1</span><span class="p">);</span>
 <span class="kd">let</span><span class="w"> </span><span class="n">u_negated</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="o">-</span><span class="n">u</span><span class="p">;</span>
-<span class="kd">let</span><span class="w"> </span><span class="n">final_u</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">Fq</span>::<span class="n">conditional_select</span><span class="p">(</span><span class="o">&amp;</span><span class="n">u</span><span class="p">,</span><span class="w"> </span><span class="o">&amp;</span><span class="n">u_negated</span><span class="p">,</span><span class="w"> </span><span class="n">flip_sign</span><span class="p">);</span></pre>
+<span class="kd">let</span><span class="w"> </span><span class="n">final_u</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">Fq</span><span class="p">::</span><span class="n">conditional_select</span><span class="p">(</span><span class="o">&amp;</span><span class="n">u</span><span class="p">,</span><span class="w"> </span><span class="o">&amp;</span><span class="n">u_negated</span><span class="p">,</span><span class="w"> </span><span class="n">flip_sign</span><span class="p">);</span></pre>
             <p>This code accepts either sign bit, because <code>u_negated == u</code>.</p>
             <p>There are two points on the Jubjub curve with
                 <span class="math">\(u\!\)</span>

diff --git a/zip-0253.html b/zip-0253.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>ZIP 253: Deployment of the NU6 Network Upgrade</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: 253
+Title: Deployment of the NU6 Network Upgrade
+Owners: Daira-Emma Hopwood &lt;[email protected]&gt;
+Status: Reserved
+Category: Consensus / Network
+Discussions-To: &lt;<a href="https://github.com/zcash/zips/issues/806">https://github.com/zcash/zips/issues/806</a>&gt;</pre>
+    </section>
+</body>
+</html>
diff --git a/zip-0316.html b/zip-0316.html
@@ -165,8 +165,16 @@
                     <li>Revision 1: This version adds support for <a href="#must-understand-typecodes">MUST-understand Typecodes</a> and <a href="#address-expiration-metadata">Address Expiration Metadata</a>. It also drops the restriction that a UA/UVK must contain at least one shielded Item.</li>
                 </ul>
                 <p>A Revision 0 UA/UVK is distinguished from a Revision 1 UA/UVK by its Human-Readable Part, as follows.</p>
-                <p>Let <em>prefix</em> be: * “<code>u</code>”, if this is a UA/UVK prior to <a href="#revision-1">Revision 1</a>; * “<code>ur</code>”, if this is a UA/UVK from <a href="#revision-1">Revision 1</a> onward.</p>
-                <p>The Human-Readable Parts (as defined in <a id="footnote-reference-10" class="footnote_reference" href="#bip-0350">36</a>) of Unified Addresses are defined as: * <em>prefix</em>, for Unified Addresses on Mainnet; * <em>prefix</em> || “<code>test</code>”, for Unified Addresses on Testnet.</p>
+                <p>Let <em>prefix</em> be:</p>
+                <ul>
+                    <li>“<code>u</code>”, if this is a UA/UVK prior to <a href="#revision-1">Revision 1</a>;</li>
+                    <li>“<code>ur</code>”, if this is a UA/UVK from <a href="#revision-1">Revision 1</a> onward.</li>
+                </ul>
+                <p>The Human-Readable Parts (as defined in <a id="footnote-reference-10" class="footnote_reference" href="#bip-0350">36</a>) of Unified Addresses are defined as:</p>
+                <ul>
+                    <li><em>prefix</em>, for Unified Addresses on Mainnet;</li>
+                    <li><em>prefix</em> || “<code>test</code>”, for Unified Addresses on Testnet.</li>
+                </ul>
                 <p>The Human-Readable Parts of Unified Viewing Keys are defined as:</p>
                 <ul>
                     <li><em>prefix</em> || “<code>ivk</code>” for Unified Incoming Viewing Keys on Mainnet;</li>

diff --git a/zip-0320.html b/zip-0320.html
@@ -12,7 +12,7 @@
 Owners: Daira-Emma Hopwood &lt;[email protected]&gt;
         Kris Nuttycombe &lt;[email protected]&gt;
 Credits: Hanh
-Status: Draft
+Status: Proposed
 Category: Standards / Wallet
 Created: 2024-01-12
 License: MIT