Get the latest history tree not the tip height history tree

ZcashFoundation · Nov 21, 2023 · f7a43b7 · f7a43b7
1 parent cfd2db8
commit f7a43b7
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/zebra-state/src/service/finalized_state/zebra_db/chain.rs b/zebra-state/src/service/finalized_state/zebra_db/chain.rs
@@ -59,11 +59,10 @@ impl ZebraDb {
         let mut history_tree: Option<Arc<HistoryTree>> = self.db.zs_get(&history_tree_cf, &());
 
         if history_tree.is_none() {
-            let tip_height = self
-                .finalized_tip_height()
-                .expect("just checked for an empty database");
-
-            history_tree = self.db.zs_get(&history_tree_cf, &tip_height);
+            // In Zebra 1.4.0 and later, we only update the history tip tree when it has changed (for every block after heartwood).
+            // But we write with a `()` key, not a height key.
+            // So we need to look for the most recent update height if the `()` key has never been written.
+            history_tree = self.db.zs_last_key_value(&history_tree_cf);
         }
 
         history_tree.unwrap_or_default()