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

Partition some loging.

Browse Source
This commit is contained in:
Arthur Britto
2012-12-19 15:28:17 -08:00
parent 8e201277a6
commit 16d2b5d45e
4 changed files with 101 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/cpp/ripple/AccountSetTransactor.cpp
View File

@@ -1,8 +1,10 @@
#include "AccountSetTransactor.h" #include "AccountSetTransactor.h"
SETUP_LOG();
TER AccountSetTransactor::doApply() TER AccountSetTransactor::doApply()
{ {
Log(lsINFO) << "doAccountSet>"; cLog(lsINFO) << "doAccountSet>";
// //
// EmailHash // EmailHash
@@ -14,13 +16,13 @@ TER AccountSetTransactor::doApply()
if (!uHash) if (!uHash)
{ {
Log(lsINFO) << "doAccountSet: unset email hash"; cLog(lsINFO) << "doAccountSet: unset email hash";
mTxnAccount->makeFieldAbsent(sfEmailHash); mTxnAccount->makeFieldAbsent(sfEmailHash);
} }
else else
{ {
Log(lsINFO) << "doAccountSet: set email hash"; cLog(lsINFO) << "doAccountSet: set email hash";
mTxnAccount->setFieldH128(sfEmailHash, uHash); mTxnAccount->setFieldH128(sfEmailHash, uHash);
} }
@@ -36,13 +38,13 @@ TER AccountSetTransactor::doApply()
if (!uHash) if (!uHash)
{ {
Log(lsINFO) << "doAccountSet: unset wallet locator"; cLog(lsINFO) << "doAccountSet: unset wallet locator";
mTxnAccount->makeFieldAbsent(sfEmailHash); mTxnAccount->makeFieldAbsent(sfEmailHash);
} }
else else
{ {
Log(lsINFO) << "doAccountSet: set wallet locator"; cLog(lsINFO) << "doAccountSet: set wallet locator";
mTxnAccount->setFieldH256(sfWalletLocator, uHash); mTxnAccount->setFieldH256(sfWalletLocator, uHash);
} }
@@ -58,7 +60,7 @@ TER AccountSetTransactor::doApply()
} }
else else
{ {
Log(lsINFO) << "doAccountSet: set message key"; cLog(lsINFO) << "doAccountSet: set message key";
mTxnAccount->setFieldVL(sfMessageKey, mTxn.getFieldVL(sfMessageKey)); mTxnAccount->setFieldVL(sfMessageKey, mTxn.getFieldVL(sfMessageKey));
} }
@@ -73,13 +75,13 @@ TER AccountSetTransactor::doApply()
if (vucDomain.empty()) if (vucDomain.empty())
{ {
Log(lsINFO) << "doAccountSet: unset domain"; cLog(lsINFO) << "doAccountSet: unset domain";
mTxnAccount->makeFieldAbsent(sfDomain); mTxnAccount->makeFieldAbsent(sfDomain);
} }
else else
{ {
Log(lsINFO) << "doAccountSet: set domain"; cLog(lsINFO) << "doAccountSet: set domain";
mTxnAccount->setFieldVL(sfDomain, vucDomain); mTxnAccount->setFieldVL(sfDomain, vucDomain);
} }
@@ -95,25 +97,25 @@ TER AccountSetTransactor::doApply()
if (!uRate || uRate == QUALITY_ONE) if (!uRate || uRate == QUALITY_ONE)
{ {
Log(lsINFO) << "doAccountSet: unset transfer rate"; cLog(lsINFO) << "doAccountSet: unset transfer rate";
mTxnAccount->makeFieldAbsent(sfTransferRate); mTxnAccount->makeFieldAbsent(sfTransferRate);
} }
else if (uRate > QUALITY_ONE) else if (uRate > QUALITY_ONE)
{ {
Log(lsINFO) << "doAccountSet: set transfer rate"; cLog(lsINFO) << "doAccountSet: set transfer rate";
mTxnAccount->setFieldU32(sfTransferRate, uRate); mTxnAccount->setFieldU32(sfTransferRate, uRate);
} }
else else
{ {
Log(lsINFO) << "doAccountSet: bad transfer rate"; cLog(lsINFO) << "doAccountSet: bad transfer rate";
return temBAD_TRANSFER_RATE; return temBAD_TRANSFER_RATE;
} }
} }
Log(lsINFO) << "doAccountSet<"; cLog(lsINFO) << "doAccountSet<";
return tesSUCCESS; return tesSUCCESS;
} }

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

