feat: add Zcash Shielded Assets (ZSA) support (draft) - #10628

Draft

oxarbitrage wants to merge 577 commits into

This pull request is big! We're only showing the most recent 250 commits

Commits on Apr 3, 2025

Fix clippy warning
dmidem
committed
a6913a2

Commits on Apr 7, 2025

Fix compilation errors appeared after the previous merge
dmidem
committed
dd5d8bd
Fix compilation error
dmidem
committed
88a47a5

Commits on Apr 11, 2025

Merge branch 'zsa-integration-state-fix-revert' into zsa-integration-state-ag
dmidem
committed
4ee9031

Commits on Apr 18, 2025

Commits on Apr 19, 2025

Commits on Apr 21, 2025

Additional fixes according #37 review comments
dmidem
committed
55c5c4b
Add support of V6 to property tests for mempool storage in zebrad
dmidem
committed
f5a6f84
Add comments according to #37 review
dmidem
committed
08ed883
Add v6_strategy to zebra-chain/src/transaction/arbitrary code
dmidem
committed
3338ef0
Fix compilation errors
dmidem
committed
a6519ff
Fix a mistake in zebra-chain/src/primitives/zcash_note_encryption
dmidem
committed
22f7ccc
Fix compilation warnings
dmidem
committed
b58c8b2
Comment out v6_strategy usage in zebra-chain/src/transaction/arbitrary.rs as it causes several tests to fail
dmidem
committed
837395e
Fix cargo fmt issue
dmidem
committed
adcc967

Commits on Apr 23, 2025

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
dmidem
committed
5de8fbd

Commits on Apr 24, 2025

Ensure orchard_shielded_data can not be None for V6 in v6_strategy of zebra-chain/src/transaction/arbitrary.rs
dmidem
committed
672d4a8

Commits on Apr 25, 2025

Fix doc comment for ACTION_SIZE in orchard::ShieldedData
dmidem
committed
7df9054

Commits on Apr 26, 2025

Move burn field inside action group in serialization functions for OrchardZSA
dmidem
committed
f071091

Commits on Apr 28, 2025

Update zebra-consensus/src/primitives/halo2/tests to add OrchardZSA tests
dmidem
committed
a3ca271
Fix cargo clippy warning
dmidem
committed
8a32389

Commits on Apr 30, 2025

Commits on May 1, 2025

Update test vectors (with ones that contain burn inside AG)
dmidem
committed
b4e7fdd

Commits on May 3, 2025

Rename and fix orchard shielded data test vectors and releated tests
dmidem
committed
632d2b2

Commits on May 4, 2025

Added a doc comment for orchard_zsa workflow test (zebra-consensus/src/orchard_zsa tests.rs module)
dmidem
committed
b102b60

Commits on May 7, 2025

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 …
dmidem
committed
bb4c872

Commits on May 19, 2025

Commits on May 20, 2025

Added short comments/descriptions for test blocks in orchard_workflow_blocks_zsa.rs
dmidem
committed
48540e5

Commits on May 23, 2025

Make fixes according to the second #37 review
dmidem
committed
90a49d7
Fix cargo clippy error
dmidem
committed
333f59c

Commits on May 26, 2025

Commits on Jun 1, 2025

\Merge branch 'zsa-integration-consensus' into zsa-integration-state-ag-4
dmidem
committed
e79160b

Commits on Jun 2, 2025

Fix compilation errors in zebra-state happened without tx-v6 feature flag enabled
dmidem
committed
65dbc74

Commits on Jun 6, 2025

Commits on Jun 8, 2025

Fix clippy errors
dmidem
committed
d301946

Commits on Jun 9, 2025

Copy tests from zsa-issued-assets-tests here and fix compilation errors
dmidem
committed
43ea314

Commits on Jun 16, 2025

Temporarily comment out verify_issuance_blocks_test test (it fails now)
dmidem
committed
3ab6b56

Commits on Jun 23, 2025

