ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Autofill with x-queue-okay uses mult_max fee (RIPD-1194):

Browse Source 
* Only relevant if escalated fee is larger than mult_max.
* Will improved queue position, giving tx more chance to succeed.
This commit is contained in:
Edward Hennis
2016-06-23 17:22:53 -04:00
committed by Miguel Portilla
parent 9cc80b7cb6
commit 654772a860
2 changed files with 73 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -679,14 +679,11 @@ Json::Value checkFee (
feeTrack.scaleFeeLoad (feeDefault,
ledger->fees().base, ledger->fees().units, isUnlimited (role));
std::uint64_t fee = loadFee;
if (ledger->rules().enabled(featureFeeEscalation,
config.features))
{
auto const assumeTx = request.isMember("x-assume-tx") &&
request["x-assume-tx"].isConvertibleTo(Json::uintValue) ?
request["x-assume-tx"].asUInt() : 0;
auto const metrics = txQ.getMetrics(config, *ledger, assumeTx);
assert(metrics);
if(metrics)
{
auto const baseFee = ledger->fees().base;
@@ -709,7 +706,7 @@ Json::Value checkFee (
request["x-queue-okay"].isBool() &&
request["x-queue-okay"].asBool())
{
fee = loadFee;
fee = std::max(loadFee, limit);
}
if (fee > limit)
{
@@ -719,7 +716,7 @@ Json::Value checkFee (
return RPC::make_error (rpcHIGH_FEE, ss.str());
}
tx [jss::Fee] = static_cast<int>(fee);
tx [jss::Fee] = static_cast<unsigned int>(fee);
return Json::Value();
}