Commit Graph

1330 Commits

Author SHA1 Message Date
Daira Hopwood 6d88eef819
Merge pull request #298 from daira/zip1005
ZIP 1005: Zcash Community Funding System
2019-11-22 16:53:17 +00:00
Daira Hopwood f0f22b5005 ZIP 1005: Editing to regularize all the dev fund ZIPs.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-22 16:51:14 +00:00
Sonya Mann 98155b9eb5 Create zcash-community-funding-system.rst 2019-11-22 15:59:58 +00:00
Daira Hopwood 00ed0aecea
Merge pull request #297 from daira/amiller-zip1004
ZIP 1004: Miner-Directed Dev Fund
2019-11-22 15:33:36 +00:00
Daira Hopwood 331098ae10 ZIP 1004: Editing to regularize all the dev fund ZIPs.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-22 15:31:13 +00:00
Andrew Miller 0651307139 Create miner-directed-devfund.rst 2019-11-22 15:28:51 +00:00
Daira Hopwood 31b35d5a88 ZIP 1003: In the event that no voting system is implemented before the 3rd halving period, express the outcome as not minting the coins that would be allocated by that system.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-22 15:26:25 +00:00
Daira Hopwood ac7594e6ca
Merge pull request #295 from daira/zip1003
ZIP 1003: 20% Split Evenly Between the ECC and the Zcash Foundation, and a Voting System Mandate
2019-11-21 15:51:53 +00:00
Daira Hopwood d5a6735bdc ZIP 1003: Editing to regularize all the dev fund ZIPs.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-21 15:47:10 +00:00
Sonya Mann 07102cf762 Create ecc-zf-split-plus-voting.rst 2019-11-20 11:40:32 +00:00
Daira Hopwood 348ae34c78
Merge pull request #294 from daira/blocktown-dev-fund
ZIP 1006: Development Fund of 10% to a 2-of-3 Multisig with Community-Involved Third Entity
2019-11-17 20:48:18 +00:00
Daira Hopwood 9a0173e086 ZIP 1006: Editing to regularize all the dev fund ZIPs
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-17 20:45:11 +00:00
Daira Hopwood 8d536a262f Convert Blocktown ZIP draft to .rst format.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-17 18:17:03 +00:00
JamesTodaroMD 549f2300b3 OFFICIAL Blocktown ZIP Draft for Zcash Dev Fund
This is the UPDATED and OFFICIAL Blocktown ZIP draft that is submitted before the August 31, 2019 deadline and up for review.
2019-11-17 18:17:03 +00:00
JamesTodaroMD bd404bae69 Update Blocktown ZIP Draft for Dev Fund 2019-11-17 18:17:03 +00:00
JamesTodaroMD 500513c9be Update Blocktown ZIP Draft for Dev Fund 2019-11-17 18:17:03 +00:00
JamesTodaroMD caa95026c3 Update Blocktown ZIP Draft for Dev Fund 2019-11-17 18:17:03 +00:00
JamesTodaroMD aca7029cfa Update Blocktown ZIP Draft for Dev Fund 2019-11-17 18:17:03 +00:00
JamesTodaroMD a3516758ef Update Blocktown ZIP Draft for Dev Fund 2019-11-17 18:17:03 +00:00
JamesTodaroMD 990d5db7a9 Blocktown ZIP Draft for Dev Fund
This is Blocktown's proposal for a Zcash Development Fund of 10% in a 2-of-3 multisig agreement.
2019-11-17 18:17:03 +00:00
Daira Hopwood 8bbe71f5d7 Lighten background colour to increase contrast (short-term hack).
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-17 17:50:48 +00:00
Daira Hopwood 7226b805e2 Add Status field to new ZIPs, and regenerate index.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-17 17:42:10 +00:00
Daira Hopwood c13faee763 Fix a Makefile bug that could result in the index failing to be regenerated when needed.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-17 17:41:37 +00:00
Daira Hopwood 707e7509a2 ZIP 1008: Editing to regularize all the dev fund ZIPs.
Added editor's notes and revised references to specific block heights.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-17 17:22:42 +00:00
mistfpga 80c8bc8913 ZIP 1008: Fund ECC for Two More Years
This was proposed by user kek on the Zcash forums. They are unable to continue
with this proposal due to real life stuff. They have asked me to act as advocate.
I am pushing this ZIP forward until kek gets time and would like to come back and
take over.

Signed-off-by: Daira Hopwood <daira@electriccoin.co>
2019-11-17 17:21:42 +00:00
Daira Hopwood af094bdcb3 ZIP 1007: Editing to regularize all of the dev fund ZIPs.
Added an editor's note.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-17 17:21:42 +00:00
mistfpga 286679b5ac ZIP 1007: Enforce Development Fund Commitments with a Legal Charter
This was written up by @mistfpga, but this is 100% lex-node's proposal.
I have taken some liberty when addressing comments; lex-node seemed happy
with my answers.

