Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZIPs 226 & 227 - ZSA Protocol: Transfer, Issuance and Burn #680

Closed
wants to merge 43 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
e6fef40
Moving changes in zsa-zips to zsa1 (#10)
vivek-arte Mar 15, 2023
16198c6
Update zip-0226.rst
vivek-arte Apr 17, 2023
17d255a
Apply suggestions from ZIP review
vivek-arte Apr 17, 2023
a2270aa
Changes to issuance key derivation details (#8)
vivek-arte Apr 17, 2023
23ef13d
updating html file based on earlier commits
vivek-arte Apr 17, 2023
ef71dda
Rearrangements and minor changes to the Security and Privacy Consider…
vivek-arte May 8, 2023
ae57a85
Rearranging ZIP structure (#14)
vivek-arte May 9, 2023
4acb79c
Corrections and addition of reference links (#16)
vivek-arte May 12, 2023
994f55c
Applying suggestions from ZIP review
vivek-arte May 16, 2023
d7e2660
Added link to nested README for build deps (#17)
AntoineRondelet May 21, 2023
3a914c5
Handling additional suggestions from PR#649 and PR#628 (#19)
vivek-arte May 25, 2023
01c8f04
Updates to `txid_digest` (#15)
vivek-arte May 25, 2023
a434b9e
First round of modifications on ZIP227 (#20)
AntoineRondelet May 29, 2023
e129e68
Adding ZSA Orchard Action Description encoding details (#21)
vivek-arte Jun 1, 2023
c5eb10f
Updates to issue bundle hash personalizations (#22)
vivek-arte Jun 3, 2023
7913ed5
Fixed math boundary around purpose (#23)
AntoineRondelet Jun 5, 2023
30a6f5b
Updates to naming conventions and table format (#28)
vivek-arte Jun 9, 2023
7cbfde6
Removed redundant terminology in ZIP226, building on ZIP227 (#26)
AntoineRondelet Jun 11, 2023
69d3f77
Changing issue digest hash personalization values to match with imple…
vivek-arte Jun 29, 2023
c4e55ea
Added missing indices over sums (#27)
AntoineRondelet Jul 4, 2023
f765818
Consistency changes for notation and updates to issuance key derivati…
vivek-arte Jul 4, 2023
5d26401
Update with circuit changes (#31)
ConstanceBeguier Jul 24, 2023
7444c86
Apply suggestions from ZIP review
vivek-arte Aug 14, 2023
ffae569
making further ZIP editor suggested changes, and updating the html fi…
vivek-arte Aug 14, 2023
51d424b
Guidelines to wallets regarding representing Assets to clients (#32)
vivek-arte Sep 5, 2023
5dfad3a
Adding explicit assumption for canonical encodings for the Asset Base…
vivek-arte Sep 5, 2023
7c48103
Burn Mechanism Rearrangement (#35)
vivek-arte Sep 20, 2023
3ba2557
Add enable_zsa flag (#37)
ConstanceBeguier Sep 21, 2023
00a608c
Renaming `idk` to `imk` throughout ZIP 227 (#41)
vivek-arte Oct 3, 2023
ae5a2d8
Move the updated transaction structure from ZIP 226 to ZIP 230 (#42)
vivek-arte Oct 5, 2023
1c3510d
Merge branch 'main' into zsa1
PaulLaux Oct 5, 2023
be596bb
Switching the issuance authorization scheme to using Bitcoin Schnorr …
vivek-arte Oct 16, 2023
d370d1f
updated burn description
vivek-arte Oct 17, 2023
69b0f23
Apply suggestions from ZIP review
vivek-arte Oct 18, 2023
9da0702
updating html file to reflect rst file changes
vivek-arte Oct 18, 2023
0f63995
Apply suggestions from ZIP review
vivek-arte Oct 31, 2023
19ef526
accepting ZIP review suggestions, updating html files for deployment
vivek-arte Nov 1, 2023
50e7958
Rename of Issuance Keys (#44)
vivek-arte Nov 1, 2023
064257a
Updates to Security and Privacy Considerations section (#45)
vivek-arte Nov 2, 2023
1b29061
Clarifying the encoding of `ik` (#46)
vivek-arte Nov 7, 2023
7346a02
ZIPs 226 and 227: minor editorial changes (#47)
daira Nov 13, 2023
668312d
Fix typo in Orchard-ZSA Action Description. (#48)
vivek-arte Jan 2, 2024
ba1c185
Updates based on review comments (#49)
vivek-arte Jan 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Use ``make`` to check that you are using correct
`reStructuredText <https://docutils.sourceforge.io/rst.html>`__ or
`Markdown <https://pandoc.org/MANUAL.html#pandocs-markdown>`__ syntax,
and double-check the generated ``draft-*.html`` file before filing a Pull Request.

See `here <protocol/README.rst>`__ for the project dependencies.
daira marked this conversation as resolved.
Show resolved Hide resolved

NU5 ZIPs
--------
Expand Down Expand Up @@ -107,9 +107,9 @@ Index of ZIPs
<tr> <td>222</td> <td class="left"><a href="zip-0222.rst">Transparent Zcash Extensions</a></td> <td>Draft</td>
<tr> <td>224</td> <td class="left"><a href="zip-0224.rst">Orchard Shielded Protocol</a></td> <td>Final</td>
<tr> <td>225</td> <td class="left"><a href="zip-0225.rst">Version 5 Transaction Format</a></td> <td>Final</td>
<tr> <td><span class="reserved">226</span></td> <td class="left"><a class="reserved" href="zip-0226.rst">Transfer and Burn of Zcash Shielded Assets</a></td> <td>Reserved</td>
<tr> <td><span class="reserved">227</span></td> <td class="left"><a class="reserved" href="zip-0227.rst">Issuance of Zcash Shielded Assets</a></td> <td>Reserved</td>
<tr> <td><span class="reserved">230</span></td> <td class="left"><a class="reserved" href="zip-0230.rst">Version 6 Transaction Format</a></td> <td>Reserved</td>
<tr> <td>226</td> <td class="left"><a href="zip-0226.rst">Transfer and Burn of Zcash Shielded Assets</a></td> <td>Draft</td>
<tr> <td>227</td> <td class="left"><a href="zip-0227.rst">Issuance of Zcash Shielded Assets</a></td> <td>Draft</td>
<tr> <td>230</td> <td class="left"><a href="zip-0230.rst">Version 6 Transaction Format</a></td> <td>Draft</td>
<tr> <td>239</td> <td class="left"><a href="zip-0239.rst">Relay of Version 5 Transactions</a></td> <td>Final</td>
<tr> <td>243</td> <td class="left"><a href="zip-0243.rst">Transaction Signature Validation for Sapling</a></td> <td>Final</td>
<tr> <td>244</td> <td class="left"><a href="zip-0244.rst">Transaction Identifier Non-Malleability</a></td> <td>Final</td>
Expand Down
2 changes: 1 addition & 1 deletion README.template
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Use ``make`` to check that you are using correct
`reStructuredText <https://docutils.sourceforge.io/rst.html>`__ or
`Markdown <https://pandoc.org/MANUAL.html#pandocs-markdown>`__ syntax,
and double-check the generated ``draft-*.html`` file before filing a Pull Request.

See `here <protocol/README.rst>`__ for the project dependencies.

NU5 ZIPs
--------
Expand Down
8 changes: 4 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<p>Participation in the Zcash project is subject to a <a href="https://github.com/zcash/zcash/blob/master/code_of_conduct.md">Code of Conduct</a>.</p>
<p>The Zcash protocol is documented in its <a href="protocol/protocol.pdf">Protocol Specification</a>.</p>
<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>
<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. See <a href="protocol/README">here</a> for the project dependencies.</p>
</section>
<section id="nu5-zips"><h2><span class="section-heading">NU5 ZIPs</span><span class="section-anchor"> <a rel="bookmark" href="#nu5-zips"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h2>
<p>This is the list of ZIPs relevant to the NU5 Upgrade, which <a href="https://z.cash/upgrade/nu5/">activated on 31st May 2022</a>:</p>
Expand Down Expand Up @@ -81,9 +81,9 @@
<tr> <td>222</td> <td class="left"><a href="zip-0222">Transparent Zcash Extensions</a></td> <td>Draft</td>
<tr> <td>224</td> <td class="left"><a href="zip-0224">Orchard Shielded Protocol</a></td> <td>Final</td>
<tr> <td>225</td> <td class="left"><a href="zip-0225">Version 5 Transaction Format</a></td> <td>Final</td>
<tr> <td><span class="reserved">226</span></td> <td class="left"><a class="reserved" href="zip-0226">Transfer and Burn of Zcash Shielded Assets</a></td> <td>Reserved</td>
<tr> <td><span class="reserved">227</span></td> <td class="left"><a class="reserved" href="zip-0227">Issuance of Zcash Shielded Assets</a></td> <td>Reserved</td>
<tr> <td><span class="reserved">230</span></td> <td class="left"><a class="reserved" href="zip-0230">Version 6 Transaction Format</a></td> <td>Reserved</td>
<tr> <td>226</td> <td class="left"><a href="zip-0226">Transfer and Burn of Zcash Shielded Assets</a></td> <td>Draft</td>
<tr> <td>227</td> <td class="left"><a href="zip-0227">Issuance of Zcash Shielded Assets</a></td> <td>Draft</td>
<tr> <td>230</td> <td class="left"><a href="zip-0230">Version 6 Transaction Format</a></td> <td>Draft</td>
<tr> <td>239</td> <td class="left"><a href="zip-0239">Relay of Version 5 Transactions</a></td> <td>Final</td>
<tr> <td>243</td> <td class="left"><a href="zip-0243">Transaction Signature Validation for Sapling</a></td> <td>Final</td>
<tr> <td>244</td> <td class="left"><a href="zip-0244">Transaction Identifier Non-Malleability</a></td> <td>Final</td>
Expand Down
Loading