Merge ZcashFoundation/zebra v2.4.2 into zsa1 (conflict resolutions + minimal follow-ups) #80

dmidem · 2025-08-25T08:23:46Z

This PR updates our zsa1 branch to upstream v2.4.2. It includes:

The merge of zcash-v2.4.2 into zsa1.
Conflict resolutions and the follow-up changes needed to build and run (API/type tweaks, small wiring fixes, test updates).

If you want to see just the conflict-resolution hunks of the merge commit, locally you can run:

git fetch origin
git checkout origin/zsa1-v2.4.2
git show --cc <merge_commit_sha>

* add pub functionality for zaino * updated doc comment with review suggestion

…oundation#9004)

…on#9005) This is an initial step before completely removing Mergify, to keep the duality betwen the two to avoid downtime with queue management

…cashFoundation#9002) Bumps the devops group with 1 update: [rlespinasse/github-slug-action](https://github.com/rlespinasse/github-slug-action). Updates `rlespinasse/github-slug-action` from 4 to 5 - [Release notes](https://github.com/rlespinasse/github-slug-action/releases) - [Commits](rlespinasse/github-slug-action@v4...v5) --- updated-dependencies: - dependency-name: rlespinasse/github-slug-action dependency-type: direct:production update-type: version-update:semver-major dependency-group: devops ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ion#9018)

Signed-off-by: pinglanlu <pinglanlu@outlook.com>

* typo 0005-treestate.md * typo xxxx-block-subsidy.md * typo continuous-delivery.md * typo docker.md * typo shielded-scan.md

…ndation#9033) While using Mergify's configuration checker, this issue was not raised, but it's now showing in some PR's summaries, as in https://github.com/ZcashFoundation/zebra/pull/9026/checks?check_run_id=33066692861

…tion#9007) * chore: update CHANGELOG to better convey the 2.0.0 issue * Apply suggestions from code review Co-authored-by: Arya <aryasolhi@gmail.com> --------- Co-authored-by: Alfredo Garcia <oxarbitrage@gmail.com> Co-authored-by: Arya <aryasolhi@gmail.com>

