Add best_tip_hash field to BlockStatus

src/new_index/schema.rs

@@ -889,24 +889,26 @@ impl ChainQuery {
             .map(BlockId::from)
     }
 
-    pub fn get_block_status(&self, hash: &BlockHash) -> BlockStatus {
+    pub fn get_block_status(&self, hash: &BlockHash, best_tip_hash: &BlockHash) -> BlockStatus {
         // TODO differentiate orphaned and non-existing blocks? telling them apart requires
         // an additional db read.
 
         let headers = self.store.indexed_headers.read().unwrap();
 
         // header_by_blockhash only returns blocks that are part of the best chain,
         // or None for orphaned blocks.
-        headers
-            .header_by_blockhash(hash)
-            .map_or_else(BlockStatus::orphaned, |header| {
+        headers.header_by_blockhash(hash).map_or_else(
+            || BlockStatus::orphaned(*best_tip_hash),
+            |header| {
                 BlockStatus::confirmed(
                     header.height(),
                     headers
                         .header_by_height(header.height() + 1)
                         .map(|h| *h.hash()),
+                    *best_tip_hash,
                 )
-            })
+            },
+        )
     }
 
     #[cfg(not(feature = "liquid"))]

src/rest.rs

@@ -673,7 +673,8 @@ fn handle_request(
         }
         (&Method::GET, Some(&"block"), Some(hash), Some(&"status"), None, None) => {
             let hash = BlockHash::from_hex(hash)?;
-            let status = query.chain().get_block_status(&hash);
+            let best_tip_hash = query.chain().best_hash();
+            let status = query.chain().get_block_status(&hash, &best_tip_hash);
             let ttl = ttl_by_depth(status.height, query);
             json_response(status, ttl)
         }

src/util/block.rs

@@ -256,22 +256,29 @@ pub struct BlockStatus {
     pub in_best_chain: bool,
     pub height: Option<usize>,
     pub next_best: Option<BlockHash>,
+    pub best_tip_hash: BlockHash,
 }
 
 impl BlockStatus {
-    pub fn confirmed(height: usize, next_best: Option<BlockHash>) -> BlockStatus {
+    pub fn confirmed(
+        height: usize,
+        next_best: Option<BlockHash>,
+        best_tip_hash: BlockHash,
+    ) -> BlockStatus {
         BlockStatus {
             in_best_chain: true,
             height: Some(height),
             next_best,
+            best_tip_hash,
         }
     }
 
-    pub fn orphaned() -> BlockStatus {
+    pub fn orphaned(best_tip_hash: BlockHash) -> BlockStatus {
         BlockStatus {
             in_best_chain: false,
             height: None,
             next_best: None,
+            best_tip_hash,
         }
     }
 }