fix(tx_history): add date and transactionResult field

Author: wangchao

src/ripple/app/misc/impl/AccountTxPaging.cpp

@@ -95,49 +95,51 @@ processTransRes(Schema& app,DatabaseCon& connection,std::function<
     st.execute();
 
     std::map<uint32_t, std::shared_ptr<const ripple::Ledger>> ledgerCache;
-    while (st.fetch ())
+    while (st.fetch())
+    {
+        if (lookingForMarker)
+        {
+            if (findLedger == ledgerSeq.value_or(0) &&
+                findSeq == txnSeq.value_or(0))
+            {
+                lookingForMarker = false;
+            }
+        }
+        else if (numberOfResults == 0)
+        {
+            marker = {
+                rangeCheckedCast<std::uint32_t>(ledgerSeq.value_or(0)),
+                txnSeq.value_or(0)};
+            break;
+        }
+
+        if (!lookingForMarker)
         {
-            if (lookingForMarker)
+            auto const seq =
+                rangeCheckedCast<std::uint32_t>(ledgerSeq.value_or(0));
+            auto const txID = from_hex_text<uint256>(transID.value());
+
+            std::shared_ptr<const ripple::Ledger> lgr = nullptr;
+
+            if (ledgerCache.count(seq))
             {
-                if (findLedger == ledgerSeq.value_or(0) &&
-                    findSeq == txnSeq.value_or(0))
-                {
-                    lookingForMarker = false;
-                }
+                lgr = ledgerCache[seq];
             }
-            else if (numberOfResults == 0)
+            else if (
+                lgr =
+                    app.getLedgerMaster().getLedgerBySeq(ledgerSeq.value_or(0)))
             {
-                marker = {
-                    rangeCheckedCast<std::uint32_t>(ledgerSeq.value_or(0)),
-                    txnSeq.value_or(0)};
-                break;
+                ledgerCache.emplace(seq, lgr);
             }
 
-            if (!lookingForMarker)
+            Blob txRaw, txMeta;
+            if (lgr && getRawMeta(*lgr, txID, txRaw, txMeta))
             {
-                auto const seq =
-                    rangeCheckedCast<std::uint32_t>(ledgerSeq.value_or(0));
-                auto const txID = from_hex_text<uint256>(transID.value());
-
-                std::shared_ptr<const ripple::Ledger> lgr = nullptr;
-
-                if (ledgerCache.count(seq))
-                {
-                    lgr = ledgerCache[seq];
-                }
-                else if (lgr = app.getLedgerMaster().getLedgerBySeq(ledgerSeq.value_or(0)))
-                {
-                    ledgerCache.emplace(seq, lgr);
-                }
-
-                Blob txRaw, txMeta;
-                if (lgr && getRawMeta(*lgr, txID, txRaw, txMeta))
-                {
-                    onTransaction(seq, std::move(txRaw), std::move(txMeta));
-                }
-                --numberOfResults;
+                onTransaction(seq, std::move(txRaw), std::move(txMeta));
             }
+            --numberOfResults;
         }
+    }
 }
 
 void

src/ripple/rpc/handlers/Tx.cpp

@@ -1218,6 +1218,10 @@ doTxCount(RPC::JsonContext& context)
     int ledger_index = -1;
     if (context.params.isMember(jss::ledger_index))
         ledger_index = context.params[jss::ledger_index].asInt();
+    if (ledger_index = -1)
+    {
+        ledger_index = context.app.getLedgerMaster().getValidLedgerIndex();
+    }
     if (context.params.isMember(jss::chainsql_tx))
         bChainsql = context.params[jss::chainsql_tx].asBool();
     Json::Value ret(Json::objectValue);

src/ripple/rpc/handlers/TxHistory.cpp

@@ -97,7 +97,7 @@ doTxHistory(RPC::JsonContext& context)
     {
         sql = boost::str(
             boost::format(
-                "SELECT TransID "
+                "SELECT TransID, TxResult "
                 "FROM Transactions WHERE (TransType != 'EnableAmendment' "
                 "AND TransType != 'SetFee' AND TransType != 'UNLModify') "
                 "ORDER BY LedgerSeq desc LIMIT %u,20;") %
@@ -115,7 +115,7 @@ doTxHistory(RPC::JsonContext& context)
         }
 
         sql = boost::str(
-            boost::format("SELECT TransID "
+            boost::format("SELECT TransID, TxResult "
                           "FROM Transactions WHERE (%s) "
                           "ORDER BY LedgerSeq desc LIMIT %u,20;") %
             cond % startIndex);
@@ -125,7 +125,9 @@ doTxHistory(RPC::JsonContext& context)
         auto db = context.app.getTxnDB().checkoutDbRead();
 
         boost::optional<std::string> stxnHash;
-        soci::statement st = (db->prepare << sql, soci::into(stxnHash));
+        boost::optional<std::string> stxnResult;
+        soci::statement st =
+            (db->prepare << sql, soci::into(stxnHash), soci::into(stxnResult));
         st.execute();
 
         while (st.fetch())
@@ -137,7 +139,10 @@ doTxHistory(RPC::JsonContext& context)
                 continue;
             }
 
-            txs.append(txn->getJson(JsonOptions::none));
+            Json::Value obj = txn->getJson(JsonOptions::include_date);
+            obj["TransactionResult"] = stxnResult.value();
+
+            txs.append(obj);
         }
     }