From 6e5278ed95e334dc861838da26857d1c0dcf638f Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Tue, 11 Aug 2020 16:28:15 +0100 Subject: [PATCH] Canopy ZIPs: update status and references to the protocol spec. Signed-off-by: Daira Hopwood --- README.rst | 6 +++--- index.html | 6 +++--- zip-0211.html | 2 +- zip-0211.rst | 2 +- zip-0212.html | 25 ++++++++++++++++++------- zip-0212.rst | 21 ++++++++++++++------- zip-0214.html | 10 +++++----- zip-0214.rst | 10 +++++----- zip-0215.html | 6 +++--- zip-0215.rst | 6 +++--- 10 files changed, 56 insertions(+), 38 deletions(-) diff --git a/README.rst b/README.rst index 725563e3..f07a453b 100644 --- a/README.rst +++ b/README.rst @@ -78,11 +78,11 @@ Index of ZIPs 208 Shorter Block Target Spacing Final 209 Prohibit Negative Shielded Value Pool Final 210 Sapling Anchor Deduplication within Transactions Draft - 211 Disabling Addition of New Value to the Sprout Value Pool Proposed + 211 Disabling Addition of New Value to the Sprout Value Pool Implemented (zcashd) 212 Allow Recipient to Derive Sapling Ephemeral Secret from Note Plaintext Implemented (zcashd) 213 Shielded Coinbase Implemented (zcashd) - 214 Consensus rules for a Zcash Development Fund Proposed - 215 Explicitly Defining and Modifying Ed25519 Validation Rules Proposed + 214 Consensus rules for a Zcash Development Fund Implemented (zcashd) + 215 Explicitly Defining and Modifying Ed25519 Validation Rules Implemented (zcashd) 221 FlyClient - Consensus-Layer Changes Implemented (zcashd) 243 Transaction Signature Validation for Sapling Final 250 Deployment of the Heartwood Network Upgrade Implemented (zcashd) diff --git a/index.html b/index.html index 86a52e95..b7fc2175 100644 --- a/index.html +++ b/index.html @@ -51,11 +51,11 @@ 208 Shorter Block Target Spacing Final 209 Prohibit Negative Shielded Value Pool Final 210 Sapling Anchor Deduplication within Transactions Draft - 211 Disabling Addition of New Value to the Sprout Value Pool Proposed + 211 Disabling Addition of New Value to the Sprout Value Pool Implemented (zcashd) 212 Allow Recipient to Derive Sapling Ephemeral Secret from Note Plaintext Implemented (zcashd) 213 Shielded Coinbase Implemented (zcashd) - 214 Consensus rules for a Zcash Development Fund Proposed - 215 Explicitly Defining and Modifying Ed25519 Validation Rules Proposed + 214 Consensus rules for a Zcash Development Fund Implemented (zcashd) + 215 Explicitly Defining and Modifying Ed25519 Validation Rules Implemented (zcashd) 221 FlyClient - Consensus-Layer Changes Implemented (zcashd) 243 Transaction Signature Validation for Sapling Final 250 Deployment of the Heartwood Network Upgrade Implemented (zcashd) diff --git a/zip-0211.html b/zip-0211.html index 17f84d31..42797cc1 100644 --- a/zip-0211.html +++ b/zip-0211.html @@ -10,7 +10,7 @@ Title: Disabling Addition of New Value to the Sprout Value Pool Owners: Daira Hopwood <daira@electriccoin.co> Credits: Sean Bowe -Status: Proposed +Status: Implemented (zcashd) Category: Consensus Created: 2019-03-29 License: MIT diff --git a/zip-0211.rst b/zip-0211.rst index 8ee41354..42be4148 100644 --- a/zip-0211.rst +++ b/zip-0211.rst @@ -4,7 +4,7 @@ Title: Disabling Addition of New Value to the Sprout Value Pool Owners: Daira Hopwood Credits: Sean Bowe - Status: Proposed + Status: Implemented (zcashd) Category: Consensus Created: 2019-03-29 License: MIT diff --git a/zip-0212.html b/zip-0212.html index 1a927d68..98602b5a 100644 --- a/zip-0212.html +++ b/zip-0212.html @@ -206,6 +206,9 @@ License: MIT \(\mathsf{rseed}\) ) this would lead to an instance of key-dependent encryption, which is difficult or perhaps impossible to prove secure using existing security notions. Our approach of using a key derivation, which ultimately queries an oracle, allows a proof for IND-CCA2 security to be written by reprogramming the oracle to return bogus keys when necessary.

+

Deployment

+

This proposal will be deployed with the Canopy network upgrade. 11

+

Reference Implementation

In zcashd:

diff --git a/zip-0212.rst b/zip-0212.rst index a4d751a4..ca84c3d4 100644 --- a/zip-0212.rst +++ b/zip-0212.rst @@ -254,6 +254,12 @@ ultimately queries an oracle, allows a proof for IND-CCA2 security to be written by reprogramming the oracle to return bogus keys when necessary. +Deployment +========== + +This proposal will be deployed with the Canopy network upgrade. [#zip-0251]_ + + Reference Implementation ======================== @@ -277,12 +283,13 @@ References ========== .. [#RFC2119] `Key words for use in RFCs to Indicate Requirement Levels `_ -.. [#protocol] `Zcash Protocol Specification, Version 2020.1.4 [Overwinter+Sapling+Blossom+Heartwood] or later `_ -.. [#saplingencrypt] `Section 4.17.1: Encryption (Sapling). Zcash Protocol Specification, Version 2020.1.4 [Overwinter+Sapling+Blossom+Heartwood] or later `_ -.. [#abstractprfs] `Section 4.1.2: Pseudo Random Functions. Zcash Protocol Specification, Version 2020.1.4 [Overwinter+Sapling+Blossom+Heartwood] or later `_ -.. [#notept] `Section 5.5: Encodings of Note Plaintexts and Memo Fields. Zcash Protocol Specification, Version 2020.1.4 [Overwinter+Sapling+Blossom+Heartwood] or later `_ -.. [#saplingdecryptivk] `Section 4.17.2: Decryption using an Incoming Viewing Key (Sapling). Zcash Protocol Specification, Version 2020.1.4 [Overwinter+Sapling+Blossom+Heartwood] or later `_ -.. [#saplingdecryptovk] `Section 4.17.3: Decryption using a Full Viewing Key (Sapling). Zcash Protocol Specification, Version 2020.1.4 [Overwinter+Sapling+Blossom+Heartwood] or later `_ -.. [#saplingsend] `Section 4.6.2: Sending Notes (Sapling). Zcash Protocol Specification, Version 2020.1.4 [Overwinter+Sapling+Blossom+Heartwood] or later `_ +.. [#protocol] `Zcash Protocol Specification, Version 2020.1.13 [Canopy] or later `_ +.. [#saplingencrypt] `Section 4.17.1: Encryption (Sapling). Zcash Protocol Specification, Version 2020.1.13 [Canopy] or later `_ +.. [#abstractprfs] `Section 4.1.2: Pseudo Random Functions. Zcash Protocol Specification, Version 2020.1.13 [Canopy] or later `_ +.. [#notept] `Section 5.5: Encodings of Note Plaintexts and Memo Fields. Zcash Protocol Specification, Version 2020.1.13 [Canopy] or later `_ +.. [#saplingdecryptivk] `Section 4.17.2: Decryption using an Incoming Viewing Key (Sapling). Zcash Protocol Specification, Version 2020.1.13 [Canopy] or later `_ +.. [#saplingdecryptovk] `Section 4.17.3: Decryption using a Full Viewing Key (Sapling). Zcash Protocol Specification, Version 2020.1.13 [Canopy] or later `_ +.. [#saplingsend] `Section 4.6.2: Sending Notes (Sapling). Zcash Protocol Specification, Version 2020.1.13 [Canopy] or later `_ .. [#zip-0207] `ZIP 207: Split Founders' Reward `_ .. [#zip-0213] `ZIP 213: Shielded Coinbase `_ +.. [#zip-0251] `ZIP 251: Deployment of the Canopy Network Upgrade `_ diff --git a/zip-0214.html b/zip-0214.html index f24c57c9..266fd41c 100644 --- a/zip-0214.html +++ b/zip-0214.html @@ -9,7 +9,7 @@ 
ZIP: 214
 Title: Consensus rules for a Zcash Development Fund
 Owners: Daira Hopwood <daira@electriccoin.co>
-Status: Proposed
+Status: Implemented (zcashd)
 Category: Consensus
 Created: 2020-02-28
 License: MIT
@@ -229,7 +229,7 @@ FS_MG_Addresses[0..50] = ["t2Gvxv2uNM7hbbACjNox4H6DjByoKZ2Fa3P"] * 51
2 - Zcash Protocol Specification, Version 2020.1.9 or later [Canopy] + Zcash Protocol Specification, Version 2020.1.13 or later [Canopy] @@ -237,7 +237,7 @@ FS_MG_Addresses[0..50] = ["t2Gvxv2uNM7hbbACjNox4H6DjByoKZ2Fa3P"] * 51 3 - Zcash Protocol Specification, Version 2020.1.9 [Canopy]. Section 3.11: Mainnet and Testnet + Zcash Protocol Specification, Version 2020.1.13 [Canopy]. Section 3.11: Mainnet and Testnet @@ -245,7 +245,7 @@ FS_MG_Addresses[0..50] = ["t2Gvxv2uNM7hbbACjNox4H6DjByoKZ2Fa3P"] * 51 4 - Zcash Protocol Specification, Version 2020.1.9 [Canopy]. Section 3.9: Block Subsidy and Founders' Reward + Zcash Protocol Specification, Version 2020.1.13 [Canopy]. Section 3.9: Block Subsidy and Founders' Reward @@ -253,7 +253,7 @@ FS_MG_Addresses[0..50] = ["t2Gvxv2uNM7hbbACjNox4H6DjByoKZ2Fa3P"] * 51 5 - Zcash Protocol Specification, Version 2020.1.9 [Canopy]. Section 7.7: Calculation of Block Subsidy and Founders' Reward + Zcash Protocol Specification, Version 2020.1.13 [Canopy]. Section 7.7: Calculation of Block Subsidy and Founders' Reward diff --git a/zip-0214.rst b/zip-0214.rst index 1f1c4da2..82e2d36b 100644 --- a/zip-0214.rst +++ b/zip-0214.rst @@ -3,7 +3,7 @@ ZIP: 214 Title: Consensus rules for a Zcash Development Fund Owners: Daira Hopwood - Status: Proposed + Status: Implemented (zcashd) Category: Consensus Created: 2020-02-28 License: MIT @@ -283,10 +283,10 @@ References ========== .. [#RFC2119] `Key words for use in RFCs to Indicate Requirement Levels `_ -.. [#protocol] `Zcash Protocol Specification, Version 2020.1.9 or later [Canopy] `_ -.. [#protocol-networks] `Zcash Protocol Specification, Version 2020.1.9 [Canopy]. Section 3.11: Mainnet and Testnet `_ -.. [#protocol-subsidyconcepts] `Zcash Protocol Specification, Version 2020.1.9 [Canopy]. Section 3.9: Block Subsidy and Founders' Reward `_ -.. [#protocol-subsidies] `Zcash Protocol Specification, Version 2020.1.9 [Canopy]. Section 7.7: Calculation of Block Subsidy and Founders' Reward `_ +.. [#protocol] `Zcash Protocol Specification, Version 2020.1.13 or later [Canopy] `_ +.. [#protocol-networks] `Zcash Protocol Specification, Version 2020.1.13 [Canopy]. Section 3.11: Mainnet and Testnet `_ +.. [#protocol-subsidyconcepts] `Zcash Protocol Specification, Version 2020.1.13 [Canopy]. Section 3.9: Block Subsidy and Founders' Reward `_ +.. [#protocol-subsidies] `Zcash Protocol Specification, Version 2020.1.13 [Canopy]. Section 7.7: Calculation of Block Subsidy and Founders' Reward `_ .. [#trademark] `Zcash Trademark Donation and License Agreement `_ .. [#osd] `The Open Source Definition `_ .. [#zip-0200] `ZIP 200: Network Upgrade Mechanism `_ diff --git a/zip-0215.html b/zip-0215.html index 14015874..5ada2a60 100644 --- a/zip-0215.html +++ b/zip-0215.html @@ -10,7 +10,7 @@ 
ZIP: 215
 Title: Explicitly Defining and Modifying Ed25519 Validation Rules
 Owners: Henry de Valence <hdevalence@zfnd.org>
-Status: Proposed
+Status: Implemented (zcashd)
 Category: Consensus
 Created: 2020-04-27
 License: BSD-2-Clause
@@ -108,7 +108,7 @@ License: BSD-2-Clause 4 - Zcash Protocol Specification, Version 2020.1.9 [Canopy]. Section 3.11: Mainnet and Testnet + Zcash Protocol Specification, Version 2020.1.13 [Canopy]. Section 3.11: Mainnet and Testnet @@ -116,7 +116,7 @@ License: BSD-2-Clause 5 - Zcash Protocol Specification, Version 2020.1.9 [Canopy]. Section 5.4.5: Ed25519 + Zcash Protocol Specification, Version 2020.1.13 [Canopy]. Section 5.4.5: Ed25519 diff --git a/zip-0215.rst b/zip-0215.rst index b600ec30..a2b033f6 100644 --- a/zip-0215.rst +++ b/zip-0215.rst @@ -3,7 +3,7 @@ ZIP: 215 Title: Explicitly Defining and Modifying Ed25519 Validation Rules Owners: Henry de Valence - Status: Proposed + Status: Implemented (zcashd) Category: Consensus Created: 2020-04-27 License: BSD-2-Clause @@ -114,6 +114,6 @@ References .. [#RFC2119] `Key words for use in RFCs to Indicate Requirement Levels `_ .. [#RFC8032] `Edwards-Curve Digital Signature Algorithm (EdDSA) `_ .. [#protocol-2020.1.1] `Zcash Protocol Specification, Version 2020.1.1 `_ -.. [#protocol-networks] `Zcash Protocol Specification, Version 2020.1.9 [Canopy]. Section 3.11: Mainnet and Testnet `_ -.. [#protocol-concreteed25519] `Zcash Protocol Specification, Version 2020.1.9 [Canopy]. Section 5.4.5: Ed25519 `_ +.. [#protocol-networks] `Zcash Protocol Specification, Version 2020.1.13 [Canopy]. Section 3.11: Mainnet and Testnet `_ +.. [#protocol-concreteed25519] `Zcash Protocol Specification, Version 2020.1.13 [Canopy]. Section 5.4.5: Ed25519 `_ .. [#zip-0251] `ZIP 251: Deployment of the Canopy Network Upgrade `_