…cashFoundation#8857) * Adds a parameter to `zebra_consensus::router::init()` for accepting a mempool setup argument, adds and uses an `init_test()` fn for passing a closed channel receiver in tests where no mempool service is needed in the transaction verifier. * Adds a `mempool` argument to the transaction::Verifier constructor (and a `new_for_tests()` constructor for convenience) * Removes `Clone` impl on `transaction::Verifier` to add mempool oneshot receiver, updates tests. * Adds TODOs * updates transaction verifier's poll_ready() method to setup the mempool service handle. * Updates VerifiedSet struct used in mempool storage * Updates mempool service and its `Storage` to use the updated `VerifiedSet` `transactions()` return type. * updates `created_outputs` when inserting or removing a transaction from the mempool's verified set * Adds a TODO, updates field docs * Updates `spent_utxos()` to query the mempool for unspent outputs * Adds `spent_mempool_outpoints` as a field on tx verifier mempool response * Updates mempool `Downloads` to return the spent_mempool_outpoints from the tx verifier response * Updates `Storage.insert()` to accept a list of spent mempool transaction outputs * Adds transaction dependencies when inserting a tx in `VerifiedSet` * polls mempool svc from tx verifier when a mempool tx that creates transparent outputs has been verified. adds a TODO for adding a `pending_outputs` field to the mempool Storage * Adds `pending_outputs` field on mempool Storage and responds to pending outputs requests when inserting new transactions into the mempool's verified set * replaces `UnminedTxId` type with `transaction::Hash` in mempool's verified set * prune pending outputs when rejecting and removing same effects. * Remove dependent transactions from verified set when removing a tx * updates tests * appeases clippy. * removes unused `len()` method * fixes doc links * Adds transaction dependencies to the `FullTransactions` response, let the caller handle it (required to avoid moving zip317 tx selection code to mempool) * updates block template construction to avoid including transactions unless their dependencies have already been added. * updates tests * Replaces placeholder setup channel with one that sends the mempool svc to the tx verifier, adds a timeout layer, adds a TODO about a concurrency bug * Use a single query to check for unspent outputs in the mempool * Updates `getblocktemplate` method to consider dependencies when sorting transactions for the final template * fixes clippy lints, removes unnecessary Option in UnspentOutput response variant * renames type alias and method, adds a TODO to use iteration instead of recursion * Adds mempool_removes_dependent_transactions() test * Updates Storage and VerifiedSet clear() methods to clear pending_outputs, created_outputs, and transaction_dependencies, adds TODO to use iteration instead of recursion. * removes outdated TODO * Adds a TODO for reporting queued transaction verification results from the mempool from the poll_ready() method * Adds `mempool_responds_to_await_output` test * updates mempool_responds_to_await_output test * Uses iteration instead of recursion in verified set's remove() method and zip317 mod's dependencies_depth() method * Adds a mempool_request_with_mempool_output_is_accepted test for the transaction verifier * Moves delay duration before polling the mempool to a constant, uses a shorter timeout for mempool output lookups, adds a `poll_count` to MockService, and updates `mempool_request_with_unmined_output_spends_is_accepted` to check that the transaction verifier polls the mempool after verifying a mempool transaction with transparent outputs * adds long_poll_input_mempool_tx_ids_are_sorted test * Adds a `excludes_tx_with_unselected_dependencies` test * Updates a TODO * moves `TransactionDependencies` struct to `zebra-node-services` * Updates `FullTransactions` response variant's `transaction_dependencies` type * updates zip317 transaction selection for block templates to include dependent transactions * Moves and refactors zip317 tx selection test to its own module, adds an `unmined_transactions_in_blocks()` method on network * Removes `unmined_transactions_in_blocks()` test utility fn from mempool Storage test module and replaces calls to it with calls to the new test method on Network * Fixes spelling mistake * Adds `includes_tx_with_selected_dependencies` test * fixes zip317 block construction issue * Fixes vectors test * Update zebra-node-services/src/mempool.rs * restores `tip_rejected_exact` type * updates affected tests * Documents the new argument in `Storage::insert()`, updates outdated comment * Update zebrad/src/components/mempool/storage/verified_set.rs * fixes potential issue with calling buffered mempool's poll_ready() method without calling it. * Avoids removing dependent transactions of transactions that have been mined onto the best chain. * Updates `spent_utxos()` method documentation * Avoids sorting getblocktemplate transactions in non-test compilations * documents PendingOutputs struct * Apply suggestions from code review Co-authored-by: Marek <mail@marek.onl> * cargo fmt * Applies suggestions from code review Avoids unnecessarily rejecting dependent transactions of randomly evicted mempool transactions. Updates `TransactionDependencies::remove_all()` to omit provided transaction id from the list of removed transaction ids. * Applies suggestions from code review. * Adds minor comments * Update zebrad/src/components/mempool/storage/verified_set.rs Co-authored-by: Marek <mail@marek.onl> * Remove an outdated comment (ZcashFoundation#9013) --------- Co-authored-by: Marek <mail@marek.onl>

* Adds getblockheader RPC method * Updates snapshots, adds hash/height/next_block_hash fields to verbose response * updates getblock snapshot * updates getblockheader response type to hex-encode fields, adds ToHex impl for sapling::tree::Root, adds snapshot and vector tests for new RPC method, adds snapshots. * rustfmt * fixes snapshots, matches zcashd more closely * fixes vectors test * updates lwd failure messages (probably doesn't matter, but seems better to handle it now than risk debugging it later) * fixes getblock_rpc test, fixes/reverses finalsaplingroot field byte-order. * fixes vector test, addresses remaining differences with zcashd (except the `chainwork` field), updates snapshots, and avoids a possible panic when there's a chain reorg between state queries. * Adds a comment noting that the `relative_to_network()` method was copied from zcashd * Apply suggestions from code review Co-authored-by: Alfredo Garcia <oxarbitrage@gmail.com> --------- Co-authored-by: Alfredo Garcia <oxarbitrage@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

A LWD test was expecting the `ZEBRA_TEST_LIGHTWALLETD` to be set, but this variable is needed for all LWD tests and not specifically for `lightwalletd_integration`. We had to rename this variable on a buggy `elif` statement in our Docker entrypoint. This was avoiding most LWD tests to run correctly.

* Update the reference Sapling treestate Zebra's treestate serialization differs from `zcashd` in the following way: `zcashd` omits the serialization of empty trailing ommers, while Zebra doesn't. This means that `zcashd` serializes the Sapling treestate for height 419_201 as 019eb30778ddeea84c72e69e07a1689f3c8def3dc0a1939f0edcbe47279069d9310002000150715810d52caf35471d10feb487213fbd95ff209122225b7b65d27a7fb1a44d Whereas Zebra serializes it as 019eb30778ddeea84c72e69e07a1689f3c8def3dc0a1939f0edcbe47279069d931001f000150715810d52caf35471d10feb487213fbd95ff209122225b7b65d27a7fb1a44d0000000000000000000000000000000000000000000000000000000000 Serialization Format ==================== The serialized treestate consists of optional, hex-encoded, 32-byte hashes. If the hash is not present, it is serialized as byte 0, i.e., `0x00`. If the hash is present, it is prefixed by byte 1, i.e. `0x01`. The first two hashes in the serialized treestate are the treestate's left and right leaves. These are followed by the serialized length of the vector of ommers. This length is serialized as 1, 3, 5, or 9 bytes. If the length is less than 253, it is serialized as a single byte. The length is then followed by the serialized ommers. We can now parse the first string, produced by `zcashd`: - `0119eb30778ddeea84c72e69e07a1689f3c8def3dc0a1939f0edcbe47279069d931` is the serialized left leaf, - `00` is the serialized right leaf, - `02` is the serialized length of the vector of ommers, - `00` is the serialized first ommer, - `0150715810d52caf35471d10feb487213fbd95ff209122225b7b65d27a7fb1a44d` is the serialized second ommer. And the second one, produced by Zebra: - `0119eb30778ddeea84c72e69e07a1689f3c8def3dc0a1939f0edcbe47279069d931` is the serialized left leaf, - `00` is the serialized right leaf, - `1f` is the serialized length of the vector of ommers, - `00` is the serialized first ommer, - `0150715810d52caf35471d10feb487213fbd95ff209122225b7b65d27a7fb1a44d` is the serialized second ommer - `0000000000000000000000000000000000000000000000000000000000` are the remaining 29 serialized ommers. Note that both serializations represent the same treestate. * Remove a new line char

…n#9055)

…9058)

… on release PRs (ZcashFoundation#8992) * Adds a test to check for crates in the Cargo.lock file that are being pulled in from a git source. * add `check_no_git_refs_in_cargo_lock` to CI * try skip instead of exclude --------- Co-authored-by: Alfredo Garcia <oxarbitrage@gmail.com>

* Allows non-local impls for abscissa derive macros and fixes other clippy lints. * Fixes formatting

…hFoundation#9006) * rpc: align getblock with zcashd behaviour * Removes handling for verbosity = 3 in getblock method, adds finalorchardroot field, removes unnecessary state request. (ZcashFoundation#9008) * align final(sapling|orchard)root with zcashd behaviour * fix test * Apply suggestions from code review Co-authored-by: Alfredo Garcia <oxarbitrage@gmail.com> * restore getblock docs; remove unneeded TODOs * Update zebra-rpc/src/methods.rs Co-authored-by: Arya <aryasolhi@gmail.com> * get rif of cloning self (ZcashFoundation#9044) --------- Co-authored-by: Arya <aryasolhi@gmail.com> Co-authored-by: Alfredo Garcia <oxarbitrage@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

…t transactions in the mempool (ZcashFoundation#9067) * change(mempool): Return verification result after attempting to insert transactions in the mempool (ZcashFoundation#8901) * respond with mempool verification result after a transaction has been inserted or has failed to be inserted into the mempool * returns mempool verification errors early, and fixes handling for cancellations or timeouts. * Adds a comment in test warning against code reuse with buffered services. * De-duplicates handling for timeout errors

…on#9068) - Removed deprecated actions and simplified default queue rules. - Adjusted batch sizes for urgent and batched queues. - Consolidated priority rules to enhance clarity and efficiency. - Updated conditions for moving pull requests to different queues based on labels and reviews.

…cashFoundation#9061) Bumps the devops group with 5 updates in the / directory: | Package | From | To | | --- | --- | --- | | [codecov/codecov-action](https://github.com/codecov/codecov-action) | `4.6.0` | `5.0.7` | | [tj-actions/changed-files](https://github.com/tj-actions/changed-files) | `45.0.3` | `45.0.4` | | [docker/metadata-action](https://github.com/docker/metadata-action) | `5.5.1` | `5.6.1` | | [docker/build-push-action](https://github.com/docker/build-push-action) | `6.9.0` | `6.10.0` | | [docker/scout-action](https://github.com/docker/scout-action) | `1.15.0` | `1.15.1` | Updates `codecov/codecov-action` from 4.6.0 to 5.0.7 - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](codecov/codecov-action@v4.6.0...v5.0.7) Updates `tj-actions/changed-files` from 45.0.3 to 45.0.4 - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](tj-actions/changed-files@v45.0.3...v45.0.4) Updates `docker/metadata-action` from 5.5.1 to 5.6.1 - [Release notes](https://github.com/docker/metadata-action/releases) - [Commits](docker/metadata-action@v5.5.1...v5.6.1) Updates `docker/build-push-action` from 6.9.0 to 6.10.0 - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v6.9.0...v6.10.0) Updates `docker/scout-action` from 1.15.0 to 1.15.1 - [Release notes](https://github.com/docker/scout-action/releases) - [Commits](docker/scout-action@v1.15.0...v1.15.1) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major dependency-group: devops - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-patch dependency-group: devops - dependency-name: docker/metadata-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: devops - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: devops - dependency-name: docker/scout-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: devops ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…pes (ZcashFoundation#9066) * add: add consensus validation reason to error messages * add additional instances

…ation#9063) * Add a consensus branch id check to tx verifier * Allow updating tx network upgrades * Fix unit tests for txs * Remove `println` * Move test-only tx methods out of the default impl * Add a test for checking consensus branch ids * Simplify some tests * Docs formatting * Update zebra-consensus/src/transaction/check.rs Co-authored-by: Conrado Gouvea <conrado@zfnd.org> * Add `effectiveVersion` to txs * Refactor the consensus branch ID check * Update zebra-consensus/src/error.rs Co-authored-by: Alfredo Garcia <oxarbitrage@gmail.com> * Refactor the consensus branch ID check * Remove `effective_version` * Refactor tests for consensus branch ID check --------- Co-authored-by: Conrado Gouvea <conrado@zfnd.org> Co-authored-by: Alfredo Garcia <oxarbitrage@gmail.com>

* Updates changelog, crate versions, end of support height, and docs. * Update CHANGELOG.md Co-authored-by: Conrado Gouvea <conrado@zfnd.org> --------- Co-authored-by: Conrado Gouvea <conrado@zfnd.org>

…cashFoundation#9065) * build(deps): bump the prod group across 1 directory with 22 updates Bumps the prod group with 21 updates in the / directory: | Package | From | To | | --- | --- | --- | | [clap](https://github.com/clap-rs/clap) | `4.5.20` | `4.5.21` | | [indexmap](https://github.com/indexmap-rs/indexmap) | `2.6.0` | `2.7.0` | | [serde](https://github.com/serde-rs/serde) | `1.0.214` | `1.0.215` | | [tokio](https://github.com/tokio-rs/tokio) | `1.41.0` | `1.41.1` | | [tower](https://github.com/tower-rs/tower) | `0.4.13` | `0.5.1` | | [thiserror](https://github.com/dtolnay/thiserror) | `1.0.65` | `2.0.3` | | [tracing-error](https://github.com/tokio-rs/tracing) | `0.2.0` | `0.2.1` | | [tracing](https://github.com/tokio-rs/tracing) | `0.1.40` | `0.1.41` | | [metrics](https://github.com/metrics-rs/metrics) | `0.24.0` | `0.24.1` | | [thread-priority](https://github.com/iddm/thread-priority) | `1.1.0` | `1.2.0` | | [sentry](https://github.com/getsentry/sentry-rust) | `0.32.3` | `0.35.0` | | [inferno](https://github.com/jonhoo/inferno) | `0.11.21` | `0.12.0` | | [hyper](https://github.com/hyperium/hyper) | `1.5.0` | `1.5.1` | | [bytes](https://github.com/tokio-rs/bytes) | `1.8.0` | `1.9.0` | | [indicatif](https://github.com/console-rs/indicatif) | `0.17.8` | `0.17.9` | | [insta](https://github.com/mitsuhiko/insta) | `1.41.0` | `1.41.1` | | [serde_json](https://github.com/serde-rs/json) | `1.0.132` | `1.0.133` | | [tempfile](https://github.com/Stebalien/tempfile) | `3.13.0` | `3.14.0` | | [primitive-types](https://github.com/paritytech/parity-common) | `0.12.2` | `0.13.1` | | [elasticsearch](https://github.com/elastic/elasticsearch-rs) | `8.5.0-alpha.1` | `8.16.0-alpha.1` | | [reqwest](https://github.com/seanmonstar/reqwest) | `0.11.27` | `0.12.9` | Updates `clap` from 4.5.20 to 4.5.21 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](clap-rs/clap@clap_complete-v4.5.20...clap_complete-v4.5.21) Updates `indexmap` from 2.6.0 to 2.7.0 - [Changelog](https://github.com/indexmap-rs/indexmap/blob/master/RELEASES.md) - [Commits](indexmap-rs/indexmap@2.6.0...2.7.0) Updates `serde` from 1.0.214 to 1.0.215 - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](serde-rs/serde@v1.0.214...v1.0.215) Updates `tokio` from 1.41.0 to 1.41.1 - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](tokio-rs/tokio@tokio-1.41.0...tokio-1.41.1) Updates `tower` from 0.4.13 to 0.5.1 - [Release notes](https://github.com/tower-rs/tower/releases) - [Commits](tower-rs/tower@tower-0.4.13...tower-0.5.1) Updates `thiserror` from 1.0.65 to 2.0.3 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](dtolnay/thiserror@1.0.65...2.0.3) Updates `tracing-error` from 0.2.0 to 0.2.1 - [Release notes](https://github.com/tokio-rs/tracing/releases) - [Commits](tokio-rs/tracing@tracing-error-0.2.0...tracing-error-0.2.1) Updates `tracing` from 0.1.40 to 0.1.41 - [Release notes](https://github.com/tokio-rs/tracing/releases) - [Commits](tokio-rs/tracing@tracing-0.1.40...tracing-0.1.41) Updates `metrics` from 0.24.0 to 0.24.1 - [Changelog](https://github.com/metrics-rs/metrics/blob/main/release.toml) - [Commits](metrics-rs/metrics@metrics-v0.24.0...metrics-v0.24.1) Updates `thread-priority` from 1.1.0 to 1.2.0 - [Commits](https://github.com/iddm/thread-priority/commits) Updates `sentry` from 0.32.3 to 0.35.0 - [Release notes](https://github.com/getsentry/sentry-rust/releases) - [Changelog](https://github.com/getsentry/sentry-rust/blob/master/CHANGELOG.md) - [Commits](getsentry/sentry-rust@0.32.3...0.35.0) Updates `inferno` from 0.11.21 to 0.12.0 - [Changelog](https://github.com/jonhoo/inferno/blob/main/CHANGELOG.md) - [Commits](jonhoo/inferno@v0.11.21...v0.12.0) Updates `hyper` from 1.5.0 to 1.5.1 - [Release notes](https://github.com/hyperium/hyper/releases) - [Changelog](https://github.com/hyperium/hyper/blob/master/CHANGELOG.md) - [Commits](hyperium/hyper@v1.5.0...v1.5.1) Updates `bytes` from 1.8.0 to 1.9.0 - [Release notes](https://github.com/tokio-rs/bytes/releases) - [Changelog](https://github.com/tokio-rs/bytes/blob/master/CHANGELOG.md) - [Commits](tokio-rs/bytes@v1.8.0...v1.9.0) Updates `indicatif` from 0.17.8 to 0.17.9 - [Release notes](https://github.com/console-rs/indicatif/releases) - [Commits](console-rs/indicatif@0.17.8...0.17.9) Updates `insta` from 1.41.0 to 1.41.1 - [Release notes](https://github.com/mitsuhiko/insta/releases) - [Changelog](https://github.com/mitsuhiko/insta/blob/master/CHANGELOG.md) - [Commits](mitsuhiko/insta@1.41.0...1.41.1) Updates `serde_json` from 1.0.132 to 1.0.133 - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](serde-rs/json@v1.0.132...v1.0.133) Updates `tempfile` from 3.13.0 to 3.14.0 - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](Stebalien/tempfile@v3.13.0...v3.14.0) Updates `primitive-types` from 0.12.2 to 0.13.1 - [Commits](https://github.com/paritytech/parity-common/commits/primitive-types-v0.13.1) Updates `elasticsearch` from 8.5.0-alpha.1 to 8.16.0-alpha.1 - [Release notes](https://github.com/elastic/elasticsearch-rs/releases) - [Commits](https://github.com/elastic/elasticsearch-rs/commits) Updates `reqwest` from 0.11.27 to 0.12.9 - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](seanmonstar/reqwest@v0.11.27...v0.12.9) Updates `syn` from 2.0.85 to 2.0.90 - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](dtolnay/syn@2.0.85...2.0.90) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: indexmap dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: tower dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-major dependency-group: prod - dependency-name: tracing-error dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: tracing dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: metrics dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: thread-priority dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: sentry dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: inferno dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: hyper dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: bytes dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: indicatif dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: insta dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: primitive-types dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: elasticsearch dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: syn dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod ... Signed-off-by: dependabot[bot] <support@github.com> * downgrade tower, add denies --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alfredo Garcia <oxarbitrage@gmail.com>

…ndation#9052) * Fixes bug in send transaction test * fixes new bug in send_transaction_test * Removes unused `load_transactions_from_future_blocks` and factors out code for sending transactions to its own fn * corrects tx count updates to exclude coinbase txs * fixes formatting * Calls zebra's sendrawtransaction method if lwd's send_transaction() return an error for more detailed error info * removes instrument * avoids panic when a future block has only a coinbase transaction * fixes check for gossip log (only happens when 10 txs have been added * fixes a concurrency bug, adds more detailed errors. * removes unnecessary wait_for_stdout calls and fixes condition for early return * Fixes issue around missing stdout line * Fixes bug around expected tx ids and removes outdated TODO * Fixes issue with expected ZF funding stream address balance in post-NU6 chains * fixes the rest of wallet_grpc_test * Update zebrad/src/components/mempool/downloads.rs Co-authored-by: Conrado Gouvea <conrado@zfnd.org> --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Conrado Gouvea <conrado@zfnd.org>

* build(deps): bump the prod group with 10 updates Bumps the prod group with 10 updates: | Package | From | To | | --- | --- | --- | | [clap](https://github.com/clap-rs/clap) | `4.5.21` | `4.5.23` | | [chrono](https://github.com/chronotope/chrono) | `0.4.38` | `0.4.39` | | [tokio](https://github.com/tokio-rs/tokio) | `1.41.1` | `1.42.0` | | [tokio-stream](https://github.com/tokio-rs/tokio) | `0.1.16` | `0.1.17` | | [tower](https://github.com/tower-rs/tower) | `0.4.13` | `0.5.1` | | [thiserror](https://github.com/dtolnay/thiserror) | `2.0.3` | `2.0.6` | | [tracing-subscriber](https://github.com/tokio-rs/tracing) | `0.3.18` | `0.3.19` | | [prost](https://github.com/tokio-rs/prost) | `0.13.3` | `0.13.4` | | [primitive-types](https://github.com/paritytech/parity-common) | `0.12.2` | `0.13.1` | | [tokio-util](https://github.com/tokio-rs/tokio) | `0.7.12` | `0.7.13` | Updates `clap` from 4.5.21 to 4.5.23 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](clap-rs/clap@clap_complete-v4.5.21...clap_complete-v4.5.23) Updates `chrono` from 0.4.38 to 0.4.39 - [Release notes](https://github.com/chronotope/chrono/releases) - [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md) - [Commits](chronotope/chrono@v0.4.38...v0.4.39) Updates `tokio` from 1.41.1 to 1.42.0 - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](tokio-rs/tokio@tokio-1.41.1...tokio-1.42.0) Updates `tokio-stream` from 0.1.16 to 0.1.17 - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](tokio-rs/tokio@tokio-stream-0.1.16...tokio-stream-0.1.17) Updates `tower` from 0.4.13 to 0.5.1 - [Release notes](https://github.com/tower-rs/tower/releases) - [Commits](tower-rs/tower@tower-0.4.13...tower-0.5.1) Updates `thiserror` from 2.0.3 to 2.0.6 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](dtolnay/thiserror@2.0.3...2.0.6) Updates `tracing-subscriber` from 0.3.18 to 0.3.19 - [Release notes](https://github.com/tokio-rs/tracing/releases) - [Commits](tokio-rs/tracing@tracing-subscriber-0.3.18...tracing-subscriber-0.3.19) Updates `prost` from 0.13.3 to 0.13.4 - [Release notes](https://github.com/tokio-rs/prost/releases) - [Changelog](https://github.com/tokio-rs/prost/blob/master/CHANGELOG.md) - [Commits](tokio-rs/prost@v0.13.3...v0.13.4) Updates `primitive-types` from 0.12.2 to 0.13.1 - [Commits](https://github.com/paritytech/parity-common/commits/primitive-types-v0.13.1) Updates `tokio-util` from 0.7.12 to 0.7.13 - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](tokio-rs/tokio@tokio-util-0.7.12...tokio-util-0.7.13) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: chrono dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: tokio-stream dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: tower dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: tracing-subscriber dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: prost dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: primitive-types dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: tokio-util dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod ... Signed-off-by: dependabot[bot] <support@github.com> * downgrade tower and primitive-types --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alfredo Garcia <oxarbitrage@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

.github/workflows/ci-build-crates.yml

      matrix: ${{ steps.set-matrix.outputs.matrix }}
    steps:
-      - uses: actions/checkout@v4.2.1
+      - uses: actions/checkout@v4.2.2


.github/workflows/ci-coverage.yml


      - name: Upload coverage report to Codecov
-        uses: codecov/codecov-action@v4.6.0
+        uses: codecov/codecov-action@v5.4.3


.github/workflows/ci-lint.yml

      - name: Rust files
        id: changed-files-rust
-        uses: tj-actions/changed-files@v45.0.3
+        uses: tj-actions/changed-files@v46.0.5


.github/workflows/ci-lint.yml

      - name: Workflow files
        id: changed-files-workflows
-        uses: tj-actions/changed-files@v45.0.3
+        uses: tj-actions/changed-files@v46.0.5


.github/workflows/ci-lint.yml

          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=stable --profile=default

-      - uses: Swatinem/rust-cache@v2.7.5
+      - uses: Swatinem/rust-cache@v2.7.8


.github/workflows/ci-tests.patch.yml

+  generate-checkpoints-testnet:
+    name: Integration tests / Generate checkpoints testnet / Run checkpoints-testnet test
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork }}
+    steps:
+      - run: 'echo "Skipping job on fork"'


.github/workflows/ci-unit-tests-os.yml



-      - uses: Swatinem/rust-cache@v2.7.5
+      - uses: Swatinem/rust-cache@v2.7.8


.github/workflows/ci-unit-tests-os.yml

      - uses: r7kamura/rust-problem-matchers@v1.5.0

+      - name: Install last version of Protoc
+        uses: arduino/setup-protoc@v3.0.0


.github/workflows/ci-unit-tests-os.yml

          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=stable --profile=minimal

-      - uses: Swatinem/rust-cache@v2.7.5
+      - uses: Swatinem/rust-cache@v2.7.8


.github/workflows/ci-unit-tests-os.yml


      - name: Install cargo-machete
-        uses: baptiste0928/cargo-install@v3.1.1
+        uses: baptiste0928/cargo-install@v3.3.0


…ctionObject - need to be fixed - see FIXME comments

…cause of a new interface of new_regtest method)

