diff --git a/src/LedgerConsensus.cpp b/src/LedgerConsensus.cpp index 01e393750d..01f90fc152 100644 --- a/src/LedgerConsensus.cpp +++ b/src/LedgerConsensus.cpp @@ -434,7 +434,6 @@ void LedgerConsensus::closeLedger() { Log(lsINFO) << "Closing ledger"; Ledger::pointer initial = theApp->getMasterLedger().getCurrentLedger(); - statusChange(newcoin::neCLOSING_LEDGER, initial); statusChange(newcoin::neCLOSING_LEDGER, mPreviousLedger); } @@ -692,6 +691,7 @@ void LedgerConsensus::accept(SHAMap::pointer set) val.set_validation(&validation[0], validation.size()); theApp->getConnectionPool().relayMessage(NULL, boost::make_shared(val, newcoin::mtVALIDATION)); Log(lsINFO) << "Validation sent " << newLCL->getHash().GetHex(); + statusChange(newcoin::neACCEPTED_LEDGER, newOL); } void LedgerConsensus::endConsensus() diff --git a/src/LedgerMaster.cpp b/src/LedgerMaster.cpp index 0b13b55ecf..67ef56705d 100644 --- a/src/LedgerMaster.cpp +++ b/src/LedgerMaster.cpp @@ -20,7 +20,7 @@ void LedgerMaster::pushLedger(Ledger::pointer newLedger) // Caller should already have properly assembled this ledger into "ready-to-close" form -- // all candidate transactions must already be appled ScopedLock sl(mLock); - if(!!mFinalizedLedger) + if (!!mFinalizedLedger) { mFinalizedLedger->setClosed(); mFinalizedLedger->setAccepted(); @@ -37,7 +37,8 @@ void LedgerMaster::pushLedger(Ledger::pointer newLCL, Ledger::pointer newOL) assert(!newOL->isClosed() && !newOL->isAccepted()); ScopedLock sl(mLock); - mLedgerHistory.addAcceptedLedger(newLCL); + if (!!mFinalizedLedger) + mLedgerHistory.addAcceptedLedger(mFinalizedLedger); mFinalizedLedger = newLCL; mCurrentLedger = newOL; mEngine.setLedger(newOL); @@ -90,7 +91,7 @@ void LedgerMaster::applyFutureProposals(uint32 ledgerIndex) { for(list< pair >::iterator iter=mFutureProposals.begin(); iter !=mFutureProposals.end(); ) { - if( (*iter).second.ledgerindex() == ledgerIndex) + if ((*iter).second.ledgerindex() == ledgerIndex) { checkLedgerProposal((*iter).first,(*iter).second); mFutureProposals.erase(iter);