diff --git a/README.rst b/README.rst index 5c6e5eeb..e1e63706 100644 --- a/README.rst +++ b/README.rst @@ -84,6 +84,7 @@ Released ZIPs 250 Deployment of the Heartwood Network Upgrade Final 251 Deployment of the Canopy Network Upgrade Final 252 Deployment of the NU5 Network Upgrade Final + 253 Deployment of the NU6 Network Upgrade Proposed 300 Cross-chain Atomic Transactions Proposed 301 Zcash Stratum Protocol Final 308 Sprout to Sapling Migration Final @@ -128,7 +129,6 @@ written. 231 Decouple Memos from Transaction Outputs Reserved 236 Blocks should balance exactly Draft 245 Transaction Identifier Digests & Signature Validation for Transparent Zcash Extensions Draft - 253 Deployment of the NU6 Network Upgrade Draft 302 Standardized Memo Field Format Draft 303 Sprout Payment Disclosure Reserved 304 Sapling Address Signatures Draft @@ -256,7 +256,7 @@ Index of ZIPs 250 Deployment of the Heartwood Network Upgrade Final 251 Deployment of the Canopy Network Upgrade Final 252 Deployment of the NU5 Network Upgrade Final - 253 Deployment of the NU6 Network Upgrade Draft + 253 Deployment of the NU6 Network Upgrade Proposed 300 Cross-chain Atomic Transactions Proposed 301 Zcash Stratum Protocol Final 302 Standardized Memo Field Format Draft diff --git a/rendered/draft-nuttycom-funding-allocation.html b/rendered/draft-nuttycom-funding-allocation.html index 873d3046..1f1c1a17 100644 --- a/rendered/draft-nuttycom-funding-allocation.html +++ b/rendered/draft-nuttycom-funding-allocation.html @@ -14,7 +14,7 @@ Original-Authors: Skylar Saveland <skylar@free2z.com> Credits: Daira-Emma Hopwood Jack Grigg @Peacemonger (Zcash Forum) -Status: Draft +Status: Withdrawn Category: Consensus Created: 2024-07-03 License: MIT diff --git a/rendered/index.html b/rendered/index.html index 4c20da6c..f50e1c84 100644 --- a/rendered/index.html +++ b/rendered/index.html @@ -59,6 +59,7 @@ 250 Deployment of the Heartwood Network Upgrade Final 251 Deployment of the Canopy Network Upgrade Final 252 Deployment of the NU5 Network Upgrade Final + 253 Deployment of the NU6 Network Upgrade Proposed 300 Cross-chain Atomic Transactions Proposed 301 Zcash Stratum Protocol Final 308 Sprout to Sapling Migration Final @@ -93,7 +94,6 @@ 231 Decouple Memos from Transaction Outputs Reserved 236 Blocks should balance exactly Draft 245 Transaction Identifier Digests & Signature Validation for Transparent Zcash Extensions Draft - 253 Deployment of the NU6 Network Upgrade Draft 302 Standardized Memo Field Format Draft 303 Sprout Payment Disclosure Reserved 304 Sapling Address Signatures Draft @@ -202,7 +202,7 @@ 250 Deployment of the Heartwood Network Upgrade Final 251 Deployment of the Canopy Network Upgrade Final 252 Deployment of the NU5 Network Upgrade Final - 253 Deployment of the NU6 Network Upgrade Draft + 253 Deployment of the NU6 Network Upgrade Proposed 300 Cross-chain Atomic Transactions Proposed 301 Zcash Stratum Protocol Final 302 Standardized Memo Field Format Draft diff --git a/rendered/zip-0253.html b/rendered/zip-0253.html index b5ab8757..138230ad 100644 --- a/rendered/zip-0253.html +++ b/rendered/zip-0253.html @@ -10,7 +10,7 @@ 
ZIP: 253
 Title: Deployment of the NU6 Network Upgrade
 Owners: Arya <arya@zfnd.org>
-Status: Draft
+Status: Proposed
 Category: Consensus / Network
 Created: 2024-07-17
 License: MIT
@@ -31,7 +31,6 @@ role="doc-noteref">3.

 
This proposal defines the deployment of the NU6 network upgrade.

 
Specification

 
NU6 deployment

-
 
The primary sources of information about NU6 consensus protocol
 changes are:

Don’t Panic

-

If this is your first time writing a ZIP, the structure and format may look intimidating. But really, it’s just meant to reflect common-sense practice and some technical conventions. Feel free to start with a simple initial draft that gets ideas across, even if it doesn’t quite follow this format. The community and ZIP editors will help you figure things out and get it into shape later.

+

If this is your first time writing a ZIP, the structure and format +may look intimidating. But really, it’s just meant to reflect +common-sense practice and some technical conventions. Feel free to start +with a simple initial draft that gets ideas across, even if it doesn’t +quite follow this format. The community and ZIP editors will help you +figure things out and get it into shape later.

{Delete this section.}

Terminology

-

{Edit this to reflect the key words that are actually used.} The key words “MUST”, “REQUIRED”, “MUST NOT”, “SHOULD”, and “MAY” in this document are to be interpreted as described in BCP 14 1 when, and only when, they appear in all capitals.

-

{Avoid duplicating definitions from other ZIPs. Instead use wording like this:}

-

The terms “Mainnet” and “Testnet” in this document are to be interpreted as defined in the Zcash protocol specification 2.

-

The term “full validator” in this document is to be interpreted as defined in the Zcash protocol specification 3.

+

{Edit this to reflect the key words that are actually used.} The key +words “MUST”, “REQUIRED”, “MUST NOT”, “SHOULD”, and “MAY” in this +document are to be interpreted as described in BCP 14 1 +when, and only when, they appear in all capitals.

+

{Avoid duplicating definitions from other ZIPs. Instead use wording +like this:}

+

The terms “Mainnet” and “Testnet” in this document are to be +interpreted as defined in the Zcash protocol specification 2.

+

The term “full validator” in this document is to be interpreted as +defined in the Zcash protocol specification 3.

The terms below are to be interpreted as follows:

{Term to be defined}
-

{Definition.}

+
+

{Definition.}

{Another term}
-

{Definition.}

+
+

{Definition.}

Abstract

{Describe what this proposal does, typically in a few paragraphs.

-

The Abstract should only provide a summary of the ZIP; the ZIP should remain complete without the Abstract.

-

Use links where applicable, e.g. 4 5.}

+

The Abstract should only provide a summary of the ZIP; the ZIP should +remain complete without the Abstract.

+

Use links where applicable, e.g. 4 5.}

Motivation

{Why is this proposal needed?

-

This is one of the most important sections of the ZIP, and should be detailed and comprehensive. It shouldn’t include any of the actual specification – don’t put conformance requirements in this section.

-

Explain the status quo, why the status quo is in need of improvement, and if applicable, the history of how this area has changed. Then describe at a high level why this proposed solution addresses the perceived issues. It is ok if this is somewhat redundant with the abstract, but here you can go into a lot more detail.}

+

This is one of the most important sections of the ZIP, and should be +detailed and comprehensive. It shouldn’t include any of the actual +specification – don’t put conformance requirements in this section.

+

Explain the status quo, why the status quo is in need of improvement, +and if applicable, the history of how this area has changed. Then +describe at a high level why this proposed solution addresses +the perceived issues. It is ok if this is somewhat redundant with the +abstract, but here you can go into a lot more detail.}

Requirements

-

{Describe design constraints on, or goals for the solution – typically one paragraph for each constraint or goal. Again, don’t actually specify anything here; this section is primarily for use as a consistency check that what is specified meets the requirements.}

+

{Describe design constraints on, or goals for the solution – +typically one paragraph for each constraint or goal. Again, don’t +actually specify anything here; this section is primarily for use as a +consistency check that what is specified meets the requirements.}

Non-requirements

-

{This section is entirely optional. If it is present, it describes issues that the proposal is not attempting to address, that someone might otherwise think it does or should.}

+

{This section is entirely optional. If it is present, it describes +issues that the proposal is not attempting to address, that +someone might otherwise think it does or should.}

Specification

{Replace this entire section.}

-

The Specification section describes what should change, using precise language and conformance key words. Anything that is required in order to implement the ZIP (or follow its process, in the case of a Process ZIP) should be in this section.

-

Avoid overspecification! Also avoid underspecification. Specification is hard. Don’t be afraid to ask for help.

-

Feel free to copy from other ZIPs doing similar things, e.g. defining RPC calls, consensus rules, etc.

-

ZIPs MUST take into account differences between the Zcash Mainnet and Testnet 6 where applicable. A consensus ZIP MUST be able to be deployed on both Mainnet and Testnet.

-

Unless the specification is particularly simple, you will need to organise it under subheadings.

+

The Specification section describes what should change, using precise +language and conformance key words. Anything that is required in +order to implement the ZIP (or follow its process, in the case of a +Process ZIP) should be in this section.

+

Avoid overspecification! Also avoid underspecification. Specification +is hard. Don’t be afraid to ask for help.

+

Feel free to copy from other ZIPs doing similar things, e.g. defining +RPC calls, consensus rules, etc.

+

ZIPs MUST take into account differences between the Zcash Mainnet and +Testnet 6 where applicable. A consensus ZIP +MUST be able to be deployed on both Mainnet and Testnet.

+

Unless the specification is particularly simple, you will need to +organise it under subheadings.

Example subheading

-

At least while the ZIP is in Draft, we encourage writing open questions and TODOs.

+

At least while the ZIP is in Draft, we encourage writing open +questions and TODOs.

Open questions

TODO: define byte encoding for the Jabberwock.

Comparison of ZIPs to RFCs

-

Like RFCs, ZIPs are precise technical documents that SHOULD give enough implementation information to implement part of a Zcash-related protocol or follow a Zcash-related process 7.

+

Like RFCs, ZIPs are precise technical documents that SHOULD give +enough implementation information to implement part of a Zcash-related +protocol or follow a Zcash-related process 7.

ZIPs are different from RFCs in the following ways:

Using mathematical notation

-

Embedded LaTeX x + y is allowed and encouraged in ZIPs. The syntax for inline math is “:math:latex code`" in reStructuredText or "latexcode`” in Markdown. The rendered HTML will use KaTeX 8, which only supports a subset of LaTeX, so you will need to double-check that the rendering is as intended.

-

In general the conventions in the Zcash protocol specification SHOULD be followed. If you find this difficult, don’t worry too much about it in initial drafts; the ZIP editors will catch any inconsistencies in review.

+

Embedded LaTeX x + y is allowed and +encouraged in ZIPs. The syntax for inline math is +“:math:latex +code`" in reStructuredText or "latexcode`” +in Markdown. The rendered HTML will use KaTeX 8, +which only supports a subset of LaTeX, so you will need to double-check +that the rendering is as intended.

+

In general the conventions in the Zcash protocol specification SHOULD +be followed. If you find this difficult, don’t worry too much about it +in initial drafts; the ZIP editors will catch any inconsistencies in +review.

Notes and warnings

-

“.. note::” in reStructuredText, or “:::info” (terminated by “:::”) in Markdown, can be used for an aside from the main text.

-

The rendering of notes is colourful and may be distracting, so they should only be used for important points.

+

“.. note::” in reStructuredText, or +“:::info” (terminated by “:::”) in Markdown, +can be used for an aside from the main text.

+

The rendering of notes is colourful and may be distracting, so they +should only be used for important points.

-

“.. warning::” in reStructuredText, or “:::warning” (terminated by “:::”) in Markdown, can be used for warnings.

-

Warnings should be used very sparingly — for example to signal that a entire specification, or part of it, may be inapplicable or could cause significant interoperability or security problems. In most cases, a “MUST” or “SHOULD” conformance requirement is more appropriate.

+

“.. warning::” in reStructuredText, or +“:::warning” (terminated by “:::”) in +Markdown, can be used for warnings.

+

Warnings should be used very sparingly — for example to signal that a +entire specification, or part of it, may be inapplicable or could cause +significant interoperability or security problems. In most cases, a +“MUST” or “SHOULD” conformance requirement is more appropriate.

Valid markup

-

