Commit Graph

1537 Commits

Author SHA1 Message Date
Daira Hopwood 4aea56d915
Merge pull request #324 from ZcashFoundation/ecc-zf-zip-1014-changes
Mutually agreed modifications to zip-1014
2020-02-27 17:46:11 +00:00
Josh Cincinnati 1a0d105a2c
Merge pull request #1 from daira/ecc-zf-zip-1014-changes
Editorial changes to Dev Fund ZIP
2020-02-26 16:26:18 -05: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 a27f08ab90 Add alt="" for anchor image, since it is "decorative" in the sense of <https://www.w3.org/WAI/tutorials/images/decorative/>.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-25 17:05:50 +00:00
Daira Hopwood a6567d6377 Regenerate HTML with section anchors.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-25 14:59:43 +00:00
Daira Hopwood ef117e9874 Add section anchors.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-25 14:59:08 +00:00
Daira Hopwood 36cf64abc3 edithtml.sh: replace MathJax URL.
Regenerate ZIP 1011 HTML.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-25 12:44:22 +00:00
Daira Hopwood a0aa25c407 Factor out HTML editing from Makefile into edithtml.sh
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-25 12:42:17 +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 206ff55aff
Merge pull request #322 from daira/spec-resolve-memo-conflict
Resolve conflicts in the specification of memo fields by deferring to ZIP 302
2020-02-13 14:34:34 +00:00
Daira Hopwood 2e5aad23a1 Regenerate PDFs for protocol spec.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-13 14:18:01 +00:00
Daira Hopwood 2e26bb072d Resolve conflicts in the specification of memo fields by deferring to ZIP 302.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-13 14:13:10 +00:00
Daira Hopwood 35d34967ee Add link to protocol spec on index page.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-07 11:08:05 +00:00
Daira Hopwood 258c3729de
Merge pull request #320 from daira/spec-timejacking-fix
Protocol Specification version 2020.1.0
2020-02-07 11:02:35 +00:00
Daira Hopwood 7af527675b Regenerate PDFs.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-07 10:56:58 +00:00
Daira Hopwood 849d9435ae Use the term monomorphism for an injective homomorphism, in the context of a "signature scheme with key monomorphism".
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-06 23:03:58 +00:00
Daira Hopwood 0d582758dd Specify a retrospective soft fork implemented in zcashd v2.1.1-1 that limits the nTime field
of a block relative to its median-time-past.
Correct the definition of median-time-past for the first PoWMedianBlockSpan blocks in a chain.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-06 22:40:00 +00:00
Daira Hopwood ed6baf0fef Change History entry.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-06 22:38:15 +00:00
Daira Hopwood 0a3ef33991 Update incremental Merkle tree diagram.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-02 16:46:34 +00:00
Daira Hopwood 62251dc54f Change 'Payment address' to 'Shielded payment address' in key components diagrams.
Also remove obsolete key_components.{odg,pdf} files.

Co-Authored-By: Za Wilcox <zancas@protonmail.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-02 16:45:47 +00:00
Daira Hopwood 20d506168b Add Acknowledgements to Henry de Valance, Deirdre Connolly, Chelsea Komlo, and Trail of Bits.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-02 15:10:19 +00:00
Daira Hopwood 8a6dc9c9fe Wording tweak: replace "it" with "the note".
I was able to read this "it" as a reference to "the transaction".
closes #174

Author: Za Wilgustus <zancas@protonmail.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-02 15:10:03 +00:00
Daira Hopwood 3e7d58efe7 ZIP 208: minor wording improvements, make Final.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-02-02 14:46:40 +00:00
Daira Hopwood 5651875ca8 ZIP 206: minor wording improvements; make Final.
MIN_PEER_PROTO_VERSION is 170002 for Blossom nodes, not 170007.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-31 13:50:38 +00:00
Daira Hopwood 168b4e49ab Reference the published ZIP 213 as an NU3 ZIP.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-30 17:25:51 +00:00
Daira Hopwood 70596553a2 Regenerate index and HTML to add ZIP 213.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-30 17:21:23 +00:00
Daira Hopwood 124476baa4
Merge pull request #217 from str4d/zip-str4d-shielded-coinbase
[ZIP 213] Shielded Coinbase
2020-01-30 17:19:36 +00:00
Jack Grigg d388e80a53 Include more precise consensus rule wording matching the protocol spec 2020-01-28 17:53:27 +00:00
Jack Grigg 4781183ab9 Add a note about post-quantum privacy to ZIP 213 privacy considerations 2020-01-27 20:32:53 +00:00
Jack Grigg 84517efcd1 Remove unused term 2020-01-27 20:26:59 +00:00
Jack Grigg 84bbeaaed4 Clarify that coinbase spending restrictions only apply to transparent outputs 2020-01-27 20:23:23 +00:00
Jack Grigg 83e8313045 Add link to reference implementation of ZIP 213 2020-01-27 20:21:05 +00:00
Jack Grigg c7d1afe2ab Reference Heartwood in ZIP 213 2020-01-27 20:20:39 +00:00
Jack Grigg 5d9b1b747d Clarify specification of decryption with all-zero ovk 2020-01-27 20:18:44 +00:00
Jack Grigg b09b53bea1 Remove "Interaction with funding streams"
ZIP 207 will not be deployed before this ZIP, so interactions should be
handled there.
2020-01-27 20:15:58 +00:00
copernicus-mogley 8e80fff644 Fix definition list and <pre> styles 2020-01-24 16:23:03 +00:00