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

Merge branch 'faster_clientops' into develop

Browse Source 
Conflicts:
	src/cpp/ripple/LedgerEntrySet.cpp
This commit is contained in:
JoelKatz
2013-05-14 16:02:10 -07:00
parent d87c602c8c 6a84a95979
commit 232e93f214
11 changed files with 91 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -471,12 +471,12 @@ void Ledger::saveAcceptedLedger(Job&, bool fromConsensus)
BOOST_FOREACH(const AcceptedLedger::value_type& vt, aLedger->getMap())
{
uint256 txID = vt.second.getTransactionID();
uint256 txID = vt.second->getTransactionID();
theApp->getMasterTransaction().inLedger(txID, mLedgerSeq);
db->executeSQL(boost::str(deleteAcctTrans % txID.GetHex()));
const std::vector<RippleAddress>& accts = vt.second.getAffected();
const std::vector<RippleAddress>& accts = vt.second->getAffected();
if (!accts.empty())
{
std::string sql = "INSERT INTO AccountTransactions (TransID, Account, LedgerSeq, TxnSeq) VALUES ";
@@ -496,7 +496,7 @@ void Ledger::saveAcceptedLedger(Job&, bool fromConsensus)
sql += "',";
sql += boost::lexical_cast<std::string>(getLedgerSeq());
sql += ",";
sql += boost::lexical_cast<std::string>(vt.second.getTxnSeq());
sql += boost::lexical_cast<std::string>(vt.second->getTxnSeq());
sql += ")";
}
sql += ";";
@@ -507,7 +507,7 @@ void Ledger::saveAcceptedLedger(Job&, bool fromConsensus)
cLog(lsWARNING) << "Transaction in ledger " << mLedgerSeq << " affects no accounts";
db->executeSQL(SerializedTransaction::getMetaSQLInsertReplaceHeader() +
vt.second.getTxn()->getMetaSQL(getLedgerSeq(), vt.second.getEscMeta()) + ";");
vt.second->getTxn()->getMetaSQL(getLedgerSeq(), vt.second->getEscMeta()) + ";");
}
db->executeSQL("COMMIT TRANSACTION;");
}