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

Tie to new code.

Browse Source
This commit is contained in:
JoelKatz
2012-04-23 16:01:23 -07:00
parent 2d24d05174
commit 39fbc0fb62
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/NetworkOPs.cpp
View File

@@ -38,10 +38,10 @@ Transaction::pointer NetworkOPs::processTransaction(Transaction::pointer trans,
return trans; return trans;
} }
Ledger::TransResult r=theApp->getMasterLedger().getCurrentLedger()->applyTransaction(trans); TransactionEngineResult r=theApp->getMasterLedger().doTransaction(*trans->getSTransaction(), tepNONE);
if(r==Ledger::TR_ERROR) throw Fault(IO_ERROR); if(r==terFAILED) throw Fault(IO_ERROR);
if((r==Ledger::TR_PREASEQ) || (r==Ledger::TR_BADLSEQ)) if(r == terPRE_SEQ)
{ // transaction should be held { // transaction should be held
#ifdef DEBUG #ifdef DEBUG
std::cerr << "Transaction should be held" << std::endl; std::cerr << "Transaction should be held" << std::endl;
@@ -51,7 +51,7 @@ Transaction::pointer NetworkOPs::processTransaction(Transaction::pointer trans,
theApp->getMasterLedger().addHeldTransaction(trans); theApp->getMasterLedger().addHeldTransaction(trans);
return trans; return trans;
} }
if( (r==Ledger::TR_PASTASEQ) || (r==Ledger::TR_ALREADY) ) if ( (r==terPAST_SEQ || r==terPAST_LEDGER) )
{ // duplicate or conflict { // duplicate or conflict
#ifdef DEBUG #ifdef DEBUG
std::cerr << "Transaction is obsolete" << std::endl; std::cerr << "Transaction is obsolete" << std::endl;
@@ -60,14 +60,18 @@ Transaction::pointer NetworkOPs::processTransaction(Transaction::pointer trans,
return trans; return trans;
} }
if(r==Ledger::TR_SUCCESS) if(r==terSUCCESS)
{ {
#ifdef DEBUG #ifdef DEBUG
std::cerr << "Transaction is now included, synching to wallet" << std::endl; std::cerr << "Transaction is now included, synching to wallet" << std::endl;
#endif #endif
trans->setStatus(INCLUDED); trans->setStatus(INCLUDED);
theApp->getMasterTransaction().canonicalize(trans, true); theApp->getMasterTransaction().canonicalize(trans, true);
theApp->getWallet().applyTransaction(trans);
// FIXME: Need code to get all accounts affected by a transaction and re-synch
// any of them that affect local accounts cached in memory. Or, we need to
// no cache the account balance information and always get it from the current ledger
// theApp->getWallet().applyTransaction(trans);
newcoin::TMTransaction *tx=new newcoin::TMTransaction(); newcoin::TMTransaction *tx=new newcoin::TMTransaction();