Sync Zebra with latest Orchard and librustzcash by dmidem · Pull Request #92 · QED-it/zebra

dmidem · 2025-11-09T20:05:05Z

This updates Zebra to the latest Orchard and librustzcash revisions and adjusts our code to compile against their breaking changes.

… changes

…on for V6

PaulLaux

Great work, added comments

PaulLaux · 2025-11-20T18:01:07Z

Cargo.toml

+zcash_note_encryption = { version = "0.4.1", git = "https://github.com/zcash/zcash_note_encryption", rev = "9f7e93d42cef839d02b9d75918117941d453f8cb" }
+sapling-crypto = { package = "sapling-crypto", version = "0.5", git = "https://github.com/QED-it/sapling-crypto", rev = "9393f93fe547d1b3738c9f4618c0f8a2fffed29f" }
+orchard = { version = "0.11.0", git = "https://github.com/QED-it/orchard", rev = "2083efe8d57e6073914ae296db2d41f8bfe1de50" }
+zcash_primitives = { version = "0.25.0", git = "https://github.com/QED-it/librustzcash", rev = "a7e5a5fe90181965aff5e42f071178dd3492e626" }


please use this commit for librustzcash (all):

QED-it/librustzcash@e27124a

We merged it today and we need it in (minor update to fee api).

To integrate into zebra, start with no_new_assets() like in the example here: https://github.com/QED-it/librustzcash/blob/e27124a49a0e549227e12adf13e42f88593f1dee/zcash_primitives/src/transaction/builder.rs#L1420

Later, when state management is merged, add the real predicate (we will discuss in due time)

As agreed, I added a TODO comment to the conventional_actions function in zebra-chain/src/transaction/unmined/zip317.rs.

I don't see the change. we need QED-it/librustzcash@e27124a

Fixed (upgraded librustzcash crates revisions to e271... in Cargo.toml).

zebra-chain/src/transaction/serialize.rs

PaulLaux · 2025-11-20T19:10:28Z

zebra-chain/src/transaction/serialize.rs

+                    .map(|sig| orchard::AuthorizedAction::from_parts(action, sig))
            })
-            .collect();
+            .collect::<Result<Vec<_>, _>>()?;


.collect::<Result<_, _>>()?; is enough.

PaulLaux · 2025-11-20T19:13:17Z

zebra-chain/src/transaction/serialize.rs


