Kris Nuttycombe
82166a003e
Merge remote-tracking branch 'upstream/main' into draft-dev-fund-proposal-20
2024-07-04 09:01:27 -06:00
Kris Nuttycombe
62482ec6b9
Update title for Alternative 2 in accordance with Jason's request.
2024-07-04 08:44:29 -06:00
Kris Nuttycombe
2712dcbcf8
Further clarify motivation; note that FPF is a non-US org.
2024-07-03 23:21:34 -06:00
Kris Nuttycombe
7ade5d379a
Use "Lockbox Funding Streams" uniformly.
2024-07-03 21:55:08 -06:00
Kris Nuttycombe
302662b239
Fix missing ZIP 1014 reference.
2024-07-03 21:53:22 -06:00
Kris Nuttycombe
a46f9e5097
Clarify the meaning of "lockbox"
2024-07-03 21:50:32 -06:00
Kris Nuttycombe
af4d76b9eb
Add titles for non-direct-funding alternatives.
2024-07-03 21:43:39 -06:00
str4d
7ed5bcfe9d
Merge pull request #869 from zcash/manual-render
...
Render manually, while the CI-based rendering is broken
2024-07-04 00:47:18 +01:00
Jack Grigg
88dca30317
Render manually, while the CI-based rendering is broken
2024-07-03 23:46:29 +00:00
str4d
8d23020faa
Merge pull request #857 from noamchom67/patch-1
...
Manufacturing Consent: V1.0 from Zip 1014
2024-07-04 00:41:04 +01:00
Jack Grigg
45a1716518
draft-noamchom67-manufacturing-consent: Fix rendering bugs
2024-07-03 23:38:48 +00:00
Jack Grigg
7b3ab75ed7
draft-noamchom67-manufacturing-consent: Use alternate TBD notation
...
`**` is rST syntax and breaks rendering.
2024-07-03 23:34:19 +00:00
Jack Grigg
175a4c1649
draft-noamchom67-manufacturing-consent: Fix reference links
2024-07-03 23:28:40 +00:00
noamchom67
d9309db436
Update draft-noamchom67-manufacturing-consent.rst
...
Editorial, added clarifications/ ** in allocations sections to acknowledge TBD status of block subsidy administration
2024-07-03 23:14:16 +00:00
noamchom67
5c34d0bf3b
Update draft-noamchom67-manufacturing-consent.rst
...
Removed ECC contingency statements, upgraded wording around statements for NFDM completion prior to 4 year cycle end.
2024-07-03 23:14:16 +00:00
noamchom67
8ccecc8604
Update draft-noamchom67-manufacturing-consent.rst
...
Accepted wording correction.
Co-authored-by: Kris Nuttycombe <kris@nutty.land>
2024-07-03 23:14:16 +00:00
noamchom67
17c4972948
Update draft-noamchom67-manufacturing-consent.rst
...
Accepted terms update.
Co-authored-by: Kris Nuttycombe <kris@nutty.land>
2024-07-03 23:14:16 +00:00
noamchom67
e39dd301ec
Update draft-noamchom67-manufacturing-consent.rst
...
Updated requirements section near the end, per Kris' feedback.
2024-07-03 23:14:16 +00:00
noamchom67
db59b5dc16
Update draft-noamchom67-manufacturing-consent.rst
...
updated details about exception scenario for the activation of a "non-direct funding model" in less than 4 years, based on Conrado's review questions.
Also noted the TBD nature of ZF and FPF participation as direct block subsidy administrators.
2024-07-03 23:14:16 +00:00
noamchom67
97a510e1b0
Update draft-noamchom67-manufacturing-consent.rst
...
update accepted
Co-authored-by: Conrado Gouvea <conradoplg@gmail.com>
2024-07-03 23:14:16 +00:00
noamchom67
0b5f34b4a6
Update draft-noamchom67-manufacturing-consent.rst
...
First round of modifications based on Manufacturing Consent from the Zcash forum.
2024-07-03 23:14:13 +00:00
noamchom67
f86ce1bb71
Copy zip-1014.rst to draft-noamchom67-manufacturing-consent.rst
2024-07-03 23:13:51 +00:00
str4d
3350082efc
Merge pull request #865 from daira/blocks-should-balance-exactly
...
[ZIP] Add draft-hopwood-coinbase-balance ("Blocks should balance exactly")
2024-07-03 23:46:03 +01:00
str4d
917906f934
Merge pull request #861 from jackgavigan/main
...
Initial draft ZIP for ZF's Dev Fund v2 proposal
2024-07-03 23:32:59 +01:00
Jack Grigg
50a72bac36
Render manually, while the CI-based rendering is broken
2024-07-03 22:32:25 +00:00
Jack Grigg
2dff979061
draft-zf-community-dev-fund-2-proposal: Fix rendering bug
2024-07-03 22:31:56 +00:00
Jack Grigg
16d03a90b4
Merge branch 'main' into jackgavigan:main
2024-07-03 21:47:14 +00:00
str4d
5382557138
Correct link to `draft-nuttycom-lockbox-streams`
2024-07-03 22:46:17 +01:00
Kris Nuttycombe
46d810b84e
Render draft ZIPs.
2024-07-03 15:41:24 -06:00
Kris Nuttycombe
c0fb87ab10
Fix missing reference to lockbox funding streams proposal.
2024-07-03 14:54:35 -06:00
Kris Nuttycombe
fa1e022c5d
Add requirements related to ZCG streams for Alternative 2 & Alternative 4
2024-07-03 14:47:25 -06:00
Kris Nuttycombe
b0a5cc902c
Add NoamChom's proposal for a 25% dev fund, motivation for Skyl's alternative.
2024-07-03 14:41:58 -06:00
Kris Nuttycombe
81551d9395
Propose alternatives for non-direct allocation of block rewards.
...
Co-authored-by: Skylar Saveland <skylar@free2z.com>
Co-authored-by: Jason McGee <aquietinvestor@gmail.com>
2024-07-03 14:27:21 -06:00
Kris Nuttycombe
6831bde74f
Rename ZIP to `Lockbox Funding Streams`
2024-07-03 14:26:58 -06:00
str4d
5916df779e
Merge pull request #867 from nuttycom/draft_deferred_funding
...
Add a draft of ZIP 207 modifications to enable funding stream deposits to a "lockbox".
2024-07-03 21:17:27 +01:00
Jack Grigg
ed3af0a2f5
Render manually, while the CI-based rendering is broken
2024-07-03 20:13:58 +00:00
Jack Grigg
9b7a22097a
draft-nuttycom-lockbox-streams: Cleanups and rendering fixes
2024-07-03 20:11:36 +00:00
Jack Grigg
eaa24abdaf
Add missing `.gitignore` entry
2024-07-03 20:04:36 +00:00
Jack Grigg
9a49cdfd19
Remove `.md` suffixes from links in HTML renders
2024-07-03 20:03:17 +00:00
Kris Nuttycombe
bd8d7ef9fc
Add a draft of ZIP 207 modifications to enable funding stream deposits to a "lockbox".
2024-07-03 13:06:01 -06:00
Jack Gavigan
6f0c34494a
Update draft-zf-community-dev-fund-2-proposal.rst
...
Removes BP/ECC as a recipient, and re-assigns the BP slice to a lockbox.
2024-07-03 16:11:15 +01:00
Jack Gavigan
dc68efd40b
Update draft-zf-community-dev-fund-2-proposal.rst
...
Changes based on @str4d's feedback.
2024-07-03 01:03:25 +01:00
Jack Gavigan
e72eb6e707
Update draft-zf-community-dev-fund-2-proposal.rst
...
Co-authored-by: str4d <thestr4d@gmail.com>
2024-07-03 00:19:08 +01:00
Jack Gavigan
767c7ce16c
Update draft-zf-community-dev-fund-2-proposal.rst
...
Co-authored-by: str4d <thestr4d@gmail.com>
2024-07-03 00:18:21 +01:00
Jack Gavigan
34757b49b9
Merge branch 'zcash:main' into main
2024-07-03 00:17:12 +01:00
Jack Gavigan
5d2c7f701f
Update draft-zf-community-dev-fund-2-proposal.rst
...
Added a requirement that BP, ECC and ZF MUST collaborate with the Zcash community to research and explore the establishment of a non-direct funding model.
2024-07-02 23:43:42 +01:00
Jack Gavigan
21ae1f0863
Update draft-zf-community-dev-fund-2-proposal.rst
...
Clarified that FPF is a non-profit.
2024-07-02 22:20:31 +01:00
Jack Gavigan
8cf1c418b1
Amend eligibility for grants in draft-zf-community-dev-fund-2-proposal.rst
2024-07-02 21:09:43 +01:00
Daira-Emma Hopwood
ca1f8aba0a
Respond to ZIP Editors' review
2024-07-02 18:41:25 +01:00
Jack Gavigan
2d6d7db000
Remove spurious newline from draft-zf-community-dev-fund-2-proposal.rst
...
Co-authored-by: Daira-Emma Hopwood <daira@jacaranda.org>
2024-07-02 13:12:57 +01:00