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

Fixes for OfferCreate.

Browse Source
This commit is contained in:
Arthur Britto
2013-01-28 21:13:48 -08:00
parent 823e04b148
commit 28d4a71e76
1 changed files with 62 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,13 @@ TER OfferCreateTransactor::takeOffers(
STAmount& saTakerGot, STAmount& saTakerGot,
bool& bUnfunded) bool& bUnfunded)
{ {
// The book has the most elements. Take the perspective of the book.
// Book is ordered for taker: taker pays / taker gets, < is better
// The order is for the other books currencys for get and pays are opposites.
// We want the same ratio for the respective currencies.
// So we swap paid and gets for determing take quality.
assert(saTakerPays && saTakerGets); assert(saTakerPays && saTakerGets);
cLog(lsINFO) << "takeOffers: against book: " << uBookBase.ToString(); cLog(lsINFO) << "takeOffers: against book: " << uBookBase.ToString();
@@ -58,10 +65,13 @@ TER OfferCreateTransactor::takeOffers(
sleOfferDir = mEngine->entryCache(ltDIR_NODE, mEngine->getLedger()->getNextLedgerIndex(uTipIndex, uBookEnd)); sleOfferDir = mEngine->entryCache(ltDIR_NODE, mEngine->getLedger()->getNextLedgerIndex(uTipIndex, uBookEnd));
if (sleOfferDir) if (sleOfferDir)
{ {
cLog(lsINFO) << "takeOffers: possible counter offer found";
uTipIndex = sleOfferDir->getIndex(); uTipIndex = sleOfferDir->getIndex();
uTipQuality = Ledger::getQuality(uTipIndex); uTipQuality = Ledger::getQuality(uTipIndex);
cLog(lsINFO) << boost::str(boost::format("takeOffers: possible counter offer found: uTipQuality=%d uTipQuality=%s")
% uTipQuality
% uTipIndex.ToString());
} }
else else
{ {
@@ -77,7 +87,25 @@ TER OfferCreateTransactor::takeOffers(
|| (bPassive && uTakeQuality == uTipQuality)) || (bPassive && uTakeQuality == uTipQuality))
{ {
// Done. // Done.
cLog(lsINFO) << "takeOffers: done"; STAmount saTipRate = sleOfferDir ? STAmount::setRate(uTipQuality) : saTakerRate;
cLog(lsINFO) << boost::str(boost::format("takeOffers: done: dir=%d uTakeQuality=%d %c uTipQuality=%d saTakerRate=%s %c saTipRate=%s bPassive=%d")
% !!sleOfferDir
% uTakeQuality
% (uTakeQuality == uTipQuality
? '='
: uTakeQuality < uTipQuality
? '<'
: '>')
% uTipQuality
% saTakerRate
% (saTakerRate == saTipRate
? '='
: saTakerRate < saTipRate
? '<'
: '>')
% saTipRate
% bPassive);
terResult = tesSUCCESS; terResult = tesSUCCESS;
} }
@@ -143,9 +171,6 @@ TER OfferCreateTransactor::takeOffers(
} }
else else
{ {
STAmount saPay = saTakerPays - saTakerPaid;
if (saTakerFunds < saPay)
saPay = saTakerFunds;
STAmount saSubTakerPaid; STAmount saSubTakerPaid;
STAmount saSubTakerGot; STAmount saSubTakerGot;
STAmount saTakerIssuerFee; STAmount saTakerIssuerFee;
@@ -156,7 +181,6 @@ TER OfferCreateTransactor::takeOffers(
cLog(lsINFO) << "takeOffers: applyOffer: saTakerPaid: " << saTakerPaid.getFullText(); cLog(lsINFO) << "takeOffers: applyOffer: saTakerPaid: " << saTakerPaid.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saTakerFunds: " << saTakerFunds.getFullText(); cLog(lsINFO) << "takeOffers: applyOffer: saTakerFunds: " << saTakerFunds.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saOfferFunds: " << saOfferFunds.getFullText(); cLog(lsINFO) << "takeOffers: applyOffer: saOfferFunds: " << saOfferFunds.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saPay: " << saPay.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saOfferPays: " << saOfferPays.getFullText(); cLog(lsINFO) << "takeOffers: applyOffer: saOfferPays: " << saOfferPays.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saOfferGets: " << saOfferGets.getFullText(); cLog(lsINFO) << "takeOffers: applyOffer: saOfferGets: " << saOfferGets.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saOfferRate: " << saOfferRate.getFullText(); cLog(lsINFO) << "takeOffers: applyOffer: saOfferRate: " << saOfferRate.getFullText();
@@ -168,7 +192,7 @@ TER OfferCreateTransactor::takeOffers(
mEngine->getNodes().rippleTransferRate(uOfferOwnerID, uTakerAccountID, uTakerGetsAccountID), mEngine->getNodes().rippleTransferRate(uOfferOwnerID, uTakerAccountID, uTakerGetsAccountID),
saOfferRate, saOfferRate,
saOfferFunds, saOfferFunds,
saPay, saTakerFunds,
saOfferPays, saOfferPays,
saOfferGets, saOfferGets,
saTakerPays, saTakerPays,
@@ -221,17 +245,28 @@ TER OfferCreateTransactor::takeOffers(
{ {
terResult = mEngine->getNodes().accountSend(uOfferOwnerID, uTakerAccountID, saSubTakerGot); // Offer owner pays taker. terResult = mEngine->getNodes().accountSend(uOfferOwnerID, uTakerAccountID, saSubTakerGot); // Offer owner pays taker.
if (tesSUCCESS == terResult) // if (tesSUCCESS == terResult)
terResult = mEngine->getNodes().accountSend(uOfferOwnerID, uTakerGetsAccountID, saOfferIssuerFee); // Offer owner pays issuer transfer fee. // terResult = mEngine->getNodes().accountSend(uOfferOwnerID, uTakerGetsAccountID, saOfferIssuerFee); // Offer owner pays issuer transfer fee.
if (tesSUCCESS == terResult) if (tesSUCCESS == terResult)
terResult = mEngine->getNodes().accountSend(uTakerAccountID, uOfferOwnerID, saSubTakerPaid); // Taker pays offer owner. terResult = mEngine->getNodes().accountSend(uTakerAccountID, uOfferOwnerID, saSubTakerPaid); // Taker pays offer owner.
if (tesSUCCESS == terResult) // if (tesSUCCESS == terResult)
terResult = mEngine->getNodes().accountSend(uTakerAccountID, uTakerPaysAccountID, saTakerIssuerFee); // Taker pays issuer transfer fee. // terResult = mEngine->getNodes().accountSend(uTakerAccountID, uTakerPaysAccountID, saTakerIssuerFee); // Taker pays issuer transfer fee.
// Reduce amount considered paid by taker's rate (not actual cost). // Reduce amount considered paid by taker's rate (not actual cost).
saTakerPaid += std::min(saPay, STAmount::multiply(saSubTakerGot, saTakerRate, saPay)); STAmount saPay = saTakerPays - saTakerPaid;
if (saTakerFunds < saPay)
saPay = saTakerFunds;
STAmount saTakerUsed = STAmount::multiply(saSubTakerGot, saTakerRate, saTakerPays);
cLog(lsINFO) << "takeOffers: applyOffer: saPay: " << saPay.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saSubTakerGot: " << saSubTakerGot.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saTakerRate: " << saTakerRate.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saTakerUsed: " << saTakerUsed.getFullText();
saTakerPaid += std::min(saPay, saTakerUsed);
saTakerGot += saSubTakerGot; saTakerGot += saSubTakerGot;
if (tesSUCCESS == terResult) if (tesSUCCESS == terResult)
@@ -368,8 +403,8 @@ TER OfferCreateTransactor::doApply()
} }
} }
STAmount saOfferPaid; STAmount saPaid;
STAmount saOfferGot; STAmount saGot;
bool bUnfunded = false; bool bUnfunded = false;
if (tesSUCCESS == terResult) if (tesSUCCESS == terResult)
@@ -383,27 +418,29 @@ TER OfferCreateTransactor::doApply()
// Take using the parameters of the offer. // Take using the parameters of the offer.
cLog(lsWARNING) << "OfferCreate: takeOffers: BEFORE saTakerGets=" << saTakerGets.getFullText(); cLog(lsWARNING) << "OfferCreate: takeOffers: BEFORE saTakerGets=" << saTakerGets.getFullText();
terResult = takeOffers( terResult = takeOffers(
bPassive, bPassive,
uTakeBookBase, uTakeBookBase,
mTxnAccountID, mTxnAccountID,
mTxnAccount, mTxnAccount,
saTakerGets, saTakerGets, // Reverse as we are the taker for taking.
saTakerPays, saTakerPays,
saOfferPaid, // How much would have spent at full price. saPaid, // How much would have spent at full price.
saOfferGot, // How much was got. saGot, // How much was got.
bUnfunded); bUnfunded);
cLog(lsWARNING) << "OfferCreate: takeOffers=" << terResult; cLog(lsWARNING) << "OfferCreate: takeOffers=" << terResult;
cLog(lsWARNING) << "OfferCreate: takeOffers: saOfferPaid=" << saOfferPaid.getFullText(); cLog(lsWARNING) << "OfferCreate: takeOffers: saPaid=" << saPaid.getFullText();
cLog(lsWARNING) << "OfferCreate: takeOffers: saOfferGot=" << saOfferGot.getFullText(); cLog(lsWARNING) << "OfferCreate: takeOffers: saGot=" << saGot.getFullText();
cLog(lsWARNING) << "OfferCreate: takeOffers: saTakerPays=" << saTakerPays.getFullText();
cLog(lsWARNING) << "OfferCreate: takeOffers: AFTER saTakerGets=" << saTakerGets.getFullText();
if (tesSUCCESS == terResult && !bUnfunded) if (tesSUCCESS == terResult && !bUnfunded)
{ {
saTakerPays -= saOfferGot; // Reduce payin from takers by what offer just got. saTakerPays -= saGot; // Reduce pay in from takers by what offer just got.
saTakerGets -= saOfferPaid; // Reduce payout to takers by what srcAccount just paid. saTakerGets -= saPaid; // Reduce pay out to takers by what srcAccount just paid.
cLog(lsWARNING) << "OfferCreate: takeOffers: AFTER saTakerPays=" << saTakerPays.getFullText();
cLog(lsWARNING) << "OfferCreate: takeOffers: AFTER saTakerGets=" << saTakerGets.getFullText();
} }
} }
@@ -431,7 +468,7 @@ TER OfferCreateTransactor::doApply()
// Hope for more reserve to come in or more offers to consume. // Hope for more reserve to come in or more offers to consume.
terResult = tecINSUF_RESERVE_OFFER; terResult = tecINSUF_RESERVE_OFFER;
} }
else if (!saOfferPaid && !saOfferGot) else if (!saPaid && !saGot)
{ {
// Ledger is final, insufficent reserve to create offer, processed nothing. // Ledger is final, insufficent reserve to create offer, processed nothing.