From 158aa7c454f654763fab0e0ae153bb43ecdfeb9d Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Fri, 15 Feb 2013 05:38:19 -0800
Subject: [PATCH] Make the 'tx' command return metadata if possible. Allow the
 ledger to be specified a bit more flexibly in account_tx.

---
 src/cpp/ripple/RPCHandler.cpp | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/cpp/ripple/RPCHandler.cpp b/src/cpp/ripple/RPCHandler.cpp
index 2da84da56..d4eeb154a 100644
--- a/src/cpp/ripple/RPCHandler.cpp
+++ b/src/cpp/ripple/RPCHandler.cpp
@@ -1425,14 +1425,26 @@ Json::Value RPCHandler::doTx(Json::Value jvRequest)
 
 	if (Transaction::isHexTxID(strTransaction))
 	{ // transaction by ID
-		Json::Value ret;
 		uint256 txid(strTransaction);
 
 		Transaction::pointer txn = theApp->getMasterTransaction().fetch(txid, true);
 
 		if (!txn) return rpcError(rpcTXN_NOT_FOUND);
 
-		return txn->getJson(0);
+		Json::Value ret = txn->getJson(0);
+
+		if (txn->getLedger() != 0)
+		{
+			Ledger::pointer lgr = theApp->getLedgerMaster().getLedgerBySeq(txn->getLedger());
+			if (lgr)
+			{
+				TransactionMetaSet::pointer set;
+				if (lgr->getTransactionMeta(txid, set))
+					ret["meta"] = set->getJson(0);
+			}
+		}
+
+		return ret;
 	}
 
 	return rpcError(rpcNOT_IMPL);
@@ -1522,18 +1534,18 @@ Json::Value RPCHandler::doAccountTransactions(Json::Value jvRequest)
 	if (!raAccount.setAccountID(jvRequest["account"].asString()))
 		return rpcError(rpcACT_MALFORMED);
 
-	if (jvRequest.isMember("ledger"))
-	{
-		minLedger	= maxLedger	= jvRequest["ledger"].asUInt();
-	}
-	else if (jvRequest.isMember("ledger_min") && jvRequest.isMember("ledger_max"))
+	if (jvRequest.isMember("ledger_min") && jvRequest.isMember("ledger_max"))
 	{
 		minLedger	= jvRequest["ledger_min"].asUInt();
 		maxLedger	= jvRequest["ledger_max"].asUInt();
 	}
 	else
 	{
-		return rpcError(rpcLGR_IDX_MALFORMED);
+		Ledger::pointer l;
+		Json::Value ret = lookupLedger(jvRequest, l);
+		if (!l)
+			return ret;
+		minLedger = maxLedger = l->getLedgerSeq();
 	}
 
 	if ((maxLedger < minLedger) || (maxLedger == 0))