From 5b5dd205163a73d660fadd78fbeb46c7fbab5fa1 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Sat, 5 Jun 2021 15:03:43 +0100 Subject: [PATCH] ZIP 252: add reference to ZIP 32. Signed-off-by: Daira Hopwood --- zip-0252.html | 60 +++++++++++++++++++++++++++++---------------------- zip-0252.rst | 4 +++- 2 files changed, 37 insertions(+), 27 deletions(-) diff --git a/zip-0252.html b/zip-0252.html index ccf96737..95c06306 100644 --- a/zip-0252.html +++ b/zip-0252.html @@ -18,7 +18,7 @@ Discussions-To: <https://g Pull-Request: <https://github.com/zcash/zips/pull/446>

Terminology

The key words "MUST" and "SHOULD" in this document are to be interpreted as described in RFC 2119. 1

-

The term "network upgrade" in this document is to be interpreted as described in ZIP 200. 5

+

The term "network upgrade" in this document is to be interpreted as described in ZIP 200. 6

The terms "Testnet" and "Mainnet" are to be interpreted as described in section 3.11 of the Zcash Protocol Specification 3.

Abstract

@@ -29,18 +29,18 @@ Pull-Request: <https://githu

The primary sources of information about NU5 consensus and peer-to-peer protocol changes are:

  • The Zcash Protocol Specification 2
    • -
  • ZIP 200: Network Upgrade Mechanism 5
    • -
  • ZIP 216: Require Canonical Point Encodings 7
    • -
  • ZIP 221: FlyClient - Consensus-Layer Changes 8 (amended)
    • -
  • ZIP 224: Orchard Shielded Protocol 9
    • -
  • ZIP 225: Version 5 Transaction Format 10
    • -
  • ZIP 239: Relay of Version 5 Transactions 11
    • -
  • ZIP 244: Transaction Identifier Non-Malleability 12
    • -
  • The Orchard Book 14
    • -
  • The halo2 Book 15
    • +
  • ZIP 200: Network Upgrade Mechanism 6
    • +
  • ZIP 216: Require Canonical Point Encodings 8
    • +
  • ZIP 221: FlyClient - Consensus-Layer Changes 9 (amended)
    • +
  • ZIP 224: Orchard Shielded Protocol 10
    • +
  • ZIP 225: Version 5 Transaction Format 11
    • +
  • ZIP 239: Relay of Version 5 Transactions 12
    • +
  • ZIP 244: Transaction Identifier Non-Malleability 13
    • +
  • The Orchard Book 15
    • +
  • The halo2 Book 16
-

The network handshake and peer management mechanisms defined in ZIP 201 6 also apply to this upgrade. Unified addresses and viewing keys are described in ZIP 316 13.

-

The following network upgrade constants 5 are defined for the NU5 upgrade:

+

The network handshake and peer management mechanisms defined in ZIP 201 7 also apply to this upgrade. Unified addresses and viewing keys are described in ZIP 316 14. ZIP 32 5 has been amended to include hierarchical key derivation for Orchard.

+

The following network upgrade constants 6 are defined for the NU5 upgrade:

