Skip to content

Commit

Permalink
fix FPF name in Manufacturing Consent; fix title of Alternative 4
Browse files Browse the repository at this point in the history
  • Loading branch information
conradoplg committed Jul 9, 2024
1 parent 14399f3 commit 68b6c01
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions draft-noamchom67-manufacturing-consent.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<p>"Section 501(c)(3)" refers to that section of the U.S. Internal Revenue Code (Title 26 of the U.S. Code). <a id="footnote-reference-5" class="footnote_reference" href="#section501c3">12</a></p>
<p>"Community Advisory Panel" refers to the panel of community members assembled by the Zcash Foundation and described at <a id="footnote-reference-6" class="footnote_reference" href="#zf-community">11</a>.</p>
<p>"Zcash Community Grants", also called "ZCG", refers to grants program (formerly known as ZOMG) that funds independent teams entering the Zcash ecosystem, to perform major ongoing development (or other work) for the public good of the Zcash ecosystem. &lt;<a href="https://zcashcommunitygrants.org/">https://zcashcommunitygrants.org/</a>&gt;</p>
<p>"Financial Privacy Fund", also called "FPF" refers to the start-up non-profit organization incorporated and based in the Cayman Islands. &lt;<a href="https://www.financialprivacyfoundation.org/">https://www.financialprivacyfoundation.org/</a>&gt;</p>
<p>"Financial Privacy Foundation", also called "FPF" refers to the start-up non-profit organization incorporated and based in the Cayman Islands. &lt;<a href="https://www.financialprivacyfoundation.org/">https://www.financialprivacyfoundation.org/</a>&gt;</p>
<p>"Qedit" refers to the company founded in 2016 by a world-class team of accomplished tech entrepreneurs, researchers, and developers; QEDIT has emerged as a global leader in the field of Zero-Knowledge Proofs. &lt;<a href="https://qed-it.com/about-us/">https://qed-it.com/about-us/</a>&gt;</p>
<p>"ZecHub" refers to the team of content creators who have supported Zcash through a series of ZCG approved grants. &lt;<a href="https://forum.zcashcommunity.com/t/zechub-an-education-hub-for-zcash-2024-continued/47947">https://forum.zcashcommunity.com/t/zechub-an-education-hub-for-zcash-2024-continued/47947</a>&gt;</p>
<p>The terms "Testnet" and "Mainnet" are to be interpreted as described in section 3.12 of the Zcash Protocol Specification <a id="footnote-reference-7" class="footnote_reference" href="#protocol-networks">3</a>.</p>
Expand All @@ -56,7 +56,7 @@
<p>Block subsidies will be administered through two organizations:</p>
<ol type="1">
<li>Zcash Foundation (✳️ for ECC, ZCG)</li>
<li>Financial Privacy Fund (✳️ for Qedit, ZecHub)</li>
<li>Financial Privacy Foundation (✳️ for Qedit, ZecHub)</li>
</ol>
<p>✳️ <strong>ZF and FPF adminstration of block subsidy details, costs, et al are currently under debate</strong> <a id="footnote-reference-9" class="footnote_reference" href="#zf-fpf-admin-details">14</a></p>
</section>
Expand Down Expand Up @@ -97,7 +97,7 @@
<p>"Dev Fund" block subsidies will be administered through two organizations:</p>
<ol type="1">
<li>Zcash Foundation (✳️ for ECC, ZCG)</li>
<li>Financial Privacy Fund (✳️ for Qedit, ZecHub)</li>
<li>Financial Privacy Foundation (✳️ for Qedit, ZecHub)</li>
</ol>
<p>✳️ <strong>ZF and FPF adminstration of block subsidy details, costs, et al are currently under debate</strong> <a id="footnote-reference-12" class="footnote_reference" href="#zf-fpf-admin-details">14</a></p>
<p>The allocations are described in more detail below. The fund flow will be implemented at the consensus-rule layer, by sending the corresponding ZEC to the designated address(es) for each block. This Dev Fund will end at the third halving (unless extended/modified by a future ZIP).</p>
Expand Down
6 changes: 3 additions & 3 deletions draft-noamchom67-manufacturing-consent.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ to perform major ongoing development (or other work)
for the public good of the Zcash ecosystem.
<https://zcashcommunitygrants.org/>

"Financial Privacy Fund", also called "FPF" refers to the start-up non-profit
"Financial Privacy Foundation", also called "FPF" refers to the start-up non-profit
organization incorporated and based in the Cayman Islands.
<https://www.financialprivacyfoundation.org/>

Expand Down Expand Up @@ -114,7 +114,7 @@ preference can be expediently realized.
Block subsidies will be administered through two organizations:

1. Zcash Foundation (✳️ for ECC, ZCG)
2. Financial Privacy Fund (✳️ for Qedit, ZecHub)
2. Financial Privacy Foundation (✳️ for Qedit, ZecHub)

✳️ **ZF and FPF adminstration of block subsidy details, costs, et al are currently under debate**
[#zf-fpf-admin-details]_
Expand Down Expand Up @@ -228,7 +228,7 @@ as generally recommended in Josh Swihart's proposal [#draft-swihart]_.
"Dev Fund" block subsidies will be administered through two organizations:

1. Zcash Foundation (✳️ for ECC, ZCG)
2. Financial Privacy Fund (✳️ for Qedit, ZecHub)
2. Financial Privacy Foundation (✳️ for Qedit, ZecHub)

✳️ **ZF and FPF adminstration of block subsidy details, costs, et al are currently under debate**
[#zf-fpf-admin-details]_
Expand Down
2 changes: 1 addition & 1 deletion draft-nuttycom-funding-allocation.html
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
<p>This alternative is presented as the simplest allocation of block rewards to a lockbox for future disbursement that is consistent with results of community polling.</p>
</section>
</section>
<section id="alternative-4-masters-of-the-universe"><h3><span class="section-heading">Alternative 4: Masters Of The Universe</span><span class="section-anchor"> <a rel="bookmark" href="#alternative-4-masters-of-the-universe"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h3>
<section id="alternative-4-masters-of-the-universe"><h3><span class="section-heading">Alternative 4: Masters Of The Universe?</span><span class="section-anchor"> <a rel="bookmark" href="#alternative-4-masters-of-the-universe"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h3>
<p>Proposed by NoamChom (Zcash forum)</p>
<ul>
<li>17% of the block subsidy is to be distributed to the lockbox.</li>
Expand Down
4 changes: 2 additions & 2 deletions draft-nuttycom-funding-allocation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,8 @@ This alternative is presented as the simplest allocation of block rewards
to a lockbox for future disbursement that is consistent with results of
community polling.

Alternative 4: Masters Of The Universe
--------------------------------------
Alternative 4: Masters Of The Universe?
---------------------------------------

Proposed by NoamChom (Zcash forum)

Expand Down

0 comments on commit 68b6c01

Please sign in to comment.