Skip to content

[DRAFT] Resolve v2.4.2 merge conflicts and follow-up fixes - new #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dmidem wants to merge 8 commits into
base: zsa1-v2.4.2-conflicts-new
Choose a base branch
from
Draft

[DRAFT] Resolve v2.4.2 merge conflicts and follow-up fixes - new #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
421b50b
v2.4.2: post-merge fixes copied from old `zsa1-v2.4.2-fixes`
dmidem Sep 22, 2025
eb71aa2
Remove a duplicated comment in zebra-chain's expiry_heigh function
dmidem Oct 3, 2025
346eaa0
Merge branch 'zsa1-v2.4.2-partial-sync' into zsa1-v2.4.2-fixes-new
dmidem Oct 3, 2025
b68065e
Remove accidentally added proptest-generated tests/prop.txt files fro…
dmidem Oct 3, 2025
89383e2
zebra_chain: try to uncomment Nu6_1 and Nu7 height in network_upgrade…
dmidem Oct 6, 2025
2c61a5d
Fix tests failing after the previous commit that uncommented Nu6_1/Nu…
dmidem Oct 12, 2025
a1cbd31
Set CURRENT_NETWORK_PROTOCOL_VERSION to NU7 when zcash_unstable=nu7 i…
dmidem Oct 12, 2025
0c13650
zebra-rpc: update test snapshot files affected by activation height c…
dmidem Oct 12, 2025
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
6 changes: 6 additions & 0 deletions .cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ rustflags = [
# Enable tx_v6 everywhere by default
"--cfg", 'feature="tx_v6"',

# TODO: Remove this when Cargo.toml is updated to use the latest librustzcash zsa1 version
"--cfg", "zcash_unstable=\"nu6.1\"",

# TODO: Consider removing this line later (it's needed for the ZSA version of librustzcash crates)
"--cfg", "zcash_unstable=\"nu7\"",

Expand Down Expand Up @@ -91,6 +94,9 @@ rustdocflags = [
# Enable tx_v6 everywhere by default
"--cfg", 'feature="tx_v6"',

# TODO: Remove this when Cargo.toml is updated to use the latest librustzcash zsa1 version
"--cfg", "zcash_unstable=\"nu6.1\"",

# TODO: Consider removing this line later (it's needed for the ZSA version of librustzcash crates)
"--cfg", "zcash_unstable=\"nu7\"",

Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/ci-basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,16 @@ jobs:
- name: Install formatting & linting tools
run: rustup component add rustfmt clippy
- name: Run tests
run: cargo test --verbose
env:
RUST_BACKTRACE: 1
# Skip two tests that intermittently fail on CI (likely a race/ordering issue).
# FIXME: investigate and fix the underlying flake; remove these skips once resolved.
Copy link

@PaulLaux PaulLaux Oct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this still needed?

Copy link
Collaborator Author

@dmidem dmidem Oct 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, as we haven't found another way to solve the race condition in the zebra-consensus test on our CI instance for now.

run: cargo test --locked --verbose -- --skip v4_with_sapling_spends --skip v5_with_sapling_spends
# Run the skipped tests separately with constrained parallelism
- name: Run Sapling spend tests
run: |
cargo test -p zebra-consensus v4_with_sapling_spends -- --nocapture
cargo test -p zebra-consensus v5_with_sapling_spends -- --nocapture
- name: Verify working directory is clean
run: git diff --exit-code
- name: Run doc check
Expand Down
Loading
Loading