devtools: Add block hash lookups

zcash · Jul 24, 2024 · 9e20253 · 9e20253
1 parent bc08f0c
commit 9e20253
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 3 deletions.
diff --git a/devtools/src/bin/inspect/block.rs b/devtools/src/bin/inspect/block.rs
@@ -283,6 +283,13 @@ fn inspect_header_inner(header: &BlockHeader, params: Option<Network>) {
     }
 }
 
+/// Used when a block hash is resolved via lightwalletd.
+pub(crate) fn inspect_block_hash(block: &CompactBlock, network: &'static str) {
+    eprintln!("Zcash block hash");
+    eprintln!(" - Network: {}", network);
+    eprintln!(" - Height: {}", block.height());
+}
+
 pub(crate) fn inspect(block: &Block, context: Option<Context>) {
     eprintln!("Zcash block");
     let params = block

diff --git a/devtools/src/bin/inspect/lookup.rs b/devtools/src/bin/inspect/lookup.rs
@@ -1,6 +1,7 @@
 use tonic::transport::{Channel, ClientTlsConfig};
-use zcash_client_backend::proto::service::{
-    compact_tx_streamer_client::CompactTxStreamerClient, TxFilter,
+use zcash_client_backend::proto::{
+    compact_formats::CompactBlock,
+    service::{compact_tx_streamer_client::CompactTxStreamerClient, BlockId, TxFilter},
 };
 use zcash_primitives::transaction::Transaction;
 use zcash_protocol::consensus::{BlockHeight, BranchId, Network};
@@ -58,6 +59,18 @@ impl Lightwalletd {
         })
     }
 
+    pub(crate) async fn lookup_block_hash(&mut self, candidate: [u8; 32]) -> Option<CompactBlock> {
+        let request = BlockId {
+            hash: candidate.into(),
+            ..Default::default()
+        };
+        self.inner
+            .get_block(request)
+            .await
+            .ok()
+            .map(|b| b.into_inner())
+    }
+
     pub(crate) async fn lookup_txid(
         &mut self,
         candidate: [u8; 32],

diff --git a/devtools/src/bin/inspect/main.rs b/devtools/src/bin/inspect/main.rs
@@ -121,7 +121,7 @@ fn inspect_bytes(bytes: Vec<u8>, context: Option<Context>, lookup: bool) {
 }
 
 fn inspect_possible_hash(bytes: [u8; 32], context: Option<Context>, lookup: bool) {
-    let maybe_mainnet_block_hash = bytes.iter().take(4).all(|c| c == &0);
+    let mut maybe_mainnet_block_hash = bytes.iter().take(4).all(|c| c == &0);
 
     if lookup {
         // Block hashes and txids are byte-reversed; we didn't do this when parsing the
@@ -134,6 +134,13 @@ fn inspect_possible_hash(bytes: [u8; 32], context: Option<Context>, lookup: bool
             match lookup::Lightwalletd::mainnet().await {
                 Err(e) => eprintln!("Error: Failed to connect to mainnet lightwalletd: {:?}", e),
                 Ok(mut mainnet) => {
+                    if let Some(block) = mainnet.lookup_block_hash(candidate).await {
+                        block::inspect_block_hash(&block, "main");
+                        return true;
+                    } else {
+                        maybe_mainnet_block_hash = false;
+                    }
+
                     if let Some((tx, mined_height)) = mainnet.lookup_txid(candidate).await {
                         transaction::inspect(tx, context, mined_height);
                         return true;
@@ -144,6 +151,11 @@ fn inspect_possible_hash(bytes: [u8; 32], context: Option<Context>, lookup: bool
             match lookup::Lightwalletd::testnet().await {
                 Err(e) => eprintln!("Error: Failed to connect to testnet lightwalletd: {:?}", e),
                 Ok(mut testnet) => {
+                    if let Some(block) = testnet.lookup_block_hash(candidate).await {
+                        block::inspect_block_hash(&block, "main");
+                        return true;
+                    }
+
                     if let Some((tx, mined_height)) = testnet.lookup_txid(candidate).await {
                         transaction::inspect(tx, context, mined_height);
                         return true;