diff --git a/zip-0252.html b/zip-0252.html index 2f083dec..3c4b54c2 100644 --- a/zip-0252.html +++ b/zip-0252.html @@ -65,7 +65,7 @@ Pull-Request: <https://githu

Mainnet: 170100

-

Note: A first activation of NU5, with a previous version of the Orchard circuit and other NU5 consensus rules, occurred at block height 1599200 with consensus branch ID 0x37519621 and peer protocol version 170015. With the release of zcashd v4.7.0, Testnet is being rolled back to another chain that forks from the block immediately preceding that activation, at height 1599199. This chain had been continuously mined by zcashd v4.0.0 nodes modified to disable End-of-Service halt.

+

Note: A first activation of NU5, with a previous version of the Orchard circuit and other NU5 consensus rules, occurred on Testnet at block height 1599200 with consensus branch ID 0x37519621 and peer protocol version 170015. With the release of zcashd v4.7.0, Testnet is being rolled back to another chain that forks from the block immediately preceding that activation, at height 1599199. This chain had been continuously mined by zcashd v4.0.0 nodes modified to disable End-of-Service halt.

For each network (Testnet and Mainnet), nodes compatible with NU5 activation on that network MUST advertise a network protocol version that is greater than or equal to the MIN_NETWORK_PROTOCOL_VERSION (NU5) for that activation.

For each network, pre-NU5 nodes are defined as nodes advertising a protocol version less than that network's MIN_NETWORK_PROTOCOL_VERSION (NU5).

Once NU5 activates on Testnet or Mainnet, NU5 nodes SHOULD take steps to:

@@ -91,7 +91,7 @@ Pull-Request: <https://githu

Support for NU5 on Mainnet will be implemented in zcashd version 5.0.0, which will advertise protocol version 170100.

Backward compatibility in zcashd

-

The minimum peer protocol version that NU5-compatible zcashd nodes will connect to is 170002. They will immediately disconnect from Testnet nodes advertising a peer protocol version less than 170040.

+

The minimum peer protocol version that NU5-compatible zcashd nodes will connect to is 170002. On Testnet, they will immediately disconnect from nodes advertising a peer protocol version less than 170040.

NU5 deployment for zcashd

For each network, approximately 1.5 days (defined in terms of block height) before the corresponding NU5 activation height, nodes compatible with NU5 activation on that network will change the behaviour of their peer connection logic in order to prefer pre-NU5 peers on that network for eviction from the set of peer connections:

diff --git a/zip-0252.rst b/zip-0252.rst index e1249685..38e4180b 100644 --- a/zip-0252.rst +++ b/zip-0252.rst @@ -86,9 +86,9 @@ MIN_NETWORK_PROTOCOL_VERSION (NU5) Note: A first activation of NU5, with a previous version of the Orchard circuit -and other NU5 consensus rules, occurred at block height 1599200 with consensus -branch ID 0x37519621 and peer protocol version 170015. With the release of -`zcashd` v4.7.0, Testnet is being rolled back to another chain that forks from +and other NU5 consensus rules, occurred on Testnet at block height 1599200 with +consensus branch ID 0x37519621 and peer protocol version 170015. With the release +of `zcashd` v4.7.0, Testnet is being rolled back to another chain that forks from the block immediately preceding that activation, at height 1599199. This chain had been continuously mined by `zcashd` v4.0.0 nodes modified to disable End-of-Service halt. @@ -156,7 +156,7 @@ Backward compatibility in zcashd -------------------------------- The minimum peer protocol version that NU5-compatible `zcashd` nodes will -connect to is 170002. They will immediately disconnect from Testnet nodes +connect to is 170002. On Testnet, they will immediately disconnect from nodes advertising a peer protocol version less than 170040. NU5 deployment for zcashd