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

Clean up rippling currency and issuer. For client issue 535.

Browse Source
This commit is contained in:
Arthur Britto
2013-05-06 20:09:24 -07:00
parent ec6efa6d00
commit fc92e563e0
1 changed files with 15 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,8 +225,10 @@ TER PathState::pushNode(
: !!pnCur.uCurrencyID : !!pnCur.uCurrencyID
? uAccountID ? uAccountID
: ACCOUNT_XRP; : ACCOUNT_XRP;
pnCur.saRevRedeem = STAmount(uCurrencyID, uAccountID); pnCur.saRevRedeem = STAmount(pnCur.uCurrencyID, uAccountID);
pnCur.saRevIssue = STAmount(uCurrencyID, uAccountID); pnCur.saRevIssue = STAmount(pnCur.uCurrencyID, uAccountID);
pnCur.saRevDeliver = STAmount(pnCur.uCurrencyID, pnCur.uIssuerID);
pnCur.saFwdDeliver = pnCur.saRevDeliver;
if (bFirst) if (bFirst)
{ {
@@ -338,6 +340,8 @@ TER PathState::pushNode(
: pnPrv.uAccountID // Or previous account if no previous issuer. : pnPrv.uAccountID // Or previous account if no previous issuer.
: ACCOUNT_XRP; : ACCOUNT_XRP;
pnCur.saRateMax = saZero; pnCur.saRateMax = saZero;
pnCur.saRevDeliver = STAmount(pnCur.uCurrencyID, pnCur.uIssuerID);
pnCur.saFwdDeliver = pnCur.saRevDeliver;
if (!!pnCur.uCurrencyID != !!pnCur.uIssuerID) if (!!pnCur.uCurrencyID != !!pnCur.uIssuerID)
{ {
@@ -1684,34 +1688,6 @@ TER RippleCalc::calcNodeOfferRev(
// Next is an account node, resolve current offer node's deliver. // Next is an account node, resolve current offer node's deliver.
STAmount saDeliverAct; STAmount saDeliverAct;
// For each offer node in the sequence clear saRevDeliver and the previous saFwdDeliver.
for (unsigned int uIndex = uNode; uIndex;)
{
PaymentNode& pnClrCur = psCur.vpnNodes[uIndex];
PaymentNode& pnClrPrv = psCur.vpnNodes[uIndex-1];
if (!pnClrCur.uAccountID)
{
// An offer.
// Reverse pass.
// Current entry is previously calculated.
// Clear prior entries which are derived.
pnClrPrv.saRevDeliver.zero(pnClrPrv.uCurrencyID, pnClrPrv.uIssuerID);
// Clear deliver entry to be added to in forward pass.
pnClrCur.saFwdDeliver.zero(pnClrCur.uCurrencyID, pnClrCur.uIssuerID);
--uIndex;
}
else
{
// A non-offer.
uIndex = 0; // Done.
}
}
cLog(lsINFO) << boost::str(boost::format("calcNodeOfferRev: OFFER --> account: uNode=%d saRevDeliver=%s") cLog(lsINFO) << boost::str(boost::format("calcNodeOfferRev: OFFER --> account: uNode=%d saRevDeliver=%s")
% uNode % uNode
% pnCur.saRevDeliver); % pnCur.saRevDeliver);
@@ -1949,7 +1925,7 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
% saPrvLimit.getFullText()); % saPrvLimit.getFullText());
// Previous can redeem the owed IOUs it holds. // Previous can redeem the owed IOUs it holds.
const STAmount saPrvRedeemReq = saPrvOwed.isPositive() ? saPrvOwed : STAmount(uCurrencyID, 0); const STAmount saPrvRedeemReq = saPrvOwed.isPositive() ? saPrvOwed : STAmount(saPrvOwed.getCurrency(), saPrvOwed.getIssuer());
STAmount& saPrvRedeemAct = pnPrv.saRevRedeem; STAmount& saPrvRedeemAct = pnPrv.saRevRedeem;
// Previous can issue up to limit minus whatever portion of limit already used (not including redeemable amount). // Previous can issue up to limit minus whatever portion of limit already used (not including redeemable amount).
@@ -1957,7 +1933,7 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
STAmount& saPrvIssueAct = pnPrv.saRevIssue; STAmount& saPrvIssueAct = pnPrv.saRevIssue;
// For !bPrvAccount // For !bPrvAccount
const STAmount saPrvDeliverReq = STAmount(uCurrencyID, uCurAccountID, -1); // Unlimited. const STAmount saPrvDeliverReq = STAmount(pnPrv.saRevDeliver.getCurrency(), pnPrv.saRevDeliver.getIssuer(), -1); // Unlimited.
STAmount& saPrvDeliverAct = pnPrv.saRevDeliver; STAmount& saPrvDeliverAct = pnPrv.saRevDeliver;
// For bNxtAccount // For bNxtAccount
@@ -1998,7 +1974,7 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
{ {
// account --> ACCOUNT --> $ // account --> ACCOUNT --> $
// Overall deliverable. // Overall deliverable.
const STAmount& saCurWantedReq = std::min(psCur.saOutReq-psCur.saOutAct, saPrvLimit+saPrvOwed); // If previous is an account, limit. const STAmount saCurWantedReq = std::min(psCur.saOutReq-psCur.saOutAct, saPrvLimit+saPrvOwed); // If previous is an account, limit.
STAmount saCurWantedAct(saCurWantedReq.getCurrency(), saCurWantedReq.getIssuer()); STAmount saCurWantedAct(saCurWantedReq.getCurrency(), saCurWantedReq.getIssuer());
cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: account --> ACCOUNT --> $ : saCurWantedReq=%s") cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: account --> ACCOUNT --> $ : saCurWantedReq=%s")
@@ -2021,11 +1997,11 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
} }
else else
{ {
saPrvRedeemAct.zero(saCurWantedAct); saPrvRedeemAct.zero(saPrvRedeemReq);
} }
// Calculate issuing. // Calculate issuing.
saPrvIssueAct.zero(saCurWantedAct); saPrvIssueAct.zero(saPrvIssueReq);
if (saCurWantedReq != saCurWantedAct // Need more. if (saCurWantedReq != saCurWantedAct // Need more.
&& saPrvIssueReq) // Will accept IOUs from prevous. && saPrvIssueReq) // Will accept IOUs from prevous.
@@ -2049,8 +2025,8 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
else else
{ {
// ^|account --> ACCOUNT --> account // ^|account --> ACCOUNT --> account
saPrvRedeemAct.zero(saCurRedeemReq); saPrvRedeemAct.zero(saPrvRedeemReq);
saPrvIssueAct.zero(saCurRedeemReq); saPrvIssueAct.zero(saPrvIssueReq);
// redeem (part 1) -> redeem // redeem (part 1) -> redeem
if (saCurRedeemReq // Next wants IOUs redeemed. if (saCurRedeemReq // Next wants IOUs redeemed.
@@ -2123,8 +2099,8 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
// Note: deliver is always issue as ACCOUNT is the issuer for the offer input. // Note: deliver is always issue as ACCOUNT is the issuer for the offer input.
cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: account --> ACCOUNT --> offer")); cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: account --> ACCOUNT --> offer"));
saPrvRedeemAct.zero(saCurRedeemReq); saPrvRedeemAct.zero(saPrvRedeemReq);
saPrvIssueAct.zero(saCurRedeemReq); saPrvIssueAct.zero(saPrvIssueReq);
// redeem -> deliver/issue. // redeem -> deliver/issue.
if (saPrvOwed.isPositive() // Previous has IOUs to redeem. if (saPrvOwed.isPositive() // Previous has IOUs to redeem.
@@ -2155,8 +2131,6 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
} }
else if (!bPrvAccount && bNxtAccount) else if (!bPrvAccount && bNxtAccount)
{ {
saPrvDeliverAct.zero(saCurRedeemReq);
if (uNode == uLast) if (uNode == uLast)
{ {
// offer --> ACCOUNT --> $ // offer --> ACCOUNT --> $
@@ -2225,8 +2199,6 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
// deliver/redeem -> deliver/issue. // deliver/redeem -> deliver/issue.
cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: offer --> ACCOUNT --> offer")); cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: offer --> ACCOUNT --> offer"));
saPrvDeliverAct.zero(saCurRedeemReq);
// Rate : 1.0 : transfer_rate // Rate : 1.0 : transfer_rate
calcNodeRipple(QUALITY_ONE, lesActive.rippleTransferRate(uCurAccountID), saPrvDeliverReq, saCurDeliverReq, saPrvDeliverAct, saCurDeliverAct, uRateMax); calcNodeRipple(QUALITY_ONE, lesActive.rippleTransferRate(uCurAccountID), saPrvDeliverReq, saCurDeliverReq, saPrvDeliverAct, saCurDeliverAct, uRateMax);