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 path expansion.

Browse Source
This commit is contained in:
Arthur Britto
2012-11-12 14:40:42 -08:00
parent 95c590bef4
commit 42b37c8b1f
3 changed files with 112 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpp/ripple/Amount.cpp
View File

@@ -383,7 +383,7 @@ bool STAmount::setFullValue(const std::string& sAmount, const std::string& sCurr
// Stamps not must have an issuer. // Stamps not must have an issuer.
if (mIsNative && !mIssuer.isZero()) if (mIsNative && !mIssuer.isZero())
{ {
Log(lsINFO) << "Issuer specified for stamps: " << sIssuer; Log(lsINFO) << "Issuer specified for XRP: " << sIssuer;
return false; return false;
} }

2
src/cpp/ripple/Ledger.cpp
View File

@@ -944,7 +944,7 @@ uint256 Ledger::getBookBase(const uint160& uTakerPaysCurrency, const uint160& uT
% RippleAddress::createHumanAccountID(uTakerGetsIssuerID) % RippleAddress::createHumanAccountID(uTakerGetsIssuerID)
% uBaseIndex.ToString()); % uBaseIndex.ToString());
assert(!bInNative || !bOutNative); // Stamps to stamps not allowed. assert(!bInNative || !bOutNative); // XRP to XRP not allowed.
assert(bInNative == uTakerPaysIssuerID.isZero()); // Make sure issuer is specified as needed. assert(bInNative == uTakerPaysIssuerID.isZero()); // Make sure issuer is specified as needed.
assert(bOutNative == uTakerGetsIssuerID.isZero()); // Make sure issuer is specified as needed. assert(bOutNative == uTakerGetsIssuerID.isZero()); // Make sure issuer is specified as needed.
assert(uTakerPaysCurrency != uTakerGetsCurrency || uTakerPaysIssuerID != uTakerGetsIssuerID); // Currencies or accounts must differ. assert(uTakerPaysCurrency != uTakerGetsCurrency || uTakerPaysIssuerID != uTakerGetsIssuerID); // Currencies or accounts must differ.

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

@@ -1472,26 +1472,27 @@ TER PathState::pushImply(
{ {
// Currency is different, need to convert via an offer. // Currency is different, need to convert via an offer.
terResult = pushNode( terResult = pushNode( // Offer.
STPathElement::typeCurrency // Offer. !!uCurrencyID
| STPathElement::typeIssuer, ? STPathElement::typeCurrency | STPathElement::typeIssuer
ACCOUNT_ONE, // Placeholder for offers. : STPathElement::typeCurrency,
ACCOUNT_XRP, // Placeholder for offers.
uCurrencyID, // The offer's output is what is now wanted. uCurrencyID, // The offer's output is what is now wanted.
uIssuerID); uIssuerID);
} }
const PaymentNode& pnBck = vpnNodes.back(); const PaymentNode& pnBck = vpnNodes.back();
// For ripple, non-stamps, ensure the issuer is on at least one side of the transaction. // For ripple, non-XRP, ensure the issuer is on at least one side of the transaction.
if (tesSUCCESS == terResult if (tesSUCCESS == terResult
&& !!uCurrencyID // Not stamps. && !!uCurrencyID // Not XRP.
&& (pnBck.uAccountID != uIssuerID // Previous is not issuing own IOUs. && (pnBck.uAccountID != uIssuerID // Previous is not issuing own IOUs.
&& uAccountID != uIssuerID)) // Current is not receiving own IOUs. && uAccountID != uIssuerID)) // Current is not receiving own IOUs.
{ {
// Need to ripple through uIssuerID's account. // Need to ripple through uIssuerID's account.
terResult = pushNode( terResult = pushNode(
STPathElement::typeAccount, STPathElement::typeAccount | STPathElement::typeCurrency | STPathElement::typeIssuer,
uIssuerID, // Intermediate account is the needed issuer. uIssuerID, // Intermediate account is the needed issuer.
uCurrencyID, uCurrencyID,
uIssuerID); uIssuerID);
@@ -1511,10 +1512,6 @@ TER PathState::pushNode(
const uint160& uCurrencyID, const uint160& uCurrencyID,
const uint160& uIssuerID) const uint160& uIssuerID)
{ {
cLog(lsINFO) << "pushNode> "
<< RippleAddress::createHumanAccountID(uAccountID)
<< " " << STAmount::createHumanCurrency(uCurrencyID)
<< "/" << RippleAddress::createHumanAccountID(uIssuerID);
PaymentNode pnCur; PaymentNode pnCur;
const bool bFirst = vpnNodes.empty(); const bool bFirst = vpnNodes.empty();
const PaymentNode& pnPrv = bFirst ? PaymentNode() : vpnNodes.back(); const PaymentNode& pnPrv = bFirst ? PaymentNode() : vpnNodes.back();
@@ -1527,11 +1524,30 @@ TER PathState::pushNode(
const bool bIssuer = isSetBit(iType, STPathElement::typeIssuer); const bool bIssuer = isSetBit(iType, STPathElement::typeIssuer);
TER terResult = tesSUCCESS; TER terResult = tesSUCCESS;
cLog(lsDEBUG) << "pushNode> "
<< iType
<< ": " << (bAccount ? RippleAddress::createHumanAccountID(uAccountID) : "-")
<< " " << (bCurrency ? STAmount::createHumanCurrency(uCurrencyID) : "-")
<< "/" << (bIssuer ? RippleAddress::createHumanAccountID(uIssuerID) : "-");
pnCur.uFlags = iType; pnCur.uFlags = iType;
pnCur.uCurrencyID = bCurrency ? uCurrencyID : pnPrv.uCurrencyID;
if (iType & ~STPathElement::typeValidBits) if (iType & ~STPathElement::typeValidBits)
{ {
cLog(lsINFO) << "pushNode: bad bits."; cLog(lsDEBUG) << "pushNode: bad bits.";
terResult = temBAD_PATH;
}
else if (bIssuer && !pnCur.uCurrencyID)
{
cLog(lsDEBUG) << "pushNode: issuer specified for XRP.";
terResult = temBAD_PATH;
}
else if (bIssuer && !uIssuerID)
{
cLog(lsDEBUG) << "pushNode: specified bad issuer.";
terResult = temBAD_PATH; terResult = temBAD_PATH;
} }
@@ -1540,8 +1556,11 @@ TER PathState::pushNode(
// Account link // Account link
pnCur.uAccountID = uAccountID; pnCur.uAccountID = uAccountID;
pnCur.uCurrencyID = bCurrency ? uCurrencyID : pnPrv.uCurrencyID; pnCur.uIssuerID = bIssuer
pnCur.uIssuerID = bIssuer ? uIssuerID : uAccountID; ? uIssuerID
: !!pnCur.uCurrencyID
? uAccountID
: ACCOUNT_XRP;
pnCur.saRevRedeem = STAmount(uCurrencyID, uAccountID); pnCur.saRevRedeem = STAmount(uCurrencyID, uAccountID);
pnCur.saRevIssue = STAmount(uCurrencyID, uAccountID); pnCur.saRevIssue = STAmount(uCurrencyID, uAccountID);
@@ -1551,6 +1570,12 @@ TER PathState::pushNode(
nothing(); nothing();
} }
else if (!uAccountID)
{
cLog(lsDEBUG) << "pushNode: specified bad account.";
terResult = temBAD_PATH;
}
else else
{ {
// Add required intermediate nodes to deliver to current account. // Add required intermediate nodes to deliver to current account.
@@ -1612,19 +1637,28 @@ TER PathState::pushNode(
{ {
// Offer link // Offer link
// Offers bridge a change in currency & issuer or just a change in issuer. // Offers bridge a change in currency & issuer or just a change in issuer.
pnCur.uCurrencyID = bCurrency ? uCurrencyID : pnPrv.uCurrencyID; pnCur.uIssuerID = bIssuer
pnCur.uIssuerID = bIssuer ? uIssuerID : pnCur.uAccountID; ? uIssuerID
: !!pnCur.uCurrencyID
? !!pnPrv.uIssuerID
? pnPrv.uIssuerID // Default to previous issuer
: pnPrv.uAccountID // Or previous account if no previous issuer.
: ACCOUNT_XRP;
pnCur.saRateMax = saZero; pnCur.saRateMax = saZero;
if (!!pnPrv.uAccountID) if (!!pnCur.uCurrencyID != !!pnCur.uIssuerID)
{
cLog(lsDEBUG) << "pushNode: currency is inconsistent with issuer.";
terResult = temBAD_PATH;
}
else if (!!pnPrv.uAccountID)
{ {
// Previous is an account. // Previous is an account.
// Insert intermediary issuer account if needed. // Insert intermediary issuer account if needed.
terResult = pushImply( terResult = pushImply(
!!pnPrv.uCurrencyID ACCOUNT_XRP, // Rippling, but offer's don't have an account.
? ACCOUNT_ONE // Rippling, but offer's don't have an account.
: ACCOUNT_XRP,
pnPrv.uCurrencyID, pnPrv.uCurrencyID,
pnPrv.uIssuerID); pnPrv.uIssuerID);
} }
@@ -1655,30 +1689,37 @@ PathState::PathState(
saInReq(saSendMax), saInReq(saSendMax),
saOutReq(saSend) saOutReq(saSend)
{ {
const uint160 uInCurrencyID = saSendMax.getCurrency(); const uint160 uMaxCurrencyID = saSendMax.getCurrency();
const uint160 uMaxIssuerID = saSendMax.getIssuer();
const uint160 uOutCurrencyID = saSend.getCurrency(); const uint160 uOutCurrencyID = saSend.getCurrency();
const uint160 uInIssuerID = !!uInCurrencyID ? saSendMax.getIssuer() : ACCOUNT_XRP; const uint160 uOutIssuerID = saSend.getIssuer();
const uint160 uOutIssuerID = !!uOutCurrencyID ? saSend.getIssuer() : ACCOUNT_XRP; const uint160 uSenderIssuerID = !!uMaxCurrencyID ? uSenderID : ACCOUNT_XRP; // Sender is always issuer for non-XRP.
lesEntries = lesSource.duplicate(); lesEntries = lesSource.duplicate();
terStatus = tesSUCCESS;
if ((!uMaxCurrencyID && !!uMaxIssuerID) || (!uOutCurrencyID && !!uOutIssuerID))
terStatus = temBAD_PATH;
// Push sending node. // Push sending node.
if (tesSUCCESS == terStatus)
terStatus = pushNode( terStatus = pushNode(
STPathElement::typeAccount !!uMaxCurrencyID
| STPathElement::typeCurrency ? STPathElement::typeAccount | STPathElement::typeCurrency | STPathElement::typeIssuer
| STPathElement::typeIssuer, : STPathElement::typeAccount | STPathElement::typeCurrency,
uSenderID, uSenderID,
uInCurrencyID, uMaxCurrencyID, // Max specifes the currency.
uSenderID); uSenderIssuerID);
cLog(lsDEBUG) << boost::str(boost::format("PathState: pushed: account=%s currency=%s issuer=%s") cLog(lsDEBUG) << boost::str(boost::format("PathState: pushed: account=%s currency=%s issuer=%s")
% RippleAddress::createHumanAccountID(uSenderID) % RippleAddress::createHumanAccountID(uSenderID)
% STAmount::createHumanCurrency(uInCurrencyID) % STAmount::createHumanCurrency(uMaxCurrencyID)
% RippleAddress::createHumanAccountID(uSenderID)); % RippleAddress::createHumanAccountID(uSenderIssuerID));
if (tesSUCCESS == terStatus if (tesSUCCESS == terStatus
&& !!uInCurrencyID // First was not XRC && uMaxIssuerID != uSenderIssuerID) { // Issuer was not same as sender
&& uInIssuerID != uSenderID) { // Issuer was not same as sender
// May have an implied node. // May have an implied node.
// Figure out next node properties for implied node. // Figure out next node properties for implied node.
@@ -1698,22 +1739,22 @@ cLog(lsDEBUG) << boost::str(boost::format("PathState: implied check: uNxtCurrenc
% RippleAddress::createHumanAccountID(uNxtAccountID)); % RippleAddress::createHumanAccountID(uNxtAccountID));
// Can't just use push implied, because it can't compensate for next account. // Can't just use push implied, because it can't compensate for next account.
if (!uNxtCurrencyID // Next is XRC - will have offer next if (!uNxtCurrencyID // Next is XRP - will have offer next
|| uInCurrencyID != uNxtCurrencyID // Next is different current - will have offer next || uMaxCurrencyID != uNxtCurrencyID // Next is different current - will have offer next
|| uInIssuerID != uNxtAccountID) // Next is not implied issuer || uMaxIssuerID != uNxtAccountID) // Next is not implied issuer
{ {
cLog(lsDEBUG) << boost::str(boost::format("PathState: implied: account=%s currency=%s issuer=%s") cLog(lsDEBUG) << boost::str(boost::format("PathState: sender implied: account=%s currency=%s issuer=%s")
% RippleAddress::createHumanAccountID(uInIssuerID) % RippleAddress::createHumanAccountID(uMaxIssuerID)
% RippleAddress::createHumanAccountID(uInCurrencyID) % RippleAddress::createHumanAccountID(uMaxCurrencyID)
% RippleAddress::createHumanAccountID(uInIssuerID)); % RippleAddress::createHumanAccountID(uMaxIssuerID));
// Add implied account. // Add account implied by SendMax.
terStatus = pushNode( terStatus = pushNode(
STPathElement::typeAccount !!uMaxCurrencyID
| STPathElement::typeCurrency ? STPathElement::typeAccount | STPathElement::typeCurrency | STPathElement::typeIssuer
| STPathElement::typeIssuer, : STPathElement::typeAccount | STPathElement::typeCurrency,
uInIssuerID, uMaxIssuerID,
uInCurrencyID, uMaxCurrencyID,
uInIssuerID); uMaxIssuerID);
} }
} }
@@ -1726,32 +1767,37 @@ cLog(lsDEBUG) << boost::str(boost::format("PathState: implied: account=%s curren
const PaymentNode& pnPrv = vpnNodes.back(); const PaymentNode& pnPrv = vpnNodes.back();
if (tesSUCCESS == terStatus if (tesSUCCESS == terStatus
&& !!uOutCurrencyID // Next is not XRC && !!uOutCurrencyID // Next is not XRP
&& uOutIssuerID != uReceiverID // Out issuer is not reciever && uOutIssuerID != uReceiverID // Out issuer is not reciever
&& (pnPrv.uCurrencyID != uOutCurrencyID // Previous will be an offer. && (pnPrv.uCurrencyID != uOutCurrencyID // Previous will be an offer.
|| pnPrv.uAccountID != uOutIssuerID)) // Need the implied issuer. || pnPrv.uAccountID != uOutIssuerID)) // Need the implied issuer.
{ {
// Add implied account. // Add implied account.
cLog(lsDEBUG) << boost::str(boost::format("PathState: receiver implied: account=%s currency=%s issuer=%s")
% RippleAddress::createHumanAccountID(uOutIssuerID)
% RippleAddress::createHumanAccountID(uOutCurrencyID)
% RippleAddress::createHumanAccountID(uOutIssuerID));
terStatus = pushNode( terStatus = pushNode(
STPathElement::typeAccount !!uOutCurrencyID
| STPathElement::typeCurrency ? STPathElement::typeAccount | STPathElement::typeCurrency | STPathElement::typeIssuer
| STPathElement::typeIssuer, : STPathElement::typeAccount | STPathElement::typeCurrency,
uOutIssuerID, uOutIssuerID,
uInCurrencyID, uOutCurrencyID,
uOutIssuerID); uOutIssuerID);
} }
if (tesSUCCESS == terStatus) if (tesSUCCESS == terStatus)
{ {
// Create receiver node. // Create receiver node.
// Last node is always an account.
terStatus = pushNode( terStatus = pushNode(
STPathElement::typeAccount // Last node is always an account. !!uOutCurrencyID
| STPathElement::typeCurrency ? STPathElement::typeAccount | STPathElement::typeCurrency | STPathElement::typeIssuer
| STPathElement::typeIssuer, : STPathElement::typeAccount | STPathElement::typeCurrency,
uReceiverID, // Receive to output uReceiverID, // Receive to output
uOutCurrencyID, // Desired currency uOutCurrencyID, // Desired currency
!!uOutCurrencyID ? uReceiverID : ACCOUNT_XRP); uReceiverID);
} }
if (tesSUCCESS == terStatus) if (tesSUCCESS == terStatus)
@@ -1773,7 +1819,7 @@ cLog(lsDEBUG) << boost::str(boost::format("PathState: implied: account=%s curren
else if (!umForward.insert(std::make_pair(boost::make_tuple(pnCur.uAccountID, pnCur.uCurrencyID, pnCur.uIssuerID), uNode)).second) else if (!umForward.insert(std::make_pair(boost::make_tuple(pnCur.uAccountID, pnCur.uCurrencyID, pnCur.uIssuerID), uNode)).second)
{ {
// Failed to insert. Have a loop. // Failed to insert. Have a loop.
cLog(lsINFO) << boost::str(boost::format("PathState: loop detected: %s") cLog(lsDEBUG) << boost::str(boost::format("PathState: loop detected: %s")
% getJson()); % getJson());
terStatus = temBAD_PATH_LOOP; terStatus = temBAD_PATH_LOOP;
@@ -1782,8 +1828,8 @@ cLog(lsDEBUG) << boost::str(boost::format("PathState: implied: account=%s curren
} }
cLog(lsINFO) << boost::str(boost::format("PathState: in=%s/%s out=%s/%s %s") cLog(lsINFO) << boost::str(boost::format("PathState: in=%s/%s out=%s/%s %s")
% STAmount::createHumanCurrency(uInCurrencyID) % STAmount::createHumanCurrency(uMaxCurrencyID)
% RippleAddress::createHumanAccountID(uInIssuerID) % RippleAddress::createHumanAccountID(uMaxIssuerID)
% STAmount::createHumanCurrency(uOutCurrencyID) % STAmount::createHumanCurrency(uOutCurrencyID)
% RippleAddress::createHumanAccountID(uOutIssuerID) % RippleAddress::createHumanAccountID(uOutIssuerID)
% getJson()); % getJson());
@@ -2024,7 +2070,7 @@ TER RippleCalc::rippleCalc(
if (!bNoRippleDirect) if (!bNoRippleDirect)
{ {
// Direct path. // Direct path.
// XXX Might also make a stamp bridge by default. // XXX Might also make a XRP bridge by default.
PathState::pointer pspDirect = PathState::createPathState( PathState::pointer pspDirect = PathState::createPathState(
vpsPaths.size(), vpsPaths.size(),
@@ -2274,7 +2320,7 @@ TER calcOfferFill(PaymentNode& pnSrc, PaymentNode& pnDst, bool bAllowPartial)
if (pnDst.saWanted.isNative()) if (pnDst.saWanted.isNative())
{ {
// Transfer stamps. // Transfer XRP.
STAmount saSrcFunds = pnSrc.saAccount->accountHolds(pnSrc.saAccount, uint160(0), uint160(0)); STAmount saSrcFunds = pnSrc.saAccount->accountHolds(pnSrc.saAccount, uint160(0), uint160(0));
@@ -2366,7 +2412,7 @@ void TransactionEngine::calcOfferBridgeNext(
if (saOfferPays.isNative()) if (saOfferPays.isNative())
{ {
// No additional fees for stamps. // No additional fees for XRP.
nothing(); nothing();
} }
@@ -2427,7 +2473,7 @@ void TransactionEngine::calcOfferBridgeNext(
#endif #endif
#if 0 #if 0
// If either currency is not stamps, then also calculates vs stamp bridge. // If either currency is not XRP, then also calculates vs XRP bridge.
// --> saWanted: Limit of how much is wanted out. // --> saWanted: Limit of how much is wanted out.
// <-- saPay: How much to pay into the offer. // <-- saPay: How much to pay into the offer.
// <-- saGot: How much to the offer pays out. Never more than saWanted. // <-- saGot: How much to the offer pays out. Never more than saWanted.