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

Fix RippleCalc on offers with bad amounts.

Browse Source
This commit is contained in:
Arthur Britto
2013-03-07 18:21:23 -08:00
parent 62b37ff283
commit 45a6c5938c
1 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/cpp/ripple/RippleCalc.cpp
View File

@@ -942,14 +942,25 @@ TER RippleCalc::calcNodeAdvance(
{ {
// Offer has bad amounts. Offers should never have a bad amounts. // Offer has bad amounts. Offers should never have a bad amounts.
if (musUnfundedFound.find(uOfferIndex) != musUnfundedFound.end()) if (bReverse)
{ {
// An internal error, offer was found failed to place this in musUnfundedFound. // Past internal error, offer had bad amounts.
cLog(lsWARNING) << boost::str(boost::format("calcNodeAdvance: PAST INTERNAL ERROR: OFFER NON-POSITIVE: saTakerPays=%s saTakerGets=%s") cLog(lsWARNING) << boost::str(boost::format("calcNodeAdvance: PAST INTERNAL ERROR: OFFER NON-POSITIVE: saTakerPays=%s saTakerGets=%s")
% saTakerPays % saTakerGets); % saTakerPays % saTakerGets);
musUnfundedFound.insert(uOfferIndex); // Mark offer for always deletion.
// bEntryAdvance = true; // Already set
continue;
}
else if (musUnfundedFound.find(uOfferIndex) != musUnfundedFound.end())
{
// Past internal error, offer was found failed to place this in musUnfundedFound.
cLog(lsDEBUG) << boost::str(boost::format("calcNodeAdvance: PAST INTERNAL ERROR: OFFER NON-POSITIVE: saTakerPays=%s saTakerGets=%s")
% saTakerPays % saTakerGets);
assert(false);
// Just skip it. It will be deleted. // Just skip it. It will be deleted.
// bEntryAdvance = true; // Already set // bEntryAdvance = true; // Already set
continue;
} }
else else
{ {
@@ -957,15 +968,13 @@ TER RippleCalc::calcNodeAdvance(
// An internal error previously left a bad offer. // An internal error previously left a bad offer.
cLog(lsWARNING) << boost::str(boost::format("calcNodeAdvance: INTERNAL ERROR: OFFER NON-POSITIVE: saTakerPays=%s saTakerGets=%s") cLog(lsWARNING) << boost::str(boost::format("calcNodeAdvance: INTERNAL ERROR: OFFER NON-POSITIVE: saTakerPays=%s saTakerGets=%s")
% saTakerPays % saTakerGets); % saTakerPays % saTakerGets);
//assert(false); assert(false);
// Don't process at all, things are in an unexpected state for this transactions. // Don't process at all, things are in an unexpected state for this transactions.
terResult = tefEXCEPTION; terResult = tefEXCEPTION;
} }
continue; continue;
} }
bEntryAdvance = false;
// Allowed to access source from this node? // Allowed to access source from this node?
// XXX This can get called multiple times for same source in a row, caching result would be nice. // XXX This can get called multiple times for same source in a row, caching result would be nice.
// XXX Going forward could we fund something with a worse quality which was previously skipped? Might need to check // XXX Going forward could we fund something with a worse quality which was previously skipped? Might need to check
@@ -979,8 +988,6 @@ TER RippleCalc::calcNodeAdvance(
{ {
// Temporarily unfunded. Another node uses this source, ignore in this offer. // Temporarily unfunded. Another node uses this source, ignore in this offer.
cLog(lsTRACE) << "calcNodeAdvance: temporarily unfunded offer (forward)"; cLog(lsTRACE) << "calcNodeAdvance: temporarily unfunded offer (forward)";
bEntryAdvance = true;
continue; continue;
} }
@@ -994,24 +1001,21 @@ TER RippleCalc::calcNodeAdvance(
{ {
// Temporarily unfunded. Another node uses this source, ignore in this offer. // Temporarily unfunded. Another node uses this source, ignore in this offer.
cLog(lsTRACE) << "calcNodeAdvance: temporarily unfunded offer (reverse)"; cLog(lsTRACE) << "calcNodeAdvance: temporarily unfunded offer (reverse)";
bEntryAdvance = true;
continue; continue;
} }
// Determine if used in past.
// We only need to know if it might need to be marked unfunded.
curIssuerNodeConstIterator itPast = mumSource.find(asLine); curIssuerNodeConstIterator itPast = mumSource.find(asLine);
bool bFoundPast = itPast != mumSource.end(); bool bFoundPast = itPast != mumSource.end();
// Determine if used in past. // XXX Restricting by node seems like a misunderstanding.
// XXX Restriction seems like a misunderstanding. // if (bFoundPast && itPast->second != uNode)
if (bFoundPast && itPast->second != uNode) // {
{ // // Temporarily unfunded. Another node uses this source, ignore in this offer.
// Temporarily unfunded. Another node uses this source, ignore in this offer. // cLog(lsTRACE) << "calcNodeAdvance: temporarily unfunded offer (past)";
cLog(lsTRACE) << "calcNodeAdvance: temporarily unfunded offer (past)"; // continue;
// }
bEntryAdvance = true;
continue;
}
// Only the current node is allowed to use the source. // Only the current node is allowed to use the source.
@@ -1030,20 +1034,17 @@ TER RippleCalc::calcNodeAdvance(
} }
else else
{ {
// Moving forward, don't need to check again. // Moving forward, don't need to insert again
// Or source was used this reverse // Or, already found it.
// Or source was previously used
// XXX
} }
// YYY Could verify offer is correct place for unfundeds. // YYY Could verify offer is correct place for unfundeds.
bEntryAdvance = true;
continue; continue;
} }
if (bReverse // Need to remember reverse mention. if (bReverse // Need to remember reverse mention.
&& !bFoundPast // Not mentioned in previous passes. && !bFoundPast // Not mentioned in previous passes.
&& !bFoundReverse) // Not mentioned for pass. && !bFoundReverse) // New to pass.
{ {
// Consider source mentioned by current path state. // Consider source mentioned by current path state.
cLog(lsTRACE) << boost::str(boost::format("calcNodeAdvance: remember=%s/%s/%s") cLog(lsTRACE) << boost::str(boost::format("calcNodeAdvance: remember=%s/%s/%s")