always return rpc fee in drops

Transia-RnD · Oct 5, 2023 · 587b665 · 587b665
1 parent 4e84ad6
commit 587b665
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 27 deletions.
diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp
@@ -2602,26 +2602,11 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
         l[jss::seq] = Json::UInt(lpClosed->info().seq);
         l[jss::hash] = to_string(lpClosed->info().hash);
 
-        if (!human)
-        {
-            l[jss::base_fee] = baseFee.jsonClipped();
-            l[jss::reserve_base] =
-                lpClosed->fees().accountReserve(0).jsonClipped();
-            l[jss::reserve_inc] = lpClosed->fees().increment.jsonClipped();
-            l[jss::close_time] = Json::Value::UInt(
-                lpClosed->info().closeTime.time_since_epoch().count());
-        }
-        else
-        {
-            l[jss::base_fee_xrp] = baseFee.decimalXRP();
-            l[jss::reserve_base_xrp] =
-                lpClosed->fees().accountReserve(0).decimalXRP();
-            l[jss::reserve_inc_xrp] = lpClosed->fees().increment.decimalXRP();
-
-            if (auto const closeOffset = app_.timeKeeper().closeOffset();
-                std::abs(closeOffset.count()) >= 60)
-                l[jss::close_time_offset] =
-                    static_cast<std::uint32_t>(closeOffset.count());
+        l[jss::base_fee] = baseFee.jsonClipped();
+        l[jss::reserve_base] = lpClosed->fees().accountReserve(0).jsonClipped();
+        l[jss::reserve_inc] = lpClosed->fees().increment.jsonClipped();
+        l[jss::close_time] = Json::Value::UInt(
+            lpClosed->info().closeTime.time_since_epoch().count());
 
 #if RIPPLED_REPORTING
             std::int64_t const dbAge =

diff --git a/src/ripple/overlay/impl/OverlayImpl.cpp b/src/ripple/overlay/impl/OverlayImpl.cpp
@@ -867,8 +867,8 @@ OverlayImpl::getServerInfo()
         Json::Value& validated_ledger = server_info[jss::validated_ledger];
 
         validated_ledger.removeMember(jss::base_fee);
-        validated_ledger.removeMember(jss::reserve_base_xrp);
-        validated_ledger.removeMember(jss::reserve_inc_xrp);
+        validated_ledger.removeMember(jss::reserve_base);
+        validated_ledger.removeMember(jss::reserve_inc);
     }
 
     return server_info;

diff --git a/src/ripple/protocol/jss.h b/src/ripple/protocol/jss.h
@@ -199,7 +199,6 @@ JSS(balance);                     // out: AccountLines
 JSS(balances);                    // out: GatewayBalances
 JSS(base);                        // out: LogLevel
 JSS(base_fee);                    // out: NetworkOPs
-JSS(base_fee_xrp);                // out: NetworkOPs
 JSS(bids);                        // out: Subscribe
 JSS(binary);                      // in: AccountTX, LedgerEntry,
                                   //     AccountTxOld, Tx LedgerData
@@ -228,7 +227,6 @@ JSS(close_time);                  // in: Application, out: NetworkOPs,
                                   //      RCLCxPeerPos, LedgerToJson
 JSS(close_time_estimated);        // in: Application, out: LedgerToJson
 JSS(close_time_human);            // out: LedgerToJson
-JSS(close_time_offset);           // out: NetworkOPs
 JSS(close_time_resolution);       // in: Application; out: LedgerToJson
 JSS(closed);                      // out: NetworkOPs, LedgerToJson,
                                   //      handlers/Ledger
@@ -555,9 +553,7 @@ JSS(request);               // RPC
 JSS(requested);             // out: Manifest
 JSS(reservations);          // out: Reservations
 JSS(reserve_base);          // out: NetworkOPs
-JSS(reserve_base_xrp);      // out: NetworkOPs
 JSS(reserve_inc);           // out: NetworkOPs
-JSS(reserve_inc_xrp);       // out: NetworkOPs
 JSS(response);              // websocket
 JSS(result);                // RPC
 JSS(ripple_lines);          // out: NetworkOPs
@@ -618,7 +614,6 @@ JSS(subcommand);            // in: PathFind
 JSS(success);               // rpc
 JSS(supported);             // out: AmendmentTableImpl
 JSS(sync_mode);             // in: Submit
-JSS(system_time_offset);    // out: NetworkOPs
 JSS(tag);                   // out: Peers
 JSS(taker);                 // in: Subscribe, BookOffers
 JSS(taker_gets);            // in: Subscribe, Unsubscribe, BookOffers