@@ -26,7 +26,7 @@ TER OfferCreateTransactor::takeOffers(
{ {
assert(saTakerPays && saTakerGets); assert(saTakerPays && saTakerGets);
Log(lsINFO) << "takeOffers: against book: " << uBookBase.ToString(); cLog(lsINFO) << "takeOffers: against book: " << uBookBase.ToString();
uint256 uTipIndex = uBookBase; uint256 uTipIndex = uBookBase;
const uint256 uBookEnd = Ledger::getQualityNext(uBookBase); const uint256 uBookEnd = Ledger::getQualityNext(uBookBase);
@@ -55,14 +55,14 @@ 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)
{ {
Log(lsINFO) << "takeOffers: possible counter offer found"; cLog(lsINFO) << "takeOffers: possible counter offer found";
uTipIndex = sleOfferDir->getIndex(); uTipIndex = sleOfferDir->getIndex();
uTipQuality = Ledger::getQuality(uTipIndex); uTipQuality = Ledger::getQuality(uTipIndex);
} }
else else
{ {
Log(lsINFO) << "takeOffers: counter offer book is empty: " cLog(lsINFO) << "takeOffers: counter offer book is empty: "
<< uTipIndex.ToString() << uTipIndex.ToString()
<< " ... " << " ... "
<< uBookEnd.ToString(); << uBookEnd.ToString();
@@ -74,14 +74,14 @@ TER OfferCreateTransactor::takeOffers(
|| (bPassive && uTakeQuality == uTipQuality)) || (bPassive && uTakeQuality == uTipQuality))
{ {
// Done. // Done.
Log(lsINFO) << "takeOffers: done"; cLog(lsINFO) << "takeOffers: done";
terResult = tesSUCCESS; terResult = tesSUCCESS;
} }
else else
{ {
// Have an offer directory to consider. // Have an offer directory to consider.
Log(lsINFO) << "takeOffers: considering dir: " << sleOfferDir->getJson(0); cLog(lsINFO) << "takeOffers: considering dir: " << sleOfferDir->getJson(0);
SLE::pointer sleBookNode; SLE::pointer sleBookNode;
unsigned int uBookEntry; unsigned int uBookEntry;
@@ -91,7 +91,7 @@ TER OfferCreateTransactor::takeOffers(
SLE::pointer sleOffer = mEngine->entryCache(ltOFFER, uOfferIndex); SLE::pointer sleOffer = mEngine->entryCache(ltOFFER, uOfferIndex);
Log(lsINFO) << "takeOffers: considering offer : " << sleOffer->getJson(0); cLog(lsINFO) << "takeOffers: considering offer : " << sleOffer->getJson(0);
const uint160 uOfferOwnerID = sleOffer->getFieldAccount(sfAccount).getAccountID(); const uint160 uOfferOwnerID = sleOffer->getFieldAccount(sfAccount).getAccountID();
STAmount saOfferPays = sleOffer->getFieldAmount(sfTakerGets); STAmount saOfferPays = sleOffer->getFieldAmount(sfTakerGets);
@@ -100,14 +100,14 @@ TER OfferCreateTransactor::takeOffers(
if (sleOffer->isFieldPresent(sfExpiration) && sleOffer->getFieldU32(sfExpiration) <= mEngine->getLedger()->getParentCloseTimeNC()) if (sleOffer->isFieldPresent(sfExpiration) && sleOffer->getFieldU32(sfExpiration) <= mEngine->getLedger()->getParentCloseTimeNC())
{ {
// Offer is expired. Expired offers are considered unfunded. Delete it. // Offer is expired. Expired offers are considered unfunded. Delete it.
Log(lsINFO) << "takeOffers: encountered expired offer"; cLog(lsINFO) << "takeOffers: encountered expired offer";
usOfferUnfundedFound.insert(uOfferIndex); usOfferUnfundedFound.insert(uOfferIndex);
} }
else if (uOfferOwnerID == uTakerAccountID) else if (uOfferOwnerID == uTakerAccountID)
{ {
// Would take own offer. Consider old offer expired. Delete it. // Would take own offer. Consider old offer expired. Delete it.
Log(lsINFO) << "takeOffers: encountered taker's own old offer"; cLog(lsINFO) << "takeOffers: encountered taker's own old offer";
usOfferUnfundedFound.insert(uOfferIndex); usOfferUnfundedFound.insert(uOfferIndex);
} }
@@ -115,7 +115,7 @@ TER OfferCreateTransactor::takeOffers(
{ {
// Get offer funds available. // Get offer funds available.
Log(lsINFO) << "takeOffers: saOfferPays=" << saOfferPays.getFullText(); cLog(lsINFO) << "takeOffers: saOfferPays=" << saOfferPays.getFullText();
STAmount saOfferFunds = mEngine->getNodes().accountFunds(uOfferOwnerID, saOfferPays, true); STAmount saOfferFunds = mEngine->getNodes().accountFunds(uOfferOwnerID, saOfferPays, true);
STAmount saTakerFunds = mEngine->getNodes().accountFunds(uTakerAccountID, saTakerPays, true); STAmount saTakerFunds = mEngine->getNodes().accountFunds(uTakerAccountID, saTakerPays, true);
@@ -124,7 +124,7 @@ TER OfferCreateTransactor::takeOffers(
if (!saOfferFunds.isPositive()) if (!saOfferFunds.isPositive())
{ {
// Offer is unfunded, possibly due to previous balance action. // Offer is unfunded, possibly due to previous balance action.
Log(lsINFO) << "takeOffers: offer unfunded: delete"; cLog(lsINFO) << "takeOffers: offer unfunded: delete";
boost::unordered_set<uint160>::iterator account = usAccountTouched.find(uOfferOwnerID); boost::unordered_set<uint160>::iterator account = usAccountTouched.find(uOfferOwnerID);
if (account != usAccountTouched.end()) if (account != usAccountTouched.end())
@@ -148,15 +148,15 @@ TER OfferCreateTransactor::takeOffers(
STAmount saTakerIssuerFee; STAmount saTakerIssuerFee;
STAmount saOfferIssuerFee; STAmount saOfferIssuerFee;
Log(lsINFO) << "takeOffers: applyOffer: saTakerPays: " << saTakerPays.getFullText(); cLog(lsINFO) << "takeOffers: applyOffer: saTakerPays: " << saTakerPays.getFullText();
Log(lsINFO) << "takeOffers: applyOffer: saTakerPaid: " << saTakerPaid.getFullText(); cLog(lsINFO) << "takeOffers: applyOffer: saTakerPaid: " << saTakerPaid.getFullText();
Log(lsINFO) << "takeOffers: applyOffer: saTakerFunds: " << saTakerFunds.getFullText(); cLog(lsINFO) << "takeOffers: applyOffer: saTakerFunds: " << saTakerFunds.getFullText();
Log(lsINFO) << "takeOffers: applyOffer: saOfferFunds: " << saOfferFunds.getFullText(); cLog(lsINFO) << "takeOffers: applyOffer: saOfferFunds: " << saOfferFunds.getFullText();
Log(lsINFO) << "takeOffers: applyOffer: saPay: " << saPay.getFullText(); cLog(lsINFO) << "takeOffers: applyOffer: saPay: " << saPay.getFullText();
Log(lsINFO) << "takeOffers: applyOffer: saOfferPays: " << saOfferPays.getFullText(); cLog(lsINFO) << "takeOffers: applyOffer: saOfferPays: " << saOfferPays.getFullText();
Log(lsINFO) << "takeOffers: applyOffer: saOfferGets: " << saOfferGets.getFullText(); cLog(lsINFO) << "takeOffers: applyOffer: saOfferGets: " << saOfferGets.getFullText();
Log(lsINFO) << "takeOffers: applyOffer: saTakerPays: " << saTakerPays.getFullText(); cLog(lsINFO) << "takeOffers: applyOffer: saTakerPays: " << saTakerPays.getFullText();
Log(lsINFO) << "takeOffers: applyOffer: saTakerGets: " << saTakerGets.getFullText(); cLog(lsINFO) << "takeOffers: applyOffer: saTakerGets: " << saTakerGets.getFullText();
bool bOfferDelete = STAmount::applyOffer( bool bOfferDelete = STAmount::applyOffer(
mEngine->getNodes().rippleTransferRate(uTakerAccountID, uOfferOwnerID, uTakerPaysAccountID), mEngine->getNodes().rippleTransferRate(uTakerAccountID, uOfferOwnerID, uTakerPaysAccountID),
@@ -172,8 +172,8 @@ TER OfferCreateTransactor::takeOffers(
saTakerIssuerFee, saTakerIssuerFee,
saOfferIssuerFee); saOfferIssuerFee);
Log(lsINFO) << "takeOffers: applyOffer: saSubTakerPaid: " << saSubTakerPaid.getFullText(); cLog(lsINFO) << "takeOffers: applyOffer: saSubTakerPaid: " << saSubTakerPaid.getFullText();
Log(lsINFO) << "takeOffers: applyOffer: saSubTakerGot: " << saSubTakerGot.getFullText(); cLog(lsINFO) << "takeOffers: applyOffer: saSubTakerGot: " << saSubTakerGot.getFullText();
// Adjust offer // Adjust offer
@@ -188,7 +188,7 @@ TER OfferCreateTransactor::takeOffers(
if (bOfferDelete) if (bOfferDelete)
{ {
// Offer now fully claimed or now unfunded. // Offer now fully claimed or now unfunded.
Log(lsINFO) << "takeOffers: offer claimed: delete"; cLog(lsINFO) << "takeOffers: offer claimed: delete";
usOfferUnfundedBecame.insert(uOfferIndex); // Delete unfunded offer on success. usOfferUnfundedBecame.insert(uOfferIndex); // Delete unfunded offer on success.
@@ -197,7 +197,7 @@ TER OfferCreateTransactor::takeOffers(
} }
else else
{ {
Log(lsINFO) << "takeOffers: offer partial claim."; cLog(lsINFO) << "takeOffers: offer partial claim.";
} }
// Offer owner pays taker. // Offer owner pays taker.
@@ -249,13 +249,13 @@ TER OfferCreateTransactor::takeOffers(
TER OfferCreateTransactor::doApply() TER OfferCreateTransactor::doApply()
{ {
Log(lsWARNING) << "doOfferCreate> " << mTxn.getJson(0); cLog(lsWARNING) << "doOfferCreate> " << mTxn.getJson(0);
const uint32 uTxFlags = mTxn.getFlags(); const uint32 uTxFlags = mTxn.getFlags();
const bool bPassive = isSetBit(uTxFlags, tfPassive); const bool bPassive = isSetBit(uTxFlags, tfPassive);
STAmount saTakerPays = mTxn.getFieldAmount(sfTakerPays); STAmount saTakerPays = mTxn.getFieldAmount(sfTakerPays);
STAmount saTakerGets = mTxn.getFieldAmount(sfTakerGets); STAmount saTakerGets = mTxn.getFieldAmount(sfTakerGets);
Log(lsINFO) << boost::str(boost::format("doOfferCreate: saTakerPays=%s saTakerGets=%s") cLog(lsINFO) << boost::str(boost::format("doOfferCreate: saTakerPays=%s saTakerGets=%s")
% saTakerPays.getFullText() % saTakerPays.getFullText()
% saTakerGets.getFullText()); % saTakerGets.getFullText());
@@ -267,7 +267,7 @@ TER OfferCreateTransactor::doApply()
const uint256 uLedgerIndex = Ledger::getOfferIndex(mTxnAccountID, uSequence); const uint256 uLedgerIndex = Ledger::getOfferIndex(mTxnAccountID, uSequence);
Log(lsINFO) << "doOfferCreate: Creating offer node: " << uLedgerIndex.ToString() << " uSequence=" << uSequence; cLog(lsINFO) << "doOfferCreate: Creating offer node: " << uLedgerIndex.ToString() << " uSequence=" << uSequence;
const uint160 uPaysCurrency = saTakerPays.getCurrency(); const uint160 uPaysCurrency = saTakerPays.getCurrency();
const uint160 uGetsCurrency = saTakerGets.getCurrency(); const uint160 uGetsCurrency = saTakerGets.getCurrency();
@@ -280,49 +280,49 @@ TER OfferCreateTransactor::doApply()
if (uTxFlags & tfOfferCreateMask) if (uTxFlags & tfOfferCreateMask)
{ {
Log(lsINFO) << "doOfferCreate: Malformed transaction: Invalid flags set."; cLog(lsINFO) << "doOfferCreate: Malformed transaction: Invalid flags set.";
return temINVALID_FLAG; return temINVALID_FLAG;
} }
else if (bHaveExpiration && !uExpiration) else if (bHaveExpiration && !uExpiration)
{ {
Log(lsWARNING) << "doOfferCreate: Malformed offer: bad expiration"; cLog(lsWARNING) << "doOfferCreate: Malformed offer: bad expiration";
terResult = temBAD_EXPIRATION; terResult = temBAD_EXPIRATION;
} }
else if (bHaveExpiration && mEngine->getLedger()->getParentCloseTimeNC() >= uExpiration) else if (bHaveExpiration && mEngine->getLedger()->getParentCloseTimeNC() >= uExpiration)
{ {
Log(lsWARNING) << "doOfferCreate: Expired transaction: offer expired"; cLog(lsWARNING) << "doOfferCreate: Expired transaction: offer expired";
terResult = tesSUCCESS; // Only charged fee. terResult = tesSUCCESS; // Only charged fee.
} }
else if (saTakerPays.isNative() && saTakerGets.isNative()) else if (saTakerPays.isNative() && saTakerGets.isNative())
{ {
Log(lsWARNING) << "doOfferCreate: Malformed offer: XRP for XRP"; cLog(lsWARNING) << "doOfferCreate: Malformed offer: XRP for XRP";
terResult = temBAD_OFFER; terResult = temBAD_OFFER;
} }
else if (!saTakerPays.isPositive() || !saTakerGets.isPositive()) else if (!saTakerPays.isPositive() || !saTakerGets.isPositive())
{ {
Log(lsWARNING) << "doOfferCreate: Malformed offer: bad amount"; cLog(lsWARNING) << "doOfferCreate: Malformed offer: bad amount";
terResult = temBAD_OFFER; terResult = temBAD_OFFER;
} }
else if (uPaysCurrency == uGetsCurrency && uPaysIssuerID == uGetsIssuerID) else if (uPaysCurrency == uGetsCurrency && uPaysIssuerID == uGetsIssuerID)
{ {
Log(lsWARNING) << "doOfferCreate: Malformed offer: redundant offer"; cLog(lsWARNING) << "doOfferCreate: Malformed offer: redundant offer";
terResult = temREDUNDANT; terResult = temREDUNDANT;
} }
else if (saTakerPays.isNative() != !uPaysIssuerID || saTakerGets.isNative() != !uGetsIssuerID) else if (saTakerPays.isNative() != !uPaysIssuerID || saTakerGets.isNative() != !uGetsIssuerID)
{ {
Log(lsWARNING) << "doOfferCreate: Malformed offer: bad issuer"; cLog(lsWARNING) << "doOfferCreate: Malformed offer: bad issuer";
terResult = temBAD_ISSUER; terResult = temBAD_ISSUER;
} }
else if (!mEngine->getNodes().accountFunds(mTxnAccountID, saTakerGets, true).isPositive()) else if (!mEngine->getNodes().accountFunds(mTxnAccountID, saTakerGets, true).isPositive())
{ {
Log(lsWARNING) << "doOfferCreate: delay: Offers must be at least partially funded."; cLog(lsWARNING) << "doOfferCreate: delay: Offers must be at least partially funded.";
terResult = terUNFUNDED; terResult = terUNFUNDED;
} }
@@ -343,7 +343,7 @@ TER OfferCreateTransactor::doApply()
if (!sleTakerPays) if (!sleTakerPays)
{ {
Log(lsWARNING) << "doOfferCreate: delay: can't receive IOUs from non-existent issuer: " << RippleAddress::createHumanAccountID(uPaysIssuerID); cLog(lsWARNING) << "doOfferCreate: delay: can't receive IOUs from non-existent issuer: " << RippleAddress::createHumanAccountID(uPaysIssuerID);
terResult = terNO_ACCOUNT; terResult = terNO_ACCOUNT;
} }
@@ -355,13 +355,13 @@ TER OfferCreateTransactor::doApply()
STAmount saOfferGot; STAmount saOfferGot;
const uint256 uTakeBookBase = Ledger::getBookBase(uGetsCurrency, uGetsIssuerID, uPaysCurrency, uPaysIssuerID); const uint256 uTakeBookBase = Ledger::getBookBase(uGetsCurrency, uGetsIssuerID, uPaysCurrency, uPaysIssuerID);
Log(lsINFO) << boost::str(boost::format("doOfferCreate: take against book: %s for %s -> %s") cLog(lsINFO) << boost::str(boost::format("doOfferCreate: take against book: %s for %s -> %s")
% uTakeBookBase.ToString() % uTakeBookBase.ToString()
% saTakerGets.getFullText() % saTakerGets.getFullText()
% saTakerPays.getFullText()); % saTakerPays.getFullText());
// Take using the parameters of the offer. // Take using the parameters of the offer.
Log(lsWARNING) << "doOfferCreate: takeOffers: BEFORE saTakerGets=" << saTakerGets.getFullText(); cLog(lsWARNING) << "doOfferCreate: takeOffers: BEFORE saTakerGets=" << saTakerGets.getFullText();
terResult = takeOffers( terResult = takeOffers(
bPassive, bPassive,
uTakeBookBase, uTakeBookBase,
@@ -373,11 +373,11 @@ TER OfferCreateTransactor::doApply()
saOfferGot // How much was got. saOfferGot // How much was got.
); );
Log(lsWARNING) << "doOfferCreate: takeOffers=" << terResult; cLog(lsWARNING) << "doOfferCreate: takeOffers=" << terResult;
Log(lsWARNING) << "doOfferCreate: takeOffers: saOfferPaid=" << saOfferPaid.getFullText(); cLog(lsWARNING) << "doOfferCreate: takeOffers: saOfferPaid=" << saOfferPaid.getFullText();
Log(lsWARNING) << "doOfferCreate: takeOffers: saOfferGot=" << saOfferGot.getFullText(); cLog(lsWARNING) << "doOfferCreate: takeOffers: saOfferGot=" << saOfferGot.getFullText();
Log(lsWARNING) << "doOfferCreate: takeOffers: saTakerPays=" << saTakerPays.getFullText(); cLog(lsWARNING) << "doOfferCreate: takeOffers: saTakerPays=" << saTakerPays.getFullText();
Log(lsWARNING) << "doOfferCreate: takeOffers: AFTER saTakerGets=" << saTakerGets.getFullText(); cLog(lsWARNING) << "doOfferCreate: takeOffers: AFTER saTakerGets=" << saTakerGets.getFullText();
if (tesSUCCESS == terResult) if (tesSUCCESS == terResult)
{ {
@@ -386,13 +386,13 @@ TER OfferCreateTransactor::doApply()
} }
} }
Log(lsWARNING) << "doOfferCreate: takeOffers: saTakerPays=" << saTakerPays.getFullText(); cLog(lsWARNING) << "doOfferCreate: takeOffers: saTakerPays=" << saTakerPays.getFullText();
Log(lsWARNING) << "doOfferCreate: takeOffers: saTakerGets=" << saTakerGets.getFullText(); cLog(lsWARNING) << "doOfferCreate: takeOffers: saTakerGets=" << saTakerGets.getFullText();
Log(lsWARNING) << "doOfferCreate: takeOffers: mTxnAccountID=" << RippleAddress::createHumanAccountID(mTxnAccountID); cLog(lsWARNING) << "doOfferCreate: takeOffers: mTxnAccountID=" << RippleAddress::createHumanAccountID(mTxnAccountID);
Log(lsWARNING) << "doOfferCreate: takeOffers: FUNDS=" << mEngine->getNodes().accountFunds(mTxnAccountID, saTakerGets, true).getFullText(); cLog(lsWARNING) << "doOfferCreate: takeOffers: FUNDS=" << mEngine->getNodes().accountFunds(mTxnAccountID, saTakerGets, true).getFullText();
// Log(lsWARNING) << "doOfferCreate: takeOffers: uPaysIssuerID=" << RippleAddress::createHumanAccountID(uPaysIssuerID); // cLog(lsWARNING) << "doOfferCreate: takeOffers: uPaysIssuerID=" << RippleAddress::createHumanAccountID(uPaysIssuerID);
// Log(lsWARNING) << "doOfferCreate: takeOffers: uGetsIssuerID=" << RippleAddress::createHumanAccountID(uGetsIssuerID); // cLog(lsWARNING) << "doOfferCreate: takeOffers: uGetsIssuerID=" << RippleAddress::createHumanAccountID(uGetsIssuerID);
if (tesSUCCESS == terResult if (tesSUCCESS == terResult
&& saTakerPays // Still wanting something. && saTakerPays // Still wanting something.
@@ -400,7 +400,7 @@ TER OfferCreateTransactor::doApply()
&& mEngine->getNodes().accountFunds(mTxnAccountID, saTakerGets, true).isPositive()) // Still funded. && mEngine->getNodes().accountFunds(mTxnAccountID, saTakerGets, true).isPositive()) // Still funded.
{ {
// We need to place the remainder of the offer into its order book. // We need to place the remainder of the offer into its order book.
Log(lsINFO) << boost::str(boost::format("doOfferCreate: offer not fully consumed: saTakerPays=%s saTakerGets=%s") cLog(lsINFO) << boost::str(boost::format("doOfferCreate: offer not fully consumed: saTakerPays=%s saTakerGets=%s")
% saTakerPays.getFullText() % saTakerPays.getFullText()
% saTakerGets.getFullText()); % saTakerGets.getFullText());
@@ -416,7 +416,7 @@ TER OfferCreateTransactor::doApply()
uint256 uBookBase = Ledger::getBookBase(uPaysCurrency, uPaysIssuerID, uGetsCurrency, uGetsIssuerID); uint256 uBookBase = Ledger::getBookBase(uPaysCurrency, uPaysIssuerID, uGetsCurrency, uGetsIssuerID);
Log(lsINFO) << boost::str(boost::format("doOfferCreate: adding to book: %s : %s/%s -> %s/%s") cLog(lsINFO) << boost::str(boost::format("doOfferCreate: adding to book: %s : %s/%s -> %s/%s")
% uBookBase.ToString() % uBookBase.ToString()
% saTakerPays.getHumanCurrency() % saTakerPays.getHumanCurrency()
% RippleAddress::createHumanAccountID(saTakerPays.getIssuer()) % RippleAddress::createHumanAccountID(saTakerPays.getIssuer())
@@ -433,13 +433,13 @@ TER OfferCreateTransactor::doApply()
if (tesSUCCESS == terResult) if (tesSUCCESS == terResult)
{ {
Log(lsWARNING) << "doOfferCreate: sfAccount=" << RippleAddress::createHumanAccountID(mTxnAccountID); cLog(lsWARNING) << "doOfferCreate: sfAccount=" << RippleAddress::createHumanAccountID(mTxnAccountID);
Log(lsWARNING) << "doOfferCreate: uPaysIssuerID=" << RippleAddress::createHumanAccountID(uPaysIssuerID); cLog(lsWARNING) << "doOfferCreate: uPaysIssuerID=" << RippleAddress::createHumanAccountID(uPaysIssuerID);
Log(lsWARNING) << "doOfferCreate: uGetsIssuerID=" << RippleAddress::createHumanAccountID(uGetsIssuerID); cLog(lsWARNING) << "doOfferCreate: uGetsIssuerID=" << RippleAddress::createHumanAccountID(uGetsIssuerID);
Log(lsWARNING) << "doOfferCreate: saTakerPays.isNative()=" << saTakerPays.isNative(); cLog(lsWARNING) << "doOfferCreate: saTakerPays.isNative()=" << saTakerPays.isNative();
Log(lsWARNING) << "doOfferCreate: saTakerGets.isNative()=" << saTakerGets.isNative(); cLog(lsWARNING) << "doOfferCreate: saTakerGets.isNative()=" << saTakerGets.isNative();
Log(lsWARNING) << "doOfferCreate: uPaysCurrency=" << saTakerPays.getHumanCurrency(); cLog(lsWARNING) << "doOfferCreate: uPaysCurrency=" << saTakerPays.getHumanCurrency();
Log(lsWARNING) << "doOfferCreate: uGetsCurrency=" << saTakerGets.getHumanCurrency(); cLog(lsWARNING) << "doOfferCreate: uGetsCurrency=" << saTakerGets.getHumanCurrency();
SLE::pointer sleOffer = mEngine->entryCreate(ltOFFER, uLedgerIndex); SLE::pointer sleOffer = mEngine->entryCreate(ltOFFER, uLedgerIndex);
@@ -457,7 +457,7 @@ TER OfferCreateTransactor::doApply()
if (bPassive) if (bPassive)
sleOffer->setFlag(lsfPassive); sleOffer->setFlag(lsfPassive);
Log(lsINFO) << boost::str(boost::format("doOfferCreate: final terResult=%s sleOffer=%s") cLog(lsINFO) << boost::str(boost::format("doOfferCreate: final terResult=%s sleOffer=%s")
% transToken(terResult) % transToken(terResult)
% sleOffer->getJson(0)); % sleOffer->getJson(0));
} }

26
src/cpp/ripple/PaymentTransactor.cpp
View File

@@ -5,6 +5,8 @@
#define RIPPLE_PATHS_MAX 3 #define RIPPLE_PATHS_MAX 3
SETUP_LOG();
TER PaymentTransactor::doApply() TER PaymentTransactor::doApply()
{ {
// Ripple if source or destination is non-native or if there are paths. // Ripple if source or destination is non-native or if there are paths.
@@ -24,37 +26,37 @@ TER PaymentTransactor::doApply()
const uint160 uSrcCurrency = saMaxAmount.getCurrency(); const uint160 uSrcCurrency = saMaxAmount.getCurrency();
const uint160 uDstCurrency = saDstAmount.getCurrency(); const uint160 uDstCurrency = saDstAmount.getCurrency();
Log(lsINFO) << boost::str(boost::format("doPayment> saMaxAmount=%s saDstAmount=%s") cLog(lsINFO) << boost::str(boost::format("doPayment> saMaxAmount=%s saDstAmount=%s")
% saMaxAmount.getFullText() % saMaxAmount.getFullText()
% saDstAmount.getFullText()); % saDstAmount.getFullText());
if (uTxFlags & tfPaymentMask) if (uTxFlags & tfPaymentMask)
{ {
Log(lsINFO) << "doPayment: Malformed transaction: Invalid flags set."; cLog(lsINFO) << "doPayment: Malformed transaction: Invalid flags set.";
return temINVALID_FLAG; return temINVALID_FLAG;
} }
else if (!uDstAccountID) else if (!uDstAccountID)
{ {
Log(lsINFO) << "doPayment: Malformed transaction: Payment destination account not specified."; cLog(lsINFO) << "doPayment: Malformed transaction: Payment destination account not specified.";
return temDST_NEEDED; return temDST_NEEDED;
} }
else if (bMax && !saMaxAmount.isPositive()) else if (bMax && !saMaxAmount.isPositive())
{ {
Log(lsINFO) << "doPayment: Malformed transaction: bad max amount: " << saMaxAmount.getFullText(); cLog(lsINFO) << "doPayment: Malformed transaction: bad max amount: " << saMaxAmount.getFullText();
return temBAD_AMOUNT; return temBAD_AMOUNT;
} }
else if (!saDstAmount.isPositive()) else if (!saDstAmount.isPositive())
{ {
Log(lsINFO) << "doPayment: Malformed transaction: bad dst amount: " << saDstAmount.getFullText(); cLog(lsINFO) << "doPayment: Malformed transaction: bad dst amount: " << saDstAmount.getFullText();
return temBAD_AMOUNT; return temBAD_AMOUNT;
} }
else if (mTxnAccountID == uDstAccountID && uSrcCurrency == uDstCurrency && !bPaths) else if (mTxnAccountID == uDstAccountID && uSrcCurrency == uDstCurrency && !bPaths)
{ {
Log(lsINFO) << boost::str(boost::format("doPayment: Malformed transaction: Redundant transaction: src=%s, dst=%s, src_cur=%s, dst_cur=%s") cLog(lsINFO) << boost::str(boost::format("doPayment: Malformed transaction: Redundant transaction: src=%s, dst=%s, src_cur=%s, dst_cur=%s")
% mTxnAccountID.ToString() % mTxnAccountID.ToString()
% uDstAccountID.ToString() % uDstAccountID.ToString()
% uSrcCurrency.ToString() % uSrcCurrency.ToString()
@@ -66,7 +68,7 @@ TER PaymentTransactor::doApply()
&& ((saMaxAmount == saDstAmount && saMaxAmount.getCurrency() == saDstAmount.getCurrency()) && ((saMaxAmount == saDstAmount && saMaxAmount.getCurrency() == saDstAmount.getCurrency())
|| (saDstAmount.isNative() && saMaxAmount.isNative()))) || (saDstAmount.isNative() && saMaxAmount.isNative())))
{ {
Log(lsINFO) << "doPayment: Malformed transaction: bad SendMax."; cLog(lsINFO) << "doPayment: Malformed transaction: bad SendMax.";
return temINVALID; return temINVALID;
} }
@@ -78,7 +80,7 @@ TER PaymentTransactor::doApply()
if (!saDstAmount.isNative()) if (!saDstAmount.isNative())
{ {
Log(lsINFO) << "doPayment: Delay transaction: Destination account does not exist."; cLog(lsINFO) << "doPayment: Delay transaction: Destination account does not exist.";
// Another transaction could create the account and then this transaction would succeed. // Another transaction could create the account and then this transaction would succeed.
return terNO_DST; return terNO_DST;
@@ -86,7 +88,7 @@ TER PaymentTransactor::doApply()
else if (isSetBit(mParams, tapOPEN_LEDGER) // Ledger is not final, can vote no. else if (isSetBit(mParams, tapOPEN_LEDGER) // Ledger is not final, can vote no.
&& saDstAmount.getNValue() < theApp->scaleFeeBase(theConfig.FEE_ACCOUNT_RESERVE)) // Reserve is not scaled by load. && saDstAmount.getNValue() < theApp->scaleFeeBase(theConfig.FEE_ACCOUNT_RESERVE)) // Reserve is not scaled by load.
{ {
Log(lsINFO) << "doPayment: Delay transaction: Destination account does not exist. Insufficent payment to create account."; cLog(lsINFO) << "doPayment: Delay transaction: Destination account does not exist. Insufficent payment to create account.";
// Another transaction could create the account and then this transaction would succeed. // Another transaction could create the account and then this transaction would succeed.
return terNO_DST_INSUF_XRP; return terNO_DST_INSUF_XRP;
@@ -146,8 +148,8 @@ TER PaymentTransactor::doApply()
&& saSrcXRPBalance < saDstAmount + uReserve) // Reserve is not scaled by fee. && saSrcXRPBalance < saDstAmount + uReserve) // Reserve is not scaled by fee.
{ {
// Vote no. However, transaction might succeed, if applied in a different order. // Vote no. However, transaction might succeed, if applied in a different order.
Log(lsINFO) << ""; cLog(lsINFO) << "";
Log(lsINFO) << boost::str(boost::format("doPayment: Delay transaction: Insufficient funds: %s / %s (%d)") cLog(lsINFO) << boost::str(boost::format("doPayment: Delay transaction: Insufficient funds: %s / %s (%d)")
% saSrcXRPBalance.getText() % (saDstAmount + uReserve).getText() % uReserve); % saSrcXRPBalance.getText() % (saDstAmount + uReserve).getText() % uReserve);
terResult = terUNFUNDED; terResult = terUNFUNDED;
@@ -170,7 +172,7 @@ TER PaymentTransactor::doApply()
if (transResultInfo(terResult, strToken, strHuman)) if (transResultInfo(terResult, strToken, strHuman))
{ {
Log(lsINFO) << boost::str(boost::format("doPayment: %s: %s") % strToken % strHuman); cLog(lsINFO) << boost::str(boost::format("doPayment: %s: %s") % strToken % strHuman);
} }
else else
{ {

26
src/cpp/ripple/TrustSetTransactor.cpp
View File

@@ -4,10 +4,12 @@
#include <boost/bind.hpp> #include <boost/bind.hpp>
SETUP_LOG();
TER TrustSetTransactor::doApply() TER TrustSetTransactor::doApply()
{ {
TER terResult = tesSUCCESS; TER terResult = tesSUCCESS;
Log(lsINFO) << "doTrustSet>"; cLog(lsINFO) << "doTrustSet>";
const STAmount saLimitAmount = mTxn.getFieldAmount(sfLimitAmount); const STAmount saLimitAmount = mTxn.getFieldAmount(sfLimitAmount);
const bool bQualityIn = mTxn.isFieldPresent(sfQualityIn); const bool bQualityIn = mTxn.isFieldPresent(sfQualityIn);
@@ -29,19 +31,19 @@ TER TrustSetTransactor::doApply()
if (saLimitAmount.isNegative()) if (saLimitAmount.isNegative())
{ {
Log(lsINFO) << "doTrustSet: Malformed transaction: Negatived credit limit."; cLog(lsINFO) << "doTrustSet: Malformed transaction: Negatived credit limit.";
return temBAD_AMOUNT; return temBAD_AMOUNT;
} }
else if (!uDstAccountID || uDstAccountID == ACCOUNT_ONE) else if (!uDstAccountID || uDstAccountID == ACCOUNT_ONE)
{ {
Log(lsINFO) << "doTrustSet: Malformed transaction: Destination account not specified."; cLog(lsINFO) << "doTrustSet: Malformed transaction: Destination account not specified.";
return temDST_NEEDED; return temDST_NEEDED;
} }
else if (mTxnAccountID == uDstAccountID) else if (mTxnAccountID == uDstAccountID)
{ {
Log(lsINFO) << "doTrustSet: Malformed transaction: Can not extend credit to self."; cLog(lsINFO) << "doTrustSet: Malformed transaction: Can not extend credit to self.";
return temDST_IS_SRC; return temDST_IS_SRC;
} }
@@ -49,7 +51,7 @@ TER TrustSetTransactor::doApply()
SLE::pointer sleDst = mEngine->entryCache(ltACCOUNT_ROOT, Ledger::getAccountRootIndex(uDstAccountID)); SLE::pointer sleDst = mEngine->entryCache(ltACCOUNT_ROOT, Ledger::getAccountRootIndex(uDstAccountID));
if (!sleDst) if (!sleDst)
{ {
Log(lsINFO) << "doTrustSet: Delay transaction: Destination account does not exist."; cLog(lsINFO) << "doTrustSet: Delay transaction: Destination account does not exist.";
return terNO_DST; return terNO_DST;
} }
@@ -230,13 +232,13 @@ TER TrustSetTransactor::doApply()
mEngine->entryDelete(sleRippleState); mEngine->entryDelete(sleRippleState);
Log(lsINFO) << "doTrustSet: Deleting ripple line"; cLog(lsINFO) << "doTrustSet: Deleting ripple line";
} }
else if (bReserveIncrease else if (bReserveIncrease
&& isSetBit(mParams, tapOPEN_LEDGER) // Ledger is not final, we can vote no. && isSetBit(mParams, tapOPEN_LEDGER) // Ledger is not final, we can vote no.
&& saSrcXRPBalance.getNValue() < uReserveCreate) // Reserve is not scaled by load. && saSrcXRPBalance.getNValue() < uReserveCreate) // Reserve is not scaled by load.
{ {
Log(lsINFO) << "doTrustSet: Delay transaction: Insufficent reserve to add trust line."; cLog(lsINFO) << "doTrustSet: Delay transaction: Insufficent reserve to add trust line.";
// Another transaction could provide XRP to the account and then this transaction would succeed. // Another transaction could provide XRP to the account and then this transaction would succeed.
terResult = terINSUF_RESERVE_LINE; terResult = terINSUF_RESERVE_LINE;
@@ -245,7 +247,7 @@ TER TrustSetTransactor::doApply()
{ {
mEngine->entryModify(sleRippleState); mEngine->entryModify(sleRippleState);
Log(lsINFO) << "doTrustSet: Modify ripple line"; cLog(lsINFO) << "doTrustSet: Modify ripple line";
} }
} }
// Line does not exist. // Line does not exist.
@@ -253,14 +255,14 @@ TER TrustSetTransactor::doApply()
&& (!bQualityIn || !uQualityIn) // Not setting quality in or setting default quality in. && (!bQualityIn || !uQualityIn) // Not setting quality in or setting default quality in.
&& (!bQualityOut || !uQualityOut)) // Not setting quality out or setting default quality out. && (!bQualityOut || !uQualityOut)) // Not setting quality out or setting default quality out.
{ {
Log(lsINFO) << "doTrustSet: Redundant: Setting non-existent ripple line to defaults."; cLog(lsINFO) << "doTrustSet: Redundant: Setting non-existent ripple line to defaults.";
return terNO_LINE_REDUNDANT; return terNO_LINE_REDUNDANT;
} }
else if (isSetBit(mParams, tapOPEN_LEDGER) // Ledger is not final, we can vote no. else if (isSetBit(mParams, tapOPEN_LEDGER) // Ledger is not final, we can vote no.
&& saSrcXRPBalance.getNValue() < uReserveCreate) // Reserve is not scaled by load. && saSrcXRPBalance.getNValue() < uReserveCreate) // Reserve is not scaled by load.
{ {
Log(lsINFO) << "doTrustSet: Delay transaction: Line does not exist. Insufficent reserve to create line."; cLog(lsINFO) << "doTrustSet: Delay transaction: Line does not exist. Insufficent reserve to create line.";
// Another transaction could create the account and then this transaction would succeed. // Another transaction could create the account and then this transaction would succeed.
terResult = terNO_LINE_INSUF_RESERVE; terResult = terNO_LINE_INSUF_RESERVE;
@@ -270,7 +272,7 @@ TER TrustSetTransactor::doApply()
// Create a new ripple line. // Create a new ripple line.
sleRippleState = mEngine->entryCreate(ltRIPPLE_STATE, Ledger::getRippleStateIndex(mTxnAccountID, uDstAccountID, uCurrencyID)); sleRippleState = mEngine->entryCreate(ltRIPPLE_STATE, Ledger::getRippleStateIndex(mTxnAccountID, uDstAccountID, uCurrencyID));
Log(lsINFO) << "doTrustSet: Creating ripple line: " << sleRippleState->getIndex().ToString(); cLog(lsINFO) << "doTrustSet: Creating ripple line: " << sleRippleState->getIndex().ToString();
sleRippleState->setFieldAmount(sfBalance, STAmount(uCurrencyID, ACCOUNT_ONE)); // Zero balance in currency. sleRippleState->setFieldAmount(sfBalance, STAmount(uCurrencyID, ACCOUNT_ONE)); // Zero balance in currency.
sleRippleState->setFieldAmount(!bHigh ? sfLowLimit : sfHighLimit, saLimitAllow); sleRippleState->setFieldAmount(!bHigh ? sfLowLimit : sfHighLimit, saLimitAllow);
@@ -304,7 +306,7 @@ TER TrustSetTransactor::doApply()
} }
} }
Log(lsINFO) << "doTrustSet<"; cLog(lsINFO) << "doTrustSet<";
return terResult; return terResult;
} }