Merge af77f9f285 into 8124633a39

Add ZIP 253 stub

.devcontainer/Dockerfile

@@ -0,0 +1,32 @@
+FROM debian:latest
+
+RUN apt-get update \
+ && apt-get install -y \
+        gawk \
+        perl \
+        sed \
+        git \
+        python3 \
+        python3-pip \
+        pandoc \
+        biber \
+        latexmk \
+        texlive \
+        texlive-science \
+        texlive-fonts-extra \
+        texlive-plain-generic \
+        texlive-bibtex-extra \
+ && apt-get clean
+
+# Install Python packages, after removing a file that breaks pip.
+RUN rm /usr/lib/python3.11/EXTERNALLY-MANAGED
+RUN pip install rst2html5 \
+ && pip install docutils==0.19
+
+RUN apt-get install -y locales \
+ && echo "LC_ALL=en_US.UTF-8" >> /etc/environment \
+ && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
+ && echo "LANG=en_US.UTF-8" > /etc/locale.conf \
+ && locale-gen en_US.UTF-8
+
+ENV PATH=${PATH}:/root/.local/bin

.devcontainer/devcontainer.json

@@ -0,0 +1,4 @@
+{
+    "name": "Dev space",
+    "dockerFile": "Dockerfile"
+}

README.template

@@ -39,6 +39,9 @@ Use ``make`` to check that you are using correct
 and double-check the generated ``draft-*.html`` file before filing a Pull Request.
 See `here <protocol/README.rst>`__ for the project dependencies.
 
+Consider leveraging `our devcontainer.json <devcontainer.rst>`__ for ease of tool aquisition
+when working in this repo.
+
 NU5 ZIPs
 --------
 

devcontainer.rst

@@ -0,0 +1,20 @@
+# Using dev containers for editing this repo
+
+This repo uses devcontainer.json to ease configuring the tools necessary to run ``make``.
+You can use [Codespaces](https://docs.github.com/en/codespaces/developing-in-codespaces/developing-in-a-codespace)
+to make your contributions and validate your work.
+Or when using VS Code, use the "Dev Containers: Reopen in Container" command to create
+the docker container with the tools.
+
+## VS Code experience
+
+When using VS Code to edit .rst files, the following extensions will add a preview pane,
+and otherwise add tooling for the files you may be editing:
+
+- [Makefile Tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.makefile-tools)
+- [reStructuredText](https://marketplace.visualstudio.com/items?itemName=lextudio.restructuredtext)
+- [Python](https://marketplace.visualstudio.com/items?itemName=ms-python.python)
+- [reStructuredText Syntax highlighting](https://marketplace.visualstudio.com/items?itemName=trond-snekvik.simple-rst)
+- [Docker](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker)
+
+Note that these extensions are not endorsed nor been vetted by the Zcash Foundation.

zip-0253.rst

@@ -0,0 +1,8 @@
+::
+
+  ZIP: 253
+  Title: Deployment of the NU6 Network Upgrade
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
+  Status: Reserved
+  Category: Consensus / Network
+  Discussions-To: <https://github.com/zcash/zips/issues/806>

zip-0320.rst

@@ -5,7 +5,7 @@
   Owners: Daira-Emma Hopwood <daira@electriccoin.co>
           Kris Nuttycombe <kris@nutty.land>
   Credits: Hanh
-  Status: Draft
+  Status: Proposed
   Category: Standards / Wallet
   Created: 2024-01-12
   License: MIT