From 09e70fefc1d3a0eb45a95f808d7bbfc053a30e05 Mon Sep 17 00:00:00 2001 From: Mark Henderson Date: Fri, 29 Sep 2023 10:41:45 -0400 Subject: [PATCH] fix: revert accidental changes to other files --- .github/workflows/render.yml | 2 +- protocol/protocol.tex | 4 ++-- zip-0032.html | 4 ++-- zip-0032.rst | 2 +- zip-0316.html | 4 ++-- zip-0316.rst | 2 +- zip-0321.html | 4 ++-- zip-0321.rst | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/render.yml b/.github/workflows/render.yml index 8ff55439..0cd8240a 100644 --- a/.github/workflows/render.yml +++ b/.github/workflows/render.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up Git repository - uses: actions/checkout@v3.6.0 + uses: actions/checkout@v3.5.3 - name: Compile Zcash Protocol Specification uses: ./.github/actions/render-protocol-pdf diff --git a/protocol/protocol.tex b/protocol/protocol.tex index 5b1c1561..532d0c93 100644 --- a/protocol/protocol.tex +++ b/protocol/protocol.tex @@ -11929,8 +11929,8 @@ When decoding this representation, the key \MUST be considered invalid if $\abst for either $\AuthSignPublic$ or $\NullifierKey$, or if $\AuthSignPublic \notin \SubgroupJstar$, or if $\NullifierKey \notin \SubgroupJ$. -For \fullViewingKeys on \Mainnet, the \humanReadablePart is \ascii{zviews}. -For \fullViewingKeys on \Testnet, the \humanReadablePart is \ascii{zviewtestsapling}. +For \incomingViewingKeys on \Mainnet, the \humanReadablePart is \ascii{zviews}. +For \incomingViewingKeys on \Testnet, the \humanReadablePart is \ascii{zviewtestsapling}. } %sapling diff --git a/zip-0032.html b/zip-0032.html index 333d780e..c7d7ad4b 100644 --- a/zip-0032.html +++ b/zip-0032.html @@ -232,7 +232,7 @@ License: MIT
  • \(\mathsf{EncodeExtFVKParts}(\mathsf{ak, nk, ovk, dk}) :=\) - \(\mathsf{LEBS2OSP}_{256}(\mathsf{repr}_\mathbb{J}(\mathsf{ak}))\) + \(\mathsf{LEBS2OS}_{256}(\mathsf{repr}_\mathbb{J}(\mathsf{ak}))\) \(||\,\mathsf{LEBS2OSP}_{256}(\mathsf{repr}_\mathbb{J}(\mathsf{nk}))\) \(||\,\mathsf{ovk}\) \(||\,\mathsf{dk}\) @@ -1158,4 +1158,4 @@ License: MIT - \ No newline at end of file + diff --git a/zip-0032.rst b/zip-0032.rst index 823fffa9..fee19257 100644 --- a/zip-0032.rst +++ b/zip-0032.rst @@ -177,7 +177,7 @@ Sapling helper functions Define * :math:`\mathsf{EncodeExtSKParts}(\mathsf{ask, nsk, ovk, dk}) :=`:math:`\mathsf{I2LEOSP}_{256}(\mathsf{ask})`:math:`||\,\mathsf{I2LEOSP}_{256}(\mathsf{nsk})`:math:`||\,\mathsf{ovk}`:math:`||\,\mathsf{dk}` -* :math:`\mathsf{EncodeExtFVKParts}(\mathsf{ak, nk, ovk, dk}) :=`:math:`\mathsf{LEBS2OSP}_{256}(\mathsf{repr}_\mathbb{J}(\mathsf{ak}))`:math:`||\,\mathsf{LEBS2OSP}_{256}(\mathsf{repr}_\mathbb{J}(\mathsf{nk}))`:math:`||\,\mathsf{ovk}`:math:`||\,\mathsf{dk}` +* :math:`\mathsf{EncodeExtFVKParts}(\mathsf{ak, nk, ovk, dk}) :=`:math:`\mathsf{LEBS2OS}_{256}(\mathsf{repr}_\mathbb{J}(\mathsf{ak}))`:math:`||\,\mathsf{LEBS2OSP}_{256}(\mathsf{repr}_\mathbb{J}(\mathsf{nk}))`:math:`||\,\mathsf{ovk}`:math:`||\,\mathsf{dk}` Sapling master key generation ----------------------------- diff --git a/zip-0316.html b/zip-0316.html index 96a4ad61..b1b05b51 100644 --- a/zip-0316.html +++ b/zip-0316.html @@ -250,7 +250,7 @@ Discussions-To: <https://g is an encoding of \((\mathsf{dk}, \mathsf{ivk})\) given by - \(\mathsf{dk}\,||\,\mathsf{I2LEOSP}_{256}(\mathsf{ivk}).\) + \(\mathsf{I2LEOSP}_{88}(\mathsf{dk})\,||\,\mathsf{I2LEOSP}_{256}(\mathsf{ivk}).\)
  • There is no defined way to represent a Viewing Key for a Transparent P2SH Address in a UFVK or UIVK (because P2SH Addresses cannot be diversified in an unlinkable way). The Typecode \(\mathtt{0x01}\) @@ -1023,4 +1023,4 @@ c^{n+m}}{q}.\) - \ No newline at end of file + diff --git a/zip-0316.rst b/zip-0316.rst index d4618b05..f5ec2e1b 100644 --- a/zip-0316.rst +++ b/zip-0316.rst @@ -431,7 +431,7 @@ The following FVK or IVK Encodings are used in place of the * A Sapling IVK Encoding, also with Typecode :math:`\mathtt{0x02},` is an encoding of :math:`(\mathsf{dk}, \mathsf{ivk})` given by - :math:`\mathsf{dk}\,||\,\mathsf{I2LEOSP}_{256}(\mathsf{ivk}).` + :math:`\mathsf{I2LEOSP}_{88}(\mathsf{dk})\,||\,\mathsf{I2LEOSP}_{256}(\mathsf{ivk}).` * There is no defined way to represent a Viewing Key for a Transparent P2SH Address in a UFVK or UIVK (because P2SH Addresses cannot be diff --git a/zip-0321.html b/zip-0321.html index 28e9753d..a2d3498c 100644 --- a/zip-0321.html +++ b/zip-0321.html @@ -121,7 +121,7 @@ License: MIT

    Also invalid; address.0= and amount.0= are not permitted as leading 0s are forbidden in paramindex.

    zcash:?amount=1.234&amount=2.345&address=tmEZhbWHTpdKMw5it8YDspUXSMGQyFwovpU
 
-zcash:?amount.1=1.234&amount.1=2.345&address.1=tmEZhbWHTpdKMw5it8YDspUXSMGQyFwovpU
    +zcash:?amount.1=1.234&amount.1=2.345&address.1=tmEZhbWHTpdKMw5it8YDspUXSMGQyFwovpU"

    Also invalid; duplicate amount= or amount.1= fields

    zcash:tmEZhbWHTpdKMw5it8YDspUXSMGQyFwovpU?amount=1%30
 zcash:tmEZhbWHTpdKMw5it8YDspUXSMGQyFwovpU?%61mount=1
@@ -247,4 +247,4 @@ zcash:%74mEZhbWHTpdKMw5it8YDspUXSMGQyFwovpU?amount=1
    - \ No newline at end of file + diff --git a/zip-0321.rst b/zip-0321.rst index f71ec0e4..f595065b 100644 --- a/zip-0321.rst +++ b/zip-0321.rst @@ -260,7 +260,7 @@ forbidden in ``paramindex``. zcash:?amount=1.234&amount=2.345&address=tmEZhbWHTpdKMw5it8YDspUXSMGQyFwovpU - zcash:?amount.1=1.234&amount.1=2.345&address.1=tmEZhbWHTpdKMw5it8YDspUXSMGQyFwovpU + zcash:?amount.1=1.234&amount.1=2.345&address.1=tmEZhbWHTpdKMw5it8YDspUXSMGQyFwovpU" Also invalid; duplicate ``amount=`` or ``amount.1=`` fields