Skip to content

Merging changes from upstream#100

Merged
PaulLaux merged 28 commits into
zsa1from
main
Mar 12, 2025
Merged

Merging changes from upstream#100
PaulLaux merged 28 commits into
zsa1from
main

Conversation

@vivek-arte
Copy link
Copy Markdown

This merges the changes from upstream into our working branch

Paul Dann and others added 28 commits January 15, 2025 14:52
This clarifies the "Benefits to ZEC Holders" section.

Co-authored-by: Daira-Emma Hopwood <daira@jacaranda.org>
ZIP 233-235: Rephrase all references to "burning"
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
Re-render HTML after updates to NSM ZIPs
requirement to document the usage in a ZIP.

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

LaTeX cases environment.

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
Co-authored-by: Jack Grigg <thestr4d@gmail.com>
…tion.

Co-authored-by: Jack Grigg <jack@electriccoin.co>
Co-authored-by: Kris Nuttycombe <kris@nutty.land>
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
[ZIP 32] Add registered child key derivation with support for tags
Co-authored-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 227: Replace `asset_desc` with its hash in `AssetId`
Co-authored-by: Daira-Emma Hopwood <daira@jacaranda.org>
Co-authored-by: Daira-Emma Hopwood <daira@jacaranda.org>
Update status of deployed ZIPs post-NU6
@netlify
Copy link
Copy Markdown

netlify Bot commented Mar 11, 2025

Deploy Preview for zcash-zips-qedit ready!

Name Link
🔨 Latest commit d377d71
🔍 Latest deploy log https://app.netlify.com/sites/zcash-zips-qedit/deploys/67d07b3a36f2510008e00122
😎 Deploy Preview https://deploy-preview-100--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.

@PaulLaux PaulLaux merged commit 3fc44bc into zsa1 Mar 12, 2025
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.

5 participants