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

Upstream update #87

Merged
merged 34 commits into from
Dec 18, 2024
Merged

Upstream update #87

merged 34 commits into from
Dec 18, 2024

Conversation

vivek-arte
Copy link

This PR updates the zsa1 branch with the changes from upstream, and resolves conflicts.

Note: Merge this PR, not Squash Merge.

Daira-Emma Hopwood and others added 30 commits November 5, 2024 15:06
address at diversifier index 0 in each ZIP 32 account, whether or not a
conformant wallet would generate that address.

fixes zcash#772

Signed-off-by: Daira-Emma Hopwood <daira@katava.local>
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>
…ct PDF.

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>
Co-authored-by: Kris Nuttycombe <kris@nutty.land>
ZIP 1015 which is NU6-specific, and the rendering of dark mode.)

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
Editorial fixes, mainly to NU7 Candidate ZIPs
Clarify that there may always be funds associated with the P2PKH address at diversifier index 0
…ving only

a Transparent address, but we missed parts of it. Also we should require
that a UA/UVK does not only consist of Metadata Items.

Co-authored-by: Kris Nuttycombe <kris@nutty.land>
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
Complete the removal of the restriction on Revision 1 UAs having only a Transparent address
…tent

between Markdown and reStructuredText.

(This also anticipates a possible switch from Pandoc to Multimarkdown;
the changes are designed to work with both.)

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>
(zip-guide *incorrectly* said that we were already using KaTeX. This has
been wrong since zcash#645.)

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
This supports MultiMarkdown as well as Pandoc, using
`make MARKDOWN_OPTION=--mmd`

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
Signed-off-by: Daira-Emma Hopwood <daira@katava.local>
Various improvements in the rendering of math and references. rST ZIPs now support $...$ for inline math.
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
fixes zcash#961, fixes zcash#893

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>
daira and others added 3 commits November 24, 2024 11:27
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
Copy link

netlify bot commented Dec 17, 2024

Deploy Preview for zcash-zips-qedit ready!

Name Link
🔨 Latest commit 47ab5b8
🔍 Latest deploy log https://app.netlify.com/sites/zcash-zips-qedit/deploys/6761f0ab64b0210008a1b169
😎 Deploy Preview https://deploy-preview-87--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 force-pushed the upstream_update_20241217 branch from e16eb7c to 47ab5b8 Compare December 17, 2024 21:44
@vivek-arte vivek-arte requested a review from PaulLaux December 17, 2024 21:51
Copy link

@PaulLaux PaulLaux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.
(do not squash)

@vivek-arte vivek-arte merged commit dcf7489 into zsa1 Dec 18, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants