mirror of https://github.com/zcash/zips.git
ZIP 252: fix a reference to ZIP 155.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
parent
474330a8f4
commit
2398e1e012
|
@ -50,8 +50,8 @@ Pull-Request: <<a href="https://github.com/zcash/zips/pull/446">https://githu
|
|||
<li>ZIP 221: FlyClient - Consensus-Layer Changes <a id="id21" class="footnote_reference" href="#zip-0221">14</a></li>
|
||||
<li>ZIP 401: Addressing Mempool Denial-of-Service <a id="id22" class="footnote_reference" href="#zip-0401">20</a></li>
|
||||
</ul>
|
||||
<p>Support for the <code>addrv2</code> peer protocol message, defined in ZIP 155 [#zip-0155], is being added concurrently with this upgrade, signalled by the same Mainnet peer protocol version.</p>
|
||||
<p>The following network upgrade constants <a id="id23" class="footnote_reference" href="#zip-0200">7</a> are defined for the NU5 upgrade:</p>
|
||||
<p>Support for the <code>addrv2</code> peer protocol message, defined in ZIP 155 <a id="id23" class="footnote_reference" href="#zip-0155">6</a>, is being added concurrently with this upgrade, signalled by the same Mainnet peer protocol version.</p>
|
||||
<p>The following network upgrade constants <a id="id24" class="footnote_reference" href="#zip-0200">7</a> are defined for the NU5 upgrade:</p>
|
||||
<dl>
|
||||
<dt>CONSENSUS_BRANCH_ID</dt>
|
||||
<dd><code>0x37519621</code> (this will change if a second Testnet activation occurs)</dd>
|
||||
|
@ -76,17 +76,17 @@ Pull-Request: <<a href="https://github.com/zcash/zips/pull/446">https://githu
|
|||
<li>reject new connections from pre-NU5 nodes on that network;</li>
|
||||
<li>disconnect any existing connections to pre-NU5 nodes on that network.</li>
|
||||
</ul>
|
||||
<p>The change to the peer-to-peer protocol described in ZIP 239 takes effect from peer protocol version 170014 onward, on both Testnet and Mainnet. <a id="id24" class="footnote_reference" href="#zip-0239">17</a></p>
|
||||
<p>The change to the peer-to-peer protocol described in ZIP 155 is currently proposed to take effect from peer protocol version 170017 onward, on both Testnet and Mainnet <a id="id25" class="footnote_reference" href="#zip-0155">6</a>. This might be changed to version 170016 depending on scheduling constraints.</p>
|
||||
<p>The change to the peer-to-peer protocol described in ZIP 239 takes effect from peer protocol version 170014 onward, on both Testnet and Mainnet. <a id="id25" class="footnote_reference" href="#zip-0239">17</a></p>
|
||||
<p>The change to the peer-to-peer protocol described in ZIP 155 is currently proposed to take effect from peer protocol version 170017 onward, on both Testnet and Mainnet <a id="id26" class="footnote_reference" href="#zip-0155">6</a>. This might be changed to version 170016 depending on scheduling constraints.</p>
|
||||
<p>Note: these peer-to-peer protocol changes are enabled whenever the relevant version (or higher) is negotiated on a given connection, which can happen in advance of the Testnet or Mainnet NU5 activation.</p>
|
||||
</section>
|
||||
</section>
|
||||
<section id="backward-compatibility"><h2><span class="section-heading">Backward compatibility</span><span class="section-anchor"> <a rel="bookmark" href="#backward-compatibility"><img width="24" height="24" src="assets/images/section-anchor.png" alt=""></a></span></h2>
|
||||
<p>Prior to the network upgrade activating on each network, NU5 and pre-NU5 nodes are compatible and can connect to each other.</p>
|
||||
<p>Once the network upgrades, even though pre-NU5 nodes can still accept the numerically larger protocol version used by NU5 as being valid, NU5 nodes will always disconnect peers using lower protocol versions.</p>
|
||||
<p>Unlike Blossom, Heartwood, and Canopy, and like Overwinter and Sapling, NU5 defines a new transaction version. Therefore, NU5 transactions MAY be in the new v5 format specified by <a id="id26" class="footnote_reference" href="#zip-0225">16</a>. Unlike previous transaction version updates, the existing v4 transaction format remains valid after NU5 activation. Both transaction formats MUST be accepted by NU5 nodes.</p>
|
||||
<p>Backward compatibility of the new <code>MSG_WTX</code> inv type introduced for <code>inv</code> and <code>getdata</code> messages is discussed in <a id="id27" class="footnote_reference" href="#zip-0239">17</a>.</p>
|
||||
<p>Backward compatibility of the new <code>addrv2</code> message (not technically part of NU5) is discussed in <a id="id28" class="footnote_reference" href="#zip-0155">6</a>.</p>
|
||||
<p>Unlike Blossom, Heartwood, and Canopy, and like Overwinter and Sapling, NU5 defines a new transaction version. Therefore, NU5 transactions MAY be in the new v5 format specified by <a id="id27" class="footnote_reference" href="#zip-0225">16</a>. Unlike previous transaction version updates, the existing v4 transaction format remains valid after NU5 activation. Both transaction formats MUST be accepted by NU5 nodes.</p>
|
||||
<p>Backward compatibility of the new <code>MSG_WTX</code> inv type introduced for <code>inv</code> and <code>getdata</code> messages is discussed in <a id="id28" class="footnote_reference" href="#zip-0239">17</a>.</p>
|
||||
<p>Backward compatibility of the new <code>addrv2</code> message (not technically part of NU5) is discussed in <a id="id29" class="footnote_reference" href="#zip-0155">6</a>.</p>
|
||||
</section>
|
||||
<section id="support-in-zcashd"><h2><span class="section-heading">Support in zcashd</span><span class="section-anchor"> <a rel="bookmark" href="#support-in-zcashd"><img width="24" height="24" src="assets/images/section-anchor.png" alt=""></a></span></h2>
|
||||
<p>Support for NU5 on Testnet is implemented in <cite>zcashd</cite> version 4.5.1, which advertises protocol version 170015. (A previous revision of the NU5 consensus rules was implemented in <cite>zcashd</cite> version 4.5.0, but this revision contained critical bugs in the Orchard Action circuit. Before it could activate, <cite>zcashd</cite> version 4.5.1 was released, with the later NU5 Testnet activation height and consensus branch ID defined in this document.)</p>
|
||||
|
@ -101,7 +101,7 @@ Pull-Request: <<a href="https://github.com/zcash/zips/pull/446">https://githu
|
|||
* This was three days for upgrades up to and including Blossom, and is 1.5 days from Heartwood onward.
|
||||
*/
|
||||
static const int NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD = 1728;</pre>
|
||||
<p>The implementation is similar to that for Overwinter which was described in <a id="id29" class="footnote_reference" href="#zip-0201">8</a>.</p>
|
||||
<p>The implementation is similar to that for Overwinter which was described in <a id="id30" class="footnote_reference" href="#zip-0201">8</a>.</p>
|
||||
<p>However, NU5 nodes will have a preference for connecting to other NU5 nodes, so pre-NU5 nodes will gradually be disconnected in the run up to activation.</p>
|
||||
</section>
|
||||
</section>
|
||||
|
|
|
@ -65,7 +65,7 @@ The following ZIPs have been updated in varying degrees to take into account Orc
|
|||
- ZIP 221: FlyClient - Consensus-Layer Changes [#zip-0221]_
|
||||
- ZIP 401: Addressing Mempool Denial-of-Service [#zip-0401]_
|
||||
|
||||
Support for the ``addrv2`` peer protocol message, defined in ZIP 155 [#zip-0155],
|
||||
Support for the ``addrv2`` peer protocol message, defined in ZIP 155 [#zip-0155]_,
|
||||
is being added concurrently with this upgrade, signalled by the same Mainnet peer
|
||||
protocol version.
|
||||
|
||||
|
|
Loading…
Reference in New Issue