ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Rate to represent transfer rates (RIPD-201, RIPD-983):

Browse Source 
The Ripple protocol represent transfer rates and trust line
qualities as fractions of one billion. For example, a transfer
rate of 1% is represented as 1010000000.

Previously, such rates where represented either as std::uint32_t
or std::uint64_t. Other, nominally related types, also used an
integral representation and could be unintentionally substituted.

The new Rate class addresses this by providing a simple, type
safe alternative which also helps make the code self-documenting
since arithmetic operations now can be clearly understood to
involve the scaling of an amount by a rate.
This commit is contained in:
Nik Bougalis
2016-06-08 03:07:19 -07:00
committed by Miguel Portilla
parent f060820f3b
commit a698104c55
34 changed files with 579 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/ripple/ledger/impl/View.cpp
View File

@@ -328,31 +328,16 @@ forEachItemAfter (ReadView const& view, AccountID const& id,
}
}
std::uint32_t
rippleTransferRate (ReadView const& view,
Rate
transferRate (ReadView const& view,
AccountID const& issuer)
{
auto const sle = view.read(keylet::account(issuer));
std::uint32_t quality;
if (sle && sle->isFieldPresent (sfTransferRate))
quality = sle->getFieldU32 (sfTransferRate);
else
quality = QUALITY_ONE;
return quality;
}
std::uint32_t
rippleTransferRate (ReadView const& view,
AccountID const& uSenderID,
AccountID const& uReceiverID,
AccountID const& issuer)
{
// If calculating the transfer rate from
// or to the issuer of the currency no
// fees are assessed.
return (uSenderID == issuer || uReceiverID == issuer)
? QUALITY_ONE
: rippleTransferRate(view, issuer);
if (sle && sle->isFieldPresent (sfTransferRate))
return Rate{ sle->getFieldU32 (sfTransferRate) };
return parityRate;
}
bool
@@ -1367,27 +1352,26 @@ rippleTransferFee (ReadView const& view,
AccountID const& from,
AccountID const& to,
AccountID const& issuer,
STAmount const& saAmount,
STAmount const& amount,
beast::Journal j)
{
if (from != issuer && to != issuer)
{
std::uint32_t uTransitRate = rippleTransferRate (view, issuer);
Rate const rate = transferRate (view, issuer);
if (QUALITY_ONE != uTransitRate)
if (parityRate != rate)
{
STAmount saTransferTotal = multiply (
saAmount, amountFromRate (uTransitRate), saAmount.issue ());
STAmount saTransferFee = saTransferTotal - saAmount;
auto const fee = multiply (amount, rate) - amount;
JLOG (j.debug()) << "rippleTransferFee:" <<
" saTransferFee=" << saTransferFee.getFullText ();
" amount=" << amount.getFullText () <<
" fee=" << fee.getFullText ();
return saTransferFee;
return fee;
}
}
return saAmount.zeroed();
return amount.zeroed();
}
// Send regardless of limits.
@@ -1426,12 +1410,8 @@ rippleSend (ApplyView& view,
}
else
{
auto const rate = rippleTransferRate (view, issuer);
if (QUALITY_ONE == rate)
saActual = saAmount;
else
saActual =
multiply (saAmount, amountFromRate (rate), saAmount.issue ());
saActual = multiply (saAmount,
transferRate (view, issuer));
}
JLOG (j.debug()) << "rippleSend> " <<