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 post NU6 updates #69

Merged
merged 32 commits into from
Sep 27, 2024
Merged

Conversation

vivek-arte
Copy link

This PR adds the NU6 changes from upstream to our branch.

(Future upgrades will not have their own PDF.)

Signed-off-by: Daira-Emma Hopwood <[email protected]>
Signed-off-by: Daira-Emma Hopwood <[email protected]>
Signed-off-by: Daira-Emma Hopwood <[email protected]>
… into

their own section.

Signed-off-by: Daira-Emma Hopwood <[email protected]>
describe NU6. Also say that additional rationale for Canopy is given in
ZIP 1014.

Signed-off-by: Daira-Emma Hopwood <[email protected]>
$\mathsf{ChainValuePoolBalance^{Deferred}}$.

Signed-off-by: Daira-Emma Hopwood <[email protected]>
Signed-off-by: Daira-Emma Hopwood <[email protected]>
…` and ``FS_FPF_ZCG``

to match the code in `zcashd`.

Signed-off-by: Daira-Emma Hopwood <[email protected]>
Signed-off-by: Daira-Emma Hopwood <[email protected]>
Signed-off-by: Daira-Emma Hopwood <[email protected]>
Signed-off-by: Daira-Emma Hopwood <[email protected]>
Signed-off-by: Daira-Emma Hopwood <[email protected]>
Copy link

netlify bot commented Sep 27, 2024

Deploy Preview for zcash-zips-qedit ready!

Name Link
🔨 Latest commit 0da1b34
🔍 Latest deploy log https://app.netlify.com/sites/zcash-zips-qedit/deploys/66f69da5a50ffc0008508528
😎 Deploy Preview https://deploy-preview-69--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 0687ce8 into zsa1 Sep 27, 2024
5 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.

2 participants