Merge branch 'zsa1' into zsa-integration-consensus
PaulLaux
authored
f0756b3
ZSA integration (stage 1) - Tx V6, Nu7 (#37)
dmidem
authored
236b4eb
Merge branch 'zsa1' into zsa-integration-state
dmidem
committed
67961c3

Commits on Jul 14, 2025

Add split of workflow, ecr and ecs
seniakalma
committed
50ea49c
Update
seniakalma
committed
b286601
Update PR comments
seniakalma
committed
afc02d3
Update PR comments
seniakalma
committed
953ea4e
Update by comments
seniakalma
committed
5111e60
Repo var for DOCKERFILE_PATH
seniakalma
committed
82193e3
Add env
seniakalma
committed
7c1be4c
Add env
seniakalma
committed
91464b8

Commits on Jul 17, 2025

Update deploy-ecs.yaml
seniakalma
authored
7bfdb2b
Update deploy-ecs.yaml
seniakalma
authored
e05d170
1 time task definition download
seniakalma
authored
6a5678d
Update deploy-ecs.yaml (#67)
seniakalma
authored
e03c7e5

Commits on Aug 4, 2025

First-stage ZSA integration: apply upstream feedback & refactoring (#9560) (#63)
dmidem
authored
6821d89

Commits on Aug 5, 2025

Add more V6 tests to zebra-chain, refactor OrchardZSA tests in zebra-test (#62)
dmidem
authored
3c9bac2

Commits on Aug 12, 2025

Clean up rust-toolchain.toml and move rustfmt & clippy installs to CI (#73)
dmidem
authored
7136f07

Commits on Aug 19, 2025

Update push ecr on zsa1 branch
seniakalma
authored
6600d62
Update push ecr on zsa1 branch (#76)
PaulLaux
authored
43037bd

Commits on Aug 25, 2025

Sync Zebra with orchard and librustzcash synced to upstream (#71)
dmidem
authored
bd332e3

Commits on Sep 7, 2025

Merge branch 'zsa1' into zsa-integration-state
dmidem
committed
c006f8a

Commits on Sep 29, 2025

Attempt to refactor asset state management
dmidem
committed
ae18bb3

Commits on Oct 16, 2025

Commits on Oct 27, 2025

CI: reclaim runner disk, add resource logs, and use --locked/--no-deps to avoid 'No space left on device' (#91)
dmidem
authored
5438017

Commits on Oct 28, 2025

Manual partial sync of upstream (ZcashFoundation) v2.4.2 to reduce future merge conflicts (#85)
dmidem
authored
871d70b

Commits on Oct 29, 2025

Add transaction_sighashes to semantically and contextually verified blocks
dmidem
committed
cfe0c61

Commits on Nov 9, 2025

Update orchard and librustzcash, align Zebra with upstream API/module changes
dmidem
committed
754860c

Commits on Nov 10, 2025

Commits on Nov 12, 2025

Commits on Nov 19, 2025

zebra-chain: add ZIP-230/ZIP-246 versioned signature support
dmidem
committed
5d239f9
zebra-chain: add NU6_1 activation heights
dmidem
committed
69ed7ba
zebra-chain: add ZIP-230/ZIP-246 versioned signature support
dmidem
committed
ea8dfbf
zebra-chain: add NU6_1 activation heights
dmidem
committed
33a3a9c
zebra-chain: add missing new sapling_v6.rs module
dmidem
committed
0c6dfd6
zebra-chain: add missing new sapling_v6.rs module
dmidem
committed
489f937
Update ZSA test blocks
dmidem
committed
86229df

Commits on Nov 24, 2025

Commits on Nov 25, 2025

Commits on Nov 26, 2025

Merge branch 'upgrade-orchard-2083-librustzcash-a7e5' into zsa-integration-state-refactor-1
dmidem
committed
ec3dc33

Commits on Nov 27, 2025

Sync Zebra with latest Orchard and librustzcash (#92)

dmidem
and
alexeykoren
authored
6ea1d70

Commits on Nov 28, 2025

Merge branch 'zsa1' into zsa-integration-state-refactor-2
dmidem
committed
78fc31c

Commits on Jan 5, 2026

Create stop-ecs workflow (#99)
seniakalma
authored
af80ebe

Commits on Jan 19, 2026

Update Orchard and librustzcash refs for PR471 review sync (#104)
ConstanceBeguier
authored
0640746

Commits on Jan 21, 2026

Refactor to use the latest zsa1 branch commits of Orchard and librustzcash
dmidem
committed
e174627

Commits on Jan 30, 2026

Pin blake2b_simd to 1.0.1 for compatibility with Orchard
dmidem
committed
2becb2d
Fix test compilation errors
dmidem
committed
ee2486d
Add reference_note field to impl serde::Serialize for AssetState
dmidem
committed
3042a11

Commits on Feb 8, 2026

Commits on Feb 9, 2026

Commits on Feb 11, 2026

Return MIN_TRANSPARENT_COINBASE_MATURITY to 100
dmidem
committed
1098dd0

Commits on Feb 14, 2026

Make transaction_sighashes optional in semantically and contextually verified blocks
dmidem
committed
7f1a3ee
Fix cargo clippy errors
dmidem
committed
746108d

Commits on Feb 15, 2026

Merge branch 'zsa1' into zsa-integration-state-refactor-2
dmidem
committed
1196785
Drop global issuance state unrelated changes
dmidem
committed
57c39a0
Minor refactoring, FIXME resolution, etc.
dmidem
committed
a7cbc60

Commits on Feb 16, 2026

Merge branch 'zcash_pr471_review' of https://github.com/QED-it/zebra into zcash_pr471_review
dmidem
committed
635d29b

Commits on Feb 18, 2026

Merge branch 'zcash_pr471_review' into zsa-integration-state
dmidem
committed
2674f18
Update deploy-ecs.yaml (#107)
seniakalma
authored
cdefdcb

Commits on Feb 20, 2026

Update Orchard and librustzcash versions and fix the code accordingly
dmidem
committed
2b80155
Merge branch 'zsa1' into zsa-integration-state
dmidem
committed
a2ec43c

Commits on Feb 23, 2026

Update push-ecr.yaml (#108)
seniakalma
authored
2a82c28
Update push-ecr.yaml
seniakalma
authored
751c0ec

Commits on Feb 25, 2026

Fix CI: update librustzcash rev and derive test reference notes via IssueBundle
dmidem
committed
a7eaff5
Merge branch 'zsa1' into zcash_pr471_review
dmidem
committed
4cc5e7f
Fix zebra-rpc test compilation error
dmidem
committed
564d588

Commits on Mar 2, 2026

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…
dmidem
committed
8e3076f

Commits on Mar 3, 2026

Commits on Mar 11, 2026

Merge branch 'zcash-v4.1.0' into sync-zcash-v4.1.0-merge
dmidem
committed
dce97e1

Commits on Mar 13, 2026

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.
dmidem
committed
4564f18

Commits on Mar 14, 2026

Add tx_sighash to VerifiedUnminedTx
dmidem
committed
56761d3

Commits on Mar 17, 2026

Commits on Mar 18, 2026

Commits on Mar 19, 2026

Commits on Mar 20, 2026

Commits on Mar 21, 2026

Merge branch 'zsa-integration-state' into sync-zcash-v4.1.0-merge-1
dmidem
committed
e3850f5

Commits on Mar 23, 2026

Commits on Mar 24, 2026

Add ZIP-230 coinbase ENABLE_ZSA consensus check
dmidem
committed
89d593d

Commits on Mar 25, 2026

Commits on Mar 26, 2026

Commits on Mar 31, 2026

Commits on Apr 6, 2026

Remove zebra-scan files (as they were removed upstream)
dmidem
committed
b55ae3b
Remove get_block_template_rpcs.rs from zebra-rpc (as it was removed in the upstream)
dmidem
committed
c3e9c58
Remove orchard/test-dependencies from zebra-chain deps to keep proptest out of the default build
dmidem
committed
a995eb4
Bump MSRV to Rust 1.85.1, as librustzcash crates use it
dmidem
committed
224ab68
Correct codespell typo
dmidem
committed
2afa187
zebra-scan: sync CHANGELOG with upstream
dmidem
committed
786fce1

Commits on Apr 7, 2026

ci: specify stable toolchain for cargo-deny job
dmidem
committed
95acd4e

Commits on Apr 9, 2026

Implement ZIP-0227 global issued-assets state in Zebra (#111)

authored
adfecee

Commits on Apr 10, 2026

Commits on Apr 12, 2026

Update cargo-deny git source allowlist for new dependency repos
dmidem
committed
d4f8d54
Allow remaining upstream git sources in cargo-deny
dmidem
committed
17915ff
Merge branch 'zsa1' into sync-zcash-v4.2.0-merge
dmidem
committed
e6a9d70

Commits on Apr 20, 2026

Address the first part of #114 review comments
dmidem
committed
09def10

Commits on Apr 21, 2026

Address the first part of #114 review comments (2)
dmidem
committed
205bf8c
Apply the same fix as the upstream branch for the new
dmidem
committed
9fe1f13
Revert "Apply the same fix as the upstream branch for the new"
dmidem
committed
8a95237
ci: temporarily allow clippy::manual_option_zip in lint job
dmidem
committed
134804d
ci: allow manual_option_zip clippy lint across toolchain versions
dmidem
committed
88911bf
Remove "toolchain: stable" for deny in lint.yml
dmidem
committed
02d75fb

Commits on May 4, 2026

Make ZSA transaction RPC flags optional
dmidem
committed
f7904f7
Add zip233amount to transaction RPC output
dmidem
committed
c2b3485

Commits on May 5, 2026

Commits on May 6, 2026

Temporarily skip empty NU6.1 lockbox disbursement checks on Regtest-like test networks
dmidem
committed
20760d2

Commits on May 7, 2026

re-added testnet-single-node-deploy/ folder
PaulLaux
committed
7aff71e
updated network upgrade table
PaulLaux
committed
e971063
fix(ci): make unit tests build with nu7 cfg
PaulLaux
committed
2b036fd

Commits on May 18, 2026

updated comments and todos
PaulLaux
committed
11afb6e

Commits on May 31, 2026

fix(ci): address ZSA CI issues (#10654)
dmidem
authored
02871aa

Commits on Jun 1, 2026

ci: allow lint workflow on v4.2.0-dev
dmidem
committed
a90946a

Commits on Jun 2, 2026

fix(ci): temporarily allow lint workflow on v4.2.0-dev (#10663)
dmidem
authored
30ef9e4

Commits on Jun 3, 2026

Add ECR and ECS pipelines to zsa1 branch (#131)

ronkq
and
a
authored
1fa93ac

Commits on Jun 4, 2026

Commits on Jun 10, 2026

fix(ci): use regtest dockerfile for ECR push (#141)

ronkq
and
ronkq
authored
83c653e

Commits on Jun 11, 2026

ci: use cargo nextest in ci-basic.yml
dmidem
committed
285e13e
ci: update the upstream YAML files to trigger on PRs to zsa1
dmidem
committed
b40f525
ci: update the upstream YAML files to trigger on PRs to zsa1 (fixed)
dmidem
committed
6b2ff2a
Temporarily pin Rust toolchain to 1.85.1
dmidem
committed
3561641
ci: pin lint workflow to Rust 1.94 temporarily
dmidem
committed
50b2e3d
ci: pin unused-deps job to Rust 1.94 and cargo-udeps 0.1.60
dmidem
committed
2161bb0

Commits on Jun 12, 2026

Commits on Jun 15, 2026

Remove duplicate cargo test step from basic CI
dmidem
committed
2fad89f
ci: add retries for sync_large_checkpoints_mempool_mainnet in upstream tests-unit.yml
dmidem
committed
63ef2f2
Pin Rust toolchain to Rust 1.94.0 used as stable for upstream v4.2.0
dmidem
committed
a99696b
Pin cargo-nextest install action to commit used in upstream CI
dmidem
committed
9642f91
Pin cargo-nextest install action to commit used in upstream CI
dmidem
committed
bf3dd4a
Run doctests in basic CI
dmidem
committed
3cce12f
Specify cargo-nextest tool for pinned install action
dmidem
committed
3ad942a
Retry only confirmed flaky tests via nextest config
dmidem
committed
11a97a0
Refresh PR checks
dmidem
committed
ec27fc2

Commits on Jun 18, 2026

Merge branch 'zsa-support' into sync-zcash-v4.2.0-merge
dmidem
authored
ac2d5f6
fix(ci): enable ZSA PR checks on integration branches
dmidem
committed
ee1a60b
fix(ci): remove internal ECS workflows from ZSA PR
dmidem
committed
61eabda

Commits on Jun 25, 2026

Run basic CI only in QED-it/zebra
dmidem
committed
6493603