From 0f84a7234e4a43d766d9554235ff5ba111b44f5a Mon Sep 17 00:00:00 2001
From: Daira Hopwood <daira@jacaranda.org>
Date: Mon, 28 Mar 2022 16:16:16 +0100
Subject: [PATCH] ZIP 252: Update 'Support in Zebra' section.

Co-authored-by: teor <teor@riseup.net>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---
 zip-0252.html | 11 ++++++++---
 zip-0252.rst  | 22 +++++++++++++++++-----
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/zip-0252.html b/zip-0252.html
index 810494ce..2f083dec 100644
--- a/zip-0252.html
+++ b/zip-0252.html
@@ -105,11 +105,16 @@ static const int NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD = 1728;</pre>
             </section>
         </section>
         <section id="support-in-zebra"><h2><span class="section-heading">Support in Zebra</span><span class="section-anchor"> <a rel="bookmark" href="#support-in-zebra"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h2>
-            <p>Partial support for NU5 on Testnet will be implemented in Zebra version [TODO], which will advertise protocol version 170050. This version will validate a strict subset of NU5 consensus rules on Testnet.</p>
+            <p>Several versions of Zebra have implemented versions of the NU5 consensus rules on Testnet:</p>
+            <ul>
+                <li><cite>zebrad</cite> v1.0.0-alpha.18 implemented partial support for NU5 on Testnet, validating a strict subset of the NU5 consensus rules. This version had an activation height of 1599200, as described in section <a href="#nu5-deployment">NU5 deployment</a> above.</li>
+                <li><cite>zebrad</cite> v1.0.0-beta.7 will fully validate what is expected to be the final revision of the NU5 consensus rules. As part of these consensus rule changes, <cite>zebrad</cite> v1.0.0-beta.7 will automatically re-download the entire chain from genesis, then follow an alternate chain starting at height 1599200. It will advertise protocol version 170050.</li>
+            </ul>
+            <p>Support for NU5 on Mainnet will be implemented in <cite>zebrad</cite> version [TODO], which will advertise protocol version 170100.</p>
             <section id="backward-compatibility-in-zebra"><h3><span class="section-heading">Backward compatibility in Zebra</span><span class="section-anchor"> <a rel="bookmark" href="#backward-compatibility-in-zebra"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h3>
-                <p>The minimum peer protocol version that NU5-compatible Zebra nodes will connect to is 170002. However, Zebra will immediately disconnect from nodes with a protocol version less than:</p>
+                <p>The minimum peer protocol version that NU5-compatible Zebra nodes will connect to is 170002. They will immediately disconnect from nodes advertising a peer protocol version less than:</p>
                 <ul>
-                    <li>170012 on Testnet, or</li>
+                    <li>170040 on Testnet, or</li>
                     <li>170013 on Mainnet.</li>
                 </ul>
             </section>
diff --git a/zip-0252.rst b/zip-0252.rst
index b8d8ff0b..e1249685 100644
--- a/zip-0252.rst
+++ b/zip-0252.rst
@@ -184,18 +184,30 @@ pre-NU5 nodes will gradually be disconnected in the run up to activation.
 Support in Zebra
 ================
 
-Partial support for NU5 on Testnet will be implemented in Zebra version [TODO],
-which will advertise protocol version 170050. This version will validate a
-strict subset of NU5 consensus rules on Testnet.
+Several versions of Zebra have implemented versions of the NU5 consensus
+rules on Testnet:
+
+- `zebrad` v1.0.0-alpha.18 implemented partial support for NU5 on Testnet,
+  validating a strict subset of the NU5 consensus rules. This version had an
+  activation height of 1599200, as described in section `NU5 deployment`_
+  above.
+- `zebrad` v1.0.0-beta.7 will fully validate what is expected to be the final
+  revision of the NU5 consensus rules. As part of these consensus rule changes,
+  `zebrad` v1.0.0-beta.7 will automatically re-download the entire chain from
+  genesis, then follow an alternate chain starting at height 1599200. It will
+  advertise protocol version 170050.
+
+Support for NU5 on Mainnet will be implemented in `zebrad` version [TODO],
+which will advertise protocol version 170100.
 
 Backward compatibility in Zebra
 -------------------------------
 
 The minimum peer protocol version that NU5-compatible Zebra nodes will connect to
-is 170002. However, Zebra will immediately disconnect from nodes with a protocol
+is 170002. They will immediately disconnect from nodes advertising a peer protocol
 version less than:
 
-- 170012 on Testnet, or
+- 170040 on Testnet, or
 - 170013 on Mainnet.
 
 NU5 deployment for Zebra