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

Draft

dmidem wants to merge 8 commits intozsa1-v2.4.2-conflicts-newfrom

zsa1-v2.4.2-fixes-new

Commits on Sep 22, 2025

v2.4.2: post-merge fixes copied from old `zsa1-v2.4.2-fixes`
dmidem
committed

Commits on Oct 3, 2025

Remove a duplicated comment in zebra-chain's expiry_heigh function
dmidem
committed
Merge branch 'zsa1-v2.4.2-partial-sync' into zsa1-v2.4.2-fixes-new
dmidem
committed
Remove accidentally added proptest-generated tests/prop.txt files from zebra-chain and zebra-network
dmidem
committed

Commits on Oct 6, 2025

zebra_chain: try to uncomment Nu6_1 and Nu7 height in network_upgrade.rs and specify temporary values for them
dmidem
committed

Commits on Oct 12, 2025