forked from ZcashFoundation/zebra
-
Notifications
You must be signed in to change notification settings - Fork 1
Update Orchard and librustzcash refs for PR471 review sync #102
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
Open
dmidem
wants to merge
17
commits into
zcash_pr471_review
Choose a base branch
from
zcash_pr471_review_2
base: zcash_pr471_review
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…am PR ZcashFoundation#471 review changes
…nabled but tv_v6 is not
…a/burn.rs as the updated orchard does not have a direct conversion method now
…/Cargo.lock to use a working versions of those deps with PR471 related updates - the refs need to be updated again to the actual branches/commits before the merge of these Zebra chnages!
…o it as we the updated orchard can not get i64 from NoteValue so we can not use the previous hack for conversion. The code still does not compile after switching to ValueSum::from_raw as it's pub(crate) now - so it should be fixed in some way - added FIXME in the code
… blake2b_simd dependency to 1.0.1 to align with Orchard
…un, allowing the new 1.85 lints
…nd unnecessary_lazy_evaluation
…for the workspace
…gs without patching upstream code
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR updates Zebra to use the current
orchardandlibrustzcashcrate versions that contain the upstream Orchard PR zcash/orchard#471 review-related changes.Other than updating the
orchardandlibrustzcashreferences inCargo.tomlit also includes the follow-up changes needed to keep Zebra building against the updatedorchard/librustzcashAPIs:NoteValue→ValueSumconversions (including updatingorchard_zsa/burn.rs, and switchingzebra-chaintoValueSum::from_rawwhere needed). This is a placeholder change and the code does not compile yet — see theFIXMEcomments and the note below.zcash_unstable="nu7"is enabled buttx_v6is not.orchard_flavormodule toflavor.Bundle::buildusage inzebra-consensustests.librustzcash) and downgrade theblake2b_simddependency to1.0.1to align withorchard.