Fix chain_state tracking for empty blocks (v1.4.4)

chain/src/main.rs

@@ -342,6 +342,26 @@ async fn build_and_commit_masp_data_at_height(
     let num_transactions = block_data.transactions.len();
     let block_height = block_data.header.height;
 
+    // Fast-path: commit empty blocks immediately to maintain chain_state
+    // progress
+    if num_transactions == 0 {
+        tracing::info!(%block_height, "Processing empty block");
+        let chain_state = ChainState::new(block_data.header.height);
+
+        db_service::commit(
+            &mut checkpoint,
+            &conn_obj,
+            chain_state,
+            commitment_tree,
+            witness_map,
+            tx_notes_index,
+            shielded_txs,
+        )
+        .into_db_error()?;
+
+        return Ok(());
+    }
+
     tracing::info!(
         %block_height,
         num_transactions,
@@ -498,23 +518,12 @@ impl FetchedBlocks {
         }
 
         std::iter::from_fn(|| {
-            while let Some(block_data) = unprocessed_blocks.dequeue_next_block()
-            {
-                // Check if we can skip committing this block for now.
-                // This is because the block is empty. We can make a
-                // single remote procedure call to Postgres, when we
-                // exit.
-                if unprocessed_blocks.pre_commit_check_if_skip(&block_data) {
-                    tracing::info!(block_height = %block_data.header.height, "Skipping commit of empty block");
-                    continue;
-                }
-
+            if let Some(block_data) = unprocessed_blocks.dequeue_next_block() {
                 tracing::info!(block_height = %block_data.header.height, "Dequeued block to be processed");
-
-                return Some(block_data);
+                Some(block_data)
+            } else {
+                None
             }
-
-            None
         })
     }
 }