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

Catching up with upstream #77

Merged
merged 83 commits into from
Nov 11, 2024
Merged

Catching up with upstream #77

merged 83 commits into from
Nov 11, 2024

Conversation

vivek-arte
Copy link

This PR merges in the changes from upstream post the merging of our PR to upstream.

acoglio and others added 30 commits September 7, 2023 14:31
`\authProvingKey` expands to 'proof authorizing key', so the article must be 'a' instead of 'an'.
Co-authored-by: Daira-Emma Hopwood <daira@jacaranda.org>
ZIP 32: Define an arbitrary key derivation process
are transparent inputs.
fixes zcash#910

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
ZIP 244: clarify that shielded inputs can't just sign the txid if there are transparent inputs
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
Author: Kris Nuttycombe <kris@nutty.land>
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
consensus changes from ZIP 236.

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
to the protocol spec.

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

as Implemented in zcashd and zebrad.

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
NU6 final specification clarifications
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
Add dark mode for the protocol specification
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
We had this requirement explicitly in mind for the existing design.

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
Signed-off-by: Daira-Emma Hopwood <daira@katava.local>
Signed-off-by: Daira-Emma Hopwood <daira@katava.local>
ZIP 317: Add a requirement that we neglected to mention
…nsactions

Add draft-hopwood-disallow-v4-transactions
str4d and others added 27 commits November 5, 2024 23:38
ZSA Protocol: Transfer, Issuance and Burn: ZIPs 226, 227, and 230
ZIP 2002: Assign ZIP 2002 for Explicit Fees
…s-dependency-on-note-encryption

[ZIP 2004] Remove the dependency of consensus on note encryption
Co-authored-by: Daira-Emma Hopwood <daira@jacaranda.org>
[ZIP-254] Deployment of the NU7 Network Upgrade
Co-authored-by: Kris Nuttycombe <kris@nutty.land>
Signed-off-by: Daira-Emma Hopwood <daira@katava.local>
Signed-off-by: Daira-Emma Hopwood <daira@katava.local>
Signed-off-by: Daira-Emma Hopwood <daira@katava.local>
Add NU7 Candidate ZIPs section to the index
Render NU7 candidate ZIPs & index page updates.
Signed-off-by: Daira-Emma Hopwood <daira@katava.local>
Signed-off-by: Daira-Emma Hopwood <daira@katava.local>
Signed-off-by: Daira-Emma Hopwood <daira@katava.local>
ZIP 316: Use the syntax specified in ZIP 0 for the multiple Status field
Rendering nits and minor clarifications
Copy link

netlify bot commented Nov 6, 2024

Deploy Preview for zcash-zips-qedit ready!

Name Link
🔨 Latest commit 7c5bb52
🔍 Latest deploy log https://app.netlify.com/sites/zcash-zips-qedit/deploys/672bb84371ca9100087e7e63
😎 Deploy Preview https://deploy-preview-77--zcash-zips-qedit.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@vivek-arte vivek-arte merged commit 2e1c16b into zsa1 Nov 11, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants