From 330a1d5e3fdcf7b94de6bfd122f930e49b43f28a Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Sat, 30 May 2020 16:31:05 +0100 Subject: [PATCH] ZIP 211: deployment and reference implementation. Signed-off-by: Daira Hopwood --- zip-0211.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/zip-0211.rst b/zip-0211.rst index e32a2afb..56f7fe4b 100644 --- a/zip-0211.rst +++ b/zip-0211.rst @@ -118,15 +118,13 @@ height, there is no additional client distinguisher. Deployment ========== -At the time of writing it has not been decided which network upgrade (if any) will -implement this proposal. Since the proposal is a purely contracting consensus change, -it could also be implemented as a "soft fork". +This proposal will be deployed with the Canopy network upgrade. [#zip-0251]_ Reference Implementation ======================== -TBD +https://github.com/zcash/zcash/pull/4489 References @@ -136,6 +134,7 @@ References .. [#zip-0200] `ZIP 200: Network Upgrade Activation Mechanism `_ .. [#zip-0205] `ZIP 205: Deployment of the Sapling Network Upgrade `_ .. [#zip-0209] `ZIP 209: Prohibit Negative Shielded Value Pool `_ +.. [#zip-0251] `ZIP 251: Deployment of the Canopy Network Upgrade `_ .. [#zip-0308] `ZIP 308: Sprout to Sapling Migration `_ .. [#protocol] `Zcash Protocol Specification, Version 2019.0-beta-37 [Overwinter+Sapling] `_ .. [#zerocash] `Zerocash: Decentralized Anonymous Payments from Bitcoin (extended version) `_