ZIP 252: Clarify that the activation at block 1599200 was on Testnet.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2022-03-28 18:24:33 +01:00 committed by Deirdre Connolly
parent 0f84a7234e
commit 12ff90a307
2 changed files with 6 additions and 6 deletions

View File

@ -65,7 +65,7 @@ Pull-Request: &lt;<a href="https://github.com/zcash/zips/pull/446">https://githu
<p>Mainnet: 170100</p>
</dd>
</dl>
<p>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 <cite>zcashd</cite> 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 <cite>zcashd</cite> v4.0.0 nodes modified to disable End-of-Service halt.</p>
<p>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 <cite>zcashd</cite> 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 <cite>zcashd</cite> v4.0.0 nodes modified to disable End-of-Service halt.</p>
<p>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.</p>
<p>For each network, pre-NU5 nodes are defined as nodes advertising a protocol version less than that network's MIN_NETWORK_PROTOCOL_VERSION (NU5).</p>
<p>Once NU5 activates on Testnet or Mainnet, NU5 nodes SHOULD take steps to:</p>
@ -91,7 +91,7 @@ Pull-Request: &lt;<a href="https://github.com/zcash/zips/pull/446">https://githu
</ul>
<p>Support for NU5 on Mainnet will be implemented in <cite>zcashd</cite> version 5.0.0, which will advertise protocol version 170100.</p>
<section id="backward-compatibility-in-zcashd"><h3><span class="section-heading">Backward compatibility in zcashd</span><span class="section-anchor"> <a rel="bookmark" href="#backward-compatibility-in-zcashd"><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 <cite>zcashd</cite> nodes will connect to is 170002. They will immediately disconnect from Testnet nodes advertising a peer protocol version less than 170040.</p>
<p>The minimum peer protocol version that NU5-compatible <cite>zcashd</cite> nodes will connect to is 170002. On Testnet, they will immediately disconnect from nodes advertising a peer protocol version less than 170040.</p>
</section>
<section id="nu5-deployment-for-zcashd"><h3><span class="section-heading">NU5 deployment for zcashd</span><span class="section-anchor"> <a rel="bookmark" href="#nu5-deployment-for-zcashd"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h3>
<p>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:</p>

View File

@ -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