Skip to content

[2] Merge with upstream#46

Merged
vivek-arte merged 25 commits into
zsa1from
upstream_merge_prep_merge_with_master
Dec 31, 2025
Merged

[2] Merge with upstream#46
vivek-arte merged 25 commits into
zsa1from
upstream_merge_prep_merge_with_master

Conversation

@vivek-arte
Copy link
Copy Markdown

This PR merges in the updates from upstream/master to the target branch.

This should be changed to target zsa1 after the merging of #45.

str4d and others added 24 commits December 1, 2023 14:02
The original draft spec for RedJubjub did not include key prefixing, and
both this reference implementation and the Rust implementation were
implemented following that spec. Then when key prefixing was added, the
Rust code was updated at its call sites instead of inside the RedJubjub
implementation.

Now that we are migrating to the `redjubjub` crate which correctly builds
in key prefixing, the old test vectors can no longer be used.
Add ZIP 32 Seed Fingerprint encoding to test vectors
This PR is intended to fix the mirror+file 404s that started [showing up in CI](https://github.com/zcash/zcash-test-vectors/actions/runs/17371436288/job/49407384424#step:3:94).

`apt-get update` seemed the simplest place to start. Open to other ideas!
Co-authored-by: Kris Nuttycombe <kris@nutty.land>
…nstall

CI: `apt-get update` before `apt-get install gnome-keyring`
Add NSM transaction test vectors
PaulLaux
PaulLaux previously approved these changes Dec 29, 2025
Copy link
Copy Markdown

@PaulLaux PaulLaux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please update the target branch to zsa1 and make sure the newly generated vectors work before merging. (do no squash)

@vivek-arte vivek-arte changed the base branch from upstream_merge_prep to zsa1 December 30, 2025 10:44
@vivek-arte vivek-arte dismissed PaulLaux’s stale review December 30, 2025 10:44

The base branch was changed.

Copy link
Copy Markdown

@PaulLaux PaulLaux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good, please do a final check before creating the merge commit.

@vivek-arte vivek-arte merged commit d8fd79d into zsa1 Dec 31, 2025
3 checks passed
vivek-arte added a commit to QED-it/librustzcash that referenced this pull request Feb 13, 2026
…for the OrchardZSA review (#207)

This adds fixes for compilation under the --features zip-233 option.

The test vectors are also updated to match the updates from the zcash-test-vectors repository (QED-it/zcash-test-vectors#46 and QED-it/zcash-test-vectors#47). These add support for the ZIP 233 addition to the transaction format, as well as some regeneration that occurs due to changes in the randomness while generating the test vectors.
---------

Co-authored-by: Paul <3682187+PaulLaux@users.noreply.github.com>
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.

8 participants