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

Simplify fee handling during transaction submission:

Browse Source 
Avoid custom overflow code; simply use 128-bit math to
maintain precision and return a saturated 64-bit value
as the final result.

Disallow use of negative values in the `fee_mult_max`
and `fee_div_max` fields. This change could potentially
cause submissions with negative values that would have
previously succeeded to now fail.
This commit is contained in:
Nik Bougalis
2017-01-18 03:33:46 -08:00
parent c7de7950c4
commit 8345475bc3
8 changed files with 135 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -662,11 +662,16 @@ Json::Value checkFee (
if (request[jss::fee_mult_max].isInt())
{
mult = request[jss::fee_mult_max].asInt();
if (mult < 0)
return RPC::make_error(rpcINVALID_PARAMS,
RPC::expected_field_message(jss::fee_mult_max,
"a positive integer"));
}
else
{
return RPC::make_error (rpcHIGH_FEE,
RPC::expected_field_message (jss::fee_mult_max, "an integer"));
RPC::expected_field_message (jss::fee_mult_max,
"a positive integer"));
}
}
if (request.isMember(jss::fee_div_max))
@@ -674,14 +679,16 @@ Json::Value checkFee (
if (request[jss::fee_div_max].isInt())
{
div = request[jss::fee_div_max].asInt();
if (div == 0)
if (div <= 0)
return RPC::make_error(rpcINVALID_PARAMS,
RPC::expected_field_message(jss::fee_div_max, "non-zero"));
RPC::expected_field_message(jss::fee_div_max,
"a positive integer"));
}
else
{
return RPC::make_error(rpcHIGH_FEE,
RPC::expected_field_message(jss::fee_div_max, "an integer"));
RPC::expected_field_message(jss::fee_div_max,
"a positive integer"));
}
}
@@ -711,8 +718,18 @@ Json::Value checkFee (
}
}
auto const limit = mulDivThrow(scaleFeeBase (
feeDefault, ledger->fees()), mult, div);
auto const limit = [&]()
{
// Scale fee units to drops:
auto const drops = mulDiv (feeDefault,
ledger->fees().base, ledger->fees().units);
if (!drops.first)
Throw<std::overflow_error>("mulDiv");
auto const result = mulDiv (drops.second, mult, div);
if (!result.first)
Throw<std::overflow_error>("mulDiv");
return result.second;
}();
if (fee > limit && fee != loadFee &&
request.isMember("x_queue_okay") &&