Implement ZIP-0227 global issued-assets state in Zebra by dmidem · Pull Request #111 · QED-it/zebra

dmidem · 2026-02-20T10:37:26Z

This PR adds global issued-asset state tracking for ZSA issuance per ZIP-0227.

Key changes:

Introduces AssetState / IssuedAssetChanges and integrates Orchard’s ZSA validation APIs to compute per-block issued-asset deltas.
During consensus checks, it uses Orchard’s validate_bundle_burn and verify_issue_bundle to validate burns and issuances while building the global issued_assets state. This relies on the Orchard refactoring in Refactor issue/burn validation for Zebra asset state integration orchard#199, which exposes/reworks these validation helpers for direct integration from Zebra.
Threads Orchard transaction sighashes through contextual block/tx verification so verify_issue_bundle can check issuance authorization signatures (issueAuthSig).
For checkpoint-verified blocks, it uses verify_trusted_issue_bundle instead of verify_issue_bundle because the current Zebra checkpoint-verification path does not provide transaction sighashes. This is intentional: checkpoint-verified blocks are treated as already verified and are only replayed through the global-state logic to (re)build issued_assets during node startup, so signature checking is not required there.
Persists issued-asset state in Zebra’s finalized DB, applies updates in non-finalized and finalized states with rollback support, and exposes a read path.
Adds an RPC method to query current asset state by AssetBase, plus tests/snapshots and workflow vectors.

Notes:

Issued-note rho derivation follows ZIP-0227 by passing nf_{0,0} (the first Orchard Action nullifier) into issuance verification.

…n-finalized chain.

…dBlock`

…callyVerifiedBlock types, updates `IssuedAssetsChange::from_transactions()` method return type

…heckpointVerifiedBlock

…s several bugs.

…f BE for amount, read amount after asset base)

…state, add a couple of FIXMEs

…ror in the function of the crate (this may not be a fully correct fix). Add a couple of FIXME comments explaining the problem.

…64 to prevent serialization errors and enable defining BurnItem in orchard, facilitating its reuse along with related functions

…instead of try_from')

…instead of try_from') (2)

…tead of amount (with_asset is used to process orchard burn) - this allows avoiding the use of try_into for burn in binding_verification_key function

…arately)

…undtrip test

…c ref for bytes OrchardWorkflowBlock instead of a vec, matching the approach used in block.rs there

…lpers

dmidem · 2026-03-29T21:47:26Z

Added comments.

In addition:

remove (to test) "--cfg", 'feature="tx_v6"' from .cargo/config.toml and make sure it works.

zebra_state will not compile without --cfg feature="tx_v6" :

zebra-state/src/error.rs:12, 269 — import orchard_zsa that need tx_v6

zebra-state/src/service/non_finalized_state.rs:13 same

zebra-rpc has no tx_v6 feature but uses tx_v6 gated types. Compiles only because of the global rustflag.

zebra-consensus/Cargo.toml:38-41 : tx_v6 = ["zebra-state/tx_v6", "zebra-chain/tx_v6"] missing zebra-test/tx_v6 (again the global flag

Thanks for the review. I addressed the review comments in this PR as much as makes sense for zsa-integration-state, and added responses to all your comments.

What is still not done here, but is already done in the synced Zebra branches (sync-zcash-v4.1.0-merge, sync-zcash-v4.1.0-merge-with-new-deps, and sync-zcash-v4.2.0-merge):

zsa-integration-state still does not compile with tx_v6 / nu7 disabled. This can be fixed, but it would require repeating cfg and feature-wiring changes that are already present in the synced version, so we agreed not to duplicate that work in this older branch.
The tx_v6 / nu7 cfg usage style in this branch is still not fully aligned with upstream Zebra, where these checks consistently require both flags together. The reason is the same: the cleanup is already done in the synced version.
zsa-integration-state uses the older zsa1 versions of our librustzcash / orchard forks, before the latest upstream merge. The latest librustzcash updates include several breaking upstream changes, and this branch no longer compiles against them. Fixing that here would take extra work, while the synced Zebra version already works with the newer dependencies. I fixed the remaining small issues for that in sync-zcash-v4.1.0-merge-with-new-deps.

So, as we discussed, I kept this PR focused on the functional changes relevant to zsa-integration-state, and left the broader cfg / feature / dependency-sync cleanup in the synced branches, where it is already implemented.

#245) This adds `IssueBundle::note_commitments()` to expose extracted note commitments directly as `pallas::Base` values. This is useful in Zebra to recompute issuance-related commitments without the current `to_bytes`/`from_bytes` workaround: https://github.com/QED-it/zebra/blob/2634fd662a4eaca6df901c82b1bc05d2982636d7/zebra-chain/src/orchard_zsa/issuance.rs#L43 See also the related Zebra PR review comment: QED-it/zebra#111 (comment)

PaulLaux

Added some minor comments.

In addition, please create a ~~file in this repo~~ github issue to track the missing test coverage and move the relevant TODOs there so we have a proper high-level overview of what is missing.

PaulLaux · 2026-04-07T10:27:10Z

+                // ZIP-0227 defines issued-note rho as DeriveIssuedRho(nf_{0,0}, i_action, i_note),
+                // so we must pass the first Action nullifier (nf_{0,0}). We rely on
+                // `orchard_nullifiers()` preserving Action order, so `.next()` returns nf_{0,0}.
+                // Nullifier type conversion via bytes: both types wrap pallas::Point
+                // but lack a direct conversion path in the current orchard API.
+                // TODO: Consider adding a test for the case where a V6 transaction has issuance data
+                // but has no nullifiers (the test may require constructing a proper mock V6 transaction).


This is unnessesary long. Just

// tx.orchard_nullifiers().next() is guaranteed to return nf_{0,0} on first call.

In addition, we need a predefined place to document test coverage gaps. Consider creating a dedicated test_coverage_gaps.md and commit to this repo or another solution. We need everything on this topic in one place.

Fixed (shortened the comment, will be tracked in the test-gap issue).

PaulLaux · 2026-04-07T11:47:48Z

                return Err(TransactionError::CoinbaseHasEnableSpendsOrchard);
            }
+            // ZIP-230: coinbase must not set enableZSA.
+            // TODO: Add V6 coinbase ENABLE_ZSA tests (fails when set, passes when unset),


move to test coverage file

Fixed. I removed the TODO. The coverage is already added in the synced branch (PR #114), where it can use the upstream Transaction::new_v6_coinbase() helper.

PaulLaux · 2026-04-07T11:49:30Z

                        recipient,
                        NoteValue::from_raw(note_value),
                        // FIXME: Use another AssetBase for OrchardZSA?
-                        AssetBase::native(),


Move FIXME to a dedicated tests gaps file

Fixed (comment removed, will be tracked in the test-gap issue).

…egtest genesis test vector

…TODO/FIXME comments

dmidem · 2026-04-09T14:44:12Z

I addressed the additional review comments in this PR and added my replies. I also created a GitHub issue to track the ZSA-related test coverage gaps that were previously noted in TODO/FIXME comments: #116

PaulLaux

Let's merge it.

Also, I updated issue #116. Feel free to update it as we go.

…egtest genesis test vector

…TODO/FIXME comments

* Minor fix in comments * Temporary comment of #[cfg(feature = tx-v6)] in zebra-chain/src/transaction/arbitrary.rs * Update ZSA test blocks (use test data with action groups) * Update Nu7 consensus branch id in rpc test snapshot * Make changes according to #17 PR review (partially) * Derive Copy, Clone, Debug, Eq, PartialEq for EncryptedNote instead of explicit imlps as const generic are stabilized * Make changes according to #17 PR review * Fix wrong resolving of merge conflict in the previous commit * Minor fix in FIXME comment * Minor spelling fixes in comments * Fix compilation error in tests * Fix clippy warning * Fix clippy warning (2) * Fix clippy warning (3) * Refactor burn serialization to use read_burn, write_burn functions from librustzcash * Remove TrustedPreallocate impl and size constants from orchard_zsa::issuance module as they are not used (librutzcash serialization is used) * Switch to updated version of orchard and librustzcash crates in Cargo.toml, which add PartialEq and Eq derives to orchard flavor marker types * Update orchard_flavor_ext module to re-use OrchardVanilla and OrchardZSA marker types from orchard, rename OrchardFlavorExt to ShieldedDataFlavor and rest of the code according those changes * Rename orchard_flavor_ext module to shielded_data_flavor * Fix several comments * Use NoiteValue instead of Amount ffor BurnItem * Fix compilation error * Fix compilation error (2) * Refactor zebra-chain/src/transaction/serialize.rs (add comments, reduce code duplication) * Fix remaining merge conflicts * Fix compilation erros * Fix clippy warning * Fix compilation errors appeared after the previous merge * Fix compilation error * Add support of V6 to remove_orchard_conflicts proptest function in zebrad * Fix to resolve some review comment for #37 * Update comments and rename some modules according to #37 review notes * More updates according to #37 review notes * Add OrchardZSA version of encrypted_ciphertext_roundtrip test * Fix a couple of comments and orchard_zsa/tests items visibility according to #37 review remarks * Additional fixes according #37 review comments * Add support of V6 to property tests for mempool storage in zebrad * Add comments according to #37 review * Add v6_strategy to zebra-chain/src/transaction/arbitrary code * Fix compilation errors * Fix a mistake in zebra-chain/src/primitives/zcash_note_encryption * Fix compilation warnings * Comment out v6_strategy usage in zebra-chain/src/transaction/arbitrary.rs as it causes several tests to fail * Fix cargo fmt issue * Fix and return support of Nu7/V6 (i.e. a call of v6_strategy) to Transaction::arbitrary_with function in zebra-chain/src/transaction/arbitrary.rs * Ensure orchard_shielded_data can not be None for V6 in v6_strategy of zebra-chain/src/transaction/arbitrary.rs * Fix doc comment for ACTION_SIZE in orchard::ShieldedData * Move burn field inside action group in serialization functions for OrchardZSA * Update zebra-consensus/src/primitives/halo2/tests to add OrchardZSA tests * Fix cargo clippy warning * Update orchard and librustzcash versions * Fix order of fields for OrchardZS serialization/deserialization to be the same as in librustzcash * Update test vectors (with ones that contain burn inside AG) * Rename and fix orchard shielded data test vectors and releated tests * Added a doc comment for orchard_zsa workflow test (zebra-consensus/src/orchard_zsa tests.rs module) * Remove ValueCommitment::with_asset and introduce a ValueCommitment::new variant gated by the tx-v6 feature flag. Use ValueSum from the orchard crate as the value type to support both Amount (value balance) and NoteValue (burn). Add TODO comments for future orchard crate enhancements to simplify type conversions by reusing existing APIs. * Rename orchard test vectors modules, data files and constants in zebra-test (for vanilla - restore the original names, i.e. remove vanilla suffix, for zsa - move zsa suffix to the end) * Remove serialization tests from orchard_zsa in zebra-chain (as there're no such tests for Vanilla Orchard, tests from zebra-chain/src/transaction/tests/vectors.rs used instead - so we need to add ZSA related tests there) * Added short comments/descriptions for test blocks in orchard_workflow_blocks_zsa.rs * Make fixes according to the second #37 review * Fix cargo clippy error * Generalize verify_v5_transaction and verify_v6_transaction functions by converting them into verify_v5_and_v6_transaction generic. The ame for verify_v6_transaction_network_upgrade function * Fix FIXME comments in transaction.rs * Create push-deploy.yaml * Remove allow(missing_docs) from zebra-test/.../orchard_workflow_blocks_zsa.rs and add a doc comment there * Fix the code to support compilation with tx-v6 feature flag disabled, make this flag non-default in Cargo.toml files and enable it by default in .cargo/config.toml * Allow manual triggering for push-deploy * Fix compilation errors in zebra-state happened without tx-v6 feature flag enabled * Allow finalizing issued assets via the issue action when no notes are provided and the finalize flag is set to true * Refactor orchard_workflow_blocks_zsa.rs (zebra-test crate) to read test data from files, introduce and use OrchardWorkflowBlock there * Fix clippy errors * Copy tests from zsa-issued-assets-tests here and fix compilation errors * Temporarily comment out verify_issuance_blocks_test test (it fails now) * Add split of workflow, ecr and ecs * Update * Update PR comments * Update PR comments * Update by comments * Repo var for DOCKERFILE_PATH * Add env * Add env * Update deploy-ecs.yaml * Update deploy-ecs.yaml * 1 time task definition download * First-stage ZSA integration: apply upstream feedback & refactoring (ZcashFoundation#9560) (#63) * Quote variables in push-deploy.yaml to pass upstream actionlint checks The actionlint job in the ZcashFoundation/zebra repository CI reported multiple SC2086 errors. This commit quotes shell variables in push-deploy.yaml to fix the linter failures. * Avoid to use Into ValueCommitment for ShieldedDataFlavor::BurnType, and use compute_burn_value_commitment instead * Rename generic const parameter N of EncryptedNote to SIZE * Remove shielded_data::ActionCommon introduced during ZSA integration, and replace Transaction::orchard_actions() with Transaction::orchard_action_count() * Remove Default trait constraint for BurnType, also remove FIXME comment there * Address PR #63 review comments: make compute_burn_value_commitment non-generic and move comment to the top of the function * Add more V6 tests to zebra-chain, refactor OrchardZSA tests in zebra-test (#62) * Rename orchard_..._zsa test vector files to orchard_zsa_..., same for structs and consts declardd there * Add tests for empty tx v6 into zebra-chain * Add V6 roundtrip tests based on ORCHARD_ZSA_WORKFLOW_BLOCKS test vectors to zebra-chain * Address PR #62 review comments * Improve OrchardZSA V6 round-trip and conversion tests * Clean up rust-toolchain.toml and move rustfmt & clippy installs to CI (#73) * Drop extra components and refresh TODO in rust-toolchain.toml * Move rustfmt and clippy installation to CI instead of rust-toolchain.toml * Update push ecr on zsa1 branch * Sync Zebra with orchard and librustzcash synced to upstream (#71) * Quote variables in push-deploy.yaml to pass upstream actionlint checks The actionlint job in the ZcashFoundation/zebra repository CI reported multiple SC2086 errors. This commit quotes shell variables in push-deploy.yaml to fix the linter failures. * Rename nu6 zcash_unstabl flag to nu7, update orchard and librustzcash revisions in Cargo.toml, other small changes * Replace deprecated librustzcash types with updated protocol equivalents * Fix compilation errors occured after the previous commit * Additionally rename nu6 zcash_unstable flag to nu7 in rustdocflags section of .cargo/config.toml * Fix cargo clippy issue * zebra-chain: port TryFrom<HashType>→SighashType from upstream Zebra v2.4.2 (to sync with librustzcash changes) * Removed resolved FIXME * Switch to the latest zsa1 rev of librustzcash * Attempt to refactor asset state management * Continue refactoring asset state management * CI: reclaim runner disk, add resource logs, and use --locked/--no-deps to avoid 'No space left on device' (#91) * Manual partial sync of upstream (ZcashFoundation) v2.4.2 to reduce future merge conflicts (#85) * Quote variables in push-deploy.yaml to pass upstream actionlint checks The actionlint job in the ZcashFoundation/zebra repository CI reported multiple SC2086 errors. This commit quotes shell variables in push-deploy.yaml to fix the linter failures. * Rename tx-v6 feature flag to tx_v6 to match with the upstream (ZF) changes * Expand and remove tx_v5_and_v6 macro * Reorder transaction methods to match the upstream * Remove a duplicated comment in zebra-chain's expiry_heigh function * CI: add --locked arg to cargo calls * ci: add root probe + safe cleanup and shrink Rust artefacts to avoid runner disk exhaustion * CI: fix ci-basic.yml for the previous commit * ci: ensure deps see cfgs by mirroring .cargo/config.toml in RUSTFLAGS/RUSTDOCFLAGS * Reove RUSTFLAGS from ci-basic.yml * CI: comment out du commands * CI: dump largest folders in ci-basic.yml * CI: simplify ci-basic.yml by removing the cleanup step and reducing disk checks * CI: expand disk check to show full system resource summary (disk, memory, CPU) * Try running ci-basic.yml on ubuntu-latest-m2 to check system resources in CI logs * CI: print runner/image identity in ci-basic.yml * CI: switch ci-basic.yml back to ubuntu-latest * CI: Switch to ubuntu-latest explicitly in ci-basic.yml * Revert "CI: print runner/image identity in ci-basic.yml" This reverts commit 8b334cd. * CI: add disk cleanup * CI: log free disk space after each disk cleanup * CI: Disk cleanup only for Android tools and preinstalled tool caches * Add transaction_sighashes to semantically and contextually verified blocks * Update orchard and librustzcash, align Zebra with upstream API/module changes * Fix compilation errors that appeared after the previous merge * zebra-chain: add ZIP-230 vSighashInfo(V0) serialization/deserialization for V6 * zebra-chain: add ZIP-230 vSighashInfo(V0) serialization/deserialization for V6 * zebra-chain: add ZIP-230/ZIP-246 versioned signature support * zebra-chain: add NU6_1 activation heights * zebra-chain: add ZIP-230/ZIP-246 versioned signature support * zebra-chain: add NU6_1 activation heights * zebra-chain: add missing new sapling_v6.rs module * zebra-chain: add missing new sapling_v6.rs module * Update ZSA test blocks * Update ZSA test blocks again and refactor orchard_zsa_workflow_blocks.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 for 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 * Update orchard-zsa-shielded-data test vectors * Update get_blockchain_info@mainnet_10.snap test snapshot * Update get_blockchain_info@testnet_10.snap test snapshot * Make fixes according to #92 review comments * zebra-chain: refactor versioned_sig_v0_roundtrip test according to #92 review comments * Add testnet-singlenode-deploy * Add testnet-singlenode-deploy to dockerignore exceptions * Sync Zebra with latest Orchard and librustzcash (#92) * Update orchard and librustzcash, align Zebra with upstream API/module changes * zebra-chain: add ZIP-230 vSighashInfo(V0) serialization/deserialization for V6 * zebra-chain: add ZIP-230/ZIP-246 versioned signature support * zebra-chain: add NU6_1 activation heights * zebra-chain: add missing new sapling_v6.rs module * Update ZSA test blocks * Update ZSA test blocks again and refactor orchard_zsa_workflow_blocks.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 for 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 * Update orchard-zsa-shielded-data test vectors * Update get_blockchain_info@mainnet_10.snap test snapshot * Update get_blockchain_info@testnet_10.snap test snapshot * Make fixes according to #92 review comments * zebra-chain: refactor versioned_sig_v0_roundtrip test according to #92 review comments * Add testnet-singlenode-deploy * Add testnet-singlenode-deploy to dockerignore exceptions * Add TODO for missing ZSA ZIP-317 logical action terms * Upgrade librustzcash crate revisions in Cargo.toml/Cargo.lock * Fix according to the second #92 review comments --------- Co-authored-by: alexeykoren <2365507+alexeykoren@users.noreply.github.com> * Create stop-ecs workflow (#99) * Create stop-ecs.yaml * Clean * Update Orchard and librustzcash refs for PR471 review sync (#104) 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 `NoteValue` → `ValueSum` 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`. * Remove `halo2_gadgets` patch in Cargo.toml * Refactor to use the latest zsa1 branch commits of Orchard and librustzcash * Pin blake2b_simd to 1.0.1 for compatibility with Orchard * Fix test compilation errors * Add reference_note field to impl serde::Serialize for AssetState * Final refactoring of asset_base.rs * Remove 'nonempty' crate dependency * Add missing doc comment for pup mod testing * Update Zebra Orchard and librustzcash refs in Cargo.toml * Skip signature verification for checkpoint verified blocks * Remove (comment out) failing assert in update_chain_tip_with_block_parallel and add a FIXME comment with an explanation * Fix zebra-rpc asset_state test snapshots to add reference_note * Fix zebra-rpc asset_state test snapshots to rename total_supply to amount * Return MIN_TRANSPARENT_COINBASE_MATURITY to 100 * Make transaction_sighashes optional in semantically and contextually verified blocks * Fix cargo clippy errors * Drop global issuance state unrelated changes * Minor refactoring, FIXME resolution, etc. * Update deploy-ecs.yaml (#107) * Update Orchard and librustzcash versions and fix the code accordingly * Update push-ecr.yaml (#108) * Update push-ecr.yaml * Fix CI: update librustzcash rev and derive test reference notes via IssueBundle - Bump librustzcash to the fixed revision (removes the extra expiry_height check). - Rewrite zebra-chain test reference-note generation to derive notes with rho via IssueBundle (replaces the removed Orchard create_test_reference_note helper). * Fix zebra-rpc test compilation error * Add initial/partial support for ZIP-233 (zip233_amount field in Transaction::V6 and serialization only — without changing consensus rules — they will be updated automatically after merging with the upstream version of Zebra, where those ZIP-233-related changes are already implemented) * Revert "Add initial/partial support for ZIP-233 (zip233_amount field in Transaction::V6 and serialization only — without changing consensus rules — they will be updated automatically after merging with the upstream version of Zebra, where those ZIP-233-related changes are already implemented)" This reverts commit 8e3076f. * zebra-test: zebra-test: update Orchard ZSA workflow blocks * zebra-test: update Orchard ZSA workflow blocks * zebra-rpc: update get_asset_state snapshots * Fix cargo clippy issues * Add initial/partial support for ZIP-233 (zip233_amount field in Transaction::V6 and serialization only — without changing consensus rules — they will be updated automatically after merging with the upstream version of Zebra, where those ZIP-233-related changes are already implemented) * Fix compilation errors that appeared after the previous commit (i.e., after merging with the upstream Zebra). The code contains new FIXME comments that need to be resolved. * Add tx_sighash to VerifiedUnminedTx * zebra-chain: Align Nu7 consensus branch ID and TxV6 version group ID with the values used in the ZSA version of librustzcash. zebra-consensus: Allow v4 transactions for Nu7 * zebra-consensus: Set activation heights for Canopy and NU7 to 1 for regtest creation in Orchard ZSA workflow tests * Sync .github/workflows with upstream * Add missed .github/workflows files for the previous commit * Update Orchard ZSA workflow blocks to support ZIP-233 * Update Orchard ZSA workflow blocks to support ZIP-233 * Fix small cargo fmt issue * zebra-test: fix Orchard ZSA workflow vectors after correcting hashBlockCommitments zebra-test/src/vectors/orchard-zsa-workflow-block-1.txt had an all-zero hashBlockCommitments (ZIP-244) field. Updating it changes the block hash and chain history tree roots, so blocks 2–4 required updated hashBlockCommitments as well, and blocks 2–5 required previous_block_hash relinking. This regenerates the workflow block *.txt vectors so the orchard_zsa workflow test passes without bypasses. * zebra-rpc: update get_asset_state_not_found snapshots, assign TransactionObject's orchard to Some(default) instead of None for non-v5/v6 transactions * ci-basic.yml: rename elided_named_lifetimes to mismatched_lifetime_syntaxes * ci-basic.yml: match clippy flags with upstream lint workflow * zebra-test: increase MockService default request wait to 1s to avoid CI failures * Address PR #111 review comments (tx_v6 feature gating to be fixed separately) * Clear ENABLE_ZSA in Flags arbitrary strategy to fix V5 transaction roundtrip test * Make Zebra compilable with tx_v6/nu7 flags disabled * ci-basic.yml: test both with and without nu7/tx_v6 flags using a matrix * Fix tv_v6 flag guard style to align with that used in upstream Zebra (now requires both tx_v6 and nu7) * Fix zsa-integration-state->sync-zcash-v4.1.0 merge conflict resolution mistakes * Add ZIP-230 coinbase ENABLE_ZSA consensus check * zebra-consensus: temporarily allow empty NU6.1 lockbox disbursements on Regtest Regtest/configured testnets can be created with an empty NU6.1 lockbox disbursement list, but block subsidy validation treated an empty list as an error on the NU6.1 activation block. After syncing with upstream Zebra v4.2.0, this started breaking our Orchard ZSA Regtest workflow tests. Temporarily skip the NU6.1 lockbox disbursement check when no disbursements are configured, and leave a FIXME to revisit whether empty configured disbursements should remain allowed or Regtest should provide defaults. * CI: restore repo cleanliness check, revert temporary Cargo config changes beforehand * zebra-test: refactor orchard_zsa_workflow_blocks.rs to use a u8 static ref for bytes OrchardWorkflowBlock instead of a vec, matching the approach used in block.rs there * zebra-test: refactor orchard_zsa_workflow_blocks.rs to use a u8 static ref for bytes OrchardWorkflowBlock instead of a vec, matching the approach used in block.rs there * Refactor insert_fake_orchard_shielded_data into separate V5 and V6 helpers * Add v6_coinbase_transaction_with_enable_zsa_flag_fails_validation test * Refactor insert_fake_orchard_shielded_data into separate V5 and V6 helpers * Add v6_coinbase_transaction_with_enable_zsa_flag_fails_validation test * Update orchard and librustzcash crate versions to the latest from the zsa1 branches and adjust related code for compatibility * Update orchard and librustzcash crate versions to the latest from the zsa1 branches (2) * Use new IssueBundle::note_commitments method from the orchard crate in IssueData::note_commitments * Remove zebra-scan files (as they were removed upstream) * Remove get_block_template_rpcs.rs from zebra-rpc (as it was removed in the upstream) * Remove orchard/test-dependencies from zebra-chain deps to keep proptest out of the default build * Bump MSRV to Rust 1.85.1, as librustzcash crates use it * Correct codespell typo * zebra-scan: sync CHANGELOG with upstream * ci: specify stable toolchain for cargo-deny job CI was failing in the deny job because rustup attempted to use an uninstalled stable-x86_64-unknown-linux-musl override toolchain (see https://github.com/QED-it/zebra/actions/runs/24046905754/job/70132458979?pr=114). Pinning the toolchain to stable makes the job deterministic and avoids inheriting an unexpected runner/toolchain override. * Implement ZIP-0227 global issued-assets state in Zebra (#111) * Defines and implements the issued asset state types * Adds issued assets to the finalized state * Validates issuance actions and burns before committing blocks to a non-finalized chain. * Adds `issued_assets` fields on `ChainInner` and `ContextuallyValidatedBlock` * Adds issued assets map to non-finalized chains * adds new column family to list of state column families * Updates AssetState, AssetStateChange, IssuedAssetsOrChange, & SemanticallyVerifiedBlock types, updates `IssuedAssetsChange::from_transactions()` method return type * Fixes tests by computing an `IssuedAssetsChange` for conversions to CheckpointVerifiedBlock * fixes finalization checks * Adds documentation to types and methods in `asset_state` module, fixes several bugs. * Fix compilation errors that appeared after the previous merge * Avoid using NonEmpty in orchard_zsa/issuance * Fix BurnItem serialization/deserializartioon errors (use LE instead of BE for amount, read amount after asset base) * Make a minor fix and add FIXME comment in orchard_flavor_ext.rs * Fix the sign of burn value in SupplyChange::add in orchard_zsa/asset_state, add a couple of FIXMEs * Fix the 'transactions must have only one burn item per asset base' error in the function of the crate (this may not be a fully correct fix). Add a couple of FIXME comments explaining the problem. * Use NoteValue from the orchard crate for BurnItem amount instead of u64 to prevent serialization errors and enable defining BurnItem in orchard, facilitating its reuse along with related functions * Use BurnItem::from instead of try_from * Fix a compilation error for the previous commit ('Use BurnItem::from instead of try_from') * Fix a compilation error for the previous commit ('Use BurnItem::from instead of try_from') (2) * Modify ValueCommitment::with_asset to accept value as a NoteValue instead of amount (with_asset is used to process orchard burn) - this allows avoiding the use of try_into for burn in binding_verification_key function * Adds TODOs * Adds state request/response variants for querying asset states * Adds a `getassetstate` RPC method * Adds snapshot test * Addesses some FIXMEs and replaces a couple others with TODOs. * Removes `issued_assets_change` field from `SemanticallyVerifiedBlock` * Temporarily disable specific Clippy checks for Rust 1.83.0 compatibility * Disable clippy warning about doc comment for empty line * Update Orchard ZSA consensus tests to calculate and check asset supply * Rename ZSA workflow tests (including file, constant and variable names) to Orchard ZSA * Add amount method to BurnItem and make BurnItem pub (visible for other crates) * Fix Orchard ZSA workflow tests to make it compilable with getblocktemplate-rpcs feature enabled * Fix clippy error * Add rust-toolchain.toml with Rust version 1.82.0 to avoid clippy errors came with Rust 1.83.0 * Fix revert_chain_with function in zebra-state to support V6/OrchardZSA * Minor fix in comments * Rename transaction_to_fake_v5 function to transaction_to_fake_min_v5 and panic if V6 passed into it * Minor fixes in comments * Revert "Minor fix in comments" This reverts commit 59fec59. * Revert "Rename transaction_to_fake_v5 function to transaction_to_fake_min_v5 and panic if V6 passed into it" This reverts commit 2ce58ef. * Revert " Minor fixes in comments" This reverts commit fac3abd. * Fix remaining merge conflicts * Fix compilation erros * Fix clippy warning * Fix compilation errors appeared after the previous merge * Fix compilation error * Fix compilation errors in zebra-state happened without tx-v6 feature flag enabled * Allow finalizing issued assets via the issue action when no notes are provided and the finalize flag is set to true * Refactor orchard_workflow_blocks_zsa.rs (zebra-test crate) to read test data from files, introduce and use OrchardWorkflowBlock there * Fix clippy errors * Copy tests from zsa-issued-assets-tests here and fix compilation errors * Temporarily comment out verify_issuance_blocks_test test (it fails now) * Attempt to refactor asset state management * Continue refactoring asset state management * Add transaction_sighashes to semantically and contextually verified blocks * Update orchard and librustzcash, align Zebra with upstream API/module changes * Fix compilation errors that appeared after the previous merge * zebra-chain: add ZIP-230 vSighashInfo(V0) serialization/deserialization for V6 * zebra-chain: add ZIP-230 vSighashInfo(V0) serialization/deserialization for V6 * zebra-chain: add ZIP-230/ZIP-246 versioned signature support * zebra-chain: add NU6_1 activation heights * zebra-chain: add ZIP-230/ZIP-246 versioned signature support * zebra-chain: add NU6_1 activation heights * zebra-chain: add missing new sapling_v6.rs module * zebra-chain: add missing new sapling_v6.rs module * Update ZSA test blocks * Update ZSA test blocks again and refactor orchard_zsa_workflow_blocks.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 for 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 * Update orchard-zsa-shielded-data test vectors * Update get_blockchain_info@mainnet_10.snap test snapshot * Update get_blockchain_info@testnet_10.snap test snapshot * Make fixes according to #92 review comments * zebra-chain: refactor versioned_sig_v0_roundtrip test according to #92 review comments * Add testnet-singlenode-deploy * Add testnet-singlenode-deploy to dockerignore exceptions * Update Orchard and librustzcash refs for PR471 review sync (#104) 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 `NoteValue` → `ValueSum` 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`. * Remove `halo2_gadgets` patch in Cargo.toml * Refactor to use the latest zsa1 branch commits of Orchard and librustzcash * Pin blake2b_simd to 1.0.1 for compatibility with Orchard * Fix test compilation errors * Add reference_note field to impl serde::Serialize for AssetState * Final refactoring of asset_base.rs * Remove 'nonempty' crate dependency * Add missing doc comment for pup mod testing * Update Zebra Orchard and librustzcash refs in Cargo.toml * Skip signature verification for checkpoint verified blocks * Remove (comment out) failing assert in update_chain_tip_with_block_parallel and add a FIXME comment with an explanation * Fix zebra-rpc asset_state test snapshots to add reference_note * Fix zebra-rpc asset_state test snapshots to rename total_supply to amount * Return MIN_TRANSPARENT_COINBASE_MATURITY to 100 * Make transaction_sighashes optional in semantically and contextually verified blocks * Fix cargo clippy errors * Drop global issuance state unrelated changes * Minor refactoring, FIXME resolution, etc. * Update Orchard and librustzcash versions and fix the code accordingly * Fix CI: update librustzcash rev and derive test reference notes via IssueBundle - Bump librustzcash to the fixed revision (removes the extra expiry_height check). - Rewrite zebra-chain test reference-note generation to derive notes with rho via IssueBundle (replaces the removed Orchard create_test_reference_note helper). * Fix zebra-rpc test compilation error * Add initial/partial support for ZIP-233 (zip233_amount field in Transaction::V6 and serialization only — without changing consensus rules — they will be updated automatically after merging with the upstream version of Zebra, where those ZIP-233-related changes are already implemented) * Revert "Add initial/partial support for ZIP-233 (zip233_amount field in Transaction::V6 and serialization only — without changing consensus rules — they will be updated automatically after merging with the upstream version of Zebra, where those ZIP-233-related changes are already implemented)" This reverts commit 8e3076f. * zebra-test: zebra-test: update Orchard ZSA workflow blocks * zebra-test: update Orchard ZSA workflow blocks * zebra-rpc: update get_asset_state snapshots * Fix cargo clippy issues * Add initial/partial support for ZIP-233 (zip233_amount field in Transaction::V6 and serialization only — without changing consensus rules — they will be updated automatically after merging with the upstream version of Zebra, where those ZIP-233-related changes are already implemented) * Update Orchard ZSA workflow blocks to support ZIP-233 * Address PR #111 review comments (tx_v6 feature gating to be fixed separately) * Clear ENABLE_ZSA in Flags arbitrary strategy to fix V5 transaction roundtrip test * Minor fixes in comments * Add ZIP-230 coinbase ENABLE_ZSA consensus check * Add unexpected_cfgs for nu7 to Cargo.toml of zebra-consensus * zebra-test: refactor orchard_zsa_workflow_blocks.rs to use a u8 static ref for bytes OrchardWorkflowBlock instead of a vec, matching the approach used in block.rs there * Refactor insert_fake_orchard_shielded_data into separate V5 and V6 helpers * Start addressing additional #111 review comments * Continue addressing additional #111 review comments: reuse existing regtest genesis test vector * Continue addressing additional #111 review comments: remove test-gap TODO/FIXME comments --------- Co-authored-by: Arya <aryasolhi@gmail.com> Co-authored-by: alexeykoren <2365507+alexeykoren@users.noreply.github.com> Co-authored-by: Constance Beguier <constance.beguier@gmail.com> * Start addressing additional #111 review comments * Continue addressing additional #111 review comments: reuse existing regtest genesis test vector * Continue addressing additional #111 review comments: remove test-gap TODO/FIXME comments * Update cargo-deny git source allowlist for new dependency repos * Allow remaining upstream git sources in cargo-deny * Address the first part of #114 review comments * Address the first part of #114 review comments (2) * Apply the same fix as the upstream branch for the new clippy::manual_option_zip lint in address UTXO reading code. Our fork is intentionally pinned to v4.2.0, so we need this small local patch instead of waiting for a later upstream merge. * Revert "Apply the same fix as the upstream branch for the new" This reverts commit 9fe1f13. * ci: temporarily allow clippy::manual_option_zip in lint job * ci: allow manual_option_zip clippy lint across toolchain versions * Remove "toolchain: stable" for deny in lint.yml * Refactor transaction handling and update related tests per #114 review feedback * Add tx_v6/nu7 feature guard before verify_v6_transaction_network_upgrade * zebra-rpc: update snapshots to use new burnexists/issuanceexists fields and add snapshots for new get_asset_state test cases * zebra-consensus: skip NU6.1 lockbox disbursement check on Regtest * Make ZSA transaction RPC flags optional * Add zip233amount to transaction RPC output * check_orchard_zsa_workflow test: remove extra lockbox_disbursements.is_empty check * Add ZSA issue note count to ZIP-317 logical actions * Temporarily skip empty NU6.1 lockbox disbursement checks on Regtest-like test networks * re-added testnet-single-node-deploy/ folder * updated network upgrade table * fix(ci): make unit tests build with nu7 cfg The setup-rust-toolchain action exports RUSTFLAGS=-D warnings, which replaces (rather than merges with) .cargo/config.toml rustflags, so --cfg zcash_unstable="nu7" was silently dropped in CI. Pass it via the action's rustflags input instead. Also drop the cfg gate on the Nu7 consensus branch ID so chain history works in builds without zcash_unstable="nu7"; Nu7-specific transaction support remains cfg-gated elsewhere. * updated comments and todos --------- Co-authored-by: Arseni Kalma <senia.kalma@gmail.com> Co-authored-by: Paul <3682187+PaulLaux@users.noreply.github.com> Co-authored-by: alexeykoren <2365507+alexeykoren@users.noreply.github.com> Co-authored-by: Constance Beguier <constance.beguier@gmail.com> Co-authored-by: Arya <aryasolhi@gmail.com>

arya2 and others added 30 commits November 12, 2024 01:07

Defines and implements the issued asset state types

1af120e

Adds issued assets to the finalized state

cc8bc0d

Validates issuance actions and burns before committing blocks to a no…

c7116f3

…n-finalized chain.

Adds issued_assets fields on ChainInner and `ContextuallyValidate…

bb62c67

…dBlock`

Adds issued assets map to non-finalized chains

3d00b81

adds new column family to list of state column families

2daf84f

Updates AssetState, AssetStateChange, IssuedAssetsOrChange, & Semanti…

c6c099b

…callyVerifiedBlock types, updates `IssuedAssetsChange::from_transactions()` method return type

Fixes tests by computing an IssuedAssetsChange for conversions to C…

9e0e043

…heckpointVerifiedBlock

fixes finalization checks

8f26a89

Adds documentation to types and methods in asset_state module, fixe…

e063729

…s several bugs.

Merge branch 'zsa-issued-assets' into zsa-integration-state

6aad8da

Fix compilation errors that appeared after the previous merge

f0b64ad

Avoid using NonEmpty in orchard_zsa/issuance

bc0c8e6

Fix BurnItem serialization/deserializartioon errors (use LE instead o…

17f3ee6

…f BE for amount, read amount after asset base)

Make a minor fix and add FIXME comment in orchard_flavor_ext.rs

3f96af0

Fix the sign of burn value in SupplyChange::add in orchard_zsa/asset_…

5524480

…state, add a couple of FIXMEs

Fix the 'transactions must have only one burn item per asset base' er…

8096da4

…ror in the function of the crate (this may not be a fully correct fix). Add a couple of FIXME comments explaining the problem.

Use NoteValue from the orchard crate for BurnItem amount instead of u…

20fd58d

…64 to prevent serialization errors and enable defining BurnItem in orchard, facilitating its reuse along with related functions

Use BurnItem::from instead of try_from

4932495

Fix a compilation error for the previous commit ('Use BurnItem::from …

89be470

…instead of try_from')

Fix a compilation error for the previous commit ('Use BurnItem::from …

c3daec9

…instead of try_from') (2)

Modify ValueCommitment::with_asset to accept value as a NoteValue ins…

a8668d6

…tead of amount (with_asset is used to process orchard burn) - this allows avoiding the use of try_into for burn in binding_verification_key function

Adds TODOs

e31f24c

Adds state request/response variants for querying asset states

2a5aebd

Adds a getassetstate RPC method

f7b43a9

Adds snapshot test

e35ae57

Addesses some FIXMEs and replaces a couple others with TODOs.

c278758

Removes issued_assets_change field from SemanticallyVerifiedBlock

d144774

Temporarily disable specific Clippy checks for Rust 1.83.0 compatibility

727e3e3

Disable clippy warning about doc comment for empty line

9a8c032

dmidem added 6 commits March 17, 2026 05:40

Update Orchard ZSA workflow blocks to support ZIP-233

7bcaab7

Address PR #111 review comments (tx_v6 feature gating to be fixed sep…

9e75366

…arately)

Clear ENABLE_ZSA in Flags arbitrary strategy to fix V5 transaction ro…

bcc02b8

…undtrip test

Minor fixes in comments

c9c814f

Add ZIP-230 coinbase ENABLE_ZSA consensus check

2f9af2c

Add unexpected_cfgs for nu7 to Cargo.toml of zebra-consensus

fc2d0f6

dmidem force-pushed the zsa-integration-state branch 2 times, most recently from e3b61f2 to 8a78bda Compare March 25, 2026 13:51

zebra-test: refactor orchard_zsa_workflow_blocks.rs to use a u8 stati…

40ba2bd

…c ref for bytes OrchardWorkflowBlock instead of a vec, matching the approach used in block.rs there

dmidem force-pushed the zsa-integration-state branch from 8a78bda to 40ba2bd Compare March 25, 2026 15:09

Refactor insert_fake_orchard_shielded_data into separate V5 and V6 he…

2634fd6

…lpers

dmidem force-pushed the zsa-integration-state branch from dab5fd9 to 2634fd6 Compare March 26, 2026 14:44

dmidem mentioned this pull request Mar 27, 2026

Add IssueBundle::note_commitments to expose extracted note commitments QED-it/orchard#245

Merged

dmidem force-pushed the zsa-integration-state branch from 9406861 to 2634fd6 Compare March 27, 2026 09:17

vivek-arte mentioned this pull request Mar 30, 2026

Grant Application - Feature Branch Testnet and Compatible Developer Tooling ZcashCommunityGrants/zcashcommunitygrants#256

Open

9 tasks

dmidem added the demo label Apr 6, 2026

PaulLaux reviewed Apr 7, 2026

View reviewed changes

dmidem added 3 commits April 9, 2026 13:43

Start addressing additional #111 review comments

a91e4fa

Continue addressing additional #111 review comments: reuse existing r…

06cdac3

…egtest genesis test vector

Continue addressing additional #111 review comments: remove test-gap …

5d65f8c

…TODO/FIXME comments

dmidem mentioned this pull request Apr 9, 2026

Track ZSA test coverage gaps #116

Open

PaulLaux approved these changes Apr 9, 2026

View reviewed changes

dmidem merged commit adfecee into zsa1 Apr 9, 2026
55 checks passed

dmidem added a commit that referenced this pull request Apr 10, 2026

Start addressing additional #111 review comments

6289f30

dmidem added a commit that referenced this pull request Apr 10, 2026

Continue addressing additional #111 review comments: reuse existing r…

0b2ca13

…egtest genesis test vector

dmidem added a commit that referenced this pull request Apr 10, 2026

Continue addressing additional #111 review comments: remove test-gap …

3002196

…TODO/FIXME comments

Conversation

dmidem commented Feb 20, 2026

Uh oh!

dmidem commented Mar 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PaulLaux left a comment • 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!

PaulLaux Apr 7, 2026

Choose a reason for hiding this comment

Uh oh!

dmidem Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

PaulLaux Apr 7, 2026

Choose a reason for hiding this comment

Uh oh!

dmidem Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

PaulLaux Apr 7, 2026

Choose a reason for hiding this comment

Uh oh!

dmidem Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

dmidem commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PaulLaux left a comment • 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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

dmidem commented Mar 29, 2026 •

edited

Loading

PaulLaux left a comment •

edited

Loading

dmidem commented Apr 9, 2026 •

edited

Loading

PaulLaux left a comment •

edited

Loading