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:
0xf5b9230b
0xF5B9230B
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: MITThe 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:
0xTODO
0xE9FF75A6
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:
Prior to the network upgrade activating on each network, Canopy and pre-Canopy nodes are compatible and can connect to each other. However, Canopy nodes will have a preference for connecting to other Canopy nodes, so pre-Canopy nodes will gradually be disconnected in the run up to activation.
Once the network upgrades, even though pre-Canopy nodes can still accept the numerically larger protocol version used by Canopy as being valid, Canopy nodes will always disconnect peers using lower protocol versions.
-TODO: delete if inapplicable. Unlike Overwinter and Sapling, and like Blossom and Heartwood, Canopy does not define a new transaction version. Canopy transactions are therefore in the same v4 format as Sapling transactions; use the same version group ID, i.e. 0x892F2085 as defined in 2 section 7.1; and use the same transaction digest algorithm as defined in 7. This does not imply that transactions are valid across the Canopy activation, since signatures MUST use the appropriate consensus branch ID. 7
+Unlike Overwinter and Sapling, and like Blossom and Heartwood, Canopy does not define a new transaction version. Canopy transactions are therefore in the same v4 format as Sapling transactions; use the same version group ID, i.e. 0x892F2085 as defined in 2 section 7.1; and use the same transaction digest algorithm as defined in 10. This does not imply that transactions are valid across the Canopy activation, since signatures MUST use the appropriate consensus branch ID. 10
Support for Canopy on testnet will be implemented in zcashd
version 3.1.0, which will advertise protocol version TODO. Support for Canopy on mainnet will be implemented in zcashd
version 4.0.0, which will advertise protocol version TODO.
Support for Canopy on testnet will be implemented in zcashd
version 3.1.0, which will advertise protocol version 170012. Support for Canopy on mainnet will be implemented in zcashd
version 4.0.0, which will advertise protocol version 170013.
1 | -Key words for use in RFCs to Indicate Requirement Levels | +Key words for use in RFCs to Indicate Requirement Levels |
---|
6 | +ZIP 211: Disabling Addition of New Value to the Sprout Value Pool | +
---|
7 | +ZIP 212: Allow Recipient to Derive Sapling Ephemeral Secret from Note Plaintext | +
---|
8 | ZIP 214: Consensus rules for a Zcash Development Fund |
---|
9 | +Draft ZIP 215: Modifying Ed25519 validation rules to allow batch verification | +
---|
7 | +10 | ZIP 243: Transaction Signature Verification for Sapling |
---|
8 | +11 | ZIP 1014: Establishing a Dev Fund for ECC, ZF, and Major Grants |
---|