Merge pull request #107 from zcash/small-fixes

Small fixes

Author: nuttycom

src/commands/create_multisig_address.rs

@@ -53,7 +53,7 @@ impl Command {
         let (multisig_script, addr) = multisig_script(threshold, pub_keys)?;
         let addr = addr.encode(&Network::from(network));
         println!("Created multisig address: {addr}");
-        println!("Script: {multisig_script:?}");
+        println!("Redeem script: {}", hex::encode(multisig_script.0));
 
         Ok(())
     }

src/commands/inspect.rs

@@ -167,7 +167,7 @@ async fn inspect_possible_hash(bytes: [u8; 32], context: Option<Context>, lookup
                     }
 
                     if let Some((tx, mined_height)) = mainnet.lookup_txid(candidate).await {
-                        transaction::inspect(tx, context, mined_height);
+                        transaction::inspect(tx, context, mined_height.map(|h| ("mainnet", h)));
                         return true;
                     }
                 }
@@ -182,7 +182,7 @@ async fn inspect_possible_hash(bytes: [u8; 32], context: Option<Context>, lookup
                     }
 
                     if let Some((tx, mined_height)) = testnet.lookup_txid(candidate).await {
-                        transaction::inspect(tx, context, mined_height);
+                        transaction::inspect(tx, context, mined_height.map(|h| ("testnet", h)));
                         return true;
                     }
                 }

src/commands/inspect/transaction.rs

@@ -157,12 +157,12 @@ impl Authorization for PrecomputedAuth {
 pub(crate) fn inspect(
     tx: Transaction,
     context: Option<Context>,
-    mined_height: Option<BlockHeight>,
+    mined_height: Option<(&'static str, BlockHeight)>,
 ) {
     eprintln!("Zcash transaction");
     eprintln!(" - ID: {}", tx.txid());
-    if let Some(height) = mined_height {
-        eprintln!(" - Mined in block {height}");
+    if let Some((chain, height)) = mined_height {
+        eprintln!(" - Mined in {chain} block {height}");
     }
     eprintln!(" - Version: {:?}", tx.version());
     match tx.version() {

src/main.rs

@@ -4,6 +4,7 @@
 //! It is only intended to show the overall light client workflow using this crate.
 
 use std::env;
+use std::io;
 use std::num::NonZeroU32;
 use std::sync::atomic::{AtomicUsize, Ordering};
 
@@ -88,7 +89,11 @@ fn main() -> Result<(), anyhow::Error> {
 
     let stdout_logger = if tui_logger.is_none() {
         let filter = tracing_subscriber::EnvFilter::from(level_filter);
-        Some(tracing_subscriber::fmt::layer().with_filter(filter))
+        Some(
+            tracing_subscriber::fmt::layer()
+                .with_writer(io::stderr)
+                .with_filter(filter),
+        )
     } else {
         None
     };