ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-27 22:45:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for brute force path finding.

Browse Source
This commit is contained in:
Arthur Britto
2013-02-13 17:00:30 -08:00
parent 235ab44728
commit e62e5f5fa2
1 changed files with 61 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
src/cpp/ripple/Pathfinder.cpp
View File

@@ -339,7 +339,7 @@ bool Pathfinder::findPaths(const unsigned int iMaxSteps, const unsigned int iMax
% STAmount::createHumanCurrency(speEnd.mCurrencyID) % STAmount::createHumanCurrency(speEnd.mCurrencyID)
% RippleAddress::createHumanAccountID(speEnd.mIssuerID)); % RippleAddress::createHumanAccountID(speEnd.mIssuerID));
if (spPath.mPath.size() == iMaxSteps) if (spPath.mPath.size() >= iMaxSteps)
{ {
// Path is at maximum size. Don't want to add more. // Path is at maximum size. Don't want to add more.
@@ -365,8 +365,8 @@ bool Pathfinder::findPaths(const unsigned int iMaxSteps, const unsigned int iMax
spNew.mPath.push_back(speBook); // Add the order book. spNew.mPath.push_back(speBook); // Add the order book.
spNew.mPath.push_back(speAccount); // Add the account and currency spNew.mPath.push_back(speAccount); // Add the account and currency
cLog(lsDEBUG) << cLog(lsDEBUG)
boost::str(boost::format("findPaths: XRP -> %s/%s") << boost::str(boost::format("findPaths: XRP -> %s/%s")
% STAmount::createHumanCurrency(speBook.mCurrencyID) % STAmount::createHumanCurrency(speBook.mCurrencyID)
% RippleAddress::createHumanAccountID(speBook.mIssuerID)); % RippleAddress::createHumanAccountID(speBook.mIssuerID));
@@ -387,64 +387,68 @@ bool Pathfinder::findPaths(const unsigned int iMaxSteps, const unsigned int iMax
AccountItems rippleLines(speEnd.mAccountID, mLedger, AccountItem::pointer(new RippleState())); AccountItems rippleLines(speEnd.mAccountID, mLedger, AccountItem::pointer(new RippleState()));
SLE::pointer sleEnd = lesActive.entryCache(ltACCOUNT_ROOT, Ledger::getAccountRootIndex(speEnd.mAccountID)); SLE::pointer sleEnd = lesActive.entryCache(ltACCOUNT_ROOT, Ledger::getAccountRootIndex(speEnd.mAccountID));
tLog(sleEnd, lsDEBUG) tLog(!sleEnd, lsDEBUG)
<< boost::str(boost::format("findPaths: account without root: %s") << boost::str(boost::format("findPaths: order book: %s/%s : ")
% RippleAddress::createHumanAccountID(speEnd.mAccountID)); % RippleAddress::createHumanAccountID(speEnd.mAccountID)
% RippleAddress::createHumanAccountID(speEnd.mIssuerID));
bool bRequireAuth = isSetBit(sleEnd->getFieldU32(sfFlags), lsfRequireAuth); if (sleEnd)
BOOST_FOREACH(AccountItem::ref item, rippleLines.getItems())
{ {
RippleState* rspEntry = (RippleState*) item.get(); // On a non-XRP account:
const uint160 uPeerID = rspEntry->getAccountIDPeer().getAccountID(); bool bRequireAuth = isSetBit(sleEnd->getFieldU32(sfFlags), lsfRequireAuth);
if (spPath.hasSeen(uPeerID, speEnd.mCurrencyID, uPeerID)) BOOST_FOREACH(AccountItem::ref item, rippleLines.getItems())
{ {
// Peer is in path already. Ignore it to avoid a loop. RippleState* rspEntry = (RippleState*) item.get();
cLog(lsDEBUG) << const uint160 uPeerID = rspEntry->getAccountIDPeer().getAccountID();
boost::str(boost::format("findPaths: SEEN: %s/%s -> %s/%s")
% RippleAddress::createHumanAccountID(speEnd.mAccountID)
% STAmount::createHumanCurrency(speEnd.mCurrencyID)
% RippleAddress::createHumanAccountID(uPeerID)
% STAmount::createHumanCurrency(speEnd.mCurrencyID));
}
else if (!rspEntry->getBalance().isPositive() // No IOUs to send.
&& (!rspEntry->getLimitPeer() // Peer does not extend credit.
|| *rspEntry->getBalance().negate() >= rspEntry->getLimitPeer() // No credit left.
|| (bRequireAuth && !rspEntry->getAuth()))) // Not authorized to hold credit.
{
// Path has no credit left. Ignore it.
cLog(lsTRACE) <<
boost::str(boost::format("findPaths: No credit: %s/%s -> %s/%s")
% RippleAddress::createHumanAccountID(speEnd.mAccountID)
% STAmount::createHumanCurrency(speEnd.mCurrencyID)
% RippleAddress::createHumanAccountID(uPeerID)
% STAmount::createHumanCurrency(speEnd.mCurrencyID));
}
else
{
// Can transmit IOUs and account to the path.
STPath spNew(spPath);
STPathElement speNew(uPeerID, speEnd.mCurrencyID, uPeerID);
spNew.mPath.push_back(speNew); if (spPath.hasSeen(uPeerID, speEnd.mCurrencyID, uPeerID))
qspExplore.push(spNew); {
// Peer is in path already. Ignore it to avoid a loop.
cLog(lsDEBUG) <<
boost::str(boost::format("findPaths: SEEN: %s/%s -> %s/%s")
% RippleAddress::createHumanAccountID(speEnd.mAccountID)
% STAmount::createHumanCurrency(speEnd.mCurrencyID)
% RippleAddress::createHumanAccountID(uPeerID)
% STAmount::createHumanCurrency(speEnd.mCurrencyID));
}
else if (!rspEntry->getBalance().isPositive() // No IOUs to send.
&& (!rspEntry->getLimitPeer() // Peer does not extend credit.
|| *rspEntry->getBalance().negate() >= rspEntry->getLimitPeer() // No credit left.
|| (bRequireAuth && !rspEntry->getAuth()))) // Not authorized to hold credit.
{
// Path has no credit left. Ignore it.
cLog(lsTRACE) <<
boost::str(boost::format("findPaths: No credit: %s/%s -> %s/%s")
% RippleAddress::createHumanAccountID(speEnd.mAccountID)
% STAmount::createHumanCurrency(speEnd.mCurrencyID)
% RippleAddress::createHumanAccountID(uPeerID)
% STAmount::createHumanCurrency(speEnd.mCurrencyID));
}
else
{
// Can transmit IOUs and account to the path.
STPath spNew(spPath);
STPathElement speNew(uPeerID, speEnd.mCurrencyID, uPeerID);
bContinued = true; spNew.mPath.push_back(speNew);
qspExplore.push(spNew);
cLog(lsTRACE) << bContinued = true;
boost::str(boost::format("findPaths: push explore: %s/%s -> %s/%s")
% STAmount::createHumanCurrency(speEnd.mCurrencyID) cLog(lsTRACE) <<
% RippleAddress::createHumanAccountID(speEnd.mAccountID) boost::str(boost::format("findPaths: push explore: %s/%s -> %s/%s")
% STAmount::createHumanCurrency(speEnd.mCurrencyID) % STAmount::createHumanCurrency(speEnd.mCurrencyID)
% RippleAddress::createHumanAccountID(uPeerID)); % RippleAddress::createHumanAccountID(speEnd.mAccountID)
% STAmount::createHumanCurrency(speEnd.mCurrencyID)
% RippleAddress::createHumanAccountID(uPeerID));
}
} }
} }
// Every book that wants the source currency. // Every book that wants the source currency.
std::vector<OrderBook::pointer> books; std::vector<OrderBook::pointer> books;
theApp->getOrderBookDB().getBooks(speEnd.mIssuerID, speEnd.mCurrencyID, books); theApp->getOrderBookDB().getBooks(speEnd.mIssuerID, speEnd.mCurrencyID, books);
BOOST_FOREACH(OrderBook::ref book, books) BOOST_FOREACH(OrderBook::ref book, books)
@@ -455,7 +459,15 @@ bool Pathfinder::findPaths(const unsigned int iMaxSteps, const unsigned int iMax
STPath spNew(spPath); STPath spNew(spPath);
STPathElement speBook(ACCOUNT_XRP, book->getCurrencyOut(), book->getIssuerOut()); STPathElement speBook(ACCOUNT_XRP, book->getCurrencyOut(), book->getIssuerOut());
spNew.mPath.push_back(speBook); spNew.mPath.push_back(speBook); // Add the order book.
if (!book->getCurrencyOut())
{
// For non-XRP out, don't end on the book, add the issuing account.
STPathElement speAccount(book->getIssuerOut(), book->getCurrencyOut(), book->getIssuerOut());
spNew.mPath.push_back(speAccount); // Add the account and currency
}
qspExplore.push(spNew); qspExplore.push(spNew);
bContinued = true; bContinued = true;