Skip to content

Adding the ZIP233 fix and updated test vectors on top of the changes for the OrchardZSA review #207

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
vivek-arte merged 9 commits into from
Feb 13, 2026
Merged

Adding the ZIP233 fix and updated test vectors on top of the changes for the OrchardZSA review #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
44eae39
fixes
PaulLaux Dec 29, 2025
a897d54
updating test vectors from zcash-test-vectors repo to include zip233a…
vivek-arte Dec 30, 2025
0a5239a
updating CI to also test for ZIP233
vivek-arte Dec 30, 2025
80220e7
update to ci.yml to fix error
vivek-arte Dec 30, 2025
b2ebe99
updating generated test vectors for ZIP 244 from zcash-test-vectors
vivek-arte Dec 31, 2025
6337256
updating CI and test vectors to only test with test vectors that incl…
vivek-arte Dec 31, 2025
338d545
fixing error and fmt
vivek-arte Dec 31, 2025
c15d577
adding comment
vivek-arte Feb 2, 2026
402d7e0
update the test vectors based on the changes made in PR#47 of the zca…
vivek-arte Feb 3, 2026
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
12 changes: 12 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,12 @@ jobs:
extra_flags: orchard transparent-inputs transparent-key-encoding
- state: all-features
all-features: true

# For NU7, we are running with the zip-233 feature:
# RUSTFLAGS='--cfg zcash_unstable="nu7"' cargo test --features zip-233
- state: NU7
all-features: true
extra_flags: zip-233
rustflags: '--cfg zcash_unstable="nu7"'

env:
Expand Down Expand Up @@ -107,8 +111,12 @@ jobs:
extra_flags: orchard transparent-inputs transparent-key-encoding
- state: all-features
all-features: true

# For NU7, we are running with the zip-233 feature:
# RUSTFLAGS='--cfg zcash_unstable="nu7"' cargo test --features zip-233
- state: NU7
all-features: true
extra_flags: zip-233
rustflags: '--cfg zcash_unstable="nu7"'

exclude:
Expand Down Expand Up @@ -180,8 +188,12 @@ jobs:
extra_flags: orchard
- state: all-features
all-features: true

# For NU7, we are running with the zip-233 feature:
# RUSTFLAGS='--cfg zcash_unstable="nu7"' cargo test --features zip-233
- state: NU7
all-features: true
extra_flags: zip-233
rustflags: '--cfg zcash_unstable="nu7"'

env:
Expand Down
6 changes: 3 additions & 3 deletions zcash_primitives/src/transaction/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1659,7 +1659,7 @@ mod tests {
// 0.0005 burned, 0.0001 t-ZEC fee
#[cfg(all(zcash_unstable = "nu7", feature = "zip-233"))]
{
let build_config = BuildConfig::Standard {
let build_config = BuildConfig::TxV6 {
sapling_anchor: Some(sapling::Anchor::empty_tree()),
orchard_anchor: Some(orchard::Anchor::empty_tree()),
};
Expand Down Expand Up @@ -1735,7 +1735,7 @@ mod tests {
// 0.0003 z-ZEC out, 0.00005 t-ZEC out, 0.0001 burned, 0.00015 t-ZEC fee, 0.00059999 z-ZEC in
#[cfg(all(zcash_unstable = "nu7", feature = "zip-233"))]
{
let build_config = BuildConfig::Standard {
let build_config = BuildConfig::TxV6 {
sapling_anchor: Some(witness1.root().into()),
orchard_anchor: Some(orchard::Anchor::empty_tree()),
};
Expand Down Expand Up @@ -1842,7 +1842,7 @@ mod tests {
// 0.0003 z-ZEC out, 0.00005 t-ZEC out, 0.0001 burned, 0.00015 t-ZEC fee, 0.0006 z-ZEC in
#[cfg(all(zcash_unstable = "nu7", feature = "zip-233"))]
{
let build_config = BuildConfig::Standard {
let build_config = BuildConfig::TxV6 {
sapling_anchor: Some(witness1.root().into()),
orchard_anchor: Some(orchard::Anchor::empty_tree()),
};
Expand Down
7 changes: 5 additions & 2 deletions zcash_primitives/src/transaction/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,9 @@ fn zip_0244() {

#[allow(unused_mut)] // mutability required for the V6 case which is flagged off by default
let mut test_vectors = self::data::zip_0244::make_test_vectors();
#[cfg(zcash_unstable = "nu7")]

// The orchard_zsa_digests test vectors include zip233_amount
#[cfg(all(zcash_unstable = "nu7", feature = "zip-233"))]
test_vectors.extend(orchard_zsa_digests::make_test_vectors());

for tv in test_vectors {
Expand Down Expand Up @@ -442,7 +444,7 @@ fn zip_0233() {
let input_scriptpubkeys = tv
.script_pubkeys
.iter()
.map(|s| Script(s.clone()))
.map(|s| Script(script::Code(s.clone())))
.collect();

let test_bundle = txdata
Expand Down Expand Up @@ -480,6 +482,7 @@ fn zip_0233() {
txdata.sprout_bundle().cloned(),
txdata.sapling_bundle().cloned(),
txdata.orchard_bundle().cloned(),
txdata.issue_bundle().cloned(),
);

(tdata, txdata.digest(TxIdDigester))
Expand Down
Loading
Loading