From e993acb2f04f5f9096da3b19e9861d4adb357c11 Mon Sep 17 00:00:00 2001
From: Duke <duke@hush.is>
Date: Tue, 13 Jun 2023 16:21:25 -0400
Subject: [PATCH] Fix missing hashFinalSaplingRoot in block header

---
 src/chain.cpp | 5 ++---
 src/chain.h   | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/chain.cpp b/src/chain.cpp
index dfa993f38..50ccc6472 100644
--- a/src/chain.cpp
+++ b/src/chain.cpp
@@ -52,8 +52,7 @@ CBlockHeader CBlockIndex::GetBlockHeader() const
         header.hashPrevBlock    = pprev->GetBlockHash();
     }
     header.hashMerkleRoot       = hashMerkleRoot;
-    // Hush does not have this, maybe some day
-    // header.hashBlockCommitments = hashBlockCommitments;
+    header.hashFinalSaplingRoot = hashFinalsaplingRoot;
     header.nTime                = nTime;
     header.nBits                = nBits;
     header.nNonce               = nNonce;
@@ -62,7 +61,7 @@ CBlockHeader CBlockIndex::GetBlockHeader() const
     } else {
         CDiskBlockIndex dbindex;
         if (!pblocktree->ReadDiskBlockIndex(GetBlockHash(), dbindex)) {
-            LogPrintf("%s: Failed to read index entry", __func__);
+            LogPrintf("%s: ReadDiskBlockIndex failed to read index entry of block %s", __func__, GetBlockHash().ToString().c_str());
             throw std::runtime_error("Failed to read index entry");
         }
         header.nSolution        = dbindex.GetSolution();
diff --git a/src/chain.h b/src/chain.h
index 67c63cf09..ce9bc1602 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -690,8 +690,7 @@ public:
         header.nVersion             = nVersion;
         header.hashPrevBlock        = hashPrev;
         header.hashMerkleRoot       = hashMerkleRoot;
-        // Hush does not have this, maybe some day
-        // header.hashBlockCommitments = hashBlockCommitments;
+        header.hashFinalSaplingRoot = hashFinalSaplingRoot;
         header.nTime                = nTime;
         header.nBits                = nBits;
         header.nNonce               = nNonce;