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 'master' into ripple

Browse Source 
Conflicts:
	src/LedgerEntrySet.cpp
This commit is contained in:
Arthur Britto
2012-08-10 13:14:58 -07:00
parent 622066f7e3 5b431ea4f6
commit 2f3f51b0ee
37 changed files with 946 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/TransactionEngine.cpp
View File

@@ -1944,7 +1944,7 @@ bool TransactionEngine::calcNodeOfferRev(
// Do a directory.
// - Drive on computing saCurDlvAct to derive saPrvDlvAct.
SLE::pointer sleDirectDir = entryCache(ltDIR_NODE, uDirectTip);
STAmount saOfrRate = STAmount::setRate(Ledger::getQuality(uDirectTip)); // For correct ratio
STAmount saOfrRate = STAmount::setRate(Ledger::getQuality(uDirectTip), uCurCurrencyID); // For correct ratio
unsigned int uEntry = 0;
uint256 uCurIndex;
@@ -2027,7 +2027,7 @@ bool TransactionEngine::calcNodeOfferRev(
// Do a directory.
// - Drive on computing saCurDlvAct to derive saPrvDlvAct.
SLE::pointer sleNxtDir = entryCache(ltDIR_NODE, uNxtTip);
// ??? STAmount saOfrRate = STAmount::setRate(STAmount::getQuality(uNxtTip)); // For correct ratio
// ??? STAmount saOfrRate = STAmount::setRate(STAmount::getQuality(uNxtTip), uCurCurrencyID); // For correct ratio
unsigned int uEntry = 0;
uint256 uNxtIndex;
@@ -2136,7 +2136,7 @@ bool TransactionEngine::calcNodeOfferFwd(
// Do a directory.
// - Drive on computing saPrvDlvAct to derive saCurDlvAct.
SLE::pointer sleDirectDir = entryCache(ltDIR_NODE, uDirectTip);
STAmount saOfrRate = STAmount::setRate(Ledger::getQuality(uDirectTip)); // For correct ratio
STAmount saOfrRate = STAmount::setRate(Ledger::getQuality(uDirectTip), uCurCurrencyID); // For correct ratio
unsigned int uEntry = 0;
uint256 uCurIndex;