refactor(logging): show block height instead of batch count in progress

Change fetcher and indexer progress logging from "blocks fetched / total
blocks" to "current height / chain tip height". This is more meaningful
during initial sync — users can immediately see how far along the chain
the sync has progressed rather than counting opaque batch numbers.

Author: philippem

src/new_index/fetch.rs

@@ -33,9 +33,10 @@ pub fn start_fetcher(
     daemon: &Daemon,
     new_headers: Vec<HeaderEntry>,
     batch_size: usize,
+    chain_tip_height: usize,
 ) -> Result<Fetcher<Vec<BlockEntry>>> {
     match from {
-        FetchFrom::Bitcoind => bitcoind_fetcher(daemon, new_headers, batch_size),
+        FetchFrom::Bitcoind => bitcoind_fetcher(daemon, new_headers, batch_size, chain_tip_height),
         FetchFrom::BlkFiles => blkfiles_fetcher(daemon, new_headers),
     }
 }
@@ -77,6 +78,7 @@ fn bitcoind_fetcher(
     daemon: &Daemon,
     new_headers: Vec<HeaderEntry>,
     batch_size: usize,
+    chain_tip_height: usize,
 ) -> Result<Fetcher<Vec<BlockEntry>>> {
     if let Some(tip) = new_headers.last() {
         debug!("{:?} ({} left to index)", tip, new_headers.len());
@@ -88,18 +90,17 @@ fn bitcoind_fetcher(
         chan.into_receiver(),
         spawn_thread("bitcoind_fetcher", move || {
             let mut fetcher_count = 0;
-            let mut blocks_fetched = 0;
             let total_blocks_fetched = new_headers.len();
             for entries in new_headers.chunks(batch_size) {
                 if fetcher_count % 50 == 0 && total_blocks_fetched >= 50 {
+                    let batch_height = entries.last().map(|e| e.height()).unwrap_or(0);
                     info!("fetching blocks {}/{} ({:.1}%)",
-                        blocks_fetched,
-                        total_blocks_fetched,
-                        blocks_fetched as f32 / total_blocks_fetched as f32 * 100.0
+                        batch_height,
+                        chain_tip_height,
+                        batch_height as f32 / chain_tip_height.max(1) as f32 * 100.0
                     );
                 }
                 fetcher_count += 1;
-                blocks_fetched += entries.len();
 
                 let blockhashes: Vec<BlockHash> = entries.iter().map(|e| *e.hash()).collect();
                 let blocks = daemon

src/new_index/schema.rs

@@ -293,6 +293,7 @@ impl Indexer {
         let tip = daemon.getbestblockhash()?;
 
         let (new_headers, reorged_since) = self.get_new_headers(&daemon, &tip)?;
+        let chain_tip_height = new_headers.last().map(|h| h.height()).unwrap_or(0);
 
         // Handle reorgs by undoing the reorged (stale) blocks first
         if let Some(reorged_since) = reorged_since {
@@ -324,7 +325,7 @@ impl Indexer {
 
             // Fetch the reorged blocks, then undo their history index db rows.
             // The txstore db rows are kept for reorged blocks/transactions.
-            start_fetcher(self.from, &daemon, reorged_headers, self.iconfig.block_batch_size)?
+            start_fetcher(self.from, &daemon, reorged_headers, self.iconfig.block_batch_size, chain_tip_height)?
                 .map(|blocks| self.undo_index(&blocks));
         }
 
@@ -350,20 +351,19 @@ impl Indexer {
         );
 
         let mut fetcher_count = 0;
-        let mut blocks_fetched = 0;
         let to_process_total = to_process.len();
 
-        start_fetcher(self.from, &daemon, to_process, self.iconfig.block_batch_size)?.map(|blocks| {
+        start_fetcher(self.from, &daemon, to_process, self.iconfig.block_batch_size, chain_tip_height)?.map(|blocks| {
             if fetcher_count % 25 == 0 && to_process_total > 20 {
+                let batch_height = blocks.last().map(|b| b.entry.height()).unwrap_or(0);
                 info!(
                     "processing blocks {}/{} ({:.1}%)",
-                    blocks_fetched,
-                    to_process_total,
-                    blocks_fetched as f32 / to_process_total as f32 * 100.0
+                    batch_height,
+                    chain_tip_height,
+                    batch_height as f32 / chain_tip_height.max(1) as f32 * 100.0
                 );
             }
             fetcher_count += 1;
-            blocks_fetched += blocks.len();
 
             // Add blocks not yet in txstore (idempotent: crash recovery skips already-added blocks)
             let to_add: Vec<_> = {