ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-21 11:35:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source
This commit is contained in:
Arthur Britto
2013-04-03 17:21:18 -07:00
parent 7b98191d68 5d4e7db788
commit 43b0e80cdc
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cpp/ripple/LedgerMaster.cpp
View File

@@ -122,10 +122,16 @@ Ledger::pointer LedgerMaster::closeLedger(bool recover)
TER LedgerMaster::doTransaction(SerializedTransaction::ref txn, TransactionEngineParams params, bool& didApply) TER LedgerMaster::doTransaction(SerializedTransaction::ref txn, TransactionEngineParams params, bool& didApply)
{ {
Ledger::pointer ledger;
TER result;
{
boost::recursive_mutex::scoped_lock sl(mLock); boost::recursive_mutex::scoped_lock sl(mLock);
TER result = mEngine.applyTransaction(*txn, params, didApply); result = mEngine.applyTransaction(*txn, params, didApply);
ledger = mEngine.getLedger();
}
// if (didApply) // if (didApply)
theApp->getOPs().pubProposedTransaction(mEngine.getLedger(), txn, result); theApp->getOPs().pubProposedTransaction(ledger, txn, result);
return result; return result;
} }

6
src/cpp/ripple/PlatRand.cpp
View File

@@ -8,12 +8,9 @@
bool AddSystemEntropy() bool AddSystemEntropy()
{ // Get entropy from the Windows crypto provider { // Get entropy from the Windows crypto provider
RAND_screen(); // this isn't really that safe since it only works for end users not servers
/* TODO: you need the cryptoAPI installed I think for the below to work. I suppose we should require people to install this to build the windows version
char name[512], rand[128]; char name[512], rand[128];
DWORD count = 500; DWORD count = 500;
HCRYPTOPROV cryptoHandle; HCRYPTPROV cryptoHandle;
if (!CryptGetDefaultProvider(PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT, name, &count)) if (!CryptGetDefaultProvider(PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT, name, &count))
{ {
@@ -43,7 +40,6 @@ bool AddSystemEntropy()
CryptReleaseContext(cryptoHandle, 0); CryptReleaseContext(cryptoHandle, 0);
RAND_seed(rand, 128); RAND_seed(rand, 128);
*/
return true; return true;
} }

1
src/cpp/ripple/UpdateTables.cpp
View File

@@ -96,6 +96,7 @@ static void addTxnSeqField()
Log(lsINFO) << i << " transactions updated"; Log(lsINFO) << i << " transactions updated";
} }
Log(lsINFO) << "Building new index";
db->executeSQL("CREATE INDEX AcctTxIndex ON AccountTransactions(Account, LedgerSeq, TxnSeq, TransID);"); db->executeSQL("CREATE INDEX AcctTxIndex ON AccountTransactions(Account, LedgerSeq, TxnSeq, TransID);");
db->executeSQL("END TRANSACTION;"); db->executeSQL("END TRANSACTION;");
} }