From 3d8b0363c72415cc221ea963d0dc465a9b62d72a Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Tue, 2 Jun 2020 18:34:35 +0100 Subject: [PATCH] Update activation heights, branch IDs, and references for Heartwood and Blossom. Signed-off-by: Daira Hopwood --- zip-0250.html | 4 ++-- zip-0250.rst | 4 ++-- zip-0251.html | 56 +++++++++++++++++++++++++++++++++++++-------------- zip-0251.rst | 26 ++++++++++++++---------- 4 files changed, 60 insertions(+), 30 deletions(-) diff --git a/zip-0250.html b/zip-0250.html index 100a7644..7eac3c0b 100644 --- a/zip-0250.html +++ b/zip-0250.html @@ -42,11 +42,11 @@ License: MIT

The following network upgrade constants 3 are defined for the Heartwood upgrade:

CONSENSUS_BRANCH_ID
-
0xf5b9230b
+
0xF5B9230B
ACTIVATION_HEIGHT (Heartwood)

Testnet: 903800

-

Mainnet: TODO

+

Mainnet: 903000

Nodes compatible with Heartwood activation on testnet MUST advertise protocol version 170010 or later. Nodes compatible with Heartwood activation on mainnet MUST advertise protocol version 170011 or later. The minimum peer protocol version that Heartwood-compatible nodes will connect to is 170002.

diff --git a/zip-0250.rst b/zip-0250.rst index 646948c3..41f1b79e 100644 --- a/zip-0250.rst +++ b/zip-0250.rst @@ -55,13 +55,13 @@ The following network upgrade constants [#zip-0200]_ are defined for the Heartwo upgrade: CONSENSUS_BRANCH_ID - ``0xf5b9230b`` + ``0xF5B9230B`` ACTIVATION_HEIGHT (Heartwood) Testnet: 903800 - Mainnet: TODO + Mainnet: 903000 Nodes compatible with Heartwood activation on testnet MUST advertise protocol version diff --git a/zip-0251.html b/zip-0251.html index ce74ce62..e184f582 100644 --- a/zip-0251.html +++ b/zip-0251.html @@ -36,30 +36,32 @@ License: MIT
  • The Zcash Protocol Specification 2
  • ZIP 200: Network Upgrade Mechanism 3
  • ZIP 207: Funding Streams 5
    • -
  • ZIP 214: Consensus rules for a Zcash Development Fund 6
    • -
  • ZIP 1014: Establishing a Dev Fund for ECC, ZF, and Major Grants 8
    • -
  • TODO: other ZIPs
    • +
  • ZIP 211: Disabling Addition of New Value to the Sprout Value Pool 6
    • +
  • ZIP 212: Allow Recipient to Derive Sapling Ephemeral Secret from Note Plaintext 7
    • +
  • ZIP 214: Consensus rules for a Zcash Development Fund 8
    • +
  • ZIP 215: Modifying Ed25519 validation rules to allow batch verification 9
    • +
  • ZIP 1014: Establishing a Dev Fund for ECC, ZF, and Major Grants 11.
    • -

    The network handshake and peer management mechanisms defined in ZIP 201 4 also apply to this upgrade.

    -

    The following network upgrade constants 3 are defined for the Canopy upgrade:

    +

    The network handshake and peer management mechanisms defined in ZIP 201 4 also apply to this upgrade.

    +

    The following network upgrade constants 3 are defined for the Canopy upgrade:

    CONSENSUS_BRANCH_ID
    -
    0xTODO
    +
    0xE9FF75A6
    ACTIVATION_HEIGHT (Canopy)

    Testnet: TODO

    Mainnet: 1046400

    -

    Nodes compatible with Canopy activation on testnet MUST advertise protocol version TODO or later. Nodes compatible with Canopy activation on mainnet MUST advertise protocol version TODO or later. The minimum peer protocol version that Canopy-compatible nodes will connect to is 170002.

    -

    Pre-Canopy testnet nodes are defined as nodes on testnet advertising a protocol version less than TODO. Pre-Canopy mainnet nodes are defined as nodes on mainnet advertising a protocol version less than TODO.

    +

    Nodes compatible with Canopy activation on testnet MUST advertise protocol version 170012 or later. Nodes compatible with Canopy activation on mainnet MUST advertise protocol version 170013 or later. The minimum peer protocol version that Canopy-compatible nodes will connect to is 170002.

    +

    Pre-Canopy testnet nodes are defined as nodes on testnet advertising a protocol version less than 170012. Pre-Canopy mainnet nodes are defined as nodes on mainnet advertising a protocol version less than 170013.

    For each network (testnet and mainnet), approximately 1.5 days (defined in terms of block height) before the corresponding Canopy activation height, nodes compatible with Canopy activation on that network will change the behaviour of their peer connection logic in order to prefer pre-Canopy 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).
  * 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;
    -

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

    +

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

    Once Canopy activates on testnet or mainnet, Canopy nodes SHOULD take steps to: