Fix noRippleCheck fee field (#786)

Fixes #709
This commit is contained in:
Arihant Kothari
2023-07-26 14:22:17 -04:00
committed by GitHub
parent 71aabc8c29
commit 1d0a43669b
6 changed files with 5 additions and 17 deletions

View File

@@ -308,10 +308,6 @@ BackendInterface::fetchFees(std::uint32_t const seq, boost::asio::yield_context&
if (sle.getFieldIndex(ripple::sfBaseFee) != -1)
fees.base = sle.getFieldU64(ripple::sfBaseFee);
// deprecated?
// if (sle.getFieldIndex(ripple::sfReferenceFeeUnits) != -1)
// fees.units = sle.getFieldU32(ripple::sfReferenceFeeUnits);
if (sle.getFieldIndex(ripple::sfReserveBase) != -1)
fees.reserve = sle.getFieldU32(ripple::sfReserveBase);

View File

@@ -46,8 +46,7 @@ NoRippleCheckHandler::process(NoRippleCheckHandler::Input input, Context const&
auto sle = ripple::SLE{it, keylet};
auto accountSeq = sle.getFieldU32(ripple::sfSequence);
bool const bDefaultRipple = sle.getFieldU32(ripple::sfFlags) & ripple::lsfDefaultRipple;
// TODO: remove if no longer needed
// auto const fees = input.transactions ? sharedPtrBackend_->fetchFees(lgrInfo.seq, ctx.yield) : std::nullopt;
auto const fees = input.transactions ? sharedPtrBackend_->fetchFees(lgrInfo.seq, ctx.yield) : std::nullopt;
auto output = NoRippleCheckHandler::Output();
@@ -58,8 +57,7 @@ NoRippleCheckHandler::process(NoRippleCheckHandler::Input input, Context const&
boost::json::object tx;
tx[JS(Sequence)] = accountSeq;
tx[JS(Account)] = ripple::toBase58(accountID);
// TODO: deprecated?
// tx[JS(Fee)] = toBoostJson(fees->units.jsonClipped());
tx[JS(Fee)] = toBoostJson(fees->base.jsonClipped());
return tx;
};

View File

@@ -53,8 +53,6 @@ getLedgerPubMessage(
pubMsg["ledger_hash"] = to_string(lgrInfo.hash);
pubMsg["ledger_time"] = lgrInfo.closeTime.time_since_epoch().count();
// deprecated?
// pubMsg["fee_ref"] = RPC::toBoostJson(fees.units.jsonClipped());
pubMsg["fee_base"] = RPC::toBoostJson(fees.base.jsonClipped());
pubMsg["reserve_base"] = RPC::toBoostJson(fees.reserve.jsonClipped());
pubMsg["reserve_inc"] = RPC::toBoostJson(fees.increment.jsonClipped());