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 rippling funds.

Browse Source
This commit is contained in:
Arthur Britto
2013-01-28 21:13:19 -08:00
parent 02b9a0b623
commit 823e04b148
2 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1111,11 +1111,12 @@ bool STAmount::applyOffer(
{ {
// Compute fees in a rounding safe way. // Compute fees in a rounding safe way.
// TakerCost includes transfer fees.
STAmount saTakerCost = STAmount::multiply(saTakerPaid, STAmount(CURRENCY_ONE, ACCOUNT_ONE, uTakerPaysRate, -9));
STAmount saTransferRate = STAmount(CURRENCY_ONE, ACCOUNT_ONE, uTakerPaysRate, -9); STAmount saTransferRate = STAmount(CURRENCY_ONE, ACCOUNT_ONE, uTakerPaysRate, -9);
cLog(lsINFO) << "applyOffer: saTransferRate=" << saTransferRate.getFullText(); cLog(lsINFO) << "applyOffer: saTransferRate=" << saTransferRate.getFullText();
// TakerCost includes transfer fees.
STAmount saTakerCost = STAmount::multiply(saTakerPaid, saTransferRate);
cLog(lsINFO) << "applyOffer: saTakerCost=" << saTakerCost.getFullText(); cLog(lsINFO) << "applyOffer: saTakerCost=" << saTakerCost.getFullText();
cLog(lsINFO) << "applyOffer: saTakerFunds=" << saTakerFunds.getFullText(); cLog(lsINFO) << "applyOffer: saTakerFunds=" << saTakerFunds.getFullText();
saTakerIssuerFee = saTakerCost > saTakerFunds saTakerIssuerFee = saTakerCost > saTakerFunds

44
src/cpp/ripple/LedgerEntrySet.cpp
View File

@@ -1129,21 +1129,25 @@ STAmount LedgerEntrySet::accountFunds(const uint160& uAccountID, const STAmount&
// Calculate transit fee. // Calculate transit fee.
STAmount LedgerEntrySet::rippleTransferFee(const uint160& uSenderID, const uint160& uReceiverID, const uint160& uIssuerID, const STAmount& saAmount) STAmount LedgerEntrySet::rippleTransferFee(const uint160& uSenderID, const uint160& uReceiverID, const uint160& uIssuerID, const STAmount& saAmount)
{ {
STAmount saTransitFee;
if (uSenderID != uIssuerID && uReceiverID != uIssuerID) if (uSenderID != uIssuerID && uReceiverID != uIssuerID)
{ {
uint32 uTransitRate = rippleTransferRate(uIssuerID); uint32 uTransitRate = rippleTransferRate(uIssuerID);
if (QUALITY_ONE != uTransitRate) if (QUALITY_ONE != uTransitRate)
{ {
STAmount saTransitRate(CURRENCY_ONE, uTransitRate, -9); STAmount saTransitRate(CURRENCY_ONE, ACCOUNT_ONE, uTransitRate, -9);
saTransitFee = STAmount::multiply(saAmount, saTransitRate, saAmount.getCurrency(), saAmount.getIssuer()); STAmount saTransferTotal = STAmount::multiply(saAmount, saTransitRate, saAmount.getCurrency(), saAmount.getIssuer());
STAmount saTransferFee = saTransferTotal-saAmount;
cLog(lsINFO) << boost::str(boost::format("rippleTransferFee: saTransferFee=%s")
% saTransferFee.getFullText());
return saTransferFee;
} }
} }
return saTransitFee; return STAmount(saAmount.getCurrency(), saAmount.getIssuer());
} }
TER LedgerEntrySet::trustCreate( TER LedgerEntrySet::trustCreate(
@@ -1239,7 +1243,7 @@ TER LedgerEntrySet::rippleCredit(const uint160& uSenderID, const uint160& uRecei
saBalance.setIssuer(ACCOUNT_ONE); saBalance.setIssuer(ACCOUNT_ONE);
cLog(lsDEBUG) << boost::str(boost::format("rippleCredit: create line: %s (0) -> %s : %s") cLog(lsDEBUG) << boost::str(boost::format("rippleCredit: create line: %s --> %s : %s")
% RippleAddress::createHumanAccountID(uSenderID) % RippleAddress::createHumanAccountID(uSenderID)
% RippleAddress::createHumanAccountID(uReceiverID) % RippleAddress::createHumanAccountID(uReceiverID)
% saAmount.getFullText()); % saAmount.getFullText());
@@ -1258,21 +1262,21 @@ TER LedgerEntrySet::rippleCredit(const uint160& uSenderID, const uint160& uRecei
{ {
STAmount saBalance = sleRippleState->getFieldAmount(sfBalance); STAmount saBalance = sleRippleState->getFieldAmount(sfBalance);
if (!bSenderHigh) if (bSenderHigh)
saBalance.negate(); // Put balance in low terms. saBalance.negate(); // Put balance in sender terms.
STAmount saBefore = saBalance; STAmount saBefore = saBalance;
saBalance += saAmount; saBalance -= saAmount;
cLog(lsDEBUG) << boost::str(boost::format("rippleCredit: %s -- (%s > %s) -> %s : %s") cLog(lsDEBUG) << boost::str(boost::format("rippleCredit: %s --> %s : before=%s amount=%s after=%s")
% RippleAddress::createHumanAccountID(uSenderID) % RippleAddress::createHumanAccountID(uSenderID)
% saBefore.getFullText()
% saBalance.getFullText()
% RippleAddress::createHumanAccountID(uReceiverID) % RippleAddress::createHumanAccountID(uReceiverID)
% saAmount.getFullText()); % saBefore.getFullText()
% saAmount.getFullText()
% saBalance.getFullText());
if (!bSenderHigh) if (bSenderHigh)
saBalance.negate(); saBalance.negate();
sleRippleState->setFieldAmount(sfBalance, saBalance); sleRippleState->setFieldAmount(sfBalance, saBalance);
@@ -1286,8 +1290,8 @@ TER LedgerEntrySet::rippleCredit(const uint160& uSenderID, const uint160& uRecei
} }
// Send regardless of limits. // Send regardless of limits.
// --> saAmount: Amount/currency/issuer for receiver to get. // --> saAmount: Amount/currency/issuer to deliver to reciever.
// <-- saActual: Amount actually sent. Sender pay's fees. // <-- saActual: Amount actually cost. Sender pay's fees.
TER LedgerEntrySet::rippleSend(const uint160& uSenderID, const uint160& uReceiverID, const STAmount& saAmount, STAmount& saActual) TER LedgerEntrySet::rippleSend(const uint160& uSenderID, const uint160& uReceiverID, const STAmount& saAmount, STAmount& saActual)
{ {
const uint160 uIssuerID = saAmount.getIssuer(); const uint160 uIssuerID = saAmount.getIssuer();
@@ -1314,12 +1318,12 @@ TER LedgerEntrySet::rippleSend(const uint160& uSenderID, const uint160& uReceive
saActual.setIssuer(uIssuerID); // XXX Make sure this done in + above. saActual.setIssuer(uIssuerID); // XXX Make sure this done in + above.
cLog(lsINFO) << boost::str(boost::format("rippleSend> %s -- %s--> %s (%s) : %s") cLog(lsINFO) << boost::str(boost::format("rippleSend> %s -- > %s : deliver=%s fee=%s cost=%s")
% RippleAddress::createHumanAccountID(uSenderID) % RippleAddress::createHumanAccountID(uSenderID)
% saTransitFee.getFullText()
% RippleAddress::createHumanAccountID(uReceiverID) % RippleAddress::createHumanAccountID(uReceiverID)
% saActual.getFullText() % saAmount.getFullText()
% saAmount.getFullText()); % saTransitFee.getFullText()
% saActual.getFullText());
terResult = rippleCredit(uIssuerID, uReceiverID, saAmount); terResult = rippleCredit(uIssuerID, uReceiverID, saAmount);