refactor(consensus)!: split transaction verifier into BlockVerifier and MempoolVerifier (#11095)

Author: mergify[bot]

CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ## [Unreleased]
 
+### Breaking Changes
+
+- Updated zebrad's mempool transaction downloader for zebra-consensus's transaction-verifier API
+  split: the removed `transaction::Request::Mempool`/`transaction::Response::Mempool` enum
+  variants are replaced by dedicated `transaction::MempoolRequest`/`transaction::MempoolResponse`
+  types. Internal-only; no user-facing or operator-facing behavior change. See zebra-consensus's
+  changelog for the underlying API split
+  ([#11095](https://github.com/ZcashFoundation/zebra/pull/11095)).
+- New `getdeprecationinfo` RPC returning the block height and estimated time at which this
+  release will halt for end of support, in zcashd's `end_of_service` format. The `end_of_service`
+  object is only present on Mainnet, where end of support is enforced
+  ([#11097](https://github.com/ZcashFoundation/zebra/pull/11097)).
+
 ### Added
 
 - Added `seeder.zec.rocks` and `seeder.testnet.zec.rocks` as default DNS seeders

zebra-chain/CHANGELOG.md

@@ -17,6 +17,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `ValueBalance::total`, which returns the sum of all value pool balances
 
+### Fixed
+
+- Comments in `zebra-chain/src/transaction/tests/vectors.rs`
+
 ## [11.3.0] - 2026-07-27
 
 ### Added

zebra-chain/src/transaction/tests/vectors.rs

@@ -262,7 +262,7 @@ fn deserialize_large_transaction() {
 /// An empty transaction v5, with no Orchard, Sapling, or Transparent data
 ///
 /// empty transaction are invalid, but Zebra only checks this rule in
-/// zebra_consensus::transaction::Verifier
+/// zebra_consensus::transaction::check::has_inputs_and_outputs
 #[test]
 fn empty_v5_round_trip() {
     let _init_guard = zebra_test::init();
@@ -286,7 +286,7 @@ fn empty_v5_round_trip() {
 /// An empty transaction v4, with no Sapling, Sprout, or Transparent data
 ///
 /// empty transaction are invalid, but Zebra only checks this rule in
-/// zebra_consensus::transaction::Verifier
+/// zebra_consensus::transaction::check::has_inputs_and_outputs
 #[test]
 fn empty_v4_round_trip() {
     let _init_guard = zebra_test::init();

zebra-consensus/CHANGELOG.md

@@ -7,6 +7,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Breaking Changes
+
+- Split the unified transaction verifier API into separate
+  `transaction::BlockTxVerifier` and `transaction::MempoolTxVerifier`
+  services with dedicated request/response types.
+- Removed the unified verifier API:
+  - `transaction::Verifier`
+  - `transaction::Request`
+  - `transaction::Response`
+- `transaction::BlockRequest::transaction_hash` must now be the hash of the request's
+  `transaction`. It is used to build `BlockResponse::tx_id` instead of re-hashing the
+  transaction, so a mismatched value yields a response identifying a different transaction.
+  A debug assertion checks this in test and debug builds.
+- The second value returned by `router::init` and `router::init_test` is now a
+  `transaction::MempoolTxVerifier` service and can no longer verify block
+  transactions. Callers verifying transactions as part of block verification
+  should construct a `transaction::BlockTxVerifier` directly.
+  ([#11095](https://github.com/ZcashFoundation/zebra/pull/11095)).
+
+### Added
+
+- `transaction::BlockTxVerifier` and `transaction::MempoolTxVerifier`.
+- `transaction::BlockRequest`, `transaction::BlockResponse`,
+  `transaction::MempoolRequest`, and `transaction::MempoolResponse`.
+  
 ## [14.0.1] - 2026-07-27
 
 ### Changed

zebra-consensus/src/block.rs

@@ -8,7 +8,6 @@
 //! verification, where it may be accepted or rejected.
 
 use std::{
-    collections::HashSet,
     future::Future,
     pin::Pin,
     sync::Arc,
@@ -26,7 +25,7 @@ use zebra_chain::{
     amount::Amount,
     block,
     parameters::{subsidy::SubsidyError, Network},
-    transaction, transparent,
+    transparent,
     work::equihash,
 };
 use zebra_state as zs;
@@ -163,7 +162,10 @@ impl<S, V> SemanticBlockVerifier<S, V>
 where
     S: Service<zs::Request, Response = zs::Response, Error = BoxError> + Send + Clone + 'static,
     S::Future: Send + 'static,
-    V: Service<tx::Request, Response = tx::Response, Error = BoxError> + Send + Clone + 'static,
+    V: Service<tx::BlockRequest, Response = tx::BlockResponse, Error = BoxError>
+        + Send
+        + Clone
+        + 'static,
     V::Future: Send + 'static,
 {
     /// Creates a new SemanticBlockVerifier
@@ -180,7 +182,10 @@ impl<S, V> Service<Request> for SemanticBlockVerifier<S, V>
 where
     S: Service<zs::Request, Response = zs::Response, Error = BoxError> + Send + Clone + 'static,
     S::Future: Send + 'static,
-    V: Service<tx::Request, Response = tx::Response, Error = BoxError> + Send + Clone + 'static,
+    V: Service<tx::BlockRequest, Response = tx::BlockResponse, Error = BoxError>
+        + Send
+        + Clone
+        + 'static,
     V::Future: Send + 'static,
 {
     type Response = block::Hash;
@@ -285,20 +290,16 @@ where
                 &transaction_hashes,
             ));
 
-            let known_outpoint_hashes: Arc<HashSet<transaction::Hash>> =
-                Arc::new(known_utxos.keys().map(|outpoint| outpoint.hash).collect());
-
             for (&transaction_hash, transaction) in
                 transaction_hashes.iter().zip(block.transactions.iter())
             {
                 let rsp = transaction_verifier
                     .ready()
                     .await
                     .expect("transaction verifier is always ready")
-                    .call(tx::Request::Block {
+                    .call(tx::BlockRequest {
                         transaction_hash,
                         transaction: transaction.clone(),
-                        known_outpoint_hashes: known_outpoint_hashes.clone(),
                         known_utxos: known_utxos.clone(),
                         height,
                         time: block.header.time,
@@ -320,16 +321,11 @@ where
                     .map_err(Into::into)
                     .map_err(VerifyBlockError::Transaction)?;
 
-                assert!(
-                    matches!(response, tx::Response::Block { .. }),
-                    "unexpected response from transaction verifier: {response:?}"
-                );
-
-                sigops += response.sigops();
+                sigops += response.sigops;
 
                 // Coinbase transactions consume the miner fee,
                 // so they don't add any value to the block's total miner fee.
-                if let Some(miner_fee) = response.miner_fee() {
+                if let Some(miner_fee) = response.miner_fee {
                     block_miner_fees += miner_fee;
                 }
             }

zebra-consensus/src/block/tests.rs

@@ -139,7 +139,7 @@ async fn check_transcripts() -> Result<(), Report> {
     let network = Network::Mainnet;
     let state_service = zebra_state::init_test(&network).await;
 
-    let transaction = transaction::Verifier::new_for_tests(&network, state_service.clone());
+    let transaction = transaction::BlockTxVerifier::new(&network, state_service.clone());
     let transaction = Buffer::new(BoxService::new(transaction), 1);
     let block_verifier = Buffer::new(
         SemanticBlockVerifier::new(&network, state_service.clone(), transaction),

zebra-consensus/src/router.rs

@@ -72,7 +72,7 @@ struct BlockVerifierRouter<S, V>
 where
     S: Service<zs::Request, Response = zs::Response, Error = BoxError> + Send + Clone + 'static,
     S::Future: Send + 'static,
-    V: Service<transaction::Request, Response = transaction::Response, Error = BoxError>
+    V: Service<transaction::BlockRequest, Response = transaction::BlockResponse, Error = BoxError>
         + Send
         + Clone
         + 'static,
@@ -157,7 +157,7 @@ impl<S, V> Service<Request> for BlockVerifierRouter<S, V>
 where
     S: Service<zs::Request, Response = zs::Response, Error = BoxError> + Send + Clone + 'static,
     S::Future: Send + 'static,
-    V: Service<transaction::Request, Response = transaction::Response, Error = BoxError>
+    V: Service<transaction::BlockRequest, Response = transaction::BlockResponse, Error = BoxError>
         + Send
         + Clone
         + 'static,
@@ -219,7 +219,7 @@ where
 
 /// Initialize block and transaction verification services.
 ///
-/// Returns a block verifier, transaction verifier,
+/// Returns a block verifier, mempool transaction verifier,
 /// a [`BackgroundTaskHandles`] with the state checkpoint verify task,
 /// and the maximum configured checkpoint verification height.
 ///
@@ -251,8 +251,8 @@ pub async fn init<S, Mempool>(
 ) -> (
     Buffer<BoxService<Request, block::Hash, RouterError>, Request>,
     Buffer<
-        BoxService<transaction::Request, transaction::Response, TransactionError>,
-        transaction::Request,
+        BoxService<transaction::MempoolRequest, transaction::MempoolResponse, TransactionError>,
+        transaction::MempoolRequest,
     >,
     BackgroundTaskHandles,
     Height,
@@ -351,8 +351,13 @@ where
 
     // transaction verification
 
-    let transaction = transaction::Verifier::new(network, state_service.clone(), mempool);
-    let transaction = Buffer::new(BoxService::new(transaction), VERIFIER_BUFFER_BOUND);
+    let block_transaction = transaction::BlockTxVerifier::new(network, state_service.clone());
+    let block_transaction = Buffer::new(BoxService::new(block_transaction), VERIFIER_BUFFER_BOUND);
+
+    let mempool_transaction =
+        transaction::MempoolTxVerifier::new(network, state_service.clone(), mempool);
+    let mempool_transaction =
+        Buffer::new(BoxService::new(mempool_transaction), VERIFIER_BUFFER_BOUND);
 
     // block verification
     let (list, max_checkpoint_height) = init_checkpoint_list(config, network);
@@ -374,7 +379,8 @@ where
         "initializing block verifier router"
     );
 
-    let block = SemanticBlockVerifier::new(network, state_service.clone(), transaction.clone());
+    let block =
+        SemanticBlockVerifier::new(network, state_service.clone(), block_transaction.clone());
     let checkpoint = CheckpointVerifier::from_checkpoint_list(list, network, tip, state_service);
     let router = BlockVerifierRouter {
         checkpoint,
@@ -388,7 +394,12 @@ where
         state_checkpoint_verify_handle,
     };
 
-    (router, transaction, task_handles, max_checkpoint_height)
+    (
+        router,
+        mempool_transaction,
+        task_handles,
+        max_checkpoint_height,
+    )
 }
 
 /// Parses the checkpoint list for `network` and `config`.
@@ -427,8 +438,8 @@ pub async fn init_test<S>(
 ) -> (
     Buffer<BoxService<Request, block::Hash, RouterError>, Request>,
     Buffer<
-        BoxService<transaction::Request, transaction::Response, TransactionError>,
-        transaction::Request,
+        BoxService<transaction::MempoolRequest, transaction::MempoolResponse, TransactionError>,
+        transaction::MempoolRequest,
     >,
     BackgroundTaskHandles,
     Height,