…te/zip317/tests.rs (because Address::try_from_raw_transparent_p2pkh was removed in librustzcash)

…rc/transaction/tests.rs, refactor those tests to support V5 and V6 in action duplication test

Unrolled the orchard_shielded_data_field! macro into explicit code to match the style used elsewhere in Orchard transaction handling and in upstream ZcashFoundation, which avoids macros there entirely.

…tion.rs to store either Vanilla and ZSA data

…s TX_V6_VERSION_GROUP_ID to align with librustzcash

…test flag

…separately with reduced concurrency pending flake fix

…tem)

…test failure

dmidem · 2025-09-23T07:31:32Z

Closed in favour of #88

idky137 and others added 30 commits November 5, 2024 19:15

add pub functionality for zaino (ZcashFoundation#8964)

c26c3f2

* add pub functionality for zaino * updated doc comment with review suggestion

chore(ci): do not default to tracing mode in jobs execution (ZcashF…

f919da3

…oundation#9004)

feat(actions): migrate Mergify to GitHub's Merge Queue (ZcashFoundati…

edff643

…on#9005) This is an initial step before completely removing Mergify, to keep the duality betwen the two to avoid downtime with queue management

ref(mergify): use the the configuration format and keys (ZcashFoundat…

ac90773

…ion#9018)

chore: remove redundant words in comment (ZcashFoundation#9015)

987a34a

Signed-off-by: pinglanlu <pinglanlu@outlook.com>

fix: typos correction docs (ZcashFoundation#9014)

7d37f77

* typo 0005-treestate.md * typo xxxx-block-subsidy.md * typo continuous-delivery.md * typo docker.md * typo shielded-scan.md

remove scan-start-where-left-test from CI (ZcashFoundation#9026)

17648cc

fix links in release templates (ZcashFoundation#9050)

4f0746a

fix(mergify): align build job name across workflows (ZcashFoundatio…

802a243

…n#9055)

upgrade min protocol versions for all network kinds (ZcashFoundation#…

0af0742

…9058)

chore: Fix clippy lints (ZcashFoundation#9062)

e15184d

* Allows non-local impls for abscissa derive macros and fixes other clippy lints. * Fixes formatting

change(diagnostics): Updates error messages to include inner error ty…

a3bb1e2

…pes (ZcashFoundation#9066) * add: add consensus validation reason to error messages * add additional instances

Updates checkpoints (ZcashFoundation#9071)

1cf249c

Release v2.1.0 (ZcashFoundation#9072)

179aaa4

* Updates changelog, crate versions, end of support height, and docs. * Update CHANGELOG.md Co-authored-by: Conrado Gouvea <conrado@zfnd.org> --------- Co-authored-by: Conrado Gouvea <conrado@zfnd.org>

Merge branch 'zcash-v2.4.2' into zsa-integration-consensus-v2.4.2

7058895

github-advanced-security bot found potential problems Aug 25, 2025

View reviewed changes

dmidem requested a review from PaulLaux August 25, 2025 08:25

dmidem added the upstream-sync label Aug 25, 2025

dmidem added 9 commits August 25, 2025 12:55

Add initial support of polymorphic Orchard action in zebra-rpc/Transa…

e6932a2

…ctionObject - need to be fixed - see FIXME comments

Fix compilation error in zebra-consensus/src/orchard_zsa/tests.rs (be…

b9e8168

…cause of a new interface of new_regtest method)

Fix compilation error in zebra-rpc/src/methods/types/get_block_templa…

54ffabe

…te/zip317/tests.rs (because Address::try_from_raw_transparent_p2pkh was removed in librustzcash)

Add orchard_flags_mut transaction method, use it in zebra-consensus/s…

e36bf87

…rc/transaction/tests.rs, refactor those tests to support V5 and V6 in action duplication test

Remove orchard_shielded_data_field macro for style consistency

156bfb5

Unrolled the orchard_shielded_data_field! macro into explicit code to match the style used elsewhere in Orchard transaction handling and in upstream ZcashFoundation, which avoids macros there entirely.

Use Vec<u8> for enc_ciphertext in zebra-rpc/src/methods/types/transac…

403047a

…tion.rs to store either Vanilla and ZSA data

Temporarily comment out Nu7 activation heights, and use 0x7777_7777 a…

fe0c081

…s TX_V6_VERSION_GROUP_ID to align with librustzcash

Merge branch 'zsa1' into zsa1-v2.4.2-fixes

1420b95

Add Cargo.lock

2a3f1c4

dmidem force-pushed the zsa1-v2.4.2-fixes branch from 3a054f0 to 3a2b832 Compare September 10, 2025 11:15

Add nu7 cfg flag in a couple of places along with the existing zebra-…

362943e

…test flag

dmidem force-pushed the zsa1-v2.4.2-fixes branch from e2956e4 to 362943e Compare September 10, 2025 14:41

Add --locked to cargo test run in CI config

3ccd96e

dmidem force-pushed the zsa1-v2.4.2-fixes branch from 738c557 to 51a6976 Compare September 11, 2025 05:55

Skip intermittently failing Sapling spend tests in main run; execute …

231ae2a

…separately with reduced concurrency pending flake fix

dmidem force-pushed the zsa1-v2.4.2-fixes branch from 51a6976 to 231ae2a Compare September 11, 2025 06:47

dmidem added 2 commits September 11, 2025 09:45

Remove env set for separate sapling spend tests from CI config

cc3b727

Update get_blockchain_info snapshots in zebra-rpc tests (remove Nu7 i…

b9b0655

…tem)

dmidem force-pushed the zsa1-v2.4.2-fixes branch 2 times, most recently from 0867495 to 0ad0ea4 Compare September 15, 2025 08:47

dmidem added 2 commits September 15, 2025 11:10

Fix cargo clippy error

70a8ba4

zebrad tests: increase BETWEEN_NODES_DELAY to fix zebra_rpc_conflict …

f3a730c

…test failure

dmidem force-pushed the zsa1-v2.4.2-fixes branch from 0ad0ea4 to f3a730c Compare September 15, 2025 09:11

Trigger CI

4446d4a

dmidem closed this Sep 23, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge ZcashFoundation/zebra v2.4.2 into zsa1 (conflict resolutions + minimal follow-ups) #80

Merge ZcashFoundation/zebra v2.4.2 into zsa1 (conflict resolutions + minimal follow-ups) #80

Uh oh!

dmidem commented Aug 25, 2025

Uh oh!

Check warning

Check failure

Check failure

Check failure

Check failure

Check warning

Check failure

Check failure

Check failure

Check failure

dmidem commented Sep 23, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants



		- uses: Swatinem/rust-cache@v2.7.5
		- uses: Swatinem/rust-cache@v2.7.8

Merge ZcashFoundation/zebra v2.4.2 into zsa1 (conflict resolutions + minimal follow-ups) #80

Merge ZcashFoundation/zebra v2.4.2 into zsa1 (conflict resolutions + minimal follow-ups) #80

Uh oh!

Conversation

dmidem commented Aug 25, 2025

Uh oh!

Check warning

Check failure

Check failure

Check failure

Check failure

Check warning

Check failure

Check failure

Check failure

Check failure

dmidem commented Sep 23, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants