diff --git a/README.rst b/README.rst index 9c3658dc..18fec486 100644 --- a/README.rst +++ b/README.rst @@ -46,7 +46,7 @@ Index of ZIPs 202 Version 3 Transaction Format for Overwinter Final 203 Transaction Expiry Final 205 Deployment of the Sapling Network Upgrade Final - 206 Deployment of the Blossom Network Upgrade Draft + 206 Deployment of the Blossom Network Upgrade Final 207 Split Founders' Reward Withdrawn 208 Shorter Block Target Spacing Implemented 209 Prohibit Negative Shielded Value Pool Final diff --git a/index.html b/index.html index 011b6b91..3c3a8a19 100644 --- a/index.html +++ b/index.html @@ -35,7 +35,7 @@ 202 Version 3 Transaction Format for Overwinter Final 203 Transaction Expiry Final 205 Deployment of the Sapling Network Upgrade Final - 206 Deployment of the Blossom Network Upgrade Draft + 206 Deployment of the Blossom Network Upgrade Final 207 Split Founders' Reward Withdrawn 208 Shorter Block Target Spacing Implemented 209 Prohibit Negative Shielded Value Pool Final diff --git a/zip-0206.html b/zip-0206.html index e4cfbccf..ea10900f 100644 --- a/zip-0206.html +++ b/zip-0206.html @@ -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 @@ -53,13 +53,13 @@ License: MIT

Mainnet: 653600

-

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.

+

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.

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.

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:

/** 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;

The implementation is similar to that for Overwinter which was described in 4.

-

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: