Add hash to ViewInfo

src/ripple/app/ledger/Ledger.cpp

@@ -189,6 +189,7 @@ Ledger::Ledger (bool /* dummy */,
     info_.seq = prevLedger.info_.seq + 1;
     info_.parentCloseTime =
         prevLedger.info_.closeTime;
+    info_.hash = prevLedger.info().hash + uint256(1);
     prevLedger.updateHash ();
 
     mParentHash = prevLedger.getHash ();
@@ -274,7 +275,7 @@ void Ledger::updateHash()
     }
 
     // VFALCO This has to match addRaw
-    mHash = sha512Half(
+    info_.hash = sha512Half(
         HashPrefix::ledgerMaster,
         std::uint32_t(info_.seq),
         std::uint64_t(mTotCoins),
@@ -464,7 +465,7 @@ Ledger::getHash()
 {
     if (! mValidHash)
         updateHash();
-    return mHash;
+    return info_.hash;
 }
 
 bool Ledger::saveValidatedLedger (bool current)
@@ -516,7 +517,7 @@ bool Ledger::saveValidatedLedger (bool current)
         s.add32 (HashPrefix::ledgerMaster);
         addRaw (s);
         getApp().getNodeStore ().store (
-            hotLEDGER, std::move (s.modData ()), mHash);
+            hotLEDGER, std::move (s.modData ()), info_.hash);
     }
 
     AcceptedLedger::pointer aLedger;
@@ -527,7 +528,7 @@ bool Ledger::saveValidatedLedger (bool current)
     catch (...)
     {
         WriteLog (lsWARNING, Ledger) << "An accepted ledger was missing nodes";
-        getApp().getLedgerMaster().failedSave(info_.seq, mHash);
+        getApp().getLedgerMaster().failedSave(info_.seq, info_.hash);
         // Clients can now trust the database for information about this
         // ledger sequence.
         getApp().pendingSaves().erase(getLedgerSeq());
@@ -1065,10 +1066,10 @@ void Ledger::visitStateItems (std::function<void (SLE::ref)> callback) const
     }
     catch (SHAMapMissingNode&)
     {
-        if (mHash.isNonZero ())
+        if (info_.hash.isNonZero ())
         {
             getApp().getInboundLedgers().acquire(
-                mHash, info_.seq, InboundLedger::fcGENERIC);
+                info_.hash, info_.seq, InboundLedger::fcGENERIC);
         }
         throw;
     }
@@ -1132,7 +1133,7 @@ bool Ledger::walkLedger () const
 
 bool Ledger::assertSane ()
 {
-    if (mHash.isNonZero () &&
+    if (info_.hash.isNonZero () &&
             mAccountHash.isNonZero () &&
             stateMap_ &&
             txMap_ &&

src/ripple/app/ledger/Ledger.h

@@ -443,7 +443,6 @@ private:
     void deprecatedUpdateCachedFees() const;
 
     // The basic Ledger structure, can be opened, closed, or synching
-    uint256 mHash; // VFALCO This could be boost::optional<uint256>
     uint256 mParentHash;
     uint256 mTransHash;
     uint256 mAccountHash;

src/ripple/app/ledger/impl/MetaView.cpp

@@ -73,6 +73,9 @@ MetaView::MetaView (open_ledger_t,
     info_.seq = parent.info().seq + 1;
     info_.parentCloseTime =
         parent.info().closeTime;
+    // Give clients a unique but
+    // meaningless hash for open ledgers.
+    info_.hash = parent.info().hash + uint256(1);
 }
 
 MetaView::MetaView (BasicView const& base,

src/ripple/ledger/View.h

@@ -76,7 +76,7 @@ struct ViewInfo
 
     // Fields for closed ledgers
     // Closed means "tx set already determined"
-    //uint256 hash;
+    uint256 hash = zero;
     //uint256 txHash;
     //uint256 stateHash;
     //uint256 parentHash;