Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
577 commits
Select commit Hold shift + click to select a range
a6913a2
Fix clippy warning
dmidem Apr 3, 2025
dd5d8bd
Fix compilation errors appeared after the previous merge
dmidem Apr 6, 2025
88a47a5
Fix compilation error
dmidem Apr 7, 2025
4ee9031
Merge branch 'zsa-integration-state-fix-revert' into zsa-integration-…
dmidem Apr 11, 2025
0f8ed6f
Add support of V6 to remove_orchard_conflicts proptest function in ze…
dmidem Apr 18, 2025
0c6aee6
Fix to resolve some review comment for #37
dmidem Apr 18, 2025
50f1ef8
Update comments and rename some modules according to #37 review notes
dmidem Apr 18, 2025
aeff48b
More updates according to #37 review notes
dmidem Apr 18, 2025
c0f9e90
Add OrchardZSA version of encrypted_ciphertext_roundtrip test
dmidem Apr 19, 2025
d82151d
Fix a couple of comments and orchard_zsa/tests items visibility accor…
dmidem Apr 19, 2025
55c5c4b
Additional fixes according #37 review comments
dmidem Apr 21, 2025
f5a6f84
Add support of V6 to property tests for mempool storage in zebrad
dmidem Apr 21, 2025
08ed883
Add comments according to #37 review
dmidem Apr 21, 2025
3338ef0
Add v6_strategy to zebra-chain/src/transaction/arbitrary code
dmidem Apr 21, 2025
a6519ff
Fix compilation errors
dmidem Apr 21, 2025
22f7ccc
Fix a mistake in zebra-chain/src/primitives/zcash_note_encryption
dmidem Apr 21, 2025
b58c8b2
Fix compilation warnings
dmidem Apr 21, 2025
837395e
Comment out v6_strategy usage in zebra-chain/src/transaction/arbitrar…
dmidem Apr 21, 2025
adcc967
Fix cargo fmt issue
dmidem Apr 21, 2025
5de8fbd
Fix and return support of Nu7/V6 (i.e. a call of v6_strategy) to Tran…
dmidem Apr 23, 2025
672d4a8
Ensure orchard_shielded_data can not be None for V6 in v6_strategy of…
dmidem Apr 24, 2025
7df9054
Fix doc comment for ACTION_SIZE in orchard::ShieldedData
dmidem Apr 25, 2025
f071091
Move burn field inside action group in serialization functions for Or…
dmidem Apr 26, 2025
a3ca271
Update zebra-consensus/src/primitives/halo2/tests to add OrchardZSA t…
dmidem Apr 28, 2025
8a32389
Fix cargo clippy warning
dmidem Apr 28, 2025
ef1882d
Update orchard and librustzcash versions
dmidem Apr 30, 2025
cd877ab
Merge branch 'zsa-integration-consensus' into zsa-integration-consens…
dmidem Apr 30, 2025
86272d5
Fix order of fields for OrchardZS serialization/deserialization to be…
dmidem Apr 30, 2025
b4e7fdd
Update test vectors (with ones that contain burn inside AG)
dmidem May 1, 2025
632d2b2
Rename and fix orchard shielded data test vectors and releated tests
dmidem May 3, 2025
b102b60
Added a doc comment for orchard_zsa workflow test (zebra-consensus/sr…
dmidem May 4, 2025
bb4c872
Remove ValueCommitment::with_asset and introduce a ValueCommitment::n…
dmidem May 7, 2025
fc1cd74
Rename orchard test vectors modules, data files and constants in zebr…
dmidem May 19, 2025
8850c5a
Remove serialization tests from orchard_zsa in zebra-chain (as there'…
dmidem May 19, 2025
48540e5
Added short comments/descriptions for test blocks in orchard_workflow…
dmidem May 20, 2025
90a49d7
Make fixes according to the second #37 review
dmidem May 23, 2025
333f59c
Fix cargo clippy error
dmidem May 23, 2025
9bb723a
Generalize verify_v5_transaction and verify_v6_transaction functions …
dmidem May 26, 2025
d88120c
Fix FIXME comments in transaction.rs
dmidem May 26, 2025
852730b
Create push-deploy.yaml
seniakalma May 5, 2025
b9f7083
Remove allow(missing_docs) from zebra-test/.../orchard_workflow_block…
dmidem May 28, 2025
183fe3d
Fix the code to support compilation with tx-v6 feature flag disabled,…
dmidem May 28, 2025
2ca5e2a
Allow manual triggering for push-deploy
seniakalma May 28, 2025
3e1e232
Allow manual triggering for push-deploy (#54)
PaulLaux May 28, 2025
e79160b
\Merge branch 'zsa-integration-consensus' into zsa-integration-state-…
dmidem Jun 1, 2025
65dbc74
Fix compilation errors in zebra-state happened without tx-v6 feature …
dmidem Jun 2, 2025
11d37fe
Allow finalizing issued assets via the issue action when no notes are…
dmidem Jun 6, 2025
70ab5ed
Refactor orchard_workflow_blocks_zsa.rs (zebra-test crate) to read te…
dmidem Jun 6, 2025
d301946
Fix clippy errors
dmidem Jun 8, 2025
43ea314
Copy tests from zsa-issued-assets-tests here and fix compilation errors
dmidem Jun 9, 2025
3ab6b56
Temporarily comment out verify_issuance_blocks_test test (it fails now)
dmidem Jun 15, 2025
f0756b3
Merge branch 'zsa1' into zsa-integration-consensus
PaulLaux Jun 23, 2025
236b4eb
ZSA integration (stage 1) - Tx V6, Nu7 (#37)
dmidem Jun 23, 2025
67961c3
Merge branch 'zsa1' into zsa-integration-state
dmidem Jun 23, 2025
50ea49c
Add split of workflow, ecr and ecs
seniakalma Jul 7, 2025
b286601
Update
seniakalma Jul 7, 2025
afc02d3
Update PR comments
seniakalma Jul 7, 2025
953ea4e
Update PR comments
seniakalma Jul 7, 2025
5111e60
Update by comments
seniakalma Jul 8, 2025
82193e3
Repo var for DOCKERFILE_PATH
seniakalma Jul 9, 2025
7c1be4c
Add env
seniakalma Jul 9, 2025
91464b8
Add env
seniakalma Jul 9, 2025
7bfdb2b
Update deploy-ecs.yaml
seniakalma Jul 17, 2025
e05d170
Update deploy-ecs.yaml
seniakalma Jul 17, 2025
6a5678d
1 time task definition download
seniakalma Jul 17, 2025
e03c7e5
Update deploy-ecs.yaml (#67)
seniakalma Jul 17, 2025
6821d89
First-stage ZSA integration: apply upstream feedback & refactoring (#…
dmidem Aug 4, 2025
3c9bac2
Add more V6 tests to zebra-chain, refactor OrchardZSA tests in zebra-…
dmidem Aug 5, 2025
7136f07
Clean up rust-toolchain.toml and move rustfmt & clippy installs to CI…
dmidem Aug 12, 2025
6600d62
Update push ecr on zsa1 branch
seniakalma Aug 19, 2025
43037bd
Update push ecr on zsa1 branch (#76)
PaulLaux Aug 19, 2025
bd332e3
Sync Zebra with orchard and librustzcash synced to upstream (#71)
dmidem Aug 25, 2025
c006f8a
Merge branch 'zsa1' into zsa-integration-state
dmidem Sep 7, 2025
ae18bb3
Attempt to refactor asset state management
dmidem Sep 26, 2025
a53cb57
Continue refactoring asset state management
dmidem Oct 16, 2025
8591f25
Merge branch 'zsa-integration-state' into zsa-integration-state-refac…
dmidem Oct 16, 2025
5438017
CI: reclaim runner disk, add resource logs, and use --locked/--no-dep…
dmidem Oct 27, 2025
871d70b
Manual partial sync of upstream (ZcashFoundation) v2.4.2 to reduce fu…
dmidem Oct 28, 2025
cfe0c61
Add transaction_sighashes to semantically and contextually verified b…
dmidem Oct 29, 2025
754860c
Update orchard and librustzcash, align Zebra with upstream API/module…
dmidem Nov 9, 2025
d87ceef
Merge branch 'upgrade-orchard-2083-librustzcash-a7e5' into zsa-integr…
dmidem Nov 10, 2025
760368b
Fix compilation errors that appeared after the previous merge
dmidem Nov 10, 2025
ec8e3bc
zebra-chain: add ZIP-230 vSighashInfo(V0) serialization/deserializati…
dmidem Nov 12, 2025
9ab4244
zebra-chain: add ZIP-230 vSighashInfo(V0) serialization/deserializati…
dmidem Nov 12, 2025
5d239f9
zebra-chain: add ZIP-230/ZIP-246 versioned signature support
dmidem Nov 19, 2025
69ed7ba
zebra-chain: add NU6_1 activation heights
dmidem Nov 19, 2025
ea8dfbf
zebra-chain: add ZIP-230/ZIP-246 versioned signature support
dmidem Nov 19, 2025
33a3a9c
zebra-chain: add NU6_1 activation heights
dmidem Nov 19, 2025
0c6dfd6
zebra-chain: add missing new sapling_v6.rs module
dmidem Nov 19, 2025
489f937
zebra-chain: add missing new sapling_v6.rs module
dmidem Nov 19, 2025
86229df
Update ZSA test blocks
dmidem Nov 19, 2025
95dc65e
Update ZSA test blocks again and refactor orchard_zsa_workflow_blocks…
dmidem Nov 24, 2025
f8e71ab
Add 1-hour limit for cargo test in CI and a specific 1-minute limit f…
dmidem Nov 24, 2025
9a03705
Fix compilation error from the previous commit
dmidem Nov 24, 2025
1344c30
Update orchard-zsa-shielded-data test vectors
dmidem Nov 24, 2025
45ee9f1
Update get_blockchain_info@mainnet_10.snap test snapshot
dmidem Nov 24, 2025
6df563e
Update get_blockchain_info@testnet_10.snap test snapshot
dmidem Nov 24, 2025
2f1c1c8
Make fixes according to #92 review comments
dmidem Nov 25, 2025
4183c0d
zebra-chain: refactor versioned_sig_v0_roundtrip test according to #9…
dmidem Nov 25, 2025
01d1037
Add testnet-singlenode-deploy
alexeykoren Nov 25, 2025
bbace68
Merge remote-tracking branch 'origin/upgrade-orchard-2083-librustzcas…
alexeykoren Nov 25, 2025
3f407c1
Add testnet-singlenode-deploy to dockerignore exceptions
alexeykoren Nov 25, 2025
ec3dc33
Merge branch 'upgrade-orchard-2083-librustzcash-a7e5' into zsa-integr…
dmidem Nov 26, 2025
6ea1d70
Sync Zebra with latest Orchard and librustzcash (#92)
dmidem Nov 27, 2025
78fc31c
Merge branch 'zsa1' into zsa-integration-state-refactor-2
dmidem Nov 28, 2025
af80ebe
Create stop-ecs workflow (#99)
seniakalma Jan 5, 2026
0640746
Update Orchard and librustzcash refs for PR471 review sync (#104)
ConstanceBeguier Jan 19, 2026
e174627
Refactor to use the latest zsa1 branch commits of Orchard and librust…
dmidem Jan 21, 2026
2becb2d
Pin blake2b_simd to 1.0.1 for compatibility with Orchard
dmidem Jan 30, 2026
ee2486d
Fix test compilation errors
dmidem Jan 30, 2026
3042a11
Add reference_note field to impl serde::Serialize for AssetState
dmidem Jan 30, 2026
969441b
Final refactoring of asset_base.rs
dmidem Feb 6, 2026
0f521fb
Remove 'nonempty' crate dependency
dmidem Feb 8, 2026
9a20622
Add missing doc comment for pup mod testing
dmidem Feb 8, 2026
1644308
Update Zebra Orchard and librustzcash refs in Cargo.toml
dmidem Feb 8, 2026
c546f96
Skip signature verification for checkpoint verified blocks
dmidem Feb 8, 2026
1928508
Remove (comment out) failing assert in update_chain_tip_with_block_pa…
dmidem Feb 9, 2026
fec3a08
Fix zebra-rpc asset_state test snapshots to add reference_note
dmidem Feb 9, 2026
ad00e18
Fix zebra-rpc asset_state test snapshots to rename total_supply to am…
dmidem Feb 9, 2026
1098dd0
Return MIN_TRANSPARENT_COINBASE_MATURITY to 100
dmidem Feb 11, 2026
7f1a3ee
Make transaction_sighashes optional in semantically and contextually …
dmidem Feb 12, 2026
746108d
Fix cargo clippy errors
dmidem Feb 14, 2026
1196785
Merge branch 'zsa1' into zsa-integration-state-refactor-2
dmidem Feb 15, 2026
57c39a0
Drop global issuance state unrelated changes
dmidem Feb 15, 2026
a7cbc60
Minor refactoring, FIXME resolution, etc.
dmidem Feb 15, 2026
635d29b
Merge branch 'zcash_pr471_review' of https://github.com/QED-it/zebra …
dmidem Feb 16, 2026
2674f18
Merge branch 'zcash_pr471_review' into zsa-integration-state
dmidem Feb 18, 2026
cdefdcb
Update deploy-ecs.yaml (#107)
seniakalma Feb 18, 2026
2b80155
Update Orchard and librustzcash versions and fix the code accordingly
dmidem Feb 20, 2026
a2ec43c
Merge branch 'zsa1' into zsa-integration-state
dmidem Feb 20, 2026
2a82c28
Update push-ecr.yaml (#108)
seniakalma Feb 23, 2026
751c0ec
Update push-ecr.yaml
seniakalma Feb 23, 2026
a7eaff5
Fix CI: update librustzcash rev and derive test reference notes via I…
dmidem Feb 25, 2026
4cc5e7f
Merge branch 'zsa1' into zcash_pr471_review
dmidem Feb 25, 2026
564d588
Fix zebra-rpc test compilation error
dmidem Feb 25, 2026
8e3076f
Add initial/partial support for ZIP-233 (zip233_amount field in Trans…
dmidem Mar 2, 2026
098270e
Revert "Add initial/partial support for ZIP-233 (zip233_amount field …
dmidem Mar 3, 2026
bd988f5
zebra-test: zebra-test: update Orchard ZSA workflow blocks
dmidem Mar 3, 2026
8421cd5
zebra-test: update Orchard ZSA workflow blocks
dmidem Mar 3, 2026
a8c0ba7
zebra-rpc: update get_asset_state snapshots
dmidem Mar 3, 2026
794f1b5
Merge branch 'zsa1' into zsa-integration-state
dmidem Mar 3, 2026
d9abe0e
Fix cargo clippy issues
dmidem Mar 3, 2026
5e3bc3b
Merge branch 'zcash_pr471_review' into zsa-integration-state
dmidem Mar 3, 2026
63341a5
Add initial/partial support for ZIP-233 (zip233_amount field in Trans…
dmidem Mar 2, 2026
dce97e1
Merge branch 'zcash-v4.1.0' into sync-zcash-v4.1.0-merge
dmidem Mar 11, 2026
4564f18
Fix compilation errors that appeared after the previous commit (i.e.,…
dmidem Mar 13, 2026
56761d3
Add tx_sighash to VerifiedUnminedTx
dmidem Mar 14, 2026
3e47b2a
zebra-chain: Align Nu7 consensus branch ID and TxV6 version group ID …
dmidem Mar 15, 2026
55c302c
zebra-consensus: Set activation heights for Canopy and NU7 to 1 for r…
dmidem Mar 15, 2026
15c4ec6
Sync .github/workflows with upstream
dmidem Mar 15, 2026
e3aaf52
Add missed .github/workflows files for the previous commit
dmidem Mar 15, 2026
7bcaab7
Update Orchard ZSA workflow blocks to support ZIP-233
dmidem Mar 17, 2026
25f5738
Update Orchard ZSA workflow blocks to support ZIP-233
dmidem Mar 17, 2026
c38c41b
Fix small cargo fmt issue
dmidem Mar 17, 2026
e53c36d
zebra-test: fix Orchard ZSA workflow vectors after correcting hashBlo…
dmidem Mar 17, 2026
63eef9d
zebra-rpc: update get_asset_state_not_found snapshots, assign Transac…
dmidem Mar 17, 2026
4c5094e
ci-basic.yml: rename elided_named_lifetimes to mismatched_lifetime_sy…
dmidem Mar 17, 2026
8e76dd8
ci-basic.yml: match clippy flags with upstream lint workflow
dmidem Mar 18, 2026
29906ba
zebra-test: increase MockService default request wait to 1s to avoid …
dmidem Mar 18, 2026
9e75366
Address PR #111 review comments (tx_v6 feature gating to be fixed sep…
dmidem Mar 19, 2026
bcc02b8
Clear ENABLE_ZSA in Flags arbitrary strategy to fix V5 transaction ro…
dmidem Mar 19, 2026
1e9ea65
Make Zebra compilable with tx_v6/nu7 flags disabled
dmidem Mar 20, 2026
426dd85
ci-basic.yml: test both with and without nu7/tx_v6 flags using a matrix
dmidem Mar 20, 2026
e3850f5
Merge branch 'zsa-integration-state' into sync-zcash-v4.1.0-merge-1
dmidem Mar 21, 2026
af45381
Fix tv_v6 flag guard style to align with that used in upstream Zebra …
dmidem Mar 23, 2026
f517d82
Fix zsa-integration-state->sync-zcash-v4.1.0 merge conflict resolutio…
dmidem Mar 23, 2026
89d593d
Add ZIP-230 coinbase ENABLE_ZSA consensus check
dmidem Mar 24, 2026
0bf444b
Merge branch 'sync-zcash-v4.1.0-merge-1' into sync-zcash-v4.1.0-merge
dmidem Mar 25, 2026
0d5ea69
Merge branch 'zcash-v4.2.0' into sync-zcash-v4.2.0-merge
dmidem Mar 25, 2026
0978377
zebra-consensus: temporarily allow empty NU6.1 lockbox disbursements …
dmidem Mar 25, 2026
bac28fe
CI: restore repo cleanliness check, revert temporary Cargo config cha…
dmidem Mar 25, 2026
e33aed7
Merge branch 'sync-zcash-v4.1.0-merge' into sync-zcash-v4.2.0-merge
dmidem Mar 25, 2026
0b6deef
zebra-test: refactor orchard_zsa_workflow_blocks.rs to use a u8 stati…
dmidem Mar 25, 2026
63c5d2b
zebra-test: refactor orchard_zsa_workflow_blocks.rs to use a u8 stati…
dmidem Mar 25, 2026
402cd87
Refactor insert_fake_orchard_shielded_data into separate V5 and V6 he…
dmidem Mar 26, 2026
47fedd3
Add v6_coinbase_transaction_with_enable_zsa_flag_fails_validation test
dmidem Mar 26, 2026
8e471f6
Refactor insert_fake_orchard_shielded_data into separate V5 and V6 he…
dmidem Mar 26, 2026
b4504d1
Add v6_coinbase_transaction_with_enable_zsa_flag_fails_validation test
dmidem Mar 26, 2026
c79fc92
Update orchard and librustzcash crate versions to the latest from the…
dmidem Mar 26, 2026
4ce0a32
Update orchard and librustzcash crate versions to the latest from the…
dmidem Mar 31, 2026
2f6121e
Use new IssueBundle::note_commitments method from the orchard crate i…
dmidem Mar 31, 2026
7314dff
Merge branch 'sync-zcash-v4.1.0-merge' into sync-zcash-v4.2.0-merge
dmidem Mar 31, 2026
b55ae3b
Remove zebra-scan files (as they were removed upstream)
dmidem Apr 6, 2026
c3e9c58
Remove get_block_template_rpcs.rs from zebra-rpc (as it was removed i…
dmidem Apr 6, 2026
a995eb4
Remove orchard/test-dependencies from zebra-chain deps to keep propte…
dmidem Apr 6, 2026
224ab68
Bump MSRV to Rust 1.85.1, as librustzcash crates use it
dmidem Apr 6, 2026
2afa187
Correct codespell typo
dmidem Apr 6, 2026
786fce1
zebra-scan: sync CHANGELOG with upstream
dmidem Apr 6, 2026
95acd4e
ci: specify stable toolchain for cargo-deny job
dmidem Apr 7, 2026
adfecee
Implement ZIP-0227 global issued-assets state in Zebra (#111)
dmidem Apr 9, 2026
6289f30
Start addressing additional #111 review comments
dmidem Apr 9, 2026
0b2ca13
Continue addressing additional #111 review comments: reuse existing r…
dmidem Apr 9, 2026
3002196
Continue addressing additional #111 review comments: remove test-gap …
dmidem Apr 9, 2026
d4f8d54
Update cargo-deny git source allowlist for new dependency repos
dmidem Apr 12, 2026
17915ff
Allow remaining upstream git sources in cargo-deny
dmidem Apr 12, 2026
e6a9d70
Merge branch 'zsa1' into sync-zcash-v4.2.0-merge
dmidem Apr 12, 2026
09def10
Address the first part of #114 review comments
dmidem Apr 20, 2026
205bf8c
Address the first part of #114 review comments (2)
dmidem Apr 21, 2026
9fe1f13
Apply the same fix as the upstream branch for the new
dmidem Apr 21, 2026
8a95237
Revert "Apply the same fix as the upstream branch for the new"
dmidem Apr 21, 2026
134804d
ci: temporarily allow clippy::manual_option_zip in lint job
dmidem Apr 21, 2026
88911bf
ci: allow manual_option_zip clippy lint across toolchain versions
dmidem Apr 21, 2026
02d75fb
Remove "toolchain: stable" for deny in lint.yml
dmidem Apr 21, 2026
3183c50
Refactor transaction handling and update related tests per #114 revie…
dmidem Apr 27, 2026
1bda5da
Add tx_v6/nu7 feature guard before verify_v6_transaction_network_upgrade
dmidem Apr 27, 2026
a1f6173
zebra-rpc: update snapshots to use new burnexists/issuanceexists fiel…
dmidem Apr 27, 2026
4a389fa
zebra-consensus: skip NU6.1 lockbox disbursement check on Regtest
dmidem Apr 27, 2026
f7904f7
Make ZSA transaction RPC flags optional
dmidem May 4, 2026
c2b3485
Add zip233amount to transaction RPC output
dmidem May 4, 2026
9d0932a
check_orchard_zsa_workflow test: remove extra lockbox_disbursements.i…
dmidem May 5, 2026
723bce1
Add ZSA issue note count to ZIP-317 logical actions
dmidem May 5, 2026
20760d2
Temporarily skip empty NU6.1 lockbox disbursement checks on Regtest-l…
dmidem May 6, 2026
7aff71e
re-added testnet-single-node-deploy/ folder
PaulLaux May 7, 2026
e971063
updated network upgrade table
PaulLaux May 7, 2026
2b036fd
fix(ci): make unit tests build with nu7 cfg
PaulLaux May 7, 2026
11afb6e
updated comments and todos
PaulLaux May 18, 2026
02871aa
fix(ci): address ZSA CI issues (#10654)
dmidem May 31, 2026
a90946a
ci: allow lint workflow on v4.2.0-dev
dmidem Jun 1, 2026
30ef9e4
fix(ci): temporarily allow lint workflow on v4.2.0-dev (#10663)
dmidem Jun 2, 2026
1fa93ac
Add ECR and ECS pipelines to zsa1 branch (#131)
ronkq Jun 3, 2026
443544a
Update push-ecr.yaml (#137)
ronkq Jun 4, 2026
6fdbb1f
ci: skip trusted_chain_sync_handles_forks_correctly test (#138)
dmidem Jun 4, 2026
15494e5
split run attempts
PaulLaux Jun 4, 2026
9117a2e
Merge branch 'zsa1' into sync-zcash-v4.2.0-merge
dmidem Jun 4, 2026
b3cc16d
Merge branch 'sync-zcash-v4.2.0-merge-pk1' into sync-zcash-v4.2.0-merge
dmidem Jun 4, 2026
83c653e
fix(ci): use regtest dockerfile for ECR push (#141)
ronkq Jun 10, 2026
285e13e
ci: use cargo nextest in ci-basic.yml
dmidem Jun 11, 2026
b40f525
ci: update the upstream YAML files to trigger on PRs to zsa1
dmidem Jun 11, 2026
6b2ff2a
ci: update the upstream YAML files to trigger on PRs to zsa1 (fixed)
dmidem Jun 11, 2026
3561641
Temporarily pin Rust toolchain to 1.85.1
dmidem Jun 11, 2026
50b2e3d
ci: pin lint workflow to Rust 1.94 temporarily
dmidem Jun 11, 2026
2161bb0
ci: pin unused-deps job to Rust 1.94 and cargo-udeps 0.1.60
dmidem Jun 11, 2026
f2987d8
Try using a pinned nightly toolchain for unused-deps
dmidem Jun 12, 2026
4168a64
ci: pin test-crates matrix job to Rust 1.94
dmidem Jun 12, 2026
56ecc8c
ci: pin test-crates matrix job to Rust 1.94 (2)
dmidem Jun 12, 2026
18619b7
Merge branch 'zsa1' into sync-zcash-v4.2.0-merge
dmidem Jun 12, 2026
11233e3
ci: try to remove test-threads limit for cargo nextest in zebrad acce…
dmidem Jun 12, 2026
2fad89f
Remove duplicate cargo test step from basic CI
dmidem Jun 15, 2026
63ef2f2
ci: add retries for sync_large_checkpoints_mempool_mainnet in upstrea…
dmidem Jun 15, 2026
a99696b
Pin Rust toolchain to Rust 1.94.0 used as stable for upstream v4.2.0
dmidem Jun 15, 2026
9642f91
Pin cargo-nextest install action to commit used in upstream CI
dmidem Jun 15, 2026
bf3dd4a
Pin cargo-nextest install action to commit used in upstream CI
dmidem Jun 15, 2026
3cce12f
Run doctests in basic CI
dmidem Jun 15, 2026
3ad942a
Specify cargo-nextest tool for pinned install action
dmidem Jun 15, 2026
11a97a0
Retry only confirmed flaky tests via nextest config
dmidem Jun 15, 2026
ec27fc2
Refresh PR checks
dmidem Jun 15, 2026
ac2d5f6
Merge branch 'zsa-support' into sync-zcash-v4.2.0-merge
dmidem Jun 18, 2026
ee1a60b
fix(ci): enable ZSA PR checks on integration branches
dmidem Jun 18, 2026
61eabda
fix(ci): remove internal ECS workflows from ZSA PR
dmidem Jun 18, 2026
6493603
Run basic CI only in QED-it/zebra
dmidem Jun 25, 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 .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
# Flags that apply to all Zebra crates and configurations
[target.'cfg(all())']
rustflags = [
# Enable tx_v6 everywhere by default
"--cfg", 'feature="tx_v6"',

# TODO: Remove when ZSA is stable
"--cfg", "zcash_unstable=\"nu7\"",

# Zebra standard lints for Rust 1.65+

# High-risk code
Expand Down Expand Up @@ -82,6 +88,12 @@ rustflags = [

[build]
rustdocflags = [
# Enable tx_v6 everywhere by default
"--cfg", 'feature="tx_v6"',

# TODO: Remove when ZSA is stable
"--cfg", "zcash_unstable=\"nu7\"",

# The -A and -W settings must be the same as the `RUSTDOCFLAGS` in:
# https://github.com/ZcashFoundation/zebra/blob/main/.github/workflows/docs-deploy-firebase.yml#L68

Expand Down
10 changes: 10 additions & 0 deletions .config/nextest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,13 @@ default-filter = 'package(zebrad) and test(=lightwalletd_test_suite)'
[profile.rpc-z-getsubtreesbyindex-snapshot]
slow-timeout = { period = "30m", terminate-after = 2 }
default-filter = 'package(zebrad) and test(=fully_synced_rpc_z_getsubtreesbyindex_snapshot_test)'

# --- QEDIT temporary retries ---

# TODO: Remove retries after investigating periodic random failures.
# Add more tests here only after confirming similar intermittent failures.
[[profile.default.overrides]]
filter = '''
test(=sync_large_checkpoints_mempool_mainnet)
'''
retries = 3
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
!zebra-*
!zebrad
!docker/entrypoint.sh
!docker/default-zebra-config.toml
!testnet-single-node-deploy
92 changes: 92 additions & 0 deletions .github/workflows/ci-basic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
name: Basic checks

on: [push]

permissions:
contents: read

jobs:
test:
if: ${{ github.repository == 'QED-it/zebra' }}
runs-on: ubuntu-latest

strategy:
matrix:
nu7:
- true
- false

env:
# Use system-installed RocksDB library instead of building from scratch
ROCKSDB_LIB_DIR: /usr/lib
# Use system-installed Snappy library for compression in RocksDB
SNAPPY_LIB_DIR: /usr/lib/x86_64-linux-gnu

steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
persist-credentials: false

- name: Show system resource summary (before cleanup)
run: |
df -h
free -h
lscpu | egrep 'Model name|Socket|Thread|Core|CPU\(s\)'

- name: Free disk space (safe cleanup for Rust CI)
run: |
# Remove heavy preinstalled SDKs and toolchains
sudo rm -rf /usr/local/lib/android || true
sudo rm -rf "$AGENT_TOOLSDIRECTORY" || true # preinstalled tool caches
df -h

- name: Install dependencies on Ubuntu
run: sudo apt-get update && sudo apt-get install -y protobuf-compiler librocksdb-dev

- name: Install formatting & linting tools
run: rustup component add rustfmt clippy

- name: Verify working directory is clean
run: git diff --exit-code

- name: Strip nu7/tx_v6 flags from config
if: ${{ !matrix.nu7 }}
run: |
sed -i 's|.*"--cfg", .feature="tx_v6".*|# &|' .cargo/config.toml
sed -i 's|.*"--cfg", "zcash_unstable=\\"nu7\\"".*|# &|' .cargo/config.toml

- name: Install cargo-nextest
uses: taiki-e/install-action@305bebabd4457bed9b82541755f034994382465b # v2.68.10
with:
tool: cargo-nextest

- name: Run tests
run: |
timeout --preserve-status 1h \
cargo nextest run --workspace --locked

- name: Run doc tests
run: |
timeout --preserve-status 30m \
cargo test --doc --workspace --locked

- name: Run doc check
run: cargo doc --workspace --no-deps --all-features --document-private-items --locked

- name: Run format check
run: cargo fmt -- --check

- name: Run clippy
run: cargo clippy --workspace --all-targets --features "default-release-binaries proptest-impl lightwalletd-grpc-tests zebra-checkpoints"

- name: Restore cargo config
run: git checkout -- .cargo/config.toml

- name: Verify working directory is clean
run: git diff --exit-code

- name: Show system resource summary
run: |
df -h
free -h
lscpu | egrep 'Model name|Socket|Thread|Core|CPU\(s\)'
15 changes: 11 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ name: Lint

on:
pull_request:
branches: [main]
branches:
- main
# TODO: Temporary ZSA integration branches. Remove before merging to main.
- zsa-support
- v4.2.0-dev
paths:
- "**/*.rs"
- "**/Cargo.toml"
Expand Down Expand Up @@ -46,7 +50,8 @@ jobs:
strategy:
fail-fast: false
matrix:
rust-version: [stable, beta]
# TODO: QED-it temporary Rust 1.94 pin: stable when testing Zebra v4.2.0 on upstream CI; remove before upstream merge.
rust-version: [1.94]
type: [release, tests]
include:
- type: release
Expand Down Expand Up @@ -161,11 +166,13 @@ jobs:
persist-credentials: false
- uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c #v1.15.2
with:
toolchain: nightly
# TODO: QED-it temp nightly pin: matches Zebra v4.2.0 CI test period; remove before upstream merge.
toolchain: nightly-2026-03-06
cache-on-failure: true
- uses: taiki-e/install-action@305bebabd4457bed9b82541755f034994382465b #v2.68.10
with:
tool: cargo-udeps
# TODO: QED-it temp cargo-udeps 0.1.60 pin: stable for Zebra v4.2.0 CI; remove before upstream merge.
tool: cargo-udeps@0.1.60
- uses: ./.github/actions/setup-zebra-build
- run: cargo udeps --workspace --all-targets --all-features --locked

Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/test-crates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ name: Test Crate Build

on:
pull_request:
branches: [main]
branches:
- main
# TODO: Temporary ZSA integration branches. Remove before merging to main.
- zsa-support
- v4.2.0-dev
paths:
- "**/*.rs"
- "**/Cargo.toml"
Expand Down Expand Up @@ -57,7 +61,8 @@ jobs:

- uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c #v1.15.2
with:
toolchain: stable
# TODO: QED-it temp Rust 1.94 pin: stable for Zebra v4.2.0 CI; remove before upstream merge.
toolchain: "1.94"
components: clippy
cache-on-failure: true
- uses: ./.github/actions/setup-zebra-build
Expand Down Expand Up @@ -109,7 +114,8 @@ jobs:

- uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c #v1.15.2
with:
toolchain: stable
# TODO: QED-it temp Rust 1.94 pin: stable for Zebra v4.2.0 CI; remove before upstream merge.
toolchain: "1.94"
components: clippy
cache-key: crate-build-${{ matrix.crate }}
cache-on-failure: true
Expand Down Expand Up @@ -184,7 +190,6 @@ jobs:
cargo clippy --package ${{ matrix.crate }} --all-features --all-targets -- -D warnings
cargo build --package ${{ matrix.crate }} --all-features --all-targets


test-crate-build-success:
name: test crate build success
runs-on: ubuntu-latest
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/test-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ name: Test Docker Config

on:
pull_request:
branches: [main]
branches:
- main
# TODO: Temporary ZSA integration branches. Remove before merging to main.
- zsa-support
- v4.2.0-dev
paths:
- "**/*.rs"
- "**/Cargo.toml"
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/tests-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ name: Unit Tests

on:
pull_request:
branches: [main]
branches:
- main
# TODO: Temporary ZSA integration branches. Remove before merging to main.
- zsa-support
- v4.2.0-dev
paths:
- "**/*.rs"
- "**/Cargo.toml"
Expand Down Expand Up @@ -66,6 +70,9 @@ jobs:
- uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c #v1.15.2
with:
toolchain: ${{ matrix.rust-version }}
# Mirror the cfgs in .cargo/config.toml; the action's RUSTFLAGS export
# would otherwise replace them.
rustflags: '-D warnings --cfg zcash_unstable="nu7" --cfg feature="tx_v6"'
cache-key: unit-tests-${{ matrix.os }}-${{ matrix.rust-version }}-${{ matrix.features }}
cache-on-failure: true
- uses: taiki-e/install-action@305bebabd4457bed9b82541755f034994382465b #v2.68.10
Expand Down
Loading
Loading