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

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

Browse Source
This commit is contained in:
JoelKatz
2013-03-07 17:48:18 -08:00
parent 9685cd285c 62b37ff283
commit b98471b20a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -359,7 +359,7 @@ TER OfferCreateTransactor::doApply()
LedgerEntrySet lesCheckpoint = lesActive; // Checkpoint with just fees paid. LedgerEntrySet lesCheckpoint = lesActive; // Checkpoint with just fees paid.
lesActive.bumpSeq(); // Begin ledger variance. lesActive.bumpSeq(); // Begin ledger variance.
SLE::pointer slePayment = mEngine->entryCache(ltACCOUNT_ROOT, Ledger::getAccountRootIndex(mTxnAccountID)); SLE::pointer sleCreator = mEngine->entryCache(ltACCOUNT_ROOT, Ledger::getAccountRootIndex(mTxnAccountID));
if (uTxFlags & tfOfferCreateMask) if (uTxFlags & tfOfferCreateMask)
{ {
@@ -450,7 +450,7 @@ TER OfferCreateTransactor::doApply()
bPassive, bPassive,
uTakeBookBase, uTakeBookBase,
mTxnAccountID, mTxnAccountID,
slePayment, sleCreator,
saTakerGets, // Reverse as we are the taker for taking. saTakerGets, // Reverse as we are the taker for taking.
saTakerPays, saTakerPays,
saPaid, // How much would have spent at full price. saPaid, // How much would have spent at full price.
@@ -504,7 +504,7 @@ TER OfferCreateTransactor::doApply()
// Complete as is. // Complete as is.
nothing(); nothing();
} }
else if (mPriorBalance.getNValue() < mEngine->getLedger()->getReserve(mTxnAccount->getFieldU32(sfOwnerCount)+1)) else if (mPriorBalance.getNValue() < mEngine->getLedger()->getReserve(sleCreator->getFieldU32(sfOwnerCount)+1))
{ {
if (bOpenLedger) // Ledger is not final, can vote no. if (bOpenLedger) // Ledger is not final, can vote no.
{ {
@@ -540,7 +540,7 @@ TER OfferCreateTransactor::doApply()
if (tesSUCCESS == terResult) if (tesSUCCESS == terResult)
{ {
lesActive.ownerCountAdjust(mTxnAccountID, 1, slePayment); // Update owner count. lesActive.ownerCountAdjust(mTxnAccountID, 1, sleCreator); // Update owner count.
uint256 uBookBase = Ledger::getBookBase(uPaysCurrency, uPaysIssuerID, uGetsCurrency, uGetsIssuerID); uint256 uBookBase = Ledger::getBookBase(uPaysCurrency, uPaysIssuerID, uGetsCurrency, uGetsIssuerID);