WIP: First dibs at storing close_time_iso

src/ripple/app/ledger/impl/LedgerToJson.cpp

@@ -17,6 +17,7 @@
 */
 //==============================================================================
 
+#include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/ledger/LedgerToJson.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/DeliverMax.h>
@@ -26,6 +27,7 @@
 #include <ripple/protocol/jss.h>
 #include <ripple/rpc/Context.h>
 #include <ripple/rpc/DeliveredAmount.h>
+#include <ripple/rpc/impl/RPCHelpers.h>
 
 namespace ripple {
 
@@ -153,6 +155,17 @@ fillJsonTx(
  txn,
  {txn->getTransactionID(), fill.ledger.seq(), *stMeta});
  }
+
+ const bool validated = RPC::isValidated(
+ fill.context->ledgerMaster, fill.ledger, fill.context->app);
+ txJson[jss::validated] = validated;
+ if (validated)
+ {
+ if (auto close_time =
+ fill.context->ledgerMaster.getCloseTimeBySeq(
+ fill.ledger.seq()))
+ txJson[jss::close_time_iso] = to_string_iso(*close_time);
+ }
  }
  else
  {

src/ripple/app/misc/NetworkOPs.cpp

@@ -3125,6 +3125,8 @@ NetworkOPsImp::transJson(
  jvObj[jss::transaction][jss::date] =
  ledger->info().closeTime.time_since_epoch().count();
  jvObj[jss::validated] = true;
+ if (auto close_time = m_ledgerMaster.getCloseTimeBySeq(ledger->seq()))
+ jvObj[jss::close_time_iso] = to_string_iso(*close_time);
 
  // WRITEME: Put the account next seq here
  }
@@ -3179,13 +3181,8 @@ NetworkOPsImp::transJson(
  {
  jvTx[jss::tx_json] = jvTx.removeMember(jss::transaction);
  jvTx[jss::hash] = hash;
-
  if (!owner_funds.empty())
- {
- if (!jvTx.isMember(jss::meta))
- jvTx[jss::meta] = Json::Value(Json::objectValue);
- jvTx[jss::meta][jss::owner_funds] = owner_funds;
- }
+ jvTx[jss::owner_funds] = owner_funds;
 
  // TODO set `jvObj[jss::close_time_iso]` if validated
  }

src/ripple/basics/chrono.h

@@ -74,6 +74,22 @@ to_string(NetClock::time_point tp)
  system_clock::time_point{tp.time_since_epoch() + 946684800s});
 }
 
+template <class Duration>
+std::string
+to_string_iso(date::sys_time<Duration> tp)
+{
+ return date::format("%FT%TZ", tp);
+}
+
+inline std::string
+to_string_iso(NetClock::time_point tp)
+{
+ // 2000-01-01 00:00:00 UTC is 946684800s from 1970-01-01 00:00:00 UTC
+ using namespace std::chrono;
+ return to_string_iso(
+ system_clock::time_point{tp.time_since_epoch() + 946684800s});
+}
+
 /** A clock for measuring elapsed time.
 
  The epoch is unspecified.

src/ripple/protocol/jss.h

@@ -230,6 +230,8 @@ JSS(close); // out: BookChanges
 JSS(close_flags); // out: LedgerToJson
 JSS(close_time); // in: Application, out: NetworkOPs,
  // RCLCxPeerPos, LedgerToJson
+JSS(close_time_iso); // out: Tx, NetworkOPs, TransactionEntry
+ // AccountTx, LedgerToJson
 JSS(close_time_estimated); // in: Application, out: LedgerToJson
 JSS(close_time_human); // out: LedgerToJson
 JSS(close_time_offset); // out: NetworkOPs

src/ripple/rpc/handlers/AccountTx.cpp

@@ -334,7 +334,6 @@ populateJsonResponse(
  jvObj[json_tx] = txn->getJson(
  JsonOptions::include_date, false, {std::ref(hash)});
  jvObj[jss::hash] = hash;
- // TODO set `jvObj[jss::close_time_iso]`
  }
  else
  jvObj[json_tx] =
@@ -351,6 +350,11 @@ populateJsonResponse(
  insertDeliveredAmount(
  jvObj[jss::meta], context, txn, *txnMeta);
  insertNFTSyntheticInJson(jvObj, sttx, *txnMeta);
+ if (auto closeTime =
+ context.ledgerMaster.getCloseTimeBySeq(
+ txnMeta->getIndex()))
+ jvObj[jss::close_time_iso] =
+ to_string_iso(*closeTime);
  }
  }
  }

src/ripple/rpc/handlers/TransactionEntry.cpp

@@ -17,6 +17,7 @@
 */
 //==============================================================================
 
+#include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/DeliverMax.h>
 #include <ripple/ledger/ReadView.h>
@@ -77,7 +78,18 @@ doTransactionEntry(RPC::JsonContext& context)
  jvResult[jss::tx_json] =
  sttx->getJson(JsonOptions::none, false, {std::ref(hash)});
  jvResult[jss::hash] = hash;
- // TODO set `jvResult[jss::close_time_iso]`
+
+ bool const validated = RPC::isValidated(
+ context.ledgerMaster, *lpLedger, context.app);
+
+ jvResult[jss::validated] = validated;
+ if (validated)
+ {
+ if (auto closeTime = context.ledgerMaster.getCloseTimeBySeq(
+ lpLedger->seq()))
+ jvResult[jss::close_time_iso] =
+ to_string_iso(*closeTime);
+ }
  }
  else
  jvResult[jss::tx_json] = sttx->getJson(JsonOptions::none);

src/ripple/rpc/handlers/Tx.cpp

@@ -22,6 +22,7 @@
 #include <ripple/app/misc/DeliverMax.h>
 #include <ripple/app/misc/NetworkOPs.h>
 #include <ripple/app/misc/Transaction.h>
+#include <ripple/app/rdb/RelationalDatabase.h>
 #include <ripple/basics/ToString.h>
 #include <ripple/net/RPCErr.h>
 #include <ripple/protocol/ErrorCodes.h>
@@ -55,6 +56,7 @@ struct TxResult
  std::variant<std::shared_ptr<TxMeta>, Blob> meta;
  bool validated = false;
  std::optional<std::string> ctid;
+ std::optional<NetClock::time_point> closeTime;
  TxSearched searchedAll;
 };
 
@@ -140,6 +142,12 @@ doTxPostgres(RPC::Context& context, TxArgs const& args)
  *(args.hash), res.txn->getLedger(), *meta);
  }
  res.validated = true;
+
+ auto const ledgerInfo =
+ context.app.getRelationalDatabase().getLedgerInfoByIndex(
+ locator.getLedgerSequence());
+ res.closeTime = ledgerInfo->closeTime;
+
  return {res, rpcSUCCESS};
  }
  else
@@ -269,6 +277,9 @@ doTxHelp(RPC::Context& context, TxArgs args)
  }
  result.validated = isValidated(
  context.ledgerMaster, ledger->info().seq, ledger->info().hash);
+ if (result.validated)
+ result.closeTime =
+ context.ledgerMaster.getCloseTimeBySeq(txn->getLedger());
 
  // compute outgoing CTID
  uint32_t lgrSeq = ledger->info().seq;
@@ -328,7 +339,9 @@ populateJsonResponse(
  context.apiVersion);
  }
  response[jss::hash] = hash;
- // TODO set `response[jss::close_time_iso]`
+ if (result.closeTime)
+ response[jss::close_time_iso] =
+ to_string_iso(*result.closeTime);
  }
  else
  {