Commit Graph

3473 Commits

Author SHA1 Message Date
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
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
Daira-Emma Hopwood 9db0cf542a Add accent on Conrado Gouvêa's surname.
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
2024-07-23 05:31:03 +01:00
Daira-Emma Hopwood 1f118f77b5 Remove Aditya Bharadwaj as a ZIP Editor, and thank teor and Aditya for
their contributions.

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
2024-07-23 03:41:51 +01:00
Arya 8de2dcb19b
Update zips/zip-0253.md 2024-07-19 21:37:33 -04:00
Conrado Gouvea 6e6893d832 address comment, update spec ref, add paper ref 2024-07-19 21:54:01 -03:00
Conrado Gouvea d9b98e6a14 Merge remote-tracking branch 'upstream/main' into zip-frost 2024-07-19 18:29:52 -03:00
teor 4bea2e3910
Remove teor as a ZIP editor 2024-07-19 10:42:44 +10:00
Jack Grigg f20d2f79d6
Merge pull request #880 from zcash/zip302-abandon-f5
ZIP 302: Abandon `0xF5`
2024-07-18 13:44:21 +01:00
Jack Grigg ae9de0a26b Render manually, while the CI-based rendering is broken 2024-07-18 05:07:17 +00:00
Automated Release Test 446cd66ec4 ZIP 253: Initial draft 2024-07-17 22:42:58 -04:00
Jack Grigg 6ae11b9bbc ZIP 302: Abandon 0xF5 as "for legacy private agreement"
We decided that using up another top-level prefix byte for structured
memos is fine, because it opens up the typecode space significantly (it
adds >250 new single-byte typecodes that can encode 509 bytes, which is
not a significant reduction from the 511 bytes that a top-level prefix
byte can encode).
2024-07-17 21:39:18 +00:00
Jack Grigg 3612111cef ZIP 302: Cleanups 2024-07-17 21:35:28 +00:00
Jack Grigg 94f654c2ec
Merge pull request #240 from daira/op-csv
Add ZIPs 68, 112, and 113 (OP_CHECKSEQUENCEVERIFY)
2024-07-17 15:55:08 +01:00
Jack Grigg cff34341ec
Merge pull request #426 from str4d/zip-0311
[ZIP 311] Zcash Payment Disclosures
2024-07-17 15:54:32 +01:00
Jack Grigg ce0180799a
Merge pull request #876 from zcash/more-index-tables
Add separate tables for Released, Draft, and struck ZIPs
2024-07-17 15:00:28 +01:00
Jack Grigg 00f6feda2e
Merge pull request #767 from zcash/dependabot/github_actions/EndBug/add-and-commit-9.1.4
Bump EndBug/add-and-commit from 9.1.3 to 9.1.4
2024-07-17 03:33:17 +01:00
Jack Grigg e96b057ae5 Move ZIPs 68, 112, and 113 into `zips/` subdirectory 2024-07-17 02:28:53 +00:00
Jack Grigg fe5a48ec59 Merge branch 'main' into op-csv 2024-07-17 02:23:04 +00:00
Jack Grigg 2479dc18d1 ZIP 311: Add TODO for Orchard support 2024-07-17 02:16:01 +00:00
Jack Grigg f044cc57d6 Merge branch 'main' into zip-0311 2024-07-17 02:10:15 +00:00
Jack Grigg 771c358c34 Add separate tables for Released, Draft, and struck ZIPs
These make it easier to determine what is currently part of the Zcash
ecosystem, and what is still in progress. The original by-number index
is preserved at the bottom for reference.
2024-07-17 01:56:26 +00:00
Jack Grigg 442afb0d3a
Merge pull request #855 from zcash/dependabot/github_actions/actions/checkout-4.1.7
Bump actions/checkout from 4.1.2 to 4.1.7
2024-07-16 21:24:25 +01:00
Jack Grigg e0b363523b
Merge pull request #875 from zcash/gh-pages-reorg
CI: Create workflow to deploy to GH Pages
2024-07-16 21:16:49 +01:00