mirror of https://github.com/zcash/zips.git
ZIP 206: minor wording improvements; make Final.
MIN_PEER_PROTO_VERSION is 170002 for Blossom nodes, not 170007. Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood
parent
168b4e49ab
commit
5651875ca8
|
|
@ -46,7 +46,7 @@ Index of ZIPs
|
|||
<tr> <td>202</td> <td class="left"><a href="zip-0202.rst">Version 3 Transaction Format for Overwinter</a></td> <td>Final</td>
|
||||
<tr> <td>203</td> <td class="left"><a href="zip-0203.rst">Transaction Expiry</a></td> <td>Final</td>
|
||||
<tr> <td>205</td> <td class="left"><a href="zip-0205.rst">Deployment of the Sapling Network Upgrade</a></td> <td>Final</td>
|
||||
<tr> <td>206</td> <td class="left"><a href="zip-0206.rst">Deployment of the Blossom Network Upgrade</a></td> <td>Draft</td>
|
||||
<tr> <td>206</td> <td class="left"><a href="zip-0206.rst">Deployment of the Blossom Network Upgrade</a></td> <td>Final</td>
|
||||
<tr> <td><strike>207</strike></td> <td class="left"><strike><a href="zip-0207.rst">Split Founders' Reward</a></strike></td> <td>Withdrawn</td>
|
||||
<tr> <td>208</td> <td class="left"><a href="zip-0208.rst">Shorter Block Target Spacing</a></td> <td>Implemented</td>
|
||||
<tr> <td>209</td> <td class="left"><a href="zip-0209.rst">Prohibit Negative Shielded Value Pool</a></td> <td>Final</td>
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
<tr> <td>202</td> <td class="left"><a href="zip-0202">Version 3 Transaction Format for Overwinter</a></td> <td>Final</td>
|
||||
<tr> <td>203</td> <td class="left"><a href="zip-0203">Transaction Expiry</a></td> <td>Final</td>
|
||||
<tr> <td>205</td> <td class="left"><a href="zip-0205">Deployment of the Sapling Network Upgrade</a></td> <td>Final</td>
|
||||
<tr> <td>206</td> <td class="left"><a href="zip-0206">Deployment of the Blossom Network Upgrade</a></td> <td>Draft</td>
|
||||
<tr> <td>206</td> <td class="left"><a href="zip-0206">Deployment of the Blossom Network Upgrade</a></td> <td>Final</td>
|
||||
<tr> <td><strike>207</strike></td> <td class="left"><strike><a href="zip-0207">Split Founders' Reward</a></strike></td> <td>Withdrawn</td>
|
||||
<tr> <td>208</td> <td class="left"><a href="zip-0208">Shorter Block Target Spacing</a></td> <td>Implemented</td>
|
||||
<tr> <td>209</td> <td class="left"><a href="zip-0209">Prohibit Negative Shielded Value Pool</a></td> <td>Final</td>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
Title: Deployment of the Blossom Network Upgrade
|
||||
Owners: Daira Hopwood <daira@electriccoin.co>
|
||||
Credits: Simon Liu
|
||||
Status: Draft
|
||||
Status: Final
|
||||
Category: Consensus
|
||||
Created: 2019-07-29
|
||||
License: MIT</pre>
|
||||
|
|
@ -53,13 +53,13 @@ License: MIT</pre>
|
|||
<p>Mainnet: 653600</p>
|
||||
</dd>
|
||||
</dl>
|
||||
<p>Nodes compatible with Blossom activation on testnet MUST advertise protocol version 170008 or later. Nodes compatible with Blossom activation on mainnet MUST advertise protocol version 170009 or later. The minimum peer protocol version that Blossom-compatible nodes will connect to will be 170007.</p>
|
||||
<p>Nodes compatible with Blossom activation on testnet MUST advertise protocol version 170008 or later. Nodes compatible with Blossom activation on mainnet MUST advertise protocol version 170009 or later. The minimum peer protocol version that Blossom-compatible nodes will connect to is 170002.</p>
|
||||
<p>Pre-Blossom testnet nodes are defined as nodes on testnet advertising a protocol version less than 170008. Pre-Blossom mainnet nodes are defined as nodes on mainnet advertising a protocol version less than 170009.</p>
|
||||
<p>For each network (testnet and mainnet), approximately three days (defined in terms of block height) before the corresponding Blossom activation height, nodes compatible with Blossom activation on that network will change the behaviour of their peer connection logic in order to prefer pre-Blossom peers on that network for eviction from the set of peer connections:</p>
|
||||
<pre>/** The period before a network upgrade activates, where connections to upgrading peers are preferred (in blocks). */
|
||||
static const int NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD = 24 * 24 * 3;</pre>
|
||||
<p>The implementation is similar to that for Overwinter which was described in <a href="#zip-0201" id="id10" class="footnote_reference">4</a>.</p>
|
||||
<p>Once Blossom activates on testnet or mainnet, Blossom nodes should take steps to:</p>
|
||||
<p>Once Blossom activates on testnet or mainnet, Blossom nodes SHOULD take steps to:</p>
|
||||
<ul>
|
||||
<li>reject new connections from pre-Blossom nodes on that network;</li>
|
||||
<li>disconnect any existing connections to pre-Blossom nodes on that network.</li>
|
||||
|
|
@ -74,7 +74,7 @@ static const int NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD = 24 * 24 * 3;</pr
|
|||
</section>
|
||||
<section id="support-in-zcashd">
|
||||
<h2>Support in zcashd</h2>
|
||||
<p>Support for Blossom on testnet will be implemented in <code>zcashd</code> version 2.0.7, which will advertise protocol version 170008. Support for Blossom on mainnet will be implemented in <code>zcashd</code> version 2.1.0, which will advertise protocol version 170009.</p>
|
||||
<p>Support for Blossom on testnet is implemented in <code>zcashd</code> version 2.0.7, which advertises protocol version 170008. Support for Blossom on mainnet is implemented in <code>zcashd</code> version 2.1.0, which advertises protocol version 170009.</p>
|
||||
</section>
|
||||
<section id="references">
|
||||
<h2>References</h2>
|
||||
|
|
|
|||
12
zip-0206.rst
12
zip-0206.rst
|
|
@ -4,7 +4,7 @@
|
|||
Title: Deployment of the Blossom Network Upgrade
|
||||
Owners: Daira Hopwood <daira@electriccoin.co>
|
||||
Credits: Simon Liu
|
||||
Status: Draft
|
||||
Status: Final
|
||||
Category: Consensus
|
||||
Created: 2019-07-29
|
||||
License: MIT
|
||||
|
|
@ -67,7 +67,7 @@ ACTIVATION_HEIGHT (Blossom)
|
|||
Nodes compatible with Blossom activation on testnet MUST advertise protocol version
|
||||
170008 or later. Nodes compatible with Blossom activation on mainnet MUST advertise
|
||||
protocol version 170009 or later. The minimum peer protocol version that
|
||||
Blossom-compatible nodes will connect to will be 170007.
|
||||
Blossom-compatible nodes will connect to is 170002.
|
||||
|
||||
Pre-Blossom testnet nodes are defined as nodes on testnet advertising a protocol
|
||||
version less than 170008. Pre-Blossom mainnet nodes are defined as nodes on mainnet
|
||||
|
|
@ -85,7 +85,7 @@ from the set of peer connections::
|
|||
The implementation is similar to that for Overwinter which was described in
|
||||
[#zip-0201]_.
|
||||
|
||||
Once Blossom activates on testnet or mainnet, Blossom nodes should take steps to:
|
||||
Once Blossom activates on testnet or mainnet, Blossom nodes SHOULD take steps to:
|
||||
|
||||
- reject new connections from pre-Blossom nodes on that network;
|
||||
- disconnect any existing connections to pre-Blossom nodes on that network.
|
||||
|
|
@ -113,9 +113,9 @@ activation, since signatures MUST use the appropriate consensus branch ID.
|
|||
Support in zcashd
|
||||
=================
|
||||
|
||||
Support for Blossom on testnet will be implemented in ``zcashd`` version 2.0.7, which
|
||||
will advertise protocol version 170008. Support for Blossom on mainnet will be
|
||||
implemented in ``zcashd`` version 2.1.0, which will advertise protocol version 170009.
|
||||
Support for Blossom on testnet is implemented in ``zcashd`` version 2.0.7, which
|
||||
advertises protocol version 170008. Support for Blossom on mainnet is implemented
|
||||
in ``zcashd`` version 2.1.0, which advertises protocol version 170009.
|
||||
|
||||
|
||||
References
|
||||
|
|
|
|||
Loading…
Reference in New Issue