zec
/
zips
mirror of https://github.com/zcash/zips.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clarify statements

This commit is contained in:
str4d 2018-02-06 19:37:05 +00:00
parent 3bbbb1036e
commit 35f33f7a34
No known key found for this signature in database
GPG Key ID: 665DBCD284F7DAFF
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drafts/str4d-overwinter-activation/draft1.rst
View File

@ -34,7 +34,7 @@ Abstract
This proposal defines a mechanism for coordinating upgrades of the Zcash network, in order to remove ambiguity
about when network upgrades will activate, provide defined periods in which users should upgrade their local
software, and minimize the risks to both the upgrading network and those users opting out of the changes.
software, and minimize the risks to both the upgrading network and any users opting out of the changes.
Motivation
@ -147,7 +147,7 @@ Chain reorganization
````````````````````
It is possible for a reorganization to occur that rolls back from after the activation height, to before that
height. This can handled in the same way as any regular chain orphaning or reorganization, as long as the new
chain is valid over the same epochs.
chain is valid.
Post-activation upgrading
`````````````````````````
@ -187,7 +187,7 @@ Wipe-out protection
Nodes running upgrade-aware software versions will enforce the upgraded consensus rules from
``ACTIVATION_HEIGHT``. The chain from that height will not reorganize to a pre-upgrade branch if any block in
that branch would violate the new consensus rules (such as including any old-format transaction).
that branch would violate the new consensus rules.
Care must be taken, however, to account for possible edge cases where the old and new consensus rules do not
differ. For example, if the non-upgraded chain only contained empty blocks from ``ACTIVATION_HEIGHT``, and the