+                // Denoted as `vSighashInfo` in the spec.
+                // There is one sighash info per transparent input. For now, only V0 is supported.
+                for _ in 0..inputs.len() {


just for _ in inputs {

PaulLaux · 2025-11-20T20:32:41Z

zebra-chain/src/transaction/serialize.rs

+                // Denoted as `vSighashInfo` in the spec (ZIP-230).
+                // There is one `TransparentSighashInfo` per transparent input (tx_in_count entries).
+                // For now, only V0 is supported, which must decode to a Vector<u8> == [0x00].
+                for _ in 0..inputs.len() {


for _ in &inputs {

PaulLaux · 2025-11-21T17:28:34Z

zebra-chain/src/versioned_sig.rs

+        }
+
+        Ok(SighashInfo {
+            version: SighashVersion(version[0]),


lets check that it is v0 here and avoid external calls to is_v0 (remove is_v0 completely.

Your solution is more general but in this case we only want to support v0 at the parser level. Also this will eliminate the invariant of checking for is_v0 at serialize.rs

I've refactored and simplified the the code so we don't have this function now, see #92 (comment)

PaulLaux · 2025-11-21T18:14:50Z

zebra-chain/src/versioned_sig.rs

+    }
+
+    #[test]
+    fn sighash_info_with_data() {


not needed is we remove is_v0.

I've refactored and simplified the the code so we don't have this test now, see #92 (comment)

PaulLaux · 2025-11-21T18:25:41Z

zebra-chain/src/versioned_sig.rs

+        }
+
+        let sig = TestSig([0x11, 0x22, 0x33, 0x44]);
+        let versioned = VersionedSig::for_tx_v6(sig.clone());


let versioned_sig = ..

PaulLaux · 2025-11-21T18:33:41Z

zebra-chain/src/versioned_sig.rs

+        let versioned = VersionedSig::for_tx_v6(sig.clone());
+
+        let bytes = versioned.zcash_serialize_to_vec().unwrap();
+        // sighash info bytes (CompactSize(1) + version 0) + signature bytes


More clear

// Expected format: [CompactSize(1), version(0), sig_bytes...] // 0x01 = CompactSize encoding of length 1 (just the version byte) // 0x00 = sighash version 0 // 0x11, 0x22, 0x33, 0x44 = the test signature bytes

zebra-chain/src/versioned_sig.rs

….rs to use the include_str! macro for storing test blocks in external files

…or the Orchard ZSA workflow test in zebra-consensus to prevent it from getting stuck when block heights are not sequential

…review comments

…h-a7e5' into upgrade-orchard-2083-librustzcash-a7e5

PaulLaux

Looks good, added minor comments.

the requested upgrade of librustzcash is missing.

PaulLaux · 2025-11-26T20:03:47Z

Cargo.toml

+zcash_note_encryption = { version = "0.4.1", git = "https://github.com/zcash/zcash_note_encryption", rev = "9f7e93d42cef839d02b9d75918117941d453f8cb" }
+sapling-crypto = { package = "sapling-crypto", version = "0.5", git = "https://github.com/QED-it/sapling-crypto", rev = "9393f93fe547d1b3738c9f4618c0f8a2fffed29f" }
+orchard = { version = "0.11.0", git = "https://github.com/QED-it/orchard", rev = "2083efe8d57e6073914ae296db2d41f8bfe1de50" }
+zcash_primitives = { version = "0.25.0", git = "https://github.com/QED-it/librustzcash", rev = "a7e5a5fe90181965aff5e42f071178dd3492e626" }


I don't see the change. we need QED-it/librustzcash@e27124a

PaulLaux · 2025-11-26T20:08:41Z

zebra-chain/src/transaction/serialize.rs

-        csm.zcash_serialize(&mut writer)?;
+        // Denoted as `nActionGroupsOrchard` in the spec (ZIP 230).
+        // TODO: Implement support for multiple groups as defined in ZIP 230
+        // (now the number of action groups is hardcoded to 1 to support V5-like transactions only).


// Denoted as `nActionGroupsOrchard` in the spec (ZIP 230). // TxV6 currently support only one action group.

PaulLaux · 2025-11-26T20:09:22Z

zebra-chain/src/transaction/serialize.rs

+        // Denoted as `nActionGroupsOrchard` in the spec (ZIP 230).
+        // TODO: Implement support for multiple groups as defined in ZIP 230
+        // (now the number of action groups is hardcoded to 1 to support V5-like transactions only).


// Denoted as `nActionGroupsOrchard` in the spec (ZIP 230). // TxV6 currently support only one action group.

PaulLaux · 2025-11-26T20:11:11Z

zebra-chain/src/transaction/serialize.rs

 }
+
+// TODO: After tx-v6 merge, refactor to share common serialization logic with V5.
+// For now the only difference is versioned signatures in V6.


The line is incorrect, there are other changes. Let's remove completely (keep TODO: ..)

Removed the second line.

zebra-consensus/src/orchard_zsa/tests.rs

PaulLaux · 2025-11-26T20:20:23Z

zebra-consensus/src/orchard_zsa/tests.rs

-        .check(block_verifier_router.clone())
-        .await
+    timeout(
+        Duration::from_secs(60),


Let's reduce to 15 sec to keep it tight.

PaulLaux · 2025-11-26T20:20:37Z

zebra-consensus/src/orchard_zsa/tests.rs

-        .await
+    timeout(
+        Duration::from_secs(60),
+        Transcript::from(create_transcript_data()).check(block_verifier_router.clone()),


.clone() not needed.

dmidem added 6 commits November 9, 2025 20:59

Update orchard and librustzcash, align Zebra with upstream API/module…

754860c

… changes

zebra-chain: add ZIP-230 vSighashInfo(V0) serialization/deserializati…

9ab4244

…on for V6

zebra-chain: add ZIP-230/ZIP-246 versioned signature support

ea8dfbf

zebra-chain: add NU6_1 activation heights

33a3a9c

zebra-chain: add missing new sapling_v6.rs module

489f937

Update ZSA test blocks

86229df

PaulLaux reviewed Nov 21, 2025

View reviewed changes

dmidem and others added 12 commits November 24, 2025 12:13

Update ZSA test blocks again and refactor orchard_zsa_workflow_blocks…

95dc65e

….rs to use the include_str! macro for storing test blocks in external files

Add 1-hour limit for cargo test in CI and a specific 1-minute limit f…

f8e71ab

…or the Orchard ZSA workflow test in zebra-consensus to prevent it from getting stuck when block heights are not sequential

Fix compilation error from the previous commit

9a03705

Update orchard-zsa-shielded-data test vectors

1344c30

Update get_blockchain_info@mainnet_10.snap test snapshot

45ee9f1

Update get_blockchain_info@testnet_10.snap test snapshot

6df563e

Make fixes according to #92 review comments

2f1c1c8

zebra-chain: refactor versioned_sig_v0_roundtrip test according to #92 …

4183c0d

…review comments

Add testnet-singlenode-deploy

01d1037

Merge remote-tracking branch 'origin/upgrade-orchard-2083-librustzcas…

bbace68

…h-a7e5' into upgrade-orchard-2083-librustzcash-a7e5

Add testnet-singlenode-deploy to dockerignore exceptions

3f407c1

Add TODO for missing ZSA ZIP-317 logical action terms

8fdd074

PaulLaux reviewed Nov 26, 2025

View reviewed changes

dmidem added 2 commits November 27, 2025 07:48

Upgrade librustzcash crate revisions in Cargo.toml/Cargo.lock

2e4b8f4

Fix according to the second #92 review comments

88883d7

PaulLaux approved these changes Nov 27, 2025

View reviewed changes

dmidem merged commit 6ea1d70 into zsa1 Nov 27, 2025
55 checks passed

dmidem deleted the upgrade-orchard-2083-librustzcash-a7e5 branch November 27, 2025 16:00

Conversation

dmidem commented Nov 9, 2025

Uh oh!

PaulLaux left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dmidem Nov 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dmidem Nov 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dmidem Nov 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

PaulLaux left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dmidem Nov 27, 2025 •

edited

Loading

dmidem Nov 25, 2025 •

edited

Loading

dmidem Nov 25, 2025 •

edited

Loading