From 691a3fa2e9d95014dab0f705dccd37871395abd9 Mon Sep 17 00:00:00 2001
From: Sean Bowe <ewillbefull@gmail.com>
Date: Fri, 27 Apr 2018 14:11:32 -0600
Subject: [PATCH] Rename hashReserved to hashSaplingAnchorEnd.

---
 src/chain.h              | 12 ++++++------
 src/miner.cpp            |  2 +-
 src/primitives/block.cpp |  4 ++--
 src/primitives/block.h   | 10 +++++-----
 src/txdb.cpp             |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/chain.h b/src/chain.h
index df05d82e6..4857435ed 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -169,7 +169,7 @@ public:
     //! block header
     int nVersion;
     uint256 hashMerkleRoot;
-    uint256 hashReserved;
+    uint256 hashSaplingAnchorEnd;
     unsigned int nTime;
     unsigned int nBits;
     uint256 nNonce;
@@ -200,7 +200,7 @@ public:
 
         nVersion       = 0;
         hashMerkleRoot = uint256();
-        hashReserved   = uint256();
+        hashSaplingAnchorEnd   = uint256();
         nTime          = 0;
         nBits          = 0;
         nNonce         = uint256();
@@ -218,7 +218,7 @@ public:
 
         nVersion       = block.nVersion;
         hashMerkleRoot = block.hashMerkleRoot;
-        hashReserved   = block.hashReserved;
+        hashSaplingAnchorEnd   = block.hashSaplingAnchorEnd;
         nTime          = block.nTime;
         nBits          = block.nBits;
         nNonce         = block.nNonce;
@@ -250,7 +250,7 @@ public:
         if (pprev)
             block.hashPrevBlock = pprev->GetBlockHash();
         block.hashMerkleRoot = hashMerkleRoot;
-        block.hashReserved   = hashReserved;
+        block.hashSaplingAnchorEnd   = hashSaplingAnchorEnd;
         block.nTime          = nTime;
         block.nBits          = nBits;
         block.nNonce         = nNonce;
@@ -372,7 +372,7 @@ public:
         READWRITE(this->nVersion);
         READWRITE(hashPrev);
         READWRITE(hashMerkleRoot);
-        READWRITE(hashReserved);
+        READWRITE(hashSaplingAnchorEnd);
         READWRITE(nTime);
         READWRITE(nBits);
         READWRITE(nNonce);
@@ -391,7 +391,7 @@ public:
         block.nVersion        = nVersion;
         block.hashPrevBlock   = hashPrev;
         block.hashMerkleRoot  = hashMerkleRoot;
-        block.hashReserved    = hashReserved;
+        block.hashSaplingAnchorEnd    = hashSaplingAnchorEnd;
         block.nTime           = nTime;
         block.nBits           = nBits;
         block.nNonce          = nNonce;
diff --git a/src/miner.cpp b/src/miner.cpp
index 44e28f82b..b0c2875a9 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -374,7 +374,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
 
         // Fill in header
         pblock->hashPrevBlock  = pindexPrev->GetBlockHash();
-        pblock->hashReserved   = uint256();
+        pblock->hashSaplingAnchorEnd   = uint256(); // TODO
         UpdateTime(pblock, Params().GetConsensus(), pindexPrev);
         pblock->nBits          = GetNextWorkRequired(pindexPrev, pblock, Params().GetConsensus());
         pblock->nSolution.clear();
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
index c2300c82a..b6c5ce9cc 100644
--- a/src/primitives/block.cpp
+++ b/src/primitives/block.cpp
@@ -112,12 +112,12 @@ uint256 CBlock::CheckMerkleBranch(uint256 hash, const std::vector<uint256>& vMer
 std::string CBlock::ToString() const
 {
     std::stringstream s;
-    s << strprintf("CBlock(hash=%s, ver=%d, hashPrevBlock=%s, hashMerkleRoot=%s, hashReserved=%s, nTime=%u, nBits=%08x, nNonce=%s, vtx=%u)\n",
+    s << strprintf("CBlock(hash=%s, ver=%d, hashPrevBlock=%s, hashMerkleRoot=%s, hashSaplingAnchorEnd=%s, nTime=%u, nBits=%08x, nNonce=%s, vtx=%u)\n",
         GetHash().ToString(),
         nVersion,
         hashPrevBlock.ToString(),
         hashMerkleRoot.ToString(),
-        hashReserved.ToString(),
+        hashSaplingAnchorEnd.ToString(),
         nTime, nBits, nNonce.ToString(),
         vtx.size());
     for (unsigned int i = 0; i < vtx.size(); i++)
diff --git a/src/primitives/block.h b/src/primitives/block.h
index f6eeebcbb..56288e10a 100644
--- a/src/primitives/block.h
+++ b/src/primitives/block.h
@@ -26,7 +26,7 @@ public:
     int32_t nVersion;
     uint256 hashPrevBlock;
     uint256 hashMerkleRoot;
-    uint256 hashReserved;
+    uint256 hashSaplingAnchorEnd;
     uint32_t nTime;
     uint32_t nBits;
     uint256 nNonce;
@@ -44,7 +44,7 @@ public:
         READWRITE(this->nVersion);
         READWRITE(hashPrevBlock);
         READWRITE(hashMerkleRoot);
-        READWRITE(hashReserved);
+        READWRITE(hashSaplingAnchorEnd);
         READWRITE(nTime);
         READWRITE(nBits);
         READWRITE(nNonce);
@@ -56,7 +56,7 @@ public:
         nVersion = CBlockHeader::CURRENT_VERSION;
         hashPrevBlock.SetNull();
         hashMerkleRoot.SetNull();
-        hashReserved.SetNull();
+        hashSaplingAnchorEnd.SetNull();
         nTime = 0;
         nBits = 0;
         nNonce = uint256();
@@ -118,7 +118,7 @@ public:
         block.nVersion       = nVersion;
         block.hashPrevBlock  = hashPrevBlock;
         block.hashMerkleRoot = hashMerkleRoot;
-        block.hashReserved   = hashReserved;
+        block.hashSaplingAnchorEnd   = hashSaplingAnchorEnd;
         block.nTime          = nTime;
         block.nBits          = nBits;
         block.nNonce         = nNonce;
@@ -158,7 +158,7 @@ public:
         READWRITE(this->nVersion);
         READWRITE(hashPrevBlock);
         READWRITE(hashMerkleRoot);
-        READWRITE(hashReserved);
+        READWRITE(hashSaplingAnchorEnd);
         READWRITE(nTime);
         READWRITE(nBits);
     }
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 6195d0b13..d14562a37 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -287,7 +287,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts()
                 pindexNew->hashSproutAnchor     = diskindex.hashSproutAnchor;
                 pindexNew->nVersion       = diskindex.nVersion;
                 pindexNew->hashMerkleRoot = diskindex.hashMerkleRoot;
-                pindexNew->hashReserved   = diskindex.hashReserved;
+                pindexNew->hashSaplingAnchorEnd   = diskindex.hashSaplingAnchorEnd;
                 pindexNew->nTime          = diskindex.nTime;
                 pindexNew->nBits          = diskindex.nBits;
                 pindexNew->nNonce         = diskindex.nNonce;