Commit Graph

3536 Commits

Author SHA1 Message Date
Daira-Emma Hopwood 9cdb4c1c77 Regenerate PDFs.
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
2024-08-28 15:18:08 +01:00
Daira-Emma Hopwood 815b38cf50 Set Change History date for 2024.5.0.
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
2024-08-28 15:04:09 +01:00
Daira-Emma Hopwood a20fcbeff0 Boilerplate for NU6 (orginally based on Kris' branch 'protocol_nu6_boilerplate').
Author: Kris Nuttycombe <kris@nutty.land>
Co-authored-by: Daira-Emma Hopwood <daira@jacaranda.org>
2024-08-28 15:03:43 +01:00
Daira-Emma Hopwood cd82c2859a
Merge pull request #902 from nuttycom/zsf
[ZIP 233] Zcash Sustainability Fund
2024-08-27 19:07:24 +01:00
Conrado Gouvea 1e0431e8b6
Merge pull request #901 from daira/add-kris-as-zip-editor
Add Kris Nuttycombe as a ZIP Editor
2024-08-27 15:00:14 -03:00
Kris Nuttycombe d0390262b5 [ZIP 233] Wrap and format math syntax. 2024-08-27 11:57:57 -06:00
Kris Nuttycombe f9838bfdf6 Move draft-zsf.md to zips/zip-0233.md 2024-08-27 11:45:41 -06:00
Daira-Emma Hopwood 2d8c904e8e Re-render ZIP 1015.
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
2024-08-27 18:37:54 +01:00
Daira-Emma Hopwood 54195b18d8 Add Kris Nuttycombe as a ZIP Editor.
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
2024-08-27 18:37:35 +01:00
Kris Nuttycombe a279a34c82 Merge remote-tracking branch 'upstream/main' into zsf 2024-08-27 11:34:13 -06:00
Kris Nuttycombe eb6f24f9bf
Merge pull request #898 from zcash/fpf-language
ZIP 1015: update FPF-related language
2024-08-27 11:11:30 -06:00
Conrado Gouvea 6fa4073d5e conformance language 2024-08-27 14:09:32 -03:00
Conrado Gouvea da1abd5214 update constraint 1 per suggestion 2024-08-27 14:07:12 -03:00
Kris Nuttycombe c63b18923f
Merge pull request #900 from daira/zip-253-and-rerender
ZIP 253: move to Proposed and fill in assigned ZIP number 1015
2024-08-27 11:03:23 -06:00
Daira-Emma Hopwood d93d3f4c36 Re-render HTML.
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
2024-08-27 10:56:50 +01:00
Daira-Emma Hopwood 0d5706ba70 ZIP 253: move to Proposed and fill in assigned ZIP number 1015.
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
2024-08-27 10:56:38 +01:00
Kris Nuttycombe 718d3c2f40
Merge pull request #881 from nuttycom/nuttycom-reorg-fund-alternatives
ZIP 1015: Specify development funding starting at NU6
2024-08-26 17:14:55 -06:00
Kris Nuttycombe 57d0fe6501 Apply suggestions from code review
Co-authored-by: Daira-Emma Hopwood <daira@jacaranda.org>
2024-08-26 17:12:34 -06:00
Conrado Gouvea e5c5b199ff ZIP 1015: update FPF-related language 2024-08-26 19:25:44 -03:00
Kris Nuttycombe e5dc216d0a Update ZIP 214 to include the ZIP 1015 funding streams as Revision 1
This includes some additional cleanup to definitions and wording
in ZIP 1015 to clarify required references in ZIP 214.
2024-08-26 14:20:21 -06:00
Kris Nuttycombe 92ed400b38 Restore the draft NU6 funding proposal that was voted on. 2024-08-26 14:03:07 -06:00
Kris Nuttycombe 9c5e188255 Create ZIP 1015 from the voted-upon funding allocation proposal draft. 2024-08-26 12:24:47 -06:00
Kris Nuttycombe b6c7a2c421 draft-nuttycom-funding-allocation: Move the 20% lockbox proposal to previously considered alternatives.
The Zcash community has selected Alternative 1, the Hybrid Deferred Dev
Fund, for the behavior of the dev fund following the November 2024
halving. See the following posts for details:

https://forum.zcashcommunity.com/t/dev-fund-decision-time/48231/16
https://forum.zcashcommunity.com/t/dev-fund-decision-time/48231/17
https://forum.zcashcommunity.com/t/dev-fund-decision-time/48231/27
2024-08-26 12:06:17 -06:00
Kris Nuttycombe c9df015564 draft-nuttycom-funding-allocation: Move alternatives 1 & 4 to "previously considerd" section.
This also renumbers the remaining alternatives to reflect the moves,
and updates the motivation for the 20% option such that it is does
not depend heavily on context provided by the other alternatives.
2024-08-26 11:56:15 -06:00
Daira-Emma Hopwood eb9391b4fd
Merge pull request #897 from zcash/253-testnet-activation-height
Update zip-0253.md with a Testnet activation height
2024-08-26 18:37:26 +01:00
Kris Nuttycombe 4290ff9787 Render zip-0253 2024-08-26 11:35:49 -06:00
Arya 38a21d3eba
Update zip-0253.md 2024-08-26 13:18:58 -04:00
Tomek Piotrowski 435fc73045
Remove the mention of zsf balance commitments 2024-08-22 16:43:27 +02:00
Tomek Piotrowski e0e3f25295
Remove the section about `ZsfBalanceAfter` persistence 2024-08-22 16:37:14 +02:00
Jack Grigg a73fa42515
Merge pull request #892 from zcash/zip-sync-editing-2024-08-06
Edits from 2024-08-06 ZIP Sync
2024-08-15 05:44:03 -07:00
Jack Grigg c13d0639fd Render manually, while the CI-based rendering is broken 2024-08-13 17:49:25 +00:00
Jack Grigg 246ce15ed2 ZIP 2001: Improvements to specification
- Add explicit consensus rules where missing.
- Adjust spec to be solely modifications to other specs.
- Improve definition of PoolValue_Deferred.

Co-authored-by: Arya <arya@zfnd.org>
Co-authored-by: Conrado Gouvêa <conrado@zfnd.org>
Co-authored-by: Daira-Emma Hopwood <daira@jacaranda.org>
Co-authored-by: Kris Nuttycombe <kris@nutty.land>
2024-08-13 17:34:40 +00:00
Jack Grigg ded0698adb ZIP 253: Fix inter-ZIP references 2024-08-06 20:27:22 +00:00
Jack Grigg b81dbf1bd9 Render manually, while the CI-based rendering is broken 2024-08-05 22:50:58 +00:00
Jack Grigg 43ebf0184c
Merge pull request #878 from zcash/draft-zip-253-nu6
[ZIP 253] Initial draft
2024-08-05 23:49:43 +01:00
Automated Release Test 5f26cb52c1 updates footnote ref 2024-08-05 11:01:42 -04:00
Jack Grigg 0c39e5ef09
Merge pull request #891 from zcash/zip-236
Assign ZIP number 236 to draft-hopwood-coinbase-balance
2024-08-01 20:52:10 +01:00
Jack Grigg cfcb5bd066
Merge pull request #890 from zcash/fix-redirects
Fix redirect for ZIP 2001
2024-08-01 20:51:49 +01:00
Automated Release Test bb4e171b01 Applies suggestions from PR review 2024-08-01 15:08:08 -04:00
Jack Grigg aaf81b843a Redirect /draft-hopwood-coinbase-balance to /zip-0236 2024-08-01 17:52:20 +00:00
Jack Grigg e485b1263d Assign ZIP 236 to draft-hopwood-coinbase-balance 2024-08-01 17:48:42 +00:00
Jack Grigg 732b3adab5 Fix redirect for ZIP 2001
`_config.yml` is deleted as it did not work, indicating that Jinja is
not being used at all for the ZIPs repo rendering.
2024-08-01 17:37:32 +00:00
Jack Grigg 6f1a2ea160
Merge pull request #887 from zcash/zip-2001
Assign ZIP 2001 to draft-nuttycom-lockbox-streams
2024-08-01 16:01:13 +01:00
Jack Grigg ede4b1cb32 Attempt to redirect `/draft-nuttycom-lockbox-streams` to `/zip-2001` 2024-08-01 15:00:15 +00:00
Jack Grigg 945da8d758 Assign ZIP 2001 to draft-nuttycom-lockbox-streams 2024-08-01 15:00:15 +00:00
Jack Grigg 6a55ee546c Move _config.yml into the subdirectory we are rendering
This was missed in the refactor PR.
2024-07-30 22:03:07 +00:00
Jack Grigg b00814bb1f
Merge pull request #882 from zcash/teor-resigns
Remove teor and Aditya Bharadwaj as ZIP editors
2024-07-30 23:00:43 +01:00
Jack Grigg 8ed75f93de Render manually, while the CI-based rendering is broken 2024-07-30 22:00:10 +00:00
Arya 054a9eeb71
Update zips/zip-0253.md
Co-authored-by: Jack Grigg <jack@electriccoin.co>
2024-07-30 14:17:50 -04:00
Jack Grigg c42647dde5
Merge pull request #662 from ZcashFoundation/zip-frost
[ZIP 312] FROST for Spend Authorization Signatures
2024-07-23 22:01:24 +01:00