CONSENSUS_BRANCH_ID
0xF919A198
@@ -62,13 +62,13 @@ Pull-Request: <https://githu
  • reject new connections from pre-NU5 nodes on that network;
  • disconnect any existing connections to pre-NU5 nodes on that network.
    • -

    The change to the peer-to-peer protocol described in ZIP 239 takes effect from peer protocol version 170014 onward, on both Testnet and Mainnet. 11

    +

    The change to the peer-to-peer protocol described in ZIP 239 takes effect from peer protocol version 170014 onward, on both Testnet and Mainnet. 12

    Backward compatibility

    Prior to the network upgrade activating on each network, NU5 and pre-NU5 nodes are compatible and can connect to each other.

    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.

    -

    Unlike Blossom, Heartwood, and Canopy, and like Overwinter and Sapling, NU5 defines a new transaction version. Therefore, NU5 transactions MAY be in the new v5 format specified by 10. Unlike previous transaction version updates, the existing v4 transaction format remains valid after NU5 activation. Both transaction formats MUST be accepted by NU5 nodes.

    +

    Unlike Blossom, Heartwood, and Canopy, and like Overwinter and Sapling, NU5 defines a new transaction version. Therefore, NU5 transactions MAY be in the new v5 format specified by 11. Unlike previous transaction version updates, the existing v4 transaction format remains valid after NU5 activation. Both transaction formats MUST be accepted by NU5 nodes.

    Support in zcashd

    TODO: Update as needed

    @@ -83,7 +83,7 @@ Pull-Request: <https://githu * 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 6.

    +

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

    However, NU5 nodes will have a preference for connecting to other NU5 nodes, so pre-NU5 nodes will gradually be disconnected in the run up to activation.

    @@ -135,10 +135,18 @@ static const int NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD = 1728; - +
    + + + +
    5ZIP 32: Shielded Hierarchical Deterministic Wallets
    + + + + @@ -146,7 +154,7 @@ static const int NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD = 1728;
    6 ZIP 200: Network Upgrade Activation Mechanism
    - + @@ -154,7 +162,7 @@ static const int NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD = 1728;
    67 ZIP 201: Network Peer Management for Overwinter
    - + @@ -162,7 +170,7 @@ static const int NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD = 1728;
    78 ZIP 216: Require Canonical Point Encodings
    - + @@ -170,7 +178,7 @@ static const int NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD = 1728;
    89 ZIP 221: FlyClient - Consensus-Layer Changes
    - + @@ -178,7 +186,7 @@ static const int NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD = 1728;
    910 ZIP 224: Orchard Shielded Protocol
    - + @@ -186,7 +194,7 @@ static const int NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD = 1728;
    1011 ZIP 225: Version 5 Transaction Format
    - + @@ -194,7 +202,7 @@ static const int NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD = 1728;
    1112 ZIP 239: Relay of Version 5 Transactions
    - + @@ -202,7 +210,7 @@ static const int NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD = 1728;
    1213 ZIP 244: Transaction Identifier Non-Malleability
    - + @@ -210,7 +218,7 @@ static const int NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD = 1728;
    1314 ZIP 316: Unified Addresses and Unified Viewing Keys
    - + @@ -218,7 +226,7 @@ static const int NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD = 1728;
    1415 The Orchard Book
    - + diff --git a/zip-0252.rst b/zip-0252.rst index 636ad9ff..687dfbc4 100644 --- a/zip-0252.rst +++ b/zip-0252.rst @@ -53,7 +53,8 @@ changes are: The network handshake and peer management mechanisms defined in ZIP 201 [#zip-0201]_ also apply to this upgrade. Unified addresses and viewing keys are described in -ZIP 316 [#zip-0316]_. +ZIP 316 [#zip-0316]_. ZIP 32 [#zip-0032]_ has been amended to include hierarchical +key derivation for Orchard. The following network upgrade constants [#zip-0200]_ are defined for the NU5 @@ -186,6 +187,7 @@ References .. [#protocol] `Zcash Protocol Specification, Version 2021.1.24 or later `_ .. [#protocol-networks] `Zcash Protocol Specification, Version 2021.1.24 [NU5 proposal]. Section 3.11: Mainnet and Testnet `_ .. [#protocol-txnencodingandconsensus] `Zcash Protocol Specification, Version 2021.1.24 [NU5 proposal]. Section 7.1: Transaction Encoding and Consensus `_ +.. [#zip-0032] `ZIP 32: Shielded Hierarchical Deterministic Wallets `_ .. [#zip-0200] `ZIP 200: Network Upgrade Activation Mechanism `_ .. [#zip-0201] `ZIP 201: Network Peer Management for Overwinter `_ .. [#zip-0216] `ZIP 216: Require Canonical Point Encodings `_
    1516 The halo2 Book