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

Properly track the most recently closed ledger. That's the first thing the

Browse Source 
network must agree on.
This commit is contained in:
JoelKatz
2012-05-01 02:27:27 -07:00
parent 3df579bbae
commit 77ebac9b5f
2 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/LedgerMaster.cpp
View File

@@ -22,14 +22,16 @@ bool LedgerMaster::addHeldTransaction(Transaction::pointer transaction)
void LedgerMaster::pushLedger(Ledger::pointer newLedger) 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); ScopedLock sl(mLock);
if(!!mFinalizingLedger) if(!!mFinalizedLedger)
{ {
mFinalizingLedger->setClosed(); mFinalizedLedger->setClosed();
mFinalizingLedger->setAccepted(); mFinalizedLedger->setAccepted();
mLedgerHistory.addAcceptedLedger(mFinalizingLedger); mLedgerHistory.addAcceptedLedger(mFinalizedLedger);
} }
mFinalizingLedger = mCurrentLedger; mFinalizedLedger = mCurrentLedger;
mCurrentLedger = newLedger; mCurrentLedger = newLedger;
mEngine.setLedger(newLedger); mEngine.setLedger(newLedger);
} }
@@ -38,27 +40,27 @@ void LedgerMaster::pushLedger(Ledger::pointer newLedger)
void LedgerMaster::startFinalization() void LedgerMaster::startFinalization()
{ {
mFinalizingLedger=mCurrentLedger; mFinalizedLedger=mCurrentLedger;
mCurrentLedger=Ledger::pointer(new Ledger(mCurrentLedger->getIndex()+1)); mCurrentLedger=Ledger::pointer(new Ledger(mCurrentLedger->getIndex()+1));
applyFutureProposals( mFinalizingLedger->getIndex() ); applyFutureProposals( mFinalizedLedger->getIndex() );
applyFutureTransactions( mCurrentLedger->getIndex() ); applyFutureTransactions( mCurrentLedger->getIndex() );
} }
void LedgerMaster::sendProposal() void LedgerMaster::sendProposal()
{ {
PackedMessage::pointer packet=Peer::createLedgerProposal(mFinalizingLedger); PackedMessage::pointer packet=Peer::createLedgerProposal(mFinalizedLedger);
theApp->getConnectionPool().relayMessage(NULL,packet); theApp->getConnectionPool().relayMessage(NULL,packet);
} }
void LedgerMaster::endFinalization() void LedgerMaster::endFinalization()
{ {
mFinalizingLedger->publishValidation(); mFinalizedLedger->publishValidation();
mLedgerHistory.addAcceptedLedger(mFinalizingLedger); mLedgerHistory.addAcceptedLedger(mFinalizedLedger);
mLedgerHistory.addLedger(mFinalizingLedger); mLedgerHistory.addLedger(mFinalizedLedger);
mFinalizingLedger=Ledger::pointer(); mFinalizedLedger=Ledger::pointer();
} }
void LedgerMaster::addFutureProposal(Peer::pointer peer,newcoin::ProposeLedger& otherLedger) void LedgerMaster::addFutureProposal(Peer::pointer peer,newcoin::ProposeLedger& otherLedger)
@@ -100,8 +102,8 @@ void LedgerMaster::checkLedgerProposal(Peer::pointer peer, newcoin::ProposeLedge
if(otherLedger.ledgerindex()<mCurrentLedger->getIndex()) if(otherLedger.ledgerindex()<mCurrentLedger->getIndex())
{ {
if( (!mFinalizingLedger) || if( (!mFinalizedLedger) ||
otherLedger.ledgerindex()<mFinalizingLedger->getIndex()) otherLedger.ledgerindex()<mFinalizedLedger->getIndex())
{ // you have already closed this ledger { // you have already closed this ledger
Ledger::pointer oldLedger=mLedgerHistory.getAcceptedLedger(otherLedger.ledgerindex()); Ledger::pointer oldLedger=mLedgerHistory.getAcceptedLedger(otherLedger.ledgerindex());
if(oldLedger) if(oldLedger)
@@ -115,11 +117,11 @@ void LedgerMaster::checkLedgerProposal(Peer::pointer peer, newcoin::ProposeLedge
}else }else
{ // you guys are on the same page { // you guys are on the same page
uint256 otherHash=protobufTo256(otherLedger.hash()); uint256 otherHash=protobufTo256(otherLedger.hash());
if(mFinalizingLedger->getHash()!= otherHash) if(mFinalizedLedger->getHash()!= otherHash)
{ {
if( mFinalizingLedger->getNumTransactions()>=otherLedger.numtransactions()) if( mFinalizedLedger->getNumTransactions()>=otherLedger.numtransactions())
{ {
peer->sendLedgerProposal(mFinalizingLedger); peer->sendLedgerProposal(mFinalizedLedger);
}else }else
{ {
peer->sendGetFullLedger(otherHash); peer->sendGetFullLedger(otherHash);
@@ -127,7 +129,7 @@ void LedgerMaster::checkLedgerProposal(Peer::pointer peer, newcoin::ProposeLedge
} }
} }
}else }else
{ // you haven't started finalizing this one yet save it for when you do { // you haven't started finalizde this one yet save it for when you do
addFutureProposal(peer,otherLedger); addFutureProposal(peer,otherLedger);
} }
} }

14
src/LedgerMaster.h
View File

@@ -19,8 +19,8 @@ class LedgerMaster
TransactionEngine mEngine; TransactionEngine mEngine;
Ledger::pointer mCurrentLedger; Ledger::pointer mCurrentLedger; // The ledger we are currently processiong
Ledger::pointer mFinalizingLedger; Ledger::pointer mFinalizedLedger; // The ledger that most recently closed
LedgerHistory mLedgerHistory; LedgerHistory mLedgerHistory;
@@ -39,7 +39,7 @@ public:
void setSynced() { mIsSynced=true; } void setSynced() { mIsSynced=true; }
Ledger::pointer getCurrentLedger() { return mCurrentLedger; } Ledger::pointer getCurrentLedger() { return mCurrentLedger; }
Ledger::pointer getClosingLedger() { return mFinalizingLedger; } Ledger::pointer getClosedLedger() { return mFinalizedLedger; }
TransactionEngineResult doTransaction(const SerializedTransaction& txn, TransactionEngineParams params) TransactionEngineResult doTransaction(const SerializedTransaction& txn, TransactionEngineParams params)
{ return mEngine.applyTransaction(txn, params); } { return mEngine.applyTransaction(txn, params); }
@@ -48,15 +48,15 @@ public:
Ledger::pointer getLedgerBySeq(uint32 index) Ledger::pointer getLedgerBySeq(uint32 index)
{ {
if(mCurrentLedger && (mCurrentLedger->getLedgerSeq()==index)) return mCurrentLedger; if (mCurrentLedger && (mCurrentLedger->getLedgerSeq()==index)) return mCurrentLedger;
if(mFinalizingLedger && (mFinalizingLedger->getLedgerSeq()==index)) return mFinalizingLedger; if (mFinalizedLedger && (mFinalizedLedger->getLedgerSeq()==index)) return mFinalizedLedger;
return mLedgerHistory.getLedgerBySeq(index); return mLedgerHistory.getLedgerBySeq(index);
} }
Ledger::pointer getLedgerByHash(const uint256& hash) Ledger::pointer getLedgerByHash(const uint256& hash)
{ {
if(mCurrentLedger && (mCurrentLedger->getHash()==hash)) return mCurrentLedger; if (mCurrentLedger && (mCurrentLedger->getHash() == hash)) return mCurrentLedger;
if(mFinalizingLedger && (mFinalizingLedger->getHash()==hash)) return mFinalizingLedger; if (mFinalizedLedger && (mFinalizedLedger->getHash() == hash)) return mFinalizedLedger;
return mLedgerHistory.getLedgerByHash(hash); return mLedgerHistory.getLedgerByHash(hash);
} }