ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some cases where ledger flags are incorrectly set.

Browse Source
This commit is contained in:
JoelKatz
2013-02-01 16:11:32 -08:00
parent db7e69164b
commit 9781c10736
8 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/cpp/ripple/Ledger.cpp
View File

@@ -113,14 +113,31 @@ Ledger::Ledger(const std::string& rawLedger, bool hasPrefix) :
zeroFees();
}
void Ledger::setImmutable()
{
if (!mImmutable)
{
updateHash();
mImmutable = true;
if (mTransactionMap)
mTransactionMap->setImmutable();
if (mAccountStateMap)
mAccountStateMap->setImmutable();
}
}
void Ledger::updateHash()
{
if (!mImmutable)
{
if (mTransactionMap) mTransHash = mTransactionMap->getHash();
else mTransHash.zero();
if (mAccountStateMap) mAccountHash = mAccountStateMap->getHash();
else mAccountHash.zero();
if (mTransactionMap)
mTransHash = mTransactionMap->getHash();
else
mTransHash.zero();
if (mAccountStateMap)
mAccountHash = mAccountStateMap->getHash();
else
mAccountHash.zero();
}
Serializer s(118);
@@ -170,18 +187,17 @@ void Ledger::setAccepted(uint32 closeTime, int closeResolution, bool correctClos
mCloseTime = correctCloseTime ? (closeTime - (closeTime % closeResolution)) : closeTime;
mCloseResolution = closeResolution;
mCloseFlags = correctCloseTime ? 0 : sLCF_NoConsensusTime;
updateHash();
mAccepted = true;
mImmutable = true;
setImmutable();
}
void Ledger::setAccepted()
{ // used when we acquired the ledger
// FIXME assert(mClosed && (mCloseTime != 0) && (mCloseResolution != 0));
mCloseTime -= mCloseTime % mCloseResolution;
updateHash();
if ((mCloseFlags & sLCF_NoConsensusTime) == 0)
mCloseTime -= mCloseTime % mCloseResolution;
mAccepted = true;
mImmutable = true;
setImmutable();
}
AccountState::pointer Ledger::getAccountState(const RippleAddress& accountID)
@@ -527,6 +543,8 @@ Ledger::pointer Ledger::getSQL(const std::string& sql)
Ledger::pointer ret = boost::make_shared<Ledger>(prevHash, transHash, accountHash, totCoins,
closingTime, prevClosingTime, closeFlags, closeResolution, ledgerSeq);
ret->setClosed();
if (theApp->getOPs().haveLedger(ledgerSeq))
ret->setAccepted();
if (ret->getHash() != ledgerHash)
{
if (sLog(lsERROR))