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

Merge branch 'pay'

Browse Source 
Conflicts:
	src/NetworkOPs.cpp
This commit is contained in:
Arthur Britto
2012-05-30 00:51:48 -07:00
parent 6123e3886a 68c8434a2b
commit a283d9df30
14 changed files with 328 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/LedgerNode.cpp
View File

@@ -141,15 +141,13 @@ SerializedLedgerEntry::pointer Ledger::getGenerator(LedgerStateParms& parms, con
// Ripple State
//
SerializedLedgerEntry::pointer Ledger::getRippleState(LedgerStateParms& parms, const NewcoinAddress& naA, const NewcoinAddress& naB, const uint160& uCurrency)
SerializedLedgerEntry::pointer Ledger::getRippleState(LedgerStateParms& parms, const uint256& uNode)
{
uint256 nodeID=getRippleStateIndex(naA, naB, uCurrency);
ScopedLock l(mAccountStateMap->Lock());
try
{
return getASNode(parms, nodeID, ltRIPPLE_STATE);
return getASNode(parms, uNode, ltRIPPLE_STATE);
}
catch (...)
{