zec
/
zips
mirror of https://github.com/zcash/zips.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace Heartwood with Canopy ZIPs in README. 

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2020-09-14 14:18:01 +01:00
parent 80d1fa8c2e
commit 858984ae0b
3 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
README.rst
View File

@ -39,14 +39,18 @@ Use ``make`` to check that you are using correct
and double-check the generated ``draft-*.html`` file before filing a Pull Request.
Heartwood ZIPs
--------------
Canopy ZIPs
-----------
This is the list of ZIPs included in Heartwood (Network Upgrade 3), due to activate on
mainnet in mid-July 2020:
This is the list of ZIPs included in Canopy (Network Upgrade 4), due to activate on
mainnet in mid-November 2020:
- `ZIP 213: Shielded Coinbase <zip-0213.rst>`__
- `ZIP 221: FlyClient - Consensus-Layer Changes <zip-0221.rst>`__
- `ZIP 207: Funding Streams <zip-0207.rst>`__
- `ZIP 211: Disabling Addition of New Value to the Sprout Value Pool <zip-0211.rst>`__
- `ZIP 212: Allow Recipient to Derive Sapling Ephemeral Secret from Note Plaintext <zip-0212.rst>`__
- `ZIP 214: Consensus rules for a Zcash Development Fund <zip-0214.rst>`__
- `ZIP 215: Explicitly Defining and Modifying Ed25519 Validation Rules <zip-0215.rst>`__
- `ZIP 251: Deployment of the Canopy Network Upgrade <zip-0251.rst>`__
License

16
README.template
View File

@ -39,14 +39,18 @@ Use ``make`` to check that you are using correct
and double-check the generated ``draft-*.html`` file before filing a Pull Request.
Heartwood ZIPs
--------------
Canopy ZIPs
-----------
This is the list of ZIPs included in Heartwood (Network Upgrade 3), due to activate on
mainnet in mid-July 2020:
This is the list of ZIPs included in Canopy (Network Upgrade 4), due to activate on
mainnet in mid-November 2020:
- `ZIP 213: Shielded Coinbase <zip-0213.rst>`__
- `ZIP 221: FlyClient - Consensus-Layer Changes <zip-0221.rst>`__
- `ZIP 207: Funding Streams <zip-0207.rst>`__
- `ZIP 211: Disabling Addition of New Value to the Sprout Value Pool <zip-0211.rst>`__
- `ZIP 212: Allow Recipient to Derive Sapling Ephemeral Secret from Note Plaintext <zip-0212.rst>`__
- `ZIP 214: Consensus rules for a Zcash Development Fund <zip-0214.rst>`__
- `ZIP 215: Explicitly Defining and Modifying Ed25519 Validation Rules <zip-0215.rst>`__
- `ZIP 251: Deployment of the Canopy Network Upgrade <zip-0251.rst>`__
License

12
index.html
View File

@ -24,11 +24,15 @@
<p>To start contributing, first read <a href="zip-0000">ZIP 0</a> which documents the ZIP process. Then clone <a href="https://github.com/zcash/zips">this repo</a> from GitHub, and start adding your draft ZIP, formatted either as reStructuredText or as Markdown.</p>
<p>For example, if using reStructuredText, use a filename matching <code>draft-*.rst</code>. Use <code>make</code> to check that you are using correct <a href="https://docutils.sourceforge.io/rst.html">reStructuredText</a> or <a href="https://pandoc.org/MANUAL.html#pandocs-markdown">Markdown</a> syntax, and double-check the generated <code>draft-*.html</code> file before filing a Pull Request.</p>
</section>
<section id="heartwood-zips"><h2><span class="section-heading">Heartwood ZIPs</span><span class="section-anchor"> <a rel="bookmark" href="#heartwood-zips"><img width="24" height="24" src="assets/images/section-anchor.png" alt=""></a></span></h2>
<p>This is the list of ZIPs included in Heartwood (Network Upgrade 3), due to activate on mainnet in mid-July 2020:</p>
<section id="canopy-zips"><h2><span class="section-heading">Canopy ZIPs</span><span class="section-anchor"> <a rel="bookmark" href="#canopy-zips"><img width="24" height="24" src="assets/images/section-anchor.png" alt=""></a></span></h2>
<p>This is the list of ZIPs included in Canopy (Network Upgrade 4), due to activate on mainnet in mid-November 2020:</p>
<ul>
<li><a href="zip-0213">ZIP 213: Shielded Coinbase</a></li>
<li><a href="zip-0221">ZIP 221: FlyClient - Consensus-Layer Changes</a></li>
<li><a href="zip-0207">ZIP 207: Funding Streams</a></li>
<li><a href="zip-0211">ZIP 211: Disabling Addition of New Value to the Sprout Value Pool</a></li>
<li><a href="zip-0212">ZIP 212: Allow Recipient to Derive Sapling Ephemeral Secret from Note Plaintext</a></li>
<li><a href="zip-0214">ZIP 214: Consensus rules for a Zcash Development Fund</a></li>
<li><a href="zip-0215">ZIP 215: Explicitly Defining and Modifying Ed25519 Validation Rules</a></li>
<li><a href="zip-0251">ZIP 251: Deployment of the Canopy Network Upgrade</a></li>
</ul>
</section>
<section id="license"><h2><span class="section-heading">License</span><span class="section-anchor"> <a rel="bookmark" href="#license"><img width="24" height="24" src="assets/images/section-anchor.png" alt=""></a></span></h2>