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

Ledger sequencing logic.

Browse Source
This commit is contained in:
JoelKatz
2012-05-08 03:45:34 -07:00
parent f9505e000d
commit f0480cb774
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/NetworkOPs.cpp
View File

@@ -22,7 +22,6 @@
NetworkOPs::NetworkOPs(boost::asio::io_service& io_service) : mMode(omDISCONNECTED), mNetTimer(io_service) NetworkOPs::NetworkOPs(boost::asio::io_service& io_service) : mMode(omDISCONNECTED), mNetTimer(io_service)
{ {
setStateTimer(5);
} }
time_t NetworkOPs::getNetworkTimeTT() time_t NetworkOPs::getNetworkTimeTT()
@@ -156,9 +155,15 @@ AccountState::pointer NetworkOPs::getAccountState(const NewcoinAddress& accountI
return theApp->getMasterLedger().getCurrentLedger()->getAccountState(accountID); return theApp->getMasterLedger().getCurrentLedger()->getAccountState(accountID);
} }
void NetworkOPs::setStateTimer(int seconds) void NetworkOPs::setStateTimer(int sec)
{ {
mNetTimer.expires_from_now(boost::posix_time::seconds(5)); uint64 closedTime = theApp->getMasterLedger().getCurrentLedger()->getCloseTimeNC();
uint64 now = getNetworkTimeNC();
if (now > closedTime) sec = 0;
if (sec > (closedTime - now)) sec = (closedTime - now);
mNetTimer.expires_from_now(boost::posix_time::seconds(sec));
mNetTimer.async_wait(boost::bind(&NetworkOPs::checkState, this)); mNetTimer.async_wait(boost::bind(&NetworkOPs::checkState, this));
} }
@@ -213,6 +218,7 @@ void NetworkOPs::checkState()
uint256 peerLedger = (*it)->getClosedLedgerHash(); uint256 peerLedger = (*it)->getClosedLedgerHash();
if (!!peerLedger) if (!!peerLedger)
{ {
// FIXME: If we have this ledger, don't count it if it's too far past its close time
ValidationCount& vc = ledgers[peerLedger]; ValidationCount& vc = ledgers[peerLedger];
if ((vc.nodesUsing == 0) || ((*it)->getNodePublic() > vc.highNode)) if ((vc.nodesUsing == 0) || ((*it)->getNodePublic() > vc.highNode))
vc.highNode = (*it)->getNodePublic(); vc.highNode = (*it)->getNodePublic();
@@ -267,7 +273,7 @@ void NetworkOPs::checkState()
} }
consensus = acq->getLedger(); consensus = acq->getLedger();
} }
switchLastClosedLedger(consensus); switchLastClosedLedger(consensus, false);
} }
if (mMode == omCONNECTED) if (mMode == omCONNECTED)
@@ -286,24 +292,38 @@ void NetworkOPs::checkState()
// check if the ledger is bad enough to go to omTRACKING // check if the ledger is bad enough to go to omTRACKING
} }
Ledger::pointer currentLedger = theApp->getMasterLedger().getCurrentLedger();
if (getNetworkTimeNC() > currentLedger->getCloseTimeNC())
{
currentLedger->setClosed();
switchLastClosedLedger(currentLedger, true);
}
setStateTimer(10); setStateTimer(10);
} }
void NetworkOPs::switchLastClosedLedger(Ledger::pointer newLedger) void NetworkOPs::switchLastClosedLedger(Ledger::pointer newLedger, bool normal)
{ // set the newledger as our last closed ledger { // set the newledger as our last closed ledger
// FIXME: Correct logic is: // FIXME: Correct logic is:
// 1) Mark this ledger closed, schedule it to be saved // 1) Mark this ledger closed, schedule it to be saved
// 2) Open a new subsequent ledger // 2) If normal, reprocess transactions
// 3) Walk back the previous ledger chain from our current ledger and the new last closed ledger // 3) Open a new subsequent ledger
// 4) Walk back the previous ledger chain from our current ledger and the new last closed ledger
// find a common previous ledger, if possible. Try to insert any transactions in our ledger // find a common previous ledger, if possible. Try to insert any transactions in our ledger
// chain into the new open ledger. Broadcast any that make it in. // chain into the new open ledger. Broadcast any that make it in.
#ifdef DEBUG
std::cerr << "Switching last closed ledger to " << newLedger->getHash().GetHex() << std::endl;
#endif
newLedger->setClosed();
Ledger::pointer openLedger = boost::make_shared<Ledger>(newLedger); Ledger::pointer openLedger = boost::make_shared<Ledger>(newLedger);
theApp->getMasterLedger().switchLedgers(newLedger, openLedger); theApp->getMasterLedger().switchLedgers(newLedger, openLedger);
#if 0 if (getNetworkTimeNC() > openLedger->getCloseTimeNC())
if (getNetworkTime() > openLedger->getCloseTime())
{ // this ledger has already closed { // this ledger has already closed
} }
#endif
} }
// FIXME: We have to tell peers when we change our active ledger