This is optional before publishing a PR, but to check whether a document is valid reStructuredText or Markdown, first install rst2html5 and pandoc. E.g. on Debian-based distros::

+

This is optional before publishing a PR, but to check whether a +document is valid reStructuredText or Markdown, first install +rst2html5 and pandoc. E.g. on Debian-based +distros::

sudo apt install python3-pip pandoc perl sed
 pip3 install docutils==0.19 rst2html5
-

Then, with draft-myzip.rst or draft-myzip.md in the root directory of a clone of this repo, run::

+

Then, with draft-myzip.rst or +draft-myzip.md in the root directory of a clone of this +repo, run::

make draft-myzip.html
-

(or just “make”) and view draft-myzip.html in a web browser.

+

(or just “make”) and view draft-myzip.html +in a web browser.

Citations and references

-

Each reference should be given a short name, e.g. “snark” 9. The syntax to cite that reference is “[#snark]_” in reStructuredText, or “[^snark]” in Markdown.

-

The corresponding entry in the References section should look like this in reStructuredText:

-
.. [#snark] `The Hunting of the Snark <https://www.gutenberg.org/files/29888/29888-h/29888-h.htm>_. Lewis Carroll, with illustrations by Henry Holiday. MacMillan and Co. London. March 29, 1876.
+

Each reference should be given a short name, e.g. “snark” 9. The syntax to cite that reference +is “[#snark]_” in reStructuredText, or +“[^snark]” in Markdown.

+

The corresponding entry in the References +section should look like this in reStructuredText:

+
.. [#snark] `The Hunting of the Snark <https://www.gutenberg.org/files/29888/29888-h/29888-h.htm>_. Lewis Carroll, with illustrations by Henry Holiday. MacMillan and Co. London. March 29, 1876.

or like this in Markdown::

-
[^snark] [The Hunting of the Snark](https://www.gutenberg.org/files/29888/29888-h/29888-h.htm). Lewis Carroll, with illustrations by Henry Holiday. MacMillan and Co. London. March 29, 1876.
-

Note that each entry must be on a single line regardless of how long that makes the line. In Markdown there must be a blank line between entries.

-

The current rendering of a Markdown ZIP reorders the references according to their first use; the rendering of a reStructuredText ZIP keeps them in the same order as in the References section.

+
[^snark] [The Hunting of the Snark](https://www.gutenberg.org/files/29888/29888-h/29888-h.htm). Lewis Carroll, with illustrations by Henry Holiday. MacMillan and Co. London. March 29, 1876.
+

Note that each entry must be on a single line regardless of how long +that makes the line. In Markdown there must be a blank line between +entries.

+

The current rendering of a Markdown ZIP reorders the references +according to their first use; the rendering of a reStructuredText ZIP +keeps them in the same order as in the References section.

To link to another section of the same ZIP, use

-
`Section title`_
+
`Section title`_

in reStructuredText, or

-
[Section title]
+
[Section title]

in Markdown.

-

Citing the Zcash protocol specification

-

For references to the Zcash protocol specification, prefer to link to a section anchor, and name the reference as [^protocol-<anchor>]. This makes it more likely that the link will remain valid if sections are renumbered or if content is moved. The anchors in the protocol specification can be displayed by clicking on a section heading in most PDF viewers. References to particular sections should be versioned, even though the link will point to the most recent stable version.

-

Do not include the “https://zips.z.cash/” part of URLs to ZIPs or the protocol spec.

+

Citing the Zcash +protocol specification

+

For references to the Zcash protocol specification, prefer to link to +a section anchor, and name the reference as +[^protocol-<anchor>]. This makes it more likely that +the link will remain valid if sections are renumbered or if content is +moved. The anchors in the protocol specification can be displayed by +clicking on a section heading in most PDF viewers. References to +particular sections should be versioned, even though the link will point +to the most recent stable version.

+

Do not include the “https://zips.z.cash/” part of URLs +to ZIPs or the protocol spec.

Reference implementation

-

{This section is entirely optional; if present, it usually gives links to zcashd or zebrad PRs.}

+

{This section is entirely optional; if present, it usually gives +links to zcashd or zebrad PRs.}

References

-
+
+