add(test): test disabled lightwalletd mempool gRPCs via zebrad logs

zebra-chain/src/block/hash.rs

@@ -29,11 +29,22 @@ impl Hash {
     ///
     /// Zebra displays transaction and block hashes in big-endian byte-order,
     /// following the u256 convention set by Bitcoin and zcashd.
-    fn bytes_in_display_order(&self) -> [u8; 32] {
+    pub fn bytes_in_display_order(&self) -> [u8; 32] {
         let mut reversed_bytes = self.0;
         reversed_bytes.reverse();
         reversed_bytes
     }
+
+    /// Convert bytes in big-endian byte-order into a [`block::Hash`](crate::block::Hash).
+    ///
+    /// Zebra displays transaction and block hashes in big-endian byte-order,
+    /// following the u256 convention set by Bitcoin and zcashd.
+    pub fn from_bytes_in_display_order(bytes_in_display_order: &[u8; 32]) -> Hash {
+        let mut internal_byte_order = *bytes_in_display_order;
+        internal_byte_order.reverse();
+
+        Hash(internal_byte_order)
+    }
 }
 
 impl fmt::Display for Hash {

zebra-chain/src/transaction/hash.rs

@@ -109,11 +109,22 @@ impl Hash {
     ///
     /// Zebra displays transaction and block hashes in big-endian byte-order,
     /// following the u256 convention set by Bitcoin and zcashd.
-    fn bytes_in_display_order(&self) -> [u8; 32] {
+    pub fn bytes_in_display_order(&self) -> [u8; 32] {
         let mut reversed_bytes = self.0;
         reversed_bytes.reverse();
         reversed_bytes
     }
+
+    /// Convert bytes in big-endian byte-order into a [`transaction::Hash`](crate::transaction::Hash).
+    ///
+    /// Zebra displays transaction and block hashes in big-endian byte-order,
+    /// following the u256 convention set by Bitcoin and zcashd.
+    pub fn from_bytes_in_display_order(bytes_in_display_order: &[u8; 32]) -> Hash {
+        let mut internal_byte_order = *bytes_in_display_order;
+        internal_byte_order.reverse();
+
+        Hash(internal_byte_order)
+    }
 }
 
 impl ToHex for &Hash {

zebra-consensus/src/transaction.rs

@@ -305,7 +305,7 @@ where
         let span = tracing::debug_span!("tx", ?tx_id);
 
         async move {
-            tracing::trace!(?req);
+            tracing::trace!(?tx_id, ?req, "got tx verify request");
 
             // Do basic checks first
             if let Some(block_time) = req.block_time() {
@@ -344,6 +344,8 @@ where
 
             check::spend_conflicts(&tx)?;
 
+            tracing::trace!(?tx_id, "passed quick checks");
+
             // "The consensus rules applied to valueBalance, vShieldedOutput, and bindingSig
             // in non-coinbase transactions MUST also be applied to coinbase transactions."
             //
@@ -360,6 +362,9 @@ where
 
             let cached_ffi_transaction =
                 Arc::new(CachedFfiTransaction::new(tx.clone(), spent_outputs));
+
+            tracing::trace!(?tx_id, "got state UTXOs");
+
             let async_checks = match tx.as_ref() {
                 Transaction::V1 { .. } | Transaction::V2 { .. } | Transaction::V3 { .. } => {
                     tracing::debug!(?tx, "got transaction with wrong version");
@@ -391,10 +396,14 @@ where
                 )?,
             };
 
+            tracing::trace!(?tx_id, "awaiting async checks...");
+
             // If the Groth16 parameter download hangs,
             // Zebra will timeout here, waiting for the async checks.
             async_checks.check().await?;
 
+            tracing::trace!(?tx_id, "finished async checks");
+
             // Get the `value_balance` to calculate the transaction fee.
             let value_balance = tx.value_balance(&spent_utxos);
 
@@ -429,6 +438,10 @@ where
 
             Ok(rsp)
         }
+        .inspect(move |result| {
+            // Hide the transaction data to avoid filling the logs
+            tracing::trace!(?tx_id, result = ?result.as_ref().map(|_tx| ()), "got tx verify result");
+        })
         .instrument(span)
         .boxed()
     }

zebra-node-services/src/mempool/gossip.rs

@@ -3,7 +3,7 @@
 use zebra_chain::transaction::{UnminedTx, UnminedTxId};
 
 /// A gossiped transaction, which can be the transaction itself or just its ID.
-#[derive(Debug, Eq, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub enum Gossip {
     /// Just the ID of an unmined transaction.
     Id(UnminedTxId),
@@ -20,6 +20,14 @@ impl Gossip {
             Gossip::Tx(tx) => tx.id,
         }
     }
+
+    /// Return the [`UnminedTx`] of a gossiped transaction, if we have it.
+    pub fn tx(&self) -> Option<UnminedTx> {
+        match self {
+            Gossip::Id(_) => None,
+            Gossip::Tx(tx) => Some(tx.clone()),
+        }
+    }
 }
 
 impl From<UnminedTxId> for Gossip {

zebra-rpc/src/config.rs

@@ -49,6 +49,10 @@ pub struct Config {
     ///
     /// If some of those instances are outdated or failed, RPC queries can be slow or inconsistent.
     pub parallel_cpu_threads: usize,
+
+    /// Test-only option that makes Zebra say it is at the chain tip,
+    /// no matter what the estimated height or local clock is.
+    pub debug_force_finished_sync: bool,
 }
 
 impl Default for Config {
@@ -59,6 +63,9 @@ impl Default for Config {
 
             // Use a single thread, so we can detect RPC port conflicts.
             parallel_cpu_threads: 1,
+
+            // Debug options are always off by default.
+            debug_force_finished_sync: false,
         }
     }
 }

zebra-rpc/src/methods.rs

@@ -243,9 +243,20 @@ where
     >,
     Tip: ChainTip,
 {
+    // Configuration
+    //
     /// Zebra's application version.
     app_version: String,
 
+    /// The configured network for this RPC service.
+    network: Network,
+
+    /// Test-only option that makes Zebra say it is at the chain tip,
+    /// no matter what the estimated height or local clock is.
+    debug_force_finished_sync: bool,
+
+    // Services
+    //
     /// A handle to the mempool service.
     mempool: Buffer<Mempool, mempool::Request>,
 
@@ -255,10 +266,8 @@ where
     /// Allows efficient access to the best tip of the blockchain.
     latest_chain_tip: Tip,
 
-    /// The configured network for this RPC service.
-    #[allow(dead_code)]
-    network: Network,
-
+    // Tasks
+    //
     /// A sender component of a channel used to send transactions to the queue.
     queue_sender: Sender<Option<UnminedTx>>,
 }
@@ -279,10 +288,11 @@ where
     /// Create a new instance of the RPC handler.
     pub fn new<Version>(
         app_version: Version,
+        network: Network,
+        debug_force_finished_sync: bool,
         mempool: Buffer<Mempool, mempool::Request>,
         state: State,
         latest_chain_tip: Tip,
-        network: Network,
     ) -> (Self, JoinHandle<()>)
     where
         Version: ToString,
@@ -300,10 +310,11 @@ where
 
         let rpc_impl = RpcImpl {
             app_version,
+            network,
+            debug_force_finished_sync,
             mempool: mempool.clone(),
             state: state.clone(),
             latest_chain_tip: latest_chain_tip.clone(),
-            network,
             queue_sender: runner.sender(),
         };
 
@@ -379,13 +390,18 @@ where
                 data: None,
             })?;
 
-        let estimated_height =
+        let mut estimated_height =
             if current_block_time > Utc::now() || zebra_estimated_height < tip_height {
                 tip_height
             } else {
                 zebra_estimated_height
             };
 
+        // If we're testing the mempool, force the estimated height to be the actual tip height.
+        if self.debug_force_finished_sync {
+            estimated_height = tip_height;
+        }
+
         // `upgrades` object
         //
         // Get the network upgrades in height order, like `zcashd`.
@@ -506,6 +522,8 @@ where
                 "mempool service returned more results than expected"
             );
 
+            tracing::debug!("sent transaction to mempool: {:?}", &queue_results[0]);
+
             match &queue_results[0] {
                 Ok(()) => Ok(SentTransactionHash(transaction_hash)),
                 Err(error) => Err(Error {