From 2b70d3f750bdcf99abc0681dd0f391856fd01d4f Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Mon, 14 Jan 2013 14:28:23 -0800 Subject: [PATCH] Output fee information in server_info. --- src/cpp/ripple/NetworkOPs.cpp | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/cpp/ripple/NetworkOPs.cpp b/src/cpp/ripple/NetworkOPs.cpp index cc52879837..b589567df0 100644 --- a/src/cpp/ripple/NetworkOPs.cpp +++ b/src/cpp/ripple/NetworkOPs.cpp @@ -1127,7 +1127,17 @@ Json::Value NetworkOPs::getServerInfo() if (mConsensus) info["consensus"] = mConsensus->getJson(); - info["load"] = theApp->getJobQueue().getJson(); + info["load"] = theApp->getJobQueue().getJson(); + info["load_base"] = theApp->getFeeTrack().getLoadBase(); + info["load_fee"] = theApp->getFeeTrack().getLoadFactor(); + + Ledger::pointer lpClosed = getClosedLedger(); + + if (lpClosed) + { + info["reserve_base"] = Json::UInt(lpClosed->getReserve(0)); + info["reserve_inc"] = Json::UInt(lpClosed->getReserveInc()); + } return info; } @@ -1468,15 +1478,16 @@ void NetworkOPs::unsubAccountChanges(InfoSub* ispListener) // <-- bool: true=added, false=already there bool NetworkOPs::subLedger(InfoSub* ispListener, Json::Value& jvResult) { - Ledger::pointer closedLgr = getClosedLedger(); - jvResult["ledger_index"] = closedLgr->getLedgerSeq(); - jvResult["ledger_hash"] = closedLgr->getHash().ToString(); - jvResult["ledger_time"] = Json::Value::UInt(utFromSeconds(closedLgr->getCloseTimeNC())); + Ledger::pointer lpClosed = getClosedLedger(); - jvResult["fee_ref"] = Json::UInt(closedLgr->getReferenceFeeUnits()); - jvResult["fee_base"] = Json::UInt(closedLgr->getBaseFee()); - jvResult["reserve_base"] = Json::UInt(closedLgr->getReserve(0)); - jvResult["reserve_inc"] = Json::UInt(closedLgr->getReserveInc()); + jvResult["ledger_index"] = lpClosed->getLedgerSeq(); + jvResult["ledger_hash"] = lpClosed->getHash().ToString(); + jvResult["ledger_time"] = Json::Value::UInt(utFromSeconds(lpClosed->getCloseTimeNC())); + + jvResult["fee_ref"] = Json::UInt(lpClosed->getReferenceFeeUnits()); + jvResult["fee_base"] = Json::UInt(lpClosed->getBaseFee()); + jvResult["reserve_base"] = Json::UInt(lpClosed->getReserve(0)); + jvResult["reserve_inc"] = Json::UInt(lpClosed->getReserveInc()); return mSubLedger.insert(ispListener).second; }