Commit Graph

54 Commits

Author SHA1 Message Date
Daira Emma Hopwood 2eb0ed8ef0 Updates to reference BCP 14 rather than RFC 2119. fixes #729
Also change two "should"s in ZIP 224 to "SHOULD"s.

Signed-off-by: Daira Emma Hopwood <daira@jacaranda.org>
2023-10-28 15:34:22 +01:00
Daira Emma Hopwood 8ea921667d Daira Hopwood -> Daira Emma Hopwood.
Signed-off-by: Daira Emma Hopwood <daira@jacaranda.org>
2023-03-02 12:13:07 +00:00
Jack Gavigan 137839e393
Amend ZIP1014 to provide a Discretionary Budget for MGRC (#668)
In 2021 Jason McGee proposed that ZIP 1014 be amended to provide the Major Grants Review Committee (aka the Zcash Community Grants Committee) with a Discretionary Budget. The proposal was approved by the Zcash Community Advisory Panel (ZCAP) in December 2021  - https://vote.heliosvoting.org/helios/elections/2d0787fc-61de-11ec-8619-8ee85a8a1b8a/view

The pull request amends ZIP 1014 to reflect the Zcash community's decision to provide the Major Grants Review Committee with a Discretionary Budget, funded out of the MG Slice of the Dev Fund. 

The initial denomination (ZEC), annual budget (3% of the MG slice), cap ($1,000,000 USD) and floor ($250,000) were established in the same ZCAP poll that approved the proposal. Zcash Foundation will run a similar poll to allow ZCAP to change these parameters if requested to do so by the Major Grants Review Committee.

Co-authored-by: teor <teor@riseup.net>
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2023-02-15 16:06:28 -05:00
Daira Hopwood 22370345a1 ZIPs 214 and 1014: update URL for Trademark Agreement.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2022-06-22 19:01:39 +01:00
Daira Hopwood 5ced374bf1 Update references to protocol spec from process and consensus ZIPs (0 to 252 inclusive, and 1014).
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2021-10-02 00:46:17 +01:00
Daira Hopwood db418a5dd5 Fix all links in ZIPs (and almost eliminate plain http links).
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2021-09-09 15:02:46 +01:00
Daira Hopwood a492c3a4bb ZIP 1014: clarify that the specification is to be interpreted as applying to Mainnet.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-11-14 22:33:44 +00:00
Daira Hopwood 947f0b6649 Regularize ZIP categories.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-11-14 22:17:27 +00:00
Daira Hopwood 8b311e9651
Merge pull request #409 from amiller/1014-update
[ZIP 1014] Updates for Bootstrap Project
2020-11-10 15:22:18 +00:00
Daira Hopwood 6f2a534deb ZIP 1014: refer to current Community Advisory Panel and define it in the Terminology section.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-11-10 15:20:19 +00:00
Daira Hopwood c762d1ca67 Regularize references, especially to RFCs and the Protocol Spec.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-11-09 15:59:51 +00:00
Daira Hopwood 2f75f92fea
Update wording to reflect the fact that the Founders' Reward was not directed to a 501(c)3 2020-11-03 18:25:10 +00:00
Daira Hopwood a34ef1a152
Remove "of the Code" since "Section 501(c)(3)" is now defined terminology 2020-11-03 15:33:41 +00:00
Andrew Miller 07c18efafc bootstrap updates to 1014
fixes after comments

remove some redundant

typo fix

Co-authored-by: Daira Hopwood <daira@jacaranda.org>

undo space changing

reference

Apply suggestions from code review

Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2020-10-28 23:27:08 -05:00
Daira Hopwood da9e9af6ef Original-Author -> Original-Authors.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-10-19 14:07:11 +01:00
Daira Hopwood 80d1fa8c2e Add Pull-Request header.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-09-14 14:16:43 +01:00
Daira Hopwood 3efc1217bd Update ZIP statuses:
* ZIPs 213, 221, 250 -> Final
* ZIPs 207, 251 -> Implemented (zcashd)
* ZIP 1014 -> Active.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-09-05 13:11:28 +01:00
Howard Loo 6d5f557c7d
Remove Howard Loo from credits section
I request that my name please be removed from this ZIP. I do not support it and as a member of the Community Panel I voted against it. I merely provided @tromer with some brief feedback one evening about the copyright portions of the ZIP. I did give permission for my name to be mentioned publicly as having provided feedback, but I did not realize that my name would be part of the actual ZIP text. Thank you for considering my request.
2020-07-15 09:26:24 -07:00
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