Signed-off-by: Daira Hopwood <daira@electriccoin.co>
2019-11-17 17:21:42 +00:00
Daira Hopwood 874010a2c3 ZIP 1002: Editing to regularize all of the dev fund ZIPs.
The word "genuine" has been dropped from the title to make it more value-neutral.
Also "protocol-level" has been dropped since it is unclear whether or not the
proposal requires consensus protocol changes. Editor's notes have been added.
Some references to the Zcash Foundation have been changed to also include ECC,
since that seems to reflect the author's intent per
https://forum.zcashcommunity.com/t/final-zip-proposal-genuine-protocol-opt-in-out-donation-feature-updated-02-sept/33846/24

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-17 17:21:42 +00:00
mistfpga 07cd5145b9 ZIP 1002: Opt-in Donation Feature
Thanks to:
* Sonya for her extensive help with this.
* Nathan, Daira and Str4d for their extensive feedback.
* Everyone else on the forum and ECC/Zfnd that helped me with this.

Co-Authored-By: Sonya Mann <sonya@zfnd.org>
Co-Authored-By: Nathan Wilcox <nathan@electriccoin.co>
Co-Authored-By: Daira Hopwood <daira@electriccoin.co>
Co-Authored-By: Jack Grigg <str4d@electriccoin.co>
Signed-off-by: Daira Hopwood <daira@electriccoin.co>
2019-11-17 17:21:42 +00:00
Daira Hopwood 30f418c4c6 ZIP 1001: Editing to regularize all of the dev fund ZIPs.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-17 17:21:42 +00:00
mistfpga ae47544e49 ZIP 1001: Keep the Block Distribution as Initially Defined -- 90% to Miners
Thanks to:
* Str4d for the help with the specification.
* Daira for pointing out issues with my interpretation of how the current FR/ECC structure works.
* Sonya for her extensive help with this.
* Everyone else on the forum and ECC/Zfnd that helped me with this.

Co-Authored-by: Jack Grigg <str4d@electriccoin.co>
Co-Authored-by: Daira Hopwood <daira@electriccoin.co>
Co-Authored-by: Sonya Mann <sonya@zfnd.org>
Signed-off-by: Daira Hopwood <daira@electriccoin.co>
2019-11-17 17:21:42 +00:00
Daira Hopwood b7dc78cf3e Change current owners of ZIP 0 to Daira and Gtank.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-16 17:40:42 +00:00
Daira Hopwood 3d792d49d2
Merge pull request #251 from sonyamann/patch-1
Add link to ZIP 0 in README
2019-11-16 17:35:45 +00:00
Daira Hopwood 41582539ee Add link to ZIP 0 in README.
Co-Authored-By: Sonya Mann <sonya@zfnd.org>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-16 17:34:32 +00:00
Daira Hopwood 8827ef0815 ZIP 32: update spec references.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-10 16:47:16 +00:00
Daira Hopwood 98b01feeb0 Fix links to NU3 ZIPs from index.
(The .rst suffix was getting deleted for all links rather than just relative links as intended.)

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-09 17:50:56 +00:00
Daira Hopwood 2ea3609133 Improve references to protocol spec from ZIPs 143 and 243.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-09 17:49:49 +00:00
Daira Hopwood 3c63d327a7 Test linking into a section of the protocol spec from a ZIP.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-07 20:37:09 +00:00
Daira Hopwood 1db4f4efe1 Use relative links from ZIPs to other ZIPs and the protocol spec.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-07 20:28:29 +00:00
Daira Hopwood 4b20dd87bb Really fix links in index.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-07 20:00:20 +00:00
Daira Hopwood 5bf0ca45c4 Fix links, maybe.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-07 19:49:41 +00:00
Daira Hopwood a213e2863f
Merge pull request #275 from daira/zip-daira-mempool-limitation
[ZIP 401] Addressing mempool denial-of-service
2019-11-07 19:41:47 +00:00
Daira Hopwood 77df9d90c9 Regenerate HTML and index.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-11-07 19:39:00 +00:00
Eirik Ogilvie-Wigley 4d66799a1b Finalize ZIP 401 2019-11-07 12:30:57 -07:00
Eirik Ogilvie-Wigley 8deea8dbe8 Update constant name and reference implementation 2019-11-07 12:21:58 -07:00
Eirik Ogilvie-Wigley 209718e956 Rename parameters to match implementation 2019-11-07 11:45:44 -07:00
Eirik Ogilvie-Wigley 5fd8a3069b Move and rename draft zip - now 401 2019-11-07 11:41:18 -07:00
Daira Hopwood 5199cdcc0b
Assign ZIP number 401 2019-10-17 13:47:35 -07:00
Daira Hopwood 2df1c61e06 Clarify weighting.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-09-27 04:52:55 +01:00
Daira Hopwood f7e6215524 Explain "five times as likely".
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-09-27 04:50:44 +01:00