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;

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:

+ +

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 version less than:

+

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:

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