Merge a68370f751 into 5273fc9c99

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>

.github/actions/render-protocol-pdf/Dockerfile

@@ -1 +0,0 @@
-../../../Dockerfile

.github/actions/render-protocol-pdf/action.yml

@@ -1,7 +0,0 @@
-name: Render Zcash Protocol Specification
-description: GitHub Action to compile Zcash Protocol Specification LaTeX documents
-author: Deirdre Connolly
-runs:
-  using: docker
-  # Runs `make all` or something like it
-  image: Dockerfile

.github/actions/render/action.yml

@@ -0,0 +1,7 @@
+name: Render ZIPs and Zcash Protocol Specification
+description: GitHub Action to compile ZIPs and Zcash Protocol Specification LaTeX documents
+author: Deirdre Connolly
+runs:
+  using: docker
+  # Runs `make all` or something like it
+  image: ../../../Dockerfile

.github/workflows/render.yml

@@ -1,19 +1,23 @@
-name: Render pdfs
+name: Build tex and rst
 
-on: workflow_dispatch
+on: 
+  workflow_dispatch:
+  push:
+    branches:
+    - main
 
 jobs:
 
   render:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Git repository
+      - name: Checkout repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.2
 
-      - name: Compile Zcash Protocol Specification
+      - name: Compile ZIPs and Zcash Protocol Specification
-        uses: ./.github/actions/render-protocol-pdf
+        uses: ./.github/actions/render
 
       - uses: EndBug/add-and-commit@v9.1.3
         with:
-          add: '**/*.pdf'
+          add: 'protocol/*.pdf *.html'
           default_author: github_actions

Dockerfile

@@ -1,7 +1,7 @@
 FROM debian:latest
 
-RUN apt-get update \
+RUN apt-get update
-        && apt-get install -y \
+RUN apt-get install -y \
         gawk \
         perl \
         sed \
@@ -17,7 +17,10 @@ RUN apt-get update \
         texlive-plain-generic \
         texlive-bibtex-extra
 
-RUN pip3 install rst2html5
+RUN rm /usr/lib/python3.11/EXTERNALLY-MANAGED
+RUN pip install rst2html5
+
+ENV PATH=${PATH}:/root/.local/bin
 
 WORKDIR "/zips"
 ENTRYPOINT ["make", "all"]

protocol/zcash.bib

@@ -1,6 +1,6 @@
 @misc{BCGGMTV2014,
    presort={BCGGMTV2014},
-   author={Eli Ben-Sasson and Alessandro Chiesa and Christina Garman and Matthew Green and Ian Miers and Eran Tromer and Madars Virza},
+   author={Eli {Ben\nbh{}Sasson} and Alessandro Chiesa and Christina Garman and Matthew Green and Ian Miers and Eran Tromer and Madars Virza},
    title={Zerocash: Decentralized {A}nonymous {P}ayments from {B}itcoin (extended version)},
    url={https://eprint.iacr.org/2014/349},
    urldate={2021-04-05},
@@ -12,18 +12,18 @@ pages 459--474; IEEE, 2014.}
 
 @misc{BCTV2014a,
    presort={BCTV2014a},
-   author={Eli Ben-Sasson and Alessandro Chiesa and Eran Tromer and Madars Virza},
+   author={Eli {Ben\nbh{}Sasson} and Alessandro Chiesa and Eran Tromer and Madars Virza},
-   title={Succinct\, {N}on\hyp {I}nteractive\, {Z}ero\, {K}nowledge\, for\, a\, von\, {N}eumann\, {A}rchitecture},
+   title={Succinct {N}on-{I}nteractive {Z}ero {K}nowledge for a von~{N}eumann {A}rchitecture},
    url={https://eprint.iacr.org/2013/879},
    urldate={2019-02-08},
-   howpublished={Cryptology\, ePrint\, Archive:\, Report\, 2013/879.
+   howpublished={Cryptology ePrint Archive: Report 2013/879.
 Last revised February~5, 2019.}
 }
 
 @misc{BCTV2014a-old,
    presort={BCTV2014a-old},
-   author={Eli Ben-Sasson and Alessandro Chiesa and Eran Tromer and Madars Virza},
+   author={Eli {Ben\nbh{}Sasson} and Alessandro Chiesa and Eran Tromer and Madars Virza},
-   title={Succinct {N}on-{I}nteractive {Z}ero {K}nowledge for a von {N}eumann {A}rchitecture
+   title={Succinct {N}on-{I}nteractive {Z}ero {K}nowledge for a von~{N}eumann {A}rchitecture
 ({M}ay~19, 2015 version)},
    url={https://eprint.iacr.org/2013/879/20150519:172604},
    urldate={2019-02-08},
@@ -61,7 +61,7 @@ Received May~6, 2015.}
 
 @misc{BCGTV2013,
    presort={BCGTV2013},
-   author={Eli Ben-Sasson and Alessandro Chiesa and Daniel Genkin and Eran Tromer and Madars Virza},
+   author={Eli {Ben\nbh{}Sasson} and Alessandro Chiesa and Daniel Genkin and Eran Tromer and Madars Virza},
    title={{SNARK}s for {C}: {V}erifying {P}rogram {E}xecutions {S}uccinctly and in {Z}ero {K}nowledge},
    url={https://eprint.iacr.org/2013/507},
    urldate={2016-08-31},
@@ -85,7 +85,7 @@ Lecture Notes in Computer Science; Springer, 2013.},
 
 @inproceedings{BCTV2014b,
    presort={BCTV2014b},
-   author={Eli Ben-Sasson and Alessandro Chiesa and Eran Tromer and Madars Virza},
+   author={Eli {Ben\nbh{}Sasson} and Alessandro Chiesa and Eran Tromer and Madars Virza},
    title={Scalable {Z}ero {K}nowledge via {C}ycles of {E}lliptic {C}urves (extended version)},
    booktitle={Advances in Cryptology - CRYPTO~2014},
    volume={8617},
@@ -191,7 +191,7 @@ Last revised September~3, 2020.}
 % Capitalized De/Di is correct <https://www.thoughtco.com/italian-capitalization-rules-2011478>
 @inproceedings{DSDCOPS2001,
    presort={DSDCOPS2001},
-   author={Alfredo {De Santis} and Giovanni {Di Crescenzo} and Rafail Ostrovsky and Guiseppe Persiano and Amit Sahai},
+   author={Alfredo {De~Santis} and \;Giovanni {Di~Crescenzo} and \;Rafail Ostrovsky and \;Guiseppe Persiano and \;Amit Sahai},
    title={Robust {N}on-{I}nteractive {Z}ero {K}nowledge},
    booktitle={Advances in Cryptology - CRYPTO~2001.
 Proceedings of the 21st Annual International Cryptology Conference
@@ -304,7 +304,7 @@ Conference on Computer and Communications Security},
    booktitle={Public Key Cryptography -- PKC 2006.
 Proceedings of the 9th International Conference on Theory and Practice in Public-Key Cryptography
 (New York, NY, USA, April~24--26, 2006)},
-   publisher={Springer-Verlag},
+   publisher={Springer},
    date={2006-02-09},
    url={https://cr.yp.to/papers.html#curve25519},
    urldate={2021-04-05},
@@ -313,7 +313,7 @@ Proceedings of the 9th International Conference on Theory and Practice in Public
 
 @article{BDLSY2012,
    presort={BDLSY2012},
-   author={Daniel Bernstein and Niels Duif and Tanja Lange and Peter Schwabe and Bo-Yin Yang},
+   author={Daniel Bernstein and Niels Duif and Tanja Lange and Peter Schwabe and {Bo\nbh{}Yin} Yang},
    title={High-speed high-security signatures},
    journal={Journal of Cryptographic Engineering},
    volume={2},
@@ -336,14 +336,14 @@ Proceedings of the 9th International Conference on Theory and Practice in Public
 
 @inproceedings{deRooij1995,
    presort={deRooij1995},
-   author={Peter {de Rooij}},
+   author={Peter {de~Rooij}},
    title={Efficient exponentiation using precomputation and vector addition chains},
    booktitle={Advances in Cryptology - EUROCRYPT~'94.
 Proceedings, Workshop on the Theory and Application of Cryptographic Techniques
 (Perugia, Italy, May~9--12, 1994)},
    volume={950},
    series={Lecture Notes in Computer Science},
-   editor={Alfredo {De Santis}},
+   editor={Alfredo {De~Santis}},
    pages={389--399},
    publisher={Springer},
    isbn={978-3-540-60176-0},
@@ -375,7 +375,7 @@ Received March~30, 2017.}
 
 @misc{BJLSY2015,
    presort={BJLSY2015},
-   author={Daniel Bernstein and Simon Josefsson and Tanja Lange and Peter Schwabe and Bo-Yin Yang},
+   author={Daniel Bernstein and Simon Josefsson and Tanja Lange and Peter Schwabe and {Bo\nbh{}Yin} Yang},
    title={{EdDSA} for more curves},
    url={https://cr.yp.to/papers.html#eddsa},
    urldate={2018-01-22},
@@ -394,7 +394,7 @@ Received March~30, 2017.}
 @misc{FKMSSS2016,
    presort={FKMSSS2016},
    author={Nils Fleischhacker and Johannes Krupp and Giulio Malavolta and Jonas Schneider and Dominique Schröder and Mark Simkin},
-   title={Efficient\; {U}nlinkable\; {S}anitizable\; {S}ignatures\; from\; {S}ignatures\; with\; {R}e\hyp {R}andomizable\; {K}eys},
+   title={Efficient\; {U}nlinkable\; {S}anitizable\; {S}ignatures\; from\; {S}ignatures\; with\; {R}e-{R}andomizable\; {K}eys},
    url={https://eprint.iacr.org/2015/395},
    urldate={2018-03-03},
    howpublished={Cryptology ePrint Archive: Report 2012/159.
@@ -402,7 +402,7 @@ Last revised February~11, 2016.},
    addendum={An extended abstract appeared in
 \textsl{Public Key Cryptography -- PKC 2016: 19th IACR International Conference on Practice and Theory in Public-Key Cryptography
 (Taipei, Taiwan, March~6--9, 2016), Proceedings, Part~1};\,
-Ed. by Chen-Mou Cheng, Kai-Min Chung, Giuseppe Persiano, and Bo-Yin Yang;\,
+Ed. by {Chen\nbh{}Mou} Cheng, {Kai\nbh{}Min} Chung, Giuseppe Persiano, and {Bo\nbh{}Yin} Yang;\,
 Vol.~9614, Lecture Notes in Computer Science, pages 301--330;
 Springer, 2016; ISBN 978-3-662-49384-7.}
 }
@@ -410,7 +410,7 @@ Springer, 2016; ISBN 978-3-662-49384-7.}
 @misc{DS2016,
    presort={DS2016},
    author={David Derler and Daniel Slamanig},
-   title={Key\hyp {H}omomorphic {S}ignatures and {A}pplications to {M}ultiparty {S}ignatures and {N}on\hyp {I}nteractive {Z}ero\hyp {K}nowledge},
+   title={Key-{H}omomorphic {S}ignatures and {A}pplications to {M}ultiparty {S}ignatures and {N}on-{I}nteractive {Z}ero-{K}nowledge},
    url={https://eprint.iacr.org/2016/792},
    urldate={2018-04-09},
    howpublished={Cryptology ePrint Archive: Report 2016/792.
@@ -524,8 +524,7 @@ Received October~20, 2020.}
 
 @misc{ANWW2013,
    presort={ANWW2013},
-   author={Jean-Philippe Aumasson and \;Samuel Neves and \;Zooko Wilcox-O'Hearn and
+   author={{Jean\nbh{}Philippe} Aumasson and Samuel Neves and Zooko Wilcox and Christian Winnerlein},
-\;Christian Winnerlein},
    date={2013-01-29},
    title={{BLAKE2}: simpler, smaller, fast as {MD5}},
    url={https://blake2.net/#sp},
@@ -553,7 +552,7 @@ Last updated December~16, 2020.}
 
 @misc{Poseidon-Zc1.1,
    presort={Poseidon-Zc1.1},
-   author={Lorenzo Grassi and Dmitry Khovratovich and Christian Rechberger and Arnab Roy and Markus Schofnegger and Daira Emma Hopwood},
+   author={Lorenzo Grassi and Dmitry Khovratovich and Christian Rechberger and Arnab Roy and Markus Schofnegger and {Daira\nbh{}Emma} Hopwood},
    title={Poseidon reference implementation, Zcash fork, Version 1.1},
    date={2021-07-28},
    url={https://github.com/daira/pasta-hadeshash},
@@ -562,7 +561,7 @@ Last updated December~16, 2020.}
 
 @misc{BDPA2007,
    presort={BDPA2007},
-   author={Guido Bertoni and Joan Daemen and Michaël Peeters and Gilles {Van Assche}},
+   author={Guido Bertoni and Joan Daemen and Michaël Peeters and Gilles {Van~Assche}},
    title={Sponge functions},
    url={https://keccak.team/files/SpongeFunctions.pdf},
    urldate={2022-08-31},
@@ -572,7 +571,7 @@ as part of the Hash Algorithm Requirements and Evaluation Criteria for the SHA-3
 
 @misc{BDPA2011,
    presort={BDPA2011},
-   author={Guido Bertoni and Joan Daemen and Michaël Peeters and Gilles {Van Assche}},
+   author={Guido Bertoni and Joan Daemen and Michaël Peeters and Gilles {Van~Assche}},
    title={Cryptographic sponge functions},
    url={https://keccak.team/files/CSF-0.1.pdf},
    urldate={2021-03-01},
@@ -581,7 +580,7 @@ as part of the Hash Algorithm Requirements and Evaluation Criteria for the SHA-3
 
 @misc{ADMA2015,
    presort={ADMA2015},
-   author={Elena Andreeva and Joan Daemen and Bart Mennink and Gilles {Van Assche}},
+   author={Elena Andreeva and Joan Daemen and Bart Mennink and Gilles {Van~Assche}},
    title={Security of Keyed Sponge Constructions Using a Modular Proof Approach},
    url={https://keccak.team/files/ModularKeyedSponge.pdf},
    urldate={2021-03-01},
@@ -649,7 +648,7 @@ Received February~13, 2020.}
 @misc{BCD+2020,
    presort={BCD+2020},
    author={Tim Beyne and Anne Canteaut and Itai Dinur and Maria Eichlseder and Gregor Leander and Gaëtan Leurent and
-María Naya-Plasencia and Léo Perrin and Yu Sasaki and Yosuke Todo and Friedrich Wiemer},
+María {Naya\nbh{}Plasencia} and Léo Perrin and Yu Sasaki and Yosuke Todo and Friedrich Wiemer},
    title={Out of Oddity --- New Cryptanalytic Techniques against Symmetric Primitives Optimized for Integrity Proof Systems},
    url={https://eprint.iacr.org/2020/188},
    urldate={2021-03-01},
@@ -684,7 +683,7 @@ Received May~21, 2016.}
 
 @misc{RFC-7693,
    presort={RFC-7693},
-   author={Markku-Juhani Saarinen (ed.)},
+   author={{Markku\nbh{}Juhani} Saarinen (ed.) and {Jean\nbh{}Philippe} Aumasson},
    title={Request for {C}omments 7693: {T}he {BLAKE2} {C}ryptographic {H}ash and
 {M}essage {A}uthentication {C}ode ({MAC})},
    howpublished={Internet Engineering Task Force (IETF)},
@@ -718,7 +717,7 @@ Received May~21, 2016.}
 
 @misc{ID-hashtocurve,
    presort={ID-hashtocurve},
-   author={Armando Faz-Hernández and Sam Scott and Nick Sullivan and Riad Wahby and Christopher Wood},
+   author={Armando {Faz\nbh{}Hernández} and Sam Scott and Nick Sullivan and Riad Wahby and Christopher Wood},
    title={Internet {D}raft: {H}ashing to Elliptic Curves, version 10},
    howpublished={Internet Research Task Force (IRTF) Crypto Forum Research Group (CFRG). Work in progress. Last revised December~22, 2020.},
    url={https://www.ietf.org/archive/id/draft-irtf-cfrg-hash-to-curve-10.html},
@@ -736,7 +735,7 @@ Received May~21, 2016.}
 
 @inproceedings{BCIMRT2010,
    presort={BCIMRT2010},
-   author={Eric Brier and Jean-Sébastien Coron and Thomas Icart and David Madore and Hugues Randriam and Mehdi Tibouchi},
+   author={Eric Brier and {Jean\nbh{}Sébastien} Coron and Thomas Icart and David Madore and Hugues Randriam and Mehdi Tibouchi},
    title={Efficient Indifferentiable Hashing into Ordinary Elliptic Curves},
    booktitle={Advances in Cryptology - CRYPTO~2010.
 Proceedings of the 30th Annual International Cryptology Conference
@@ -755,12 +754,12 @@ Proceedings of the 30th Annual International Cryptology Conference
 
 @inproceedings{SvdW2006,
    presort={SvdW2006},
-   author={Andrew Shallue and Christiaan E. van de Woestijne},
+   author={Andrew Shallue and Christiaan E. {van~de~Woestijne}},
    title={Construction of Rational Points on Elliptic Curves over Finite Fields},
-   booktitle={Algorithmic Number Theory: 7th International Symposium, ANTS-VII (Berlin, Germany, July~23--28, 2006)},
+   booktitle={Algorithmic Number Theory: 7th International Symposium, {ANTS-VII} (Berlin, Germany, July~23--28, 2006)},
    volume={4076},
    series={Lecture Notes in Computer Science},
-   editor={F. Hess and S. Pauli and M. Pohst},
+   editor={Florian Hess and Sebastian Pauli and Michael Pohst},
    pages={510--524},
    year={2006},
    publisher={Springer},
@@ -786,7 +785,7 @@ Proceedings of the 30th Annual International Cryptology Conference
 
 @article{FFSTV2013,
    presort={FFSTV2013},
-   author={Reza Farashahi and Pierre-Alain Fouque and Igor Shparlinski and Mehdi Tibouchi and J. Felipe Voloch},
+   author={Reza Farashahi and {Pierre\nbh{}Alain} Fouque and Igor Shparlinski and Mehdi Tibouchi and J. Felipe Voloch},
    title={Indifferentiable deterministic hashing to elliptic and hyperelliptic curves},
    journal={Mathematics of Computation},
    volume={82},
@@ -802,14 +801,14 @@ Proceedings of the 30th Annual International Cryptology Conference
    author={Taechan Kim and Mehdi Tibouchi},
    title={Improved Elliptic Curve Hashing and Point Representation},
    booktitle={Proceedings of WCC2015 - 9th International Workshop on Coding and Cryptography (Paris, France, April 2015)},
-   editor={Anne Canteaut and Gaëtan Leurent and Maria Naya-Plasencia},
+   editor={Anne Canteaut and Gaëtan Leurent and Maria {Naya\nbh{}Plasencia}},
    url={https://hal.inria.fr/hal-01275711},
    urldate={2021-01-28}
 }
 
 @article{BGHOZ2013,
    presort={BGHOZ2013},
-   author={Gilles Barthe and Benjamin Grégoire and Sylvain Heraud and Frederico Olmedo and Santiago Zanella-Béguelin},
+   author={Gilles\; Barthe and \;\;Benjamin\; Grégoire and \;\;Sylvain\; Heraud and \;\;Frederico\; Olmedo and \;\;Santiago {Zanella\nbh{}Béguelin}},
    title={Verified indifferentiable hashing into elliptic curves},
    journal={Journal of Computer Security, Security and Trust Principles},
    volume={21},
@@ -896,7 +895,7 @@ L. Hernández Encinas and C. Sánchez Ávila},
 @misc{ABR1999,
    presort={ABR1999},
    author={Michel Abdalla and Mihir Bellare and Phillip Rogaway},
-   title={{DHAES}: {A}n {E}ncryption {S}cheme {B}ased on the {D}iffie-{H}ellman {P}roblem},
+   title={{DHAES}: {A}n {E}ncryption {S}cheme {B}ased on the {D}iffie--{H}ellman {P}roblem},
    url={https://eprint.iacr.org/1999/007},
    urldate={2016-08-21},
    date={1998-09},
@@ -905,7 +904,7 @@ L. Hernández Encinas and C. Sánchez Ávila},
 
 @misc{DGKM2011,
    presort={DGKM2011},
-   author={Dana Dachman-Soled and Rosario Gennaro and Hugo Krawczyk and Tal Malkin},
+   author={Dana {Dachman\nbh{}Soled} and Rosario Gennaro and Hugo Krawczyk and Tal Malkin},
    title={Computational {E}xtractors and {P}seudorandomness},
    url={https://eprint.iacr.org/2011/708},
    urldate={2016-09-02},
@@ -934,7 +933,7 @@ Last revised February~5, 2018.}
 
 @misc{vanSaberh2014,
    presort={vanSaberh2014},
-   author={Nicolas {van Saberhagen}},
+   author={Nicolas {van~Saberhagen}},
    title={CryptoNote v 2.0},
    note={Date disputed.},
    url={https://bytecoin.org/old/whitepaper.pdf},
@@ -952,7 +951,7 @@ Last revised February~5, 2018.}
 
 @misc{Dalek-notes,
    presort={Dalek-notes},
-   author={Cathie Yun and Henry {de Valence} and Oleg Andreev and Dimitris Apostolou},
+   author={Cathie Yun and Henry {de~Valence} and Oleg Andreev and Dimitris Apostolou},
    title={Dalek bulletproofs notes, module r1cs\_proof},
    url={https://doc-internal.dalek.rs/bulletproofs/notes/r1cs_proof/index.html},
    urldate={2021-04-07}
@@ -1170,8 +1169,8 @@ Last revised February~5, 2018.}
 
 @misc{BIP-68,
    presort={BIP-0068},
-   author={Mark Friedenbach and BtcDrak and Nicolas Dorier and kinoshitajona},
+   author={Mark\; Friedenbach and \;BtcDrak and \;Nicolas\; Dorier and \;kinoshitajona},
-   title={Relative lock-time using consensus\hyp enforced sequence numbers},
+   title={\;Relative\, lock-time\, using consensus-enforced sequence numbers},
    howpublished={Bitcoin Improvement Proposal 68. Last revised November~21, 2015},
    url={https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki},
    urldate={2020-07-13}
@@ -1206,7 +1205,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-32,
    presort={ZIP-0032},
-   author={Jack Grigg and Daira Emma Hopwood},
+   author={Jack Grigg and {Daira\nbh{}Emma} Hopwood},
    title={Shielded Hierarchical Deterministic Wallets},
    howpublished={Zcash Improvement Proposal 32.},
    url={https://zips.z.cash/zip-0032},
@@ -1215,14 +1214,14 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-76,
    presort={ZIP-0076},
-   author={Jack Grigg and Daira Emma Hopwood},
+   author={Jack Grigg and {Daira\nbh{}Emma} Hopwood},
    title={Transaction Signature Validation before {O}verwinter},
    howpublished={Zcash Improvement Proposal 76 (in progress).},
 }
 
 @misc{ZIP-143,
    presort={ZIP-0143},
-   author={Jack Grigg and Daira Emma Hopwood},
+   author={Jack Grigg and {Daira\nbh{}Emma} Hopwood},
    title={Transaction Signature Validation for {O}verwinter},
    howpublished={Zcash Improvement Proposal 143. Created December~27, 2017.},
    url={https://zips.z.cash/zip-0143},
@@ -1231,7 +1230,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-173,
    presort={ZIP-0173},
-   author={Daira Emma Hopwood},
+   author={{Daira\nbh{}Emma} Hopwood},
    title={Bech32 Format},
    howpublished={Zcash Improvement Proposal 173. Created June~13, 2018.},
    url={https://zips.z.cash/zip-0173},
@@ -1249,7 +1248,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-201,
    presort={ZIP-0201},
-   author={Simon Liu},
+   author={Simon Liu and {Daira\nbh{}Emma} Hopwood},
    title={Network Peer Management for {O}verwinter},
    howpublished={Zcash Improvement Proposal 201. Created January~15, 2018.},
    url={https://zips.z.cash/zip-0201},
@@ -1258,7 +1257,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-202,
    presort={ZIP-0202},
-   author={Simon Liu},
+   author={Simon Liu and {Daira\nbh{}Emma} Hopwood},
    title={Version 3 Transaction Format for {O}verwinter},
    howpublished={Zcash Improvement Proposal 202. Created January~10, 2018.},
    url={https://zips.z.cash/zip-0202},
@@ -1267,7 +1266,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-203,
    presort={ZIP-0203},
-   author={Jay Graber},
+   author={Jay Graber and {Daira\nbh{}Emma} Hopwood},
    title={Transaction Expiry},
    howpublished={Zcash Improvement Proposal 203. Created January~9, 2018.},
    url={https://zips.z.cash/zip-0203},
@@ -1276,7 +1275,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-205,
    presort={ZIP-0205},
-   author={Daira Emma Hopwood},
+   author={Simon Liu and {Daira\nbh{}Emma} Hopwood},
    title={Deployment of the {S}apling Network Upgrade},
    howpublished={Zcash Improvement Proposal 205. Created October~8, 2018.},
    url={https://zips.z.cash/zip-0205},
@@ -1285,7 +1284,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-206,
    presort={ZIP-0206},
-   author={Daira Emma Hopwood},
+   author={Simon Liu and {Daira\nbh{}Emma} Hopwood},
    title={Deployment of the {B}lossom Network Upgrade},
    howpublished={Zcash Improvement Proposal 206. Created July~29, 2019.},
    url={https://zips.z.cash/zip-0206},
@@ -1294,7 +1293,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-207,
    presort={ZIP-0207},
-   author={Jack Grigg},
+   author={Jack Grigg and {Daira\nbh{}Emma} Hopwood},
    title={Funding Streams},
    howpublished={Zcash Improvement Proposal 207. Created January~4, 2019.},
    url={https://zips.z.cash/zip-0207},
@@ -1303,7 +1302,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-208,
    presort={ZIP-0208},
-   author={Simon Liu and Daira Emma Hopwood},
+   author={{Daira\nbh{}Emma} Hopwood and Simon Liu},
    title={Shorter Block Target Spacing},
    howpublished={Zcash Improvement Proposal 208. Created January~10, 2019.},
    url={https://zips.z.cash/zip-0208},
@@ -1312,7 +1311,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-209,
    presort={ZIP-0209},
-   author={Sean Bowe},
+   author={Sean Bowe and {Daira\nbh{}Emma} Hopwood},
    title={Prohibit Negative Shielded Value Pool Balances},
    howpublished={Zcash Improvement Proposal 209. Created February~25, 2019.},
    url={https://zips.z.cash/zip-0209},
@@ -1321,7 +1320,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-211,
    presort={ZIP-0211},
-   author={Daira Emma Hopwood},
+   author={{Daira\nbh{}Emma} Hopwood},
    title={Disabling Addition of New Value to the {S}prout Value Pool},
    howpublished={Zcash Improvement Proposal 211. Created March~29, 2019.},
    url={https://zips.z.cash/zip-0211},
@@ -1348,7 +1347,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-214,
    presort={ZIP-0214},
-   author={Daira Emma Hopwood},
+   author={{Daira\nbh{}Emma} Hopwood},
    title={Consensus rules for a {Z}cash Development Fund},
    howpublished={Zcash Improvement Proposal 214. Created February~28, 2020.},
    url={https://zips.z.cash/zip-0214},
@@ -1357,7 +1356,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-215,
    presort={ZIP-0215},
-   author={Henry de Valance},
+   author={Henry {de~Valence}},
    title={Explicitly Defining and Modifying {Ed25519} Validation Rules},
    howpublished={Zcash Improvement Proposal 215. Created April~27, 2020.},
    url={https://zips.z.cash/zip-0215},
@@ -1366,7 +1365,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-216,
    presort={ZIP-0216},
-   author={Jack Grigg and Daira Emma Hopwood},
+   author={Jack Grigg and {Daira\nbh{}Emma} Hopwood},
    title={Require Canonical Point Encodings},
    howpublished={Zcash Improvement Proposal 216. Created February~11, 2021.},
    url={https://zips.z.cash/zip-0216},
@@ -1375,7 +1374,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-221,
    presort={ZIP-0221},
-   author={Jack Grigg},
+   author={{Ying~Tong} Lai and James Prestwich and Georgios Konstantopoulos and Jack Grigg},
    title={{FlyClient} - Consensus-Layer Changes},
    howpublished={Zcash Improvement Proposal 221. Created March~30, 2019.},
    url={https://zips.z.cash/zip-0221},
@@ -1393,7 +1392,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-224,
    presort={ZIP-0224},
-   author={Daira Emma Hopwood and Jack Grigg and Sean Bowe and Kris Nuttycombe and Ying Tong Lai},
+   author={{Daira\nbh{}Emma} Hopwood and Jack Grigg and Sean Bowe and Kris Nuttycombe and {Ying~Tong} Lai},
    title={Orchard Shielded Protocol},
    howpublished={Zcash Improvement Proposal 224. Created February~27, 2021.},
    url={https://zips.z.cash/zip-0225},
@@ -1402,7 +1401,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-225,
    presort={ZIP-0225},
-   author={Daira Emma Hopwood and Jack Grigg and Sean Bowe and Kris Nuttycombe and Ying Tong Lai},
+   author={{Daira\nbh{}Emma} Hopwood and Jack Grigg and Sean Bowe and Kris Nuttycombe and {Ying~Tong} Lai},
    title={Version 5 Transaction Format},
    howpublished={Zcash Improvement Proposal 225. Created February~28, 2021.},
    url={https://zips.z.cash/zip-0225},
@@ -1411,7 +1410,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-239,
    presort={ZIP-0239},
-   author={Daira Emma Hopwood and Jack Grigg},
+   author={{Daira\nbh{}Emma} Hopwood and Jack Grigg},
    title={Relay of Version 5 Transactions},
    howpublished={Zcash Improvement Proposal 239. Created May~29, 2021.},
    url={https://zips.z.cash/zip-0239},
@@ -1420,7 +1419,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-243,
    presort={ZIP-0243},
-   author={Jack Grigg and Daira Emma Hopwood},
+   author={Jack Grigg and {Daira\nbh{}Emma} Hopwood},
    title={Transaction Signature Validation for {S}apling},
    howpublished={Zcash Improvement Proposal 243. Created April~10, 2018.},
    url={https://zips.z.cash/zip-0243},
@@ -1429,7 +1428,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-244,
    presort={ZIP-0244},
-   author={Kris Nuttycombe and Daira Emma Hopwood},
+   author={Kris Nuttycombe and {Daira\nbh{}Emma} Hopwood and Jack Grigg},
    title={Transaction Identifier Non-Malleability},
    howpublished={Zcash Improvement Proposal 244. Created January~6, 2021.},
    url={https://zips.z.cash/zip-0244},
@@ -1438,7 +1437,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-245,
    presort={ZIP-0245},
-   author={Daira Emma Hopwood and Kris Nuttycombe},
+   author={Kris Nuttycombe and {Daira\nbh{}Emma} Hopwood},
    title={Transaction Identifier Digests & Signature Validation for {T}ransparent {Z}cash {E}xtensions},
    howpublished={Zcash Improvement Proposal 245. Created January~13, 2021.},
    url={https://zips.z.cash/zip-0245},
@@ -1447,7 +1446,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-250,
    presort={ZIP-0250},
-   author={Daira Emma Hopwood},
+   author={{Daira\nbh{}Emma} Hopwood},
    title={Deployment of the {H}eartwood Network Upgrade},
    howpublished={Zcash Improvement Proposal 250. Created February~28, 2020.},
    url={https://zips.z.cash/zip-0250},
@@ -1456,7 +1455,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-251,
    presort={ZIP-0251},
-   author={Daira Emma Hopwood},
+   author={{Daira\nbh{}Emma} Hopwood},
    title={Deployment of the {C}anopy Network Upgrade},
    howpublished={Zcash Improvement Proposal 251. Created February~28, 2020.},
    url={https://zips.z.cash/zip-0251},
@@ -1465,7 +1464,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-252,
    presort={ZIP-0252},
-   author={Teor and Daira Emma Hopwood},
+   author={teor and {Daira\nbh{}Emma} Hopwood},
    title={Deployment of the {NU5} Network Upgrade},
    howpublished={Zcash Improvement Proposal 252. Created February~23, 2021.},
    url={https://zips.z.cash/zip-0252},
@@ -1483,7 +1482,7 @@ Last revised February~5, 2018.}
 
 @misc{ZIP-316,
    presort={ZIP-0316},
-   author={Daira Emma Hopwood and Nathan Wilcox and Taylor Hornby and Jack Grigg and Sean Bowe and Kris Nuttycombe and Ying Tong Lai},
+   author={{Daira\nbh{}Emma} Hopwood and Nathan Wilcox and Taylor Hornby and Jack Grigg and Sean Bowe and Kris Nuttycombe and Greg Pfeil and {Ying~Tong} Lai},
    title={Unified Addresses and Unified Viewing Keys},
    howpublished={Zcash Improvement Proposal 316. Created April~7, 2021.},
    url={https://zips.z.cash/zip-0316},
@@ -1501,14 +1500,14 @@ Last revised February~5, 2018.}
 @misc{BGG-mpc,
    presort={BGG-mpc},
    author={Sean Bowe and Ariel Gabizon and Matthew Green},
-   title={GitHub repository `\hairspace zcash/mpc'\hairspace: zk-SNARK parameter multi-party computation protocol},
+   title={GitHub repository `\hairspace zcash/mpc'\hairspace: zk-{SNARK} parameter multi-party computation protocol},
    url={https://github.com/zcash/mpc},
    urldate={2017-01-06}
 }
 
 @misc{Hopwood2018,
    presort={Hopwood2018},
-   author={Daira Emma Hopwood},
+   author={{Daira\nbh{}Emma} Hopwood},
    title={GitHub repository `\hairspace daira/jubjub'\hairspace:
 {S}upporting evidence for security of the {J}ubjub curve to be used in {Z}cash},
    url={https://github.com/daira/jubjub},
@@ -1518,7 +1517,7 @@ Last revised February~5, 2018.}
 
 @misc{Hopwood2020,
    presort={Hopwood2020},
-   author={Daira Emma Hopwood},
+   author={{Daira\nbh{}Emma} Hopwood},
    title={GitHub repository `\hairspace zcash/pasta'\hairspace:
 {G}enerator and supporting evidence for security of the {P}allas/{V}esta pair of elliptic curves suitable for {H}alo},
    url={https://github.com/zcash/pasta},
@@ -1528,7 +1527,7 @@ Last revised February~5, 2018.}
 
 @misc{Hopwood2022,
    presort={Hopwood2022},
-   author={Daira Emma Hopwood},
+   author={{Daira\nbh{}Emma} Hopwood},
    title={Explaining the Security of Zcash},
    howpublished={Presentation at Zcon3. Slides and a link to the video are available at:
 \textit{GitHub repository `\hairspace daira/zcash-security'\hairspace: Code and documentation supporting security analysis of Zcash}.},
@@ -1737,7 +1736,7 @@ generic composition paradigm},
 
 @misc{WCBTV2015,
    presort={WCBTV2015},
-   author={Zooko Wilcox and Alessandro Chiesa and Eli Ben-Sasson and Eran Tromer and Madars Virza},
+   author={Zooko Wilcox and Alessandro Chiesa and Eli {Ben\nbh{}Sasson} and Eran Tromer and Madars Virza},
    title={A {B}ug in libsnark},
    howpublished={Least Authority blog},
    date={2015-05-16},
@@ -1842,7 +1841,7 @@ IEEE Computer Society Press, 1997; ISBN 0-8186-8197-7.}
 
 @misc{KvE2013,
    presort={KvE2013},
-   author={Kaa1el and Hagen von Eitzen},
+   author={Kaa1el and Hagen {von~Eitzen}},
    title={If a group $G$ has odd order, then the square function is injective (answer).},
    howpublished={Mathematics Stack Exchange},
    url={https://math.stackexchange.com/a/522277/185422},
@@ -1873,7 +1872,7 @@ Proceedings of the 14th Annual International Cryptology Conference
 
 @misc{CvHP1991,
    presort={CvHP1991},
-   author={David Chaum and Eugène {van Heijst} and Birgit Pfitzmann},
+   author={David Chaum and Eugène {van~Heijst} and Birgit Pfitzmann},
    title={Cryptographically {S}trong {U}ndeniable {S}ignatures, {U}nconditionally {S}ecure for the {S}igner},
    date={1991-02},
    publisher={Universität Karlsruhe Fakultät für Informatik},
@@ -1898,7 +1897,7 @@ Springer, 1992; ISBN 978-3-540-55188-1.}
 
 @inproceedings{CDvdG1987,
    presort={CDvdG1987},
-   author={David Chaum and Ivan Damgård and Jeroen {van de Graaf}},
+   author={David Chaum and Ivan Damgård and Jeroen {van~de~Graaf}},
    title={Multiparty\, computations\, ensuring\, privacy\, of\, each\, party's\, input\, and\, correctness\, of\, the\, result},
    date={1988-01},
    booktitle={Advances\, in\, Cryptology - CRYPTO~'87.
@@ -1937,7 +1936,8 @@ Proceedings of the 14th Annual International Cryptology Conference
 
 @inproceedings{ST1999,
    presort={ST1999},
-   author={Tomas Sander and Amnon Ta--Shma},
+   author={Tomas Sander and Amnon {Ta\nbh{}Shma}},
+% paper uses em-dash but e.g. https://simons.berkeley.edu/people/amnon-ta-shma uses Ta-Shma
    title={Auditable, {A}nonymous {E}lectronic {C}ash},
    year={1999},
    booktitle={Advances in Cryptology - CRYPTO~'99.
@@ -1982,7 +1982,7 @@ Proceedings of the 19th Annual International Cryptology Conference
 
 @misc{Zcash-Orchard,
    presort={Zcash-Orchard},
-   author={Daira Emma Hopwood and Sean Bowe and Jack Grigg and Kris Nuttycombe and Ying Tong Lai and Steven Smith},
+   author={{Daira\nbh{}Emma} Hopwood and Sean Bowe and Jack Grigg and Kris Nuttycombe and {Ying~Tong} Lai and Steven Smith},
    title={The {O}rchard Book},
    url={https://zcash.github.io/orchard/},
    urldate={2021-03-02}
@@ -1990,7 +1990,7 @@ Proceedings of the 19th Annual International Cryptology Conference
 
 @misc{Zcash-halo2,
    presort={Zcash-halo2},
-   author={Daira Emma Hopwood and Sean Bowe and Jack Grigg and Kris Nuttycombe and Ying Tong Lai and Steven Smith},
+   author={{Daira\nbh{}Emma} Hopwood and Sean Bowe and Jack Grigg and Kris Nuttycombe and {Ying~Tong} Lai and Steven Smith},
    title={The halo2 Book},
    url={https://zcash.github.io/halo2/},
    urldate={2021-03-23}
@@ -1998,7 +1998,7 @@ Proceedings of the 19th Annual International Cryptology Conference
 
 @misc{zcashd-6459,
    presort={Zcashd-6459},
-   author={Jack Grigg and Daira Emma Hopwood},
+   author={Jack Grigg and {Daira\nbh{}Emma} Hopwood},
    title={zcashd PR 6459: Migrate to zcash\_primitives 0.10},
    comment={Merged on 2023-03-17.},
    url={https://github.com/zcash/zcash/pull/6459},

zip-0000.rst

@@ -18,7 +18,6 @@
   License: BSD-2-Clause
 
 
-
 Terminology
 ===========
 

zip-0032.rst

@@ -3,7 +3,7 @@
   ZIP: 32
   Title: Shielded Hierarchical Deterministic Wallets
   Owners: Jack Grigg <str4d@electriccoin.co>
-          Daira Emma Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Credits: Sean Bowe
            Kris Nuttycombe
            Ying Tong Lai

zip-0076.rst

@@ -3,7 +3,7 @@
   ZIP: 76
   Title: Transaction Signature Validation before Overwinter
   Owners: Jack Grigg <str4d@electriccoin.co>
-          Daira Emma Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Reserved
   Category: Consensus
   Discussions-To: <https://github.com/zcash/zips/issues/130>

zip-0143.rst

@@ -3,7 +3,7 @@
   ZIP: 143
   Title: Transaction Signature Validation for Overwinter
   Owners: Jack Grigg <str4d@electriccoin.co>
-          Daira Emma Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Credits: Johnson Lau
            Pieter Wuille
            Bitcoin-ABC

zip-0155.rst

@@ -2,7 +2,7 @@
 
   ZIP: 155
   Title: addrv2 message
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Credits: Wladimir J. van der Laan
            Zancas Wilcox
   Status: Proposed

zip-0173.rst

@@ -2,7 +2,7 @@
 
   ZIP: 173
   Title: Bech32 Format
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Credits: Pieter Wuille <pieter.wuille@gmail.com>
            Greg Maxwell <greg@xiph.org>
            Rusty Russell

zip-0201.rst

@@ -2,7 +2,7 @@
 
   ZIP: 201
   Title: Network Peer Management for Overwinter
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Original-Authors: Simon Liu
   Status: Final
   Category: Network

zip-0202.rst

@@ -2,7 +2,7 @@
 
   ZIP: 202
   Title: Version 3 Transaction Format for Overwinter
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Original-Authors: Simon Liu
   Status: Final
   Category: Consensus

zip-0203.rst

@@ -2,7 +2,7 @@
 
   ZIP: 203
   Title: Transaction Expiry
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Original-Authors: Jay Graber
   Status: Final
   Category: Consensus

zip-0204.rst

@@ -2,7 +2,7 @@
 
   ZIP: 204
   Title: Zcash P2P Network Protocol
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Reserved
   Category: Network
   Discussions-To: <https://github.com/zcash/zips/issues/352>

zip-0205.rst

@@ -2,7 +2,7 @@
 
   ZIP: 205
   Title: Deployment of the Sapling Network Upgrade
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Credits: Simon Liu
   Status: Final
   Category: Consensus / Network

zip-0206.rst

@@ -2,7 +2,7 @@
 
   ZIP: 206
   Title: Deployment of the Blossom Network Upgrade
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Credits: Simon Liu
   Status: Final
   Category: Consensus / Network

zip-0207.rst

@@ -3,7 +3,7 @@
   ZIP: 207
   Title: Funding Streams
   Owners: Jack Grigg <str4d@electriccoin.co>
-          Daira Emma Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Final
   Category: Consensus
   Created: 2019-01-04

zip-0208.rst

@@ -2,8 +2,8 @@
 
   ZIP: 208
   Title: Shorter Block Target Spacing
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
-  Original-Authors: Daira Emma Hopwood
+  Original-Authors: Daira-Emma Hopwood
                     Simon Liu
   Status: Final
   Category: Consensus

zip-0209.rst

@@ -3,7 +3,7 @@
   ZIP: 209
   Title: Prohibit Negative Shielded Chain Value Pool Balances
   Owners: Sean Bowe <sean@electriccoin.co>
-          Daira Emma Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Final
   Category: Consensus
   Created: 2019-02-25

zip-0211.rst

@@ -2,7 +2,7 @@
 
   ZIP: 211
   Title: Disabling Addition of New Value to the Sprout Chain Value Pool
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Credits: Sean Bowe
   Status: Final
   Category: Consensus

zip-0214.rst

@@ -2,7 +2,7 @@
 
   ZIP: 214
   Title: Consensus rules for a Zcash Development Fund
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Final
   Category: Consensus
   Created: 2020-02-28

zip-0216.rst

@@ -3,7 +3,7 @@
   ZIP: 216
   Title: Require Canonical Jubjub Point Encodings
   Owners: Jack Grigg <jack@electriccoin.co>
-          Daira Emma Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Final
   Category: Consensus
   Created: 2021-02-11

zip-0217.rst

@@ -2,7 +2,7 @@
 
   ZIP: 217
   Title: Aggregate Signatures
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Reserved
   Category: Consensus
   Discussions-To: <https://github.com/zcash/zcash/issues/2914>

zip-0219.rst

@@ -2,7 +2,7 @@
 
   ZIP: 219
   Title: Disabling Addition of New Value to the Sapling Chain Value Pool
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Reserved
   Category: Consensus
   Discussions-To: <https://github.com/zcash/zips/issues/428>

zip-0220.rst

@@ -3,7 +3,7 @@
   ZIP: 220
   Title: Zcash Shielded Assets
   Owners: Jack Grigg <jack@electriccoin.co>
-          Daira Emma Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Withdrawn
   Category: Consensus
   Discussions-To: <https://github.com/zcash/zcash/issues/830>

zip-0222.rst

@@ -5,7 +5,7 @@
   Owners: Jack Grigg <jack@electriccoin.co>
           Kris Nuttycombe <kris@electriccoin.co>
   Credits: Zaki Manian
-           Daira Emma Hopwood
+           Daira-Emma Hopwood
            Sean Bowe
   Status: Draft
   Category: Consensus
@@ -311,7 +311,7 @@ Acknowledgements
 ================
 
 The handler semantics of ``tze_verify`` were suggested by Zaki Manian, drawing on the
-design of Cosmos. Daira Emma Hopwood and Sean Bowe gave useful feedback on an early draft of
+design of Cosmos. Daira-Emma Hopwood and Sean Bowe gave useful feedback on an early draft of
 this ZIP, and helped to analyse the various sources of transaction ID malleability.
 
 We would also like to thank the numerous other individuals who participated in discussions

zip-0224.rst

@@ -2,11 +2,11 @@
 
   ZIP: 224
   Title: Orchard Shielded Protocol
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
           Jack Grigg <jack@electriccoin.co>
           Sean Bowe <sean@electriccoin.co>
           Kris Nuttycombe <kris@electriccoin.co>
-          Ying Tong Lai <yingtong@electriccoin.co>
+  Original-Authors: Ying Tong Lai
   Status: Final
   Category: Consensus
   Created: 2021-02-27

zip-0225.rst

@@ -2,11 +2,11 @@
 
   ZIP: 225
   Title: Version 5 Transaction Format
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
           Jack Grigg <jack@electriccoin.co>
           Sean Bowe <sean@electriccoin.co>
           Kris Nuttycombe <kris@electriccoin.co>
-          Ying Tong Lai <yingtong@electriccoin.co>
+  Original-Authors: Ying Tong Lai
   Status: Final
   Category: Consensus
   Created: 2021-02-28

zip-0226.rst

@@ -4,7 +4,7 @@
   Title: Transfer and Burn of Zcash Shielded Assets
   Owners: Pablo Kogan <pablo@qed-it.com>
           Vivek Arte <vivek@qed-it.com>
-          Daira-Emma Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
           Jack Grigg <str4d@electriccoin.co>
   Credits: Daniel Benarroch
            Aurelien Nicolas

zip-0227.rst

@@ -4,7 +4,7 @@
   Title: Issuance of Zcash Shielded Assets
   Owners: Pablo Kogan <pablo@qed-it.com>
           Vivek Arte <vivek@qed-it.com>
-          Daira-Emma Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
           Jack Grigg <str4d@electriccoin.co>
   Credits: Daniel Benarroch
            Aurelien Nicolas

zip-0228.rst

@@ -4,7 +4,7 @@
   Title: Asset Swaps for Zcash Shielded Assets
   Owners: Pablo Kogan <pablo@qed-it.com>
           Vivek Arte <vivek@qed-it.com>
-          Daira-Emma Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
           Jack Grigg <str4d@electriccoin.co>
   Credits: Daniel Benarroch
            Aurelien Nicolas

zip-0230.rst

@@ -2,7 +2,7 @@
 
   ZIP: 230
   Title: Version 6 Transaction Format
-  Owners: Daira-Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
           Jack Grigg <jack@electriccoin.co>
           Sean Bowe <sean@electriccoin.co>
           Kris Nuttycombe <kris@electriccoin.co>

zip-0231.rst

@@ -4,7 +4,7 @@
   Title: Decouple Memos from Transaction Outputs
   Owners: Jack Grigg <jack@electriccoin.co>
           Kris Nuttycombe <kris@electriccoin.co>
-          Daira Emma Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Credits: Sean Bowe
            Nate Wilcox
   Status: Reserved

zip-0239.rst

@@ -2,7 +2,7 @@
 
   ZIP: 239
   Title: Relay of Version 5 Transactions
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
           Jack Grigg <jack@electriccoin.co>
   Status: Final
   Category: Network

zip-0243.rst

@@ -3,7 +3,7 @@
   ZIP: 243
   Title: Transaction Signature Validation for Sapling
   Owners: Jack Grigg <str4d@electriccoin.co>
-          Daira Emma Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Credits: Simon Liu
   Status: Final
   Category: Consensus

zip-0244.rst

@@ -3,7 +3,7 @@
   ZIP: 244
   Title: Transaction Identifier Non-Malleability
   Owners: Kris Nuttycombe <kris@electriccoin.co>
-          Daira Emma Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
           Jack Grigg <str4d@electriccoin.co>
   Status: Final
   Category: Consensus

zip-0245.rst

@@ -3,6 +3,7 @@
   ZIP: 245
   Title: Transaction Identifier Digests & Signature Validation for Transparent Zcash Extensions
   Owners: Kris Nuttycombe <kris@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Draft
   Category: Consensus
   Created: 2021-01-13

zip-0250.rst

@@ -2,7 +2,7 @@
 
   ZIP: 250
   Title: Deployment of the Heartwood Network Upgrade
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Final
   Category: Consensus / Network
   Created: 2020-02-28

zip-0251.rst

@@ -2,7 +2,7 @@
 
   ZIP: 251
   Title: Deployment of the Canopy Network Upgrade
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Final
   Category: Consensus / Network
   Created: 2020-02-28

zip-0252.rst

@@ -3,7 +3,7 @@
   ZIP: 252
   Title: Deployment of the NU5 Network Upgrade
   Owners: teor <teor@zfnd.org>
-          Daira Emma Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Final
   Category: Consensus / Network
   Created: 2021-02-23

zip-0300.rst

@@ -2,7 +2,7 @@
 
   ZIP: 300
   Title: Cross-chain Atomic Transactions
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Original-Authors: Jay Graber
   Status: Proposed
   Category: Informational

zip-0301.rst

@@ -4,7 +4,7 @@
   Title: Zcash Stratum Protocol
   Owners: Jack Grigg <str4d@electriccoin.co>
   Credits: 5a1t
-           Daira Emma Hopwood
+           Daira-Emma Hopwood
            Marek Palatinus (slush) and colleagues
            Jelle Bourdeaud'hui (razakal)
            ocminer
@@ -477,7 +477,7 @@ Thanks to:
 
 - 5a1t for the initial brainstorming session.
 
-- Daira Emma Hopwood for their input on API selection and design.
+- Daira-Emma Hopwood for hir input on API selection and design.
 
 - Marek Palatinus (slush) and his colleagues for their refinements, suggestions, and
   robust discussion.

zip-0304.rst

@@ -3,7 +3,7 @@
   ZIP: 304
   Title: Sapling Address Signatures
   Owners: Jack Grigg <jack@electriccoin.co>
-  Credits: Daira Emma Hopwood <daira@electriccoin.co>
+  Credits: Daira-Emma Hopwood <daira-emma@electriccoin.co>
            Sean Bowe <sean@electriccoin.co>
   Status: Draft
   Category: Standards / RPC / Wallet

zip-0305.rst

@@ -2,7 +2,7 @@
 
   ZIP: 305
   Title: Best Practices for Hardware Wallets supporting Sapling
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Reserved
   Category: Wallet
   Discussions-To: <https://github.com/zcash/zips/issues/346>

zip-0306.rst

@@ -2,7 +2,7 @@
 
   ZIP: 306
   Title: Security Considerations for Anchor Selection
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Reserved
   Category: Informational
   Discussions-To: <https://github.com/zcash/zips/issues/351>

zip-0307.rst

@@ -3,7 +3,7 @@
   ZIP: 307
   Title: Light Client Protocol for Payment Detection
   Owners: Jack Grigg <jack@electriccoin.co>
-          Daira Emma Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Original-Authors: George Tankersley
   Credits: Matthew Green
   Category: Standards / Ecosystem

zip-0308.rst

@@ -2,8 +2,8 @@
 
   ZIP: 308
   Title: Sprout to Sapling Migration
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
-  Original-Authors: Daira Emma Hopwood
+  Original-Authors: Daira-Emma Hopwood
                     Eirik Ogilvie-Wigley
   Status: Final
   Category: Standards / RPC / Wallet

zip-0310.rst

@@ -2,7 +2,7 @@
 
   ZIP: 310
   Title: Security Properties of Sapling Viewing Keys
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
           Jack Grigg <jack@electriccoin.co>
   Status: Draft
   Category: Informational

zip-0313.rst

@@ -3,7 +3,7 @@
   ZIP: 313
   Title: Reduce Conventional Transaction Fee to 1000 zatoshis
   Owners: Aditya Bharadwaj <nighthawkwallet@protonmail.com>
-  Credits: Daira Emma Hopwood
+  Credits: Daira-Emma Hopwood
            Deirdre Connolly
            Nathan Wilcox
   Status: Obsolete
@@ -199,7 +199,7 @@ Acknowledgements
 ================
 
 Thanks to Nathan Wilcox for suggesting improvements to the denial of service
-section. Thanks to Daira Emma Hopwood and Deirdre Connolly for reviewing and fixing
+section. Thanks to Daira-Emma Hopwood and Deirdre Connolly for reviewing and fixing
 the wording in this ZIP.
 
 

zip-0315.rst

@@ -2,7 +2,7 @@
 
   ZIP: 315
   Title: Best Practices for Wallet Handling of Multiple Pools
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
           Jack Grigg <jack@electriccoin.co>
   Status: Reserved
   Category: Wallet

zip-0316.rst

@@ -2,14 +2,14 @@
 
   ZIP: 316
   Title: Unified Addresses and Unified Viewing Keys
-  Owners: Daira-Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
           Nathan Wilcox <nathan@electriccoin.co>
           Jack Grigg <jack@electriccoin.co>
           Sean Bowe <sean@electriccoin.co>
           Kris Nuttycombe <kris@electriccoin.co>
-          Greg Pfeil <greg@electriccoin.co>
+  Original-Authors: Greg Pfeil
-  Credits: Taylor Hornby
                     Ying Tong Lai
+  Credits: Taylor Hornby
            Stephen Smith
   Status: Revision 0: Final, Revision 1: Proposed
   Category: Standards / RPC / Wallet
@@ -38,8 +38,8 @@ Consumer
   that it is given.
 Sender
   A wallet or other software that can send transfers of assets, or other
-  consensus state side-effects defined in future. Senders are a subset of
+  side effects to consensus state that may be defined in future. Senders are a
-  Consumers.
+  subset of Consumers.
 Receiver
   The necessary information to transfer an asset to a Recipient that generated
   that Receiver using a specific Transfer Protocol. Each Receiver is associated
@@ -383,7 +383,7 @@ Orchard Receiver.
 
 The raw encoding of a Unified Address is a concatenation of
 :math:`(\mathtt{typecode}, \mathtt{length}, \mathtt{addr})` encodings
-of the consituent Receivers, in ascending order of Typecode:
+of the constituent Receivers, in ascending order of Typecode:
 
 * :math:`\mathtt{typecode} : \mathtt{compactSize}` — the Typecode from the
   above Priority List;
@@ -454,7 +454,7 @@ The following FVK or IVK Encodings are used in place of the
 :math:`\mathtt{addr}` field:
 
 * An Orchard FVK or IVK Encoding, with Typecode :math:`\mathtt{0x03},` is
-  is the raw encoding of the Orchard Full Viewing Key or Orchard Incoming
+  the raw encoding of the Orchard Full Viewing Key or Orchard Incoming
   Viewing Key respectively.
 
 * A Sapling FVK Encoding, with Typecode :math:`\mathtt{0x02},` is the
@@ -684,7 +684,7 @@ Rationale for making Revision 0 UA/UVKs with MUST-understand Typecodes invalid
    <summary>Click to show/hide</summary>
 
 A Consumer implementing this ZIP prior to `Revision 1`_ will not
-recognize the Human-Readable Parts beginning with “``ur``” that mark a
+recognise the Human-Readable Parts beginning with “``ur``” that mark a
 `Revision 1`_ UA/UVK. So if a UA/UVK that includes MUST-understand
 Typecodes is required to use these `Revision 1`_ HRPs, this will ensure
 that the MUST-understand specification is correctly enforced even for

zip-0317.rst

@@ -3,7 +3,7 @@
   ZIP: 317
   Title: Proportional Transfer Fee Mechanism
   Owners: Aditya Bharadwaj <nighthawk24@gmail.com>
-          Daira Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Credits: Madars Virza
            Kris Nuttycombe
            Jack Grigg
@@ -29,7 +29,7 @@ to the value of a transaction fee that is conventionally used by wallets,
 and that a user can reasonably expect miners on the Zcash network to accept
 for including a transaction in a block.
 
-The terms "Mainnet, "Testnet", and "zatoshi" in this document are defined
+The terms "Mainnet", "Testnet", and "zatoshi" in this document are defined
 as in [#protocol-networks]_.
 
 

zip-0318.rst

@@ -3,7 +3,7 @@
   ZIP: 318
   Title: Associated Payload Encryption
   Owners: Kris Nuttycombe <kris@electriccoin.co>
-          Daira Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Reserved
   Category: Standards Track
   Created: 2022-09-19

zip-0319.rst

@@ -3,7 +3,7 @@
   ZIP: 319
   Title: Options for Shielded Pool Retirement
   Owners: Nathan Wilcox <nathan@electriccoin.co>
-          Daira Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Reserved
   Category: Informational
   Created: 2022-09-20

zip-0320.rst

@@ -2,7 +2,7 @@
 
   ZIP: 320
   Title: Defining an Address Type to which funds can only be sent from Transparent Addresses
-  Owners: Daira-Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
           Kris Nuttycombe <kris@nutty.land>
   Credits: Hanh
   Status: Draft

zip-0321.rst

@@ -2,8 +2,8 @@
 
   ZIP: 321
   Title: Payment Request URIs
-  Owners: Kris Nuttycombe (kris@electriccoin.co)
+  Owners: Kris Nuttycombe <kris@electriccoin.co>
-          Daira Emma Hopwood (daira@electriccoin.co)
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Credits: Francisco Gindre
   Status: Proposed
   Category: Standards / Wallet

zip-0322.rst

@@ -3,7 +3,7 @@
   ZIP: 322
   Title: Generic Signed Message Format
   Owners: Jack Grigg <jack@electriccoin.co>
-          Daira Emma Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Reserved
   Category: Standards / RPC / Wallet
   Discussions-To: <https://github.com/zcash/zips/issues/429>

zip-0323.rst

@@ -2,7 +2,7 @@
 
   ZIP: 323
   Title: Specification of getblocktemplate for Zcash
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
           Jack Grigg <jack@electriccoin.co>
   Status: Reserved
   Category: RPC / Mining

zip-0324.rst

@@ -386,7 +386,7 @@ In the above description, we explicitly list the notes involved in the payment (
 
 Instead, we can have the nodes be implicitly identified by the spending key (or similar) included in the URI. This can make URI shorter, thus less scary and less likely to run into length limits (consider SMS). The following alternatives are feasible:
 
-0. Explicitly list the note commitments within the URI.
+:math:`\hspace{0.9em}`\0. Explicitly list the note commitments within the URI.
 
 1. Include only the spending key(s) in the URI, and have the recipient scan the blockchain using the existing mechanism (trial decryption of the encrypted memo field). This is very slow, and risks denial-of-service attacks. Would be faster in the nominal case if the scanning is done backwards (newest block first), or if told by the sender when the transactions were mined; but scanning the whole chain for nonexistent transactions (perhaps induced by a DoS) would still take very long.
 

zip-0332.rst

@@ -3,7 +3,7 @@
   ZIP: 332
   Title: Wallet Recovery from zcashd HD Seeds
   Owners: Kris Nuttycombe <kris@electriccoin.co>
-          Daira Emma Hopwood <daira@electriccoin.co>
+          Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Reserved
   Category: Wallet
   Discussions-To: <https://github.com/zcash/zips/issues/675>

zip-0339.rst

@@ -2,7 +2,7 @@
 
   ZIP: 339
   Title: Wallet Recovery Words
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Reserved
   Category: Wallet
   Discussions-To: <https://github.com/zcash/zips/issues/364>

zip-0401.rst

@@ -2,7 +2,7 @@
 
   ZIP: 401
   Title: Addressing Mempool Denial-of-Service
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
   Status: Active
   Category: Network
   Created: 2019-09-09

zip-0416.rst

@@ -2,7 +2,7 @@
 
   ZIP: 416
   Title: Support for Unified Addresses in zcashd
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
           Jack Grigg <jack@electriccoin.co>
           Sean Bowe <sean@electriccoin.co>
           Kris Nuttycombe <kris@electriccoin.co>

zip-1010.rst

@@ -348,7 +348,7 @@ References
 .. [#zfnd-guidance] `Zcash Foundation Guidance on Dev Fund Proposals. Zcash Foundation blog, August 6, 2019. <https://www.zfnd.org/blog/dev-fund-guidance-and-timeline/>`_
 .. [#tromer-comment] `Comment on a post “How to hire ECC” in the Zcash Community Forum. Eran Tromer, August 11, 2019. <https://forum.zcashcommunity.com/t/how-to-hire-ecc/34379/55>`_
 .. [#restricted-funds] `“What Are Restricted Funds?” Foundation Group, last modified December 7, 2018. <https://www.501c3.org/kb/what-are-restricted-funds/>`_
-.. [#zfnd-grants] `ZF Grants — Funding for Zcash ecosystem projects <https://grants.zfnd.org/>`_
+.. [#zfnd-grants] `ZF Grants — Funding for Zcash ecosystem projects <https://zfnd.org/grants/>`_
 .. [#zfnd-state] `The State of the Zcash Foundation in 2019. Zcash Foundation blog, January 31, 2019. <https://www.zfnd.org/blog/foundation-in-2019/>`_
 .. [#acityinohio-comment] `Comment on a post “Decentralizing the Dev Fee” in the Zcash Community Forum. Josh Cincinnati, October 27, 2019. <https://forum.zcashcommunity.com/t/decentralizing-the-dev-fee/35252/38>`_
 .. [#zip-1007] `ZIP 1007: Enforce Development Fund Commitments with a Legal Charter <zip-1007.rst>`_

zip-1014.rst

@@ -8,7 +8,7 @@
   Credits: Matt Luongo
            @aristarchus
            @dontbeevil
-           Daira Emma Hopwood
+           Daira-Emma Hopwood
            George Tankersley
            Josh Cincinnati
            Andrew Miller