From 27accd4cc3c99bac445b250c9fd237e8ce1d99ca Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Tue, 24 Mar 2020 23:07:45 +0000 Subject: [PATCH] ZIP 214: allow addresses within a funding stream to be repeated. Remove definitions of unused RFC 2119 keywords. Signed-off-by: Daira Hopwood --- zip-0214.html | 5 +++-- zip-0214.rst | 12 ++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/zip-0214.html b/zip-0214.html index 963d766c..9d009675 100644 --- a/zip-0214.html +++ b/zip-0214.html @@ -15,7 +15,7 @@ Created: 2020-02-28 License: MIT Discussions-To: <https://forum.zcashcommunity.com/t/community-sentiment-polling-results-nu4-and-draft-zip-1014/35560>

Terminology

-

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

+

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

The term "Zcash" in this document is to be interpreted as described in the Zcash Trademark Donation and License Agreement (3 or successor agreement).

The term "network upgrade" in this document is to be interpreted as described in ZIP 200 5 and the Zcash Trademark Donation and License Agreement (3 or successor agreement).

The terms "block subsidy" and "halving" in this document are to be interpreted as described in sections 3.9 and 7.7 of the Zcash Protocol Specification. 2

@@ -92,11 +92,12 @@ Discussions-To: <https://forum.zcashcommunity.com/t/community-sentiment-polli

The funding streams are defined for Testnet are identical except that the start height of each stream is the activation height of ${NU4} on Testnet, i.e. xxxxxxx.

Note: on Testnet, the activation height of ${NU4} will be before the first halving. Therefore, the consequence of the above rules for Testnet is that the amount sent to each Zcash Development Fund recipient address will initially (before Testnet block height 1046400) be double the number of currency units as the corresponding initial amount on Mainnet. This reduces to the same number of currency units as on Mainnet, from Testnet block heights 1046400 (inclusive) to 2726400 (exclusive).

Dev Fund Recipient Addresses

-

For each of Testnet and Mainnet, before deploying this ZIP in a node implementation with the activation height set for that network, each of the parties (ECC and ZF) SHALL generate sequences of independent recipient addresses to be used for each stream in each funding period:

+

For each of Testnet and Mainnet, before deploying this ZIP in a node implementation with the activation height set for that network, each of the parties (ECC and ZF) SHALL generate sequences of recipient addresses to be used for each stream in each funding period:

  • ECC SHALL generate the addresses for the FS_ECC funding stream, which on Mainnet corresponds to the ECC slice;
  • ZF SHALL generate the addresses for the FS_ZF and FS_MG funding streams, which on Mainnet correspond to the ZF slice and MG slice respectively.
+

Within each stream, the addresses MAY be independent, or MAY be repeated between funding periods. Each party SHOULD take account of operational security issues associated with potential compromise of the associated spending keys.

Funds sent to each Mainnet funding stream SHALL be governed by all requirements on the corresponding slice specified in ZIP 1014 9.

No requirements are imposed on the use of funds sent to Testnet funding streams.

Direct-grant option

diff --git a/zip-0214.rst b/zip-0214.rst index f097dddf..872bc9b2 100644 --- a/zip-0214.rst +++ b/zip-0214.rst @@ -13,8 +13,8 @@ Terminology =========== -The key words "MUST", "MUST NOT", "SHALL", "SHALL NOT", "SHOULD", and "MAY" -in this document are to be interpreted as described in RFC 2119. [#RFC2119]_ +The key words "MUST", "SHALL", and "SHOULD" in this document are to be +interpreted as described in RFC 2119. [#RFC2119]_ The term "Zcash" in this document is to be interpreted as described in the Zcash Trademark Donation and License Agreement ([#trademark]_ or successor @@ -132,14 +132,18 @@ Dev Fund Recipient Addresses For each of Testnet and Mainnet, before deploying this ZIP in a node implementation with the activation height set for that network, each of the parties (ECC and ZF) -SHALL generate sequences of independent recipient addresses to be used for each -stream in each funding period: +SHALL generate sequences of recipient addresses to be used for each stream in each +funding period: * ECC SHALL generate the addresses for the ``FS_ECC`` funding stream, which on Mainnet corresponds to the **ECC slice**; * ZF SHALL generate the addresses for the ``FS_ZF`` and ``FS_MG`` funding streams, which on Mainnet correspond to the **ZF slice** and **MG slice** respectively. +Within each stream, the addresses MAY be independent, or MAY be repeated between +funding periods. Each party SHOULD take account of operational security issues +associated with potential compromise of the associated spending keys. + Funds sent to each Mainnet funding stream SHALL be governed by all requirements on the corresponding slice specified in ZIP 1014 [#zip-1014]_.