Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ZIP 1014, based on ZIP 1012 with modifications from the Zcash Foundation board #308

Closed
wants to merge 60 commits into from
Closed

Add ZIP 1014, based on ZIP 1012 with modifications from the Zcash Foundation board #308

wants to merge 60 commits into from

Conversation

acityinohio
Copy link
Contributor

Opening this PR for discussion/comments from ECC and the community.

@tromer
Copy link
Contributor

tromer commented Dec 12, 2019

utACK

I support these revisions, and in particular making the Major Grant Review Committee autonomous and binding, and the improved Funding Target update mechanism.

tromer
tromer reviewed Dec 13, 2019
View reviewed changes
zip-1012.rst Outdated Show resolved Hide resolved
daira
daira approved these changes Dec 19, 2019
View reviewed changes
Copy link
Collaborator

@daira daira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Editorial suggestions.

zip-1012.rst Outdated Show resolved Hide resolved
zip-1012.rst Outdated Show resolved Hide resolved
zip-1012.rst Outdated Show resolved Hide resolved
zip-1012.rst Outdated
@@ -3,17 +3,21 @@
ZIP: 1012
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(wearing ZIP Editor hat) I believe that this should be published as a new ZIP since it has substantive changes from ZIP 1012, and it's necessary to preserve the historical record of ZIP 1012 as voted on.

For the time being, the PR can continue to update ZIP 1012 for ease of seeing the changes, but I will change it to ZIP 1014 before publication, unless anyone raises an objection.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we publish earlier and move to ZIP 1014 @daira @gtank ? @zookozcash and I think for polling it would be nicer for folks to see it on https://zips.z.cash/ . I'd be happy to accept all these changes and get it ready to make it an easier PR.

zip-1012.rst Outdated Show resolved Hide resolved
zip-1012.rst Outdated Show resolved Hide resolved
zip-1012.rst Outdated Show resolved Hide resolved
zip-1012.rst Outdated Show resolved Hide resolved
zip-1012.rst Outdated Show resolved Hide resolved
zip-1012.rst Outdated Show resolved Hide resolved
daira
daira reviewed Dec 19, 2019
View reviewed changes
Copy link
Collaborator

@daira daira left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that my "Approve" review indicates only ZIP Editor approval to publish as ZIP 1014, and is not an indication of approval to the content by ECC. ECC had published its response here: https://electriccoin.co/blog/dev-funds-should-be-in-zcash-not-united-states-dollars/

acityinohio and others added 13 commits December 20, 2019 12:55
@acityinohio @daira
Update zip-1012.rst
3558d34 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1012.rst
c093569 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1012.rst
e7ddc76 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1012.rst
a39fdca 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1012.rst
fc9d9d8 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1012.rst
deae965 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1012.rst
bac8679 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1012.rst
2d6645b 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio
renames to Community Panel
6ad2089
@acityinohio
rename to zip-1014
ac3bd31
@acityinohio
adds old zip-1012
defae69
@tromer
ZIP 1014: Clarify how Volatility Reserve is managed and by whom
8ab8598 
Addresses a FAQ on how Volatility Reserve is meant to work. No normative changes.
@acityinohio
Merge pull request #1 from tromer/zip1014-reserve-clarifications
c5977cf 
ZIP 1014 Volatility Reserve clarifications
daira
daira approved these changes Dec 27, 2019
View reviewed changes
Copy link
Collaborator

@daira daira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK with suggestions (mainly RFC 2119 conformance language).

zip-1014.rst Outdated Show resolved Hide resolved
zip-1014.rst Outdated Show resolved Hide resolved
zip-1014.rst Outdated Show resolved Hide resolved
zip-1014.rst Outdated Show resolved Hide resolved
zip-1014.rst Outdated Show resolved Hide resolved
zip-1014.rst Outdated Show resolved Hide resolved
zip-1014.rst Outdated Show resolved Hide resolved
zip-1014.rst Outdated Show resolved Hide resolved
zip-1014.rst Outdated Show resolved Hide resolved
zip-1014.rst Outdated Show resolved Hide resolved
daira
daira approved these changes Dec 27, 2019
View reviewed changes
Copy link
Collaborator

@daira daira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK with suggestions (mainly RFC 2119 conformance language).

@daira daira changed the title Updates ZIP 1012 to include modifications from the Zcash Foundation board Add ZIP 1014, based on ZIP 1012 with modifications from the Zcash Foundation board Dec 27, 2019
@daira
Copy link
Collaborator

daira commented Dec 28, 2019

(Speaking for myself.) I made a couple of comments on the forum regarding the status of ECC in applying for Major Grants: https://forum.zcashcommunity.com/t/community-sentiment-polling-results-nu4/35560/223

daira
daira reviewed Dec 28, 2019
View reviewed changes
zip-1014.rst Outdated Show resolved Hide resolved
tromer and others added 5 commits December 28, 2019 21:27
@tromer
ZIP 1014: Clarify Major Grant criteria
517562a 
Clarify language around the criteria for awarding major grants.
No normative changes intended, other than removal of "new" in
item 4, which conflicts with the "maintain the existing teams
and capabilities" goal of this ZIP.
@tromer
ZIP 1014: fix typo ("voting mechanism")
b0a582b
@tromer
ZIP 1014: typo fixes in MG criteria
f7277c6
@acityinohio
Merge pull request #2 from tromer/zip1014-mg-criteria-clarifications
2fc8052 
ZIP 1014: Clarify Major Grant criteria
@acityinohio
Merge pull request #3 from tromer/zip1014-typo1
1f2783a 
ZIP 1014: fix typo ("voting mechanism")
daira
daira reviewed Jan 3, 2020
View reviewed changes
zip-1014.rst Outdated Show resolved Hide resolved
@tromer
Copy link
Contributor

tromer commented Jan 7, 2020

Regarding the RFC 2119 changes ("SHALL", etc.): Is there a consensus among the ZIP editors that these changes are desirable? If so, I'll review them and submit a pull request.

I very mildly prefer to not make the change to RFC 2119 language, because they make it more difficult to see the differences from ZIP 1012, and because to me it feels awkward to use this formal language for terms that (by necessity) fuzzy.

acityinohio and others added 26 commits January 7, 2020 09:33
@acityinohio @daira
Update zip-1014.rst
4dc9bc1 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
6aa0d3c 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
65ce4eb 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
f6e4489 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
c81f1c7 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
0c8c432 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
90fe13a 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
86e9fcc 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
ed7d7e6 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
a8deca2 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
b8a5162 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
f738d02 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
335ca04 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
491922e 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
f532d08 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
d725dcf 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
cfe431c 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
4950e92 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
8c7e270 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
3a886a3 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
f6552f1 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
6990458 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
000926d 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio @daira
Update zip-1014.rst
14cddcc 
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
@acityinohio
removes disclosure and add more detailed acknowledgement
b8f9eb3
@acityinohio
final RFC 2119 fixes
864a8bb
@acityinohio
Copy link
Contributor Author

@daira I made what should be the final fixes, and out-of-band @tromer agreed that we can find another place to show the substantive diff without modifying ZIP 1012 (for historical preservation reasons). @gtank does it look good to you?

gtank
gtank reviewed Jan 7, 2020
View reviewed changes
zip-1014.rst Show resolved Hide resolved
@daira
Copy link
Collaborator

daira commented Jan 7, 2020

Superceded by #312.

@daira daira closed this Jan 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tromer tromer tromer left review comments

@gtank gtank gtank left review comments

@daira daira daira approved these changes

@sonyamann sonyamann sonyamann left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@acityinohio @tromer @daira @gtank @sonyamann