Skip to content

Sync Zebra with orchard and librustzcash synced to upstream #71

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.

Sign up for GitHub

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

Merged
dmidem merged 12 commits into from
Aug 25, 2025
Merged

Sync Zebra with orchard and librustzcash synced to upstream #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
798267c
Quote variables in push-deploy.yaml to pass upstream actionlint checks
dmidem Jun 26, 2025
c6076f1
Rename nu6 zcash_unstabl flag to nu7, update orchard and librustzcash…
dmidem Jul 27, 2025
56f62b3
Replace deprecated librustzcash types with updated protocol equivalents
dmidem Jul 27, 2025
e0a3e1d
Fix compilation errors occured after the previous commit
dmidem Jul 27, 2025
25590c6
Additionally rename nu6 zcash_unstable flag to nu7 in rustdocflags se…
dmidem Jul 28, 2025
7ef1df5
Fix cargo clippy issue
dmidem Jul 28, 2025
2c9c3e7
Merge branch 'zsa1' into zsa-integration-consensus-new-lrzc
dmidem Aug 12, 2025
c8a5f41
zebra-chain: port TryFrom<HashType>→SighashType from upstream Zebra v…
dmidem Aug 12, 2025
c747598
Merge branch 'zsa1' into zsa-integration-consensus-new-lrzc
dmidem Aug 12, 2025
1113f22
Removed resolved FIXME
dmidem Aug 12, 2025
d2242b8
Switch to the latest zsa1 rev of librustzcash
dmidem Aug 12, 2025
c754763
Merge branch 'zsa1' into zsa-integration-consensus-new-lrzc
dmidem Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ rustflags = [
"--cfg", 'feature="tx-v6"',

# TODO: Consider removing this line later (it's needed for the ZSA version of librustzcash crates)
"--cfg", "zcash_unstable=\"nu6\"",
"--cfg", "zcash_unstable=\"nu7\"",

# Zebra standard lints for Rust 1.65+

Expand Down Expand Up @@ -92,7 +92,7 @@ rustdocflags = [
"--cfg", 'feature="tx-v6"',

# TODO: Consider removing this line later (it's needed for the ZSA version of librustzcash crates)
"--cfg", "zcash_unstable=\"nu6\"",
"--cfg", "zcash_unstable=\"nu7\"",

# The -A and -W settings must be the same as the `RUSTDOCFLAGS` in:
# https://github.com/ZcashFoundation/zebra/blob/main/.github/workflows/docs-deploy-firebase.yml#L68
Expand Down
Loading