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

Add units to all fee calculations:

Browse Source 
* Uses existing XRPAmount with units for drops, and a new TaggedFee for
  fee units (LoadFeeTrack), and fee levels (TxQ).
* Resolves #2451
This commit is contained in:
Edward Hennis
2019-02-14 18:59:07 -05:00
parent 1901b981f3
commit e3b5b808c5
87 changed files with 2195 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ripple/rpc/impl/TransactionSign.cpp
View File

@@ -709,22 +709,19 @@ Json::Value checkFee (
}
// Default fee in fee units.
std::uint64_t const feeDefault = config.TRANSACTION_FEE_BASE;
FeeUnit32 const feeDefault = config.TRANSACTION_FEE_BASE;
// Administrative and identified endpoints are exempt from local fees.
std::uint64_t const loadFee =
XRPAmount const loadFee =
scaleFeeLoad (feeDefault, feeTrack,
ledger->fees(), isUnlimited (role));
std::uint64_t fee = loadFee;
XRPAmount fee = loadFee;
{
auto const metrics = txQ.getMetrics(*ledger);
auto const baseFee = ledger->fees().base;
auto escalatedFee = mulDiv(
metrics.openLedgerFeeLevel, baseFee,
metrics.referenceFeeLevel).second;
if (mulDiv(escalatedFee, metrics.referenceFeeLevel,
baseFee).second < metrics.openLedgerFeeLevel)
++escalatedFee;
auto escalatedFee = toDrops(
metrics.openLedgerFeeLevel - FeeLevel64{ 1 }, baseFee).second +
1;
fee = std::max(fee, escalatedFee);
}
@@ -749,7 +746,7 @@ Json::Value checkFee (
return RPC::make_error (rpcHIGH_FEE, ss.str());
}
tx [jss::Fee] = static_cast<unsigned int>(fee);
tx [jss::Fee] = fee.jsonClipped();
return Json::Value();
}