From 09a7eb094b61a4db9fb7d7bc947c371d1849f9ba Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Fri, 6 Jul 2012 01:17:55 -0700 Subject: [PATCH] CC work. --- src/Ledger.h | 4 ++-- src/LedgerConsensus.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Ledger.h b/src/Ledger.h index 99cd25a7e3..fe0d1ab157 100644 --- a/src/Ledger.h +++ b/src/Ledger.h @@ -65,6 +65,7 @@ private: uint256 mHash, mParentHash, mTransHash, mAccountHash; uint64 mTotCoins; uint64 mCloseTime; // when this ledger should close / did close + uint64 mPrevClose; // when the previous ledger closed uint32 mLedgerSeq; bool mClosed, mValidHash, mAccepted, mImmutable; @@ -82,8 +83,7 @@ protected: static Ledger::pointer getSQL(const std::string& sqlStatement); - SLE::pointer getASNode(LedgerStateParms& parms, const uint256& nodeID, - LedgerEntryType let); + SLE::pointer getASNode(LedgerStateParms& parms, const uint256& nodeID, LedgerEntryType let); public: Ledger(const NewcoinAddress& masterID, uint64 startAmount); // used for the starting bootstrap ledger diff --git a/src/LedgerConsensus.cpp b/src/LedgerConsensus.cpp index 1602758e60..72dc958dcb 100644 --- a/src/LedgerConsensus.cpp +++ b/src/LedgerConsensus.cpp @@ -466,7 +466,7 @@ bool LedgerConsensus::updateOurPositions(int sinceClose) } if (it->second->getOurPosition()) // now a yes { - ourPosition->addItem(SHAMapItem(it->first, it->second->peekTransaction()), true); + ourPosition->addItem(SHAMapItem(it->first, it->second->peekTransaction()), true, false); addedTx.push_back(it->first); } else // now a no