Skip to content

Conversation

@dmidem
Copy link
Collaborator

@dmidem dmidem commented Jan 12, 2026

This PR updates Zebra to use the current orchard and librustzcash crate versions that contain the upstream Orchard PR zcash/orchard#471 review-related changes.

Other than updating the orchard and librustzcash references in Cargo.toml it also includes the follow-up changes needed to keep Zebra building against the updated orchard/librustzcash APIs:

  • Adjust NoteValueValueSum conversions (including updating orchard_zsa/burn.rs, and switching zebra-chain to ValueSum::from_raw where needed). This is a placeholder change and the code does not compile yet — see the FIXME comments and the note below.
  • Fix test vectors so they compile when zcash_unstable="nu7" is enabled but tx_v6 is not.
  • Rename the orchard_flavor module to flavor.
  • Update Orchard's Bundle::build usage in zebra-consensus tests.
  • Upgrade Rust to 1.85.1 (to align with librustzcash) and downgrade the blake2b_simd dependency to 1.0.1 to align with orchard.

dmidem added 7 commits January 5, 2026 15:14
…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
@dmidem dmidem changed the base branch from zsa1 to zcash_pr471_review January 14, 2026 11:33
@dmidem dmidem marked this pull request as ready for review January 14, 2026 11:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants