ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply tx to new open ledger on switch (RIPD-972):

Browse Source 
When the last closed ledger jumps, transactions from the
old open ledger and local transactions need to be applied
to the new open ledger or else transactions could get lost
locally (but still relayed, and therefore make it into a ledger).

A harmful effect is that rippled will report that the transaction
was not applied even when it was, making robust transaction
submission malfunction.
This commit is contained in:
Vinnie Falco
2015-07-02 10:54:39 -07:00
parent 3b6ea02920
commit 08bfd302fe
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/ripple/app/misc/NetworkOPs.cpp
View File

@@ -1399,25 +1399,38 @@ bool NetworkOPsImp::checkLastClosedLedger (
}
void NetworkOPsImp::switchLastClosedLedger (
Ledger::pointer newLedger, bool duringConsensus)
Ledger::pointer newLCL, bool duringConsensus)
{
// set the newledger as our last closed ledger -- this is abnormal code
// set the newLCL as our last closed ledger -- this is abnormal code
auto msg = duringConsensus ? "JUMPdc" : "JUMP";
m_journal.error << msg << " last closed ledger to " << newLedger->getHash ();
m_journal.error << msg << " last closed ledger to " << newLCL->getHash ();
clearNeedNetworkLedger ();
newLedger->setClosed ();
auto openLedger = std::make_shared<Ledger> (false, std::ref (*newLedger));
m_ledgerMaster.switchLedgers (newLedger, openLedger);
newLCL->setClosed ();
auto newOL = std::make_shared<Ledger> (false, std::ref (*newLCL));
// Caller must own master lock
{
// Apply tx in old open ledger to new
// open ledger. Then apply local tx.
auto const oldOL =
m_ledgerMaster.getCurrentLedger();
MetaView accum(*newLCL, tapNONE);
auto retries = m_localTX->getTxSet();
applyTransactions (&oldOL->txMap(),
accum, newLCL, retries);
accum.apply(*newOL, m_journal);
}
m_ledgerMaster.switchLedgers (newLCL, newOL);
protocol::TMStatusChange s;
s.set_newevent (protocol::neSWITCHED_LEDGER);
s.set_ledgerseq (newLedger->getLedgerSeq ());
s.set_ledgerseq (newLCL->getLedgerSeq ());
s.set_networktime (getApp().getOPs ().getNetworkTimeNC ());
uint256 hash = newLedger->getParentHash ();
uint256 hash = newLCL->getParentHash ();
s.set_ledgerhashprevious (hash.begin (), hash.size ());
hash = newLedger->getHash ();
hash = newLCL->getHash ();
s.set_ledgerhash (hash.begin (), hash.size ());
getApp ().overlay ().foreach (send_always (