diff --git a/zip-0252.rst b/zip-0252.rst index c20f2680..2848c24b 100644 --- a/zip-0252.rst +++ b/zip-0252.rst @@ -41,12 +41,7 @@ The primary sources of information about NU5 consensus protocol changes are: - The Zcash Protocol Specification [#protocol]_ - ZIP 200: Network Upgrade Mechanism [#zip-0200]_ -- ZIP 207: Funding Streams [#zip-0207]_ -- ZIP 211: Disabling Addition of New Value to the Sprout Value Pool [#zip-0211]_ -- ZIP 212: Allow Recipient to Derive Sapling Ephemeral Secret from Note Plaintext [#zip-0212]_ -- ZIP 214: Consensus rules for a Zcash Development Fund [#zip-0214]_ -- ZIP 215: Explicitly Defining and Modifying Ed25519 Validation Rules [#zip-0215]_ -- ZIP 1014: Establishing a Dev Fund for ECC, ZF, and Major Grants [#zip-1014]_. +- **TODO: Select ZIPs** The network handshake and peer management mechanisms defined in ZIP 201 [#zip-0201]_ also apply to this upgrade. @@ -107,6 +102,8 @@ 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. +**TODO: Delete if ZIP-225: Version 5 Transaction Format is accepted** + Unlike Overwinter and Sapling, and like Blossom and Heartwood, NU5 does not define a new transaction version. NU5 transactions are therefore in the same v4 format as Sapling transactions; use the same version group ID, i.e. 0x892F2085 @@ -127,16 +124,13 @@ in ``zcashd`` version 4.0.0, which will advertise protocol version 170013. References ========== +**TODO: Update spec versions** + .. [#RFC2119] `RFC 2119: Key words for use in RFCs to Indicate Requirement Levels `_ .. [#protocol] `Zcash Protocol Specification, Version 2020.1.15 or later `_ .. [#protocol-networks] `Zcash Protocol Specification, Version 2020.1.15. Section 3.11: Mainnet and Testnet `_ .. [#protocol-txnencodingandconsensus] `Zcash Protocol Specification, Version 2020.1.15. Section 7.1: Transaction Encoding and Consensus `_ .. [#zip-0200] `ZIP 200: Network Upgrade Activation Mechanism `_ .. [#zip-0201] `ZIP 201: Network Peer Management for Overwinter `_ -.. [#zip-0207] `ZIP 207: Funding Streams `_ -.. [#zip-0211] `ZIP 211: Disabling Addition of New Value to the Sprout Value Pool `_ -.. [#zip-0212] `ZIP 212: Allow Recipient to Derive Sapling Ephemeral Secret from Note Plaintext `_ -.. [#zip-0214] `ZIP 214: Consensus rules for a Zcash Development Fund `_ -.. [#zip-0215] `ZIP 215: Explicitly Defining and Modifying Ed25519 Validation Rules `_ +**TODO: Delete if ZIP-225: Version 5 Transaction Format is accepted** .. [#zip-0243] `ZIP 243: Transaction Signature Validation for Sapling `_ -.. [#zip-1014] `ZIP 1014: Establishing a Dev Fund for ECC, ZF, and Major Grants `_