Commit Graph

36 Commits

Author SHA1 Message Date
Daira Hopwood 62a1d5c103 Update ZIPs 207, 214, 251, and 1014 to use Canopy name for NU4.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-05-26 23:06:08 +01:00
Daira Hopwood 09b3f6955c Link to https://www.rfc-editor.org/rfc/rfcXXXX.html for RFCs.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-29 16:00:39 +00:00
Daira Hopwood c040121fc1 ZIP 1014 Status to Proposed.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-26 19:58:13 +00:00
Daira Hopwood 4392f80542 ZIP 1014: delete "and any other pertinent governance processes" from the description of process for which
it is desirable to develop "robust means of decentralized community voting and governance".

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-26 19:58:13 +00:00
Daira Hopwood 12b3f0e25f ZIP 1014: add "(current or future)" to other obligations under U.S. IRS 501(c)(3).
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-26 19:58:13 +00:00
Daira Hopwood de48022622 ZIP 1014: include the Zcash Trademark Donation and License Agreement as part of the definition of "network upgrade".
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-26 19:58:09 +00:00
Daira Hopwood c3dad3f1ed ZIP 1014: wording clarification. 20% of the block subsidy is allocated from *each* block.
(The previous wording could have allowed an interpretation of any allocation that sums to 20%
over four years, which was not the intent.)

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-26 19:58:03 +00:00
Daira Hopwood 51224cbca1 ZIP 1014: change title to disambiguate from ZIP 1012.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-20 00:48:50 +00:00
Daira Hopwood dbd3001774 ZIP 1014: add "for example" to sentence about ecosystem growth.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-20 00:48:50 +00:00
Daira Hopwood 573ea33397 ZIP 1014: minor wording fixes.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-20 00:48:50 +00:00
Daira Hopwood 36efce62ac ZIP 1014: cosmetics.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-20 00:48:50 +00:00
Daira Hopwood e2de904356 ZIP 1014: add ZIP numbers to references.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-20 00:48:47 +00:00
Daira Hopwood 5811fadeef ZIP 1014: terminology.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-20 00:47:56 +00:00
Daira Hopwood 8cfeb65925 Obligations under 501(c)(3) are not only reporting requirements.
This responds to one part of @tromer's point at
https://forum.zcashcommunity.com/t/final-text-of-zip-1014/36002/3

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-15 12:50:00 +00:00
Daira Hopwood f7229384d9 Clear up a stale reference to "both of these processes"
(originally one of the processes referred to was the Community Panel's
power to change the Funding Cap, which no longer exists).

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-15 03:31:57 +00:00
Daira Hopwood d3d52c75fe Resolve a wording ambiguity: Major Grant funding decisions are intended to be subject to veto if they violate any U.S. law,
not just law relating to the ZF's reporting requirements.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-15 03:30:31 +00:00
Daira Hopwood 7448bba530 Rename the "ZF-MG" slice to "MG", and the "ZF-GU" slice to "ZF".
Clearer, and reflects common use in the forum and Helios poll.

Based on 1f851eb1c3

Co-authored-by: Eran Tromer <eran@tromer.org>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-15 03:28:45 +00:00
Josh Cincinnati 4f5f2aa4c3 mutually agreed modifications to zip-1014 2020-02-14 16:21:13 -07:00
Daira Hopwood 242148b92d ZIP 1014: remove "audited" from "Annual audited financial report". fixes #313
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-12 00:42:59 +00:00
Daira Hopwood 136835232a ZIP 1014: Funding Cap -> Monthly Funding Cap.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-12 00:23:28 +00:00
Daira Hopwood 803aea13f3 ZIP 1014: rename Funding Target to Funding Cap, as suggested by @aristarchus.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-11 03:10:11 +00:00
George Tankersley 9dc6913989 zip-1014: clarify review of indefinite duration grants
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-08 15:51:50 +00:00
Daira Hopwood b9b5ffc646 Trivial change to poke GitHub Pages.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 19:14:00 +00:00
Daira Hopwood 5e44e622a7 ZIP 1014: updates from review with Gtank.
Update Discussions-To: URL.
Delete section on differences from Matt Luongo's proposal.
Clarify wording on large or long-duration Major Grants.
Reporting requirement for how "fair market value" is computed.
RFC 2119 conformance language.
"$" -> USD.
Copyediting.

Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
Co-Authored-By: George Tankersley <george@zfnd.org>
Co-Authored-By: Josh Cincinnati <acityinohio@users.noreply.github.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 18:49:57 +00:00
Daira Hopwood 6a86d4a853 ZIP 1014: update Acknowledgements.
Contains some text from b8f9eb3c0b

Co-Authored-By: Josh Cincinnati <acityinohio@users.noreply.github.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 18:13:03 +00:00
Daira Hopwood befd65d99d ZIP 1014: delete Disclosures section.
Originally part of b8f9eb3c0b

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 18:09:55 +00:00
Daira Hopwood 8ed505a6c9 ZIP 1014: Add reference to the Open Source Definition.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 16:05:19 +00:00
Daira Hopwood fe161c5537 ZIP 1014: RFC 2119 conformance language.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 16:03:56 +00:00
Daira Hopwood a23752742b ZIP 1014: remove redundant credit line and fix potentially bad incentive structure in volatility reserve.
Originally 71de73058e

Co-Authored-By: Josh Cincinnati <acityinohio@users.noreply.github.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 15:59:39 +00:00
Daira Hopwood 642f7c6f1a ZIP 1014: 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.

Originally
* 517562aae3
* f7277c6777

Co-Authored-By: Eran Tromer <eran@tromer.org>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 15:54:24 +00:00
Daira Hopwood e6a5a5380c ZIP 1014: clarify how Volatility Reserve is managed and by whom.
Originally 8ab85986be

Co-Authored-By: Eran Tromer <eran@tromer.org>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 14:07:16 +00:00
Daira Hopwood 46690175b9 ZIP 1014: rename Community Advisory Panel to Community Panel.
Originally 6ad20895a4

Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
Co-Authored-By: Josh Cincinnati <acityinohio@users.noreply.github.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 11:45:07 +00:00
Daira Hopwood 08f48b1b9b ZIP 1014: copyediting from Daira's review.
Originally
* c093569d53
* e7ddc76496
* deae965edc
* bac8679e83
* 2d6645b732

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 11:39:23 +00:00
Daira Hopwood f20542877c ZIP 1014: ECC may distribute Dev Fund proceeds in fair-market-value compensation to contractors, as well as employees.
Originally 3558d34601

Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
Co-Authored-By: Josh Cincinnati <acityinohio@users.noreply.github.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 11:31:45 +00:00
Daira Hopwood cfe18281eb ZIP 1014: wording updates; volatility reserve is per organization.
Deletes "ZF may award grants as profit-sharing contracts".
Adds "The ECC will not be eligible for Major Grants if they have any funds available in their slice's Volatility Reserve" (which is later deleted).
Transfers responsibility for Major Grants awards from the ZF Board of Directors to a separate committee.

Originally 025dc79858

Co-Authored-By: Josh Cincinnati <acityinohio.users.noreply.github.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 11:26:28 +00:00
Daira Hopwood cafed14a2e Create ZIP 1014 from ZIP 1012.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 11:04:07 +00:00