Skip to content

ZSA (final version from zsa-integration-state) synced with the upstream v4.2.0#114

Open
dmidem wants to merge 509 commits intomainfrom
sync-zcash-v4.2.0-merge
Open

ZSA (final version from zsa-integration-state) synced with the upstream v4.2.0#114
dmidem wants to merge 509 commits intomainfrom
sync-zcash-v4.2.0-merge

Conversation

@dmidem
Copy link
Copy Markdown
Collaborator

@dmidem dmidem commented Mar 25, 2026

ZSA (final version from zsa-integration-state branch) synced with the upstream v4.2.0

dmidem added 3 commits March 25, 2026 11:29
…on Regtest

Regtest/configured testnets can be created with an empty NU6.1 lockbox disbursement list, but
block subsidy validation treated an empty list as an error on the NU6.1 activation block.

After syncing with upstream Zebra v4.2.0, this started breaking our Orchard ZSA Regtest
workflow tests.

Temporarily skip the NU6.1 lockbox disbursement check when no disbursements are configured,
and leave a FIXME to revisit whether empty configured disbursements should remain allowed or
Regtest should provide defaults.
@dmidem dmidem force-pushed the sync-zcash-v4.2.0-merge branch from 05b53c6 to e0c0abf Compare March 25, 2026 13:40
…c ref for bytes OrchardWorkflowBlock instead of a vec, matching the approach used in block.rs there
@dmidem dmidem force-pushed the sync-zcash-v4.2.0-merge branch from e0c0abf to 0b6deef Compare March 25, 2026 14:51
…c ref for bytes OrchardWorkflowBlock instead of a vec, matching the approach used in block.rs there
@dmidem dmidem changed the base branch from zcash-v4.2.0 to main April 1, 2026 12:26
@dmidem dmidem changed the title Sync with the upstream v4.2.0 ZSA synced with the upstream v4.2.0 Apr 1, 2026
@dmidem dmidem changed the title ZSA synced with the upstream v4.2.0 ZSA (final version from zsa-integration-state) synced with the upstream v4.2.0 Apr 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants