Skip to content

Commit 6ea1d70

Browse files
dmidemalexeykoren
andauthored
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>
1 parent 871d70b commit 6ea1d70

39 files changed

+724
-208
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@
2121
!zebra-*
2222
!zebrad
2323
!docker/entrypoint.sh
24+
!testnet-single-node-deploy

.github/workflows/ci-basic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Install formatting & linting tools
3535
run: rustup component add rustfmt clippy
3636
- name: Run tests
37-
run: cargo test --verbose --locked
37+
run: timeout --preserve-status 1h cargo test --verbose --locked
3838
- name: Verify working directory is clean
3939
run: git diff --exit-code
4040
- name: Run doc check

0 commit comments

Comments
 (0)