Merge pull request #901 from daira/add-kris-as-zip-editor

Add Kris Nuttycombe as a ZIP Editor
zcash · Aug 27, 2024 · 1e0431e · 1e0431e
2 parents eb6f24f + 2d8c904
commit 1e0431e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/rendered/zip-0000.html b/rendered/zip-0000.html
@@ -11,6 +11,7 @@
 Owners: Jack Grigg &lt;str4d@electriccoin.co&gt;
         Conrado Gouvêa &lt;conrado@zfnd.org&gt;
         Arya &lt;arya@zfnd.org&gt;
+        Kris Nuttycombe &lt;kris@nutty.land&gt;
 Original-Authors: Daira-Emma Hopwood
                   Josh Cincinnati
                   George Tankersley
@@ -60,7 +61,7 @@
             <section id="zip-editors"><h3><span class="section-heading">ZIP Editors</span><span class="section-anchor"> <a rel="bookmark" href="#zip-editors"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h3>
                 <p>The current ZIP Editors are:</p>
                 <ul>
-                    <li>Jack Grigg, associated with the Electric Coin Company;</li>
+                    <li>Jack Grigg and Kris Nuttycombe, associated with the Electric Coin Company;</li>
                     <li>Conrado Gouvêa and Arya, associated with the Zcash Foundation.</li>
                 </ul>
                 <p>All can be reached at <a href="mailto:zips@z.cash">zips@z.cash</a>. The current design of the ZIP Process dictates that there are always at least two ZIP Editors: at least one from the Electric Coin Company and at least one from the Zcash Foundation.</p>

diff --git a/rendered/zip-1015.html b/rendered/zip-1015.html
@@ -70,7 +70,7 @@
                     <p>The stream allocated to Zcash Community Grants (ZCG) is intended to fund independent teams entering the Zcash ecosystem, to perform major ongoing development (or other work) for the public good of the Zcash ecosystem, to the extent that such teams are available and effective. The ZCG Committee is given the discretion to allocate funds not only to major grants, but also to a diverse range of projects that advance the usability, security, privacy, and adoption of Zcash, including community programs, dedicated resources, and other projects of varying sizes.</p>
                     <p>The funds SHALL be received and administered by the Financial Privacy Foundation (FPF). FPF MUST disburse them for grants and expenses reasonably related to the administration of the ZCG program, but subject to the following additional constraints:</p>
                     <ol type="1">
-                        <li>These funds must be used exclusively for issuing Zcash Community Grants to external parties that are independent of the FPF or to Autonomous Entities operating under the FPF umbrella. Additionally, they may be used to cover expenses reasonably related to the administration of Zcash Community Grants. Under no circumstances should these funds be used by FPF for its internal operations or for any direct expenses unrelated to the administration of Zcash Community Grants.</li>
+                        <li>These funds MUST be used exclusively for issuing Zcash Community Grants to external parties that are independent of the FPF or to Autonomous Entities operating under the FPF umbrella. Additionally, they MAY be used to cover expenses reasonably related to the administration of Zcash Community Grants. These funds MUST NOT be used by FPF for its internal operations or for any direct expenses unrelated to the administration of Zcash Community Grants.</li>
                         <li>ZCG SHOULD support well-specified work proposed by the grantee, at reasonable market-rate costs. They can be of any duration or ongoing without a duration limit. Grants of indefinite duration SHOULD be reviewed periodically (on a schedule that the Zcash Community Grants Committee considers appropriate for the value and complexity of the grant) for continuation of funding.</li>
                         <li>Priority SHOULD be given to major grants that bolster teams with substantial (current or prospective) continual existence, and set them up for long-term success, subject to the usual grant award considerations (impact, ability, risks, team, cost-effectiveness, etc.). Priority SHOULD be given to major grants that support ecosystem growth, for example through mentorship, coaching, technical resources, creating entrepreneurial opportunities, etc. If one proposal substantially duplicates another’s plans, priority SHOULD be given to the originator of the plans.</li>
                         <li>The ZCG committee SHOULD be restricted to funding projects that further the Zcash cryptocurrency and its ecosystem (which is more specific than furthering financial privacy in general) as permitted by any relevant jurisdictional requirements.</li>

diff --git a/zips/zip-0000.rst b/zips/zip-0000.rst
@@ -5,6 +5,7 @@
   Owners: Jack Grigg <str4d@electriccoin.co>
           Conrado Gouvêa <conrado@zfnd.org>
           Arya <arya@zfnd.org>
+          Kris Nuttycombe <kris@nutty.land>
   Original-Authors: Daira-Emma Hopwood
                     Josh Cincinnati
                     George Tankersley
@@ -170,7 +171,7 @@ ZIP Editors
 
 The current ZIP Editors are:
 
-* Jack Grigg, associated with the Electric Coin Company;
+* Jack Grigg and Kris Nuttycombe, associated with the Electric Coin Company;
 * Conrado Gouvêa and Arya, associated with the Zcash Foundation.
 
 All can be reached at zips@z.cash. The current design of the ZIP Process