# HG changeset patch
# User Gavin Andresen <gavinandresen@gmail.com>
# Date 1324325662 18000
# Node ID 820c00b483916ec429dcc8c02caaed0aeab97c64
# Parent  2b4bb23f2eccd3c427fcfaae604b745653ddb3a1# Parent  417a846d3aea92f9a2bfebb71c7349b00b3c614a
Merge branch 'txn_block_info' of https://github.com/luke-jr/bitcoin

diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -91,7 +91,13 @@
 
 void WalletTxToJSON(const CWalletTx& wtx, Object& entry)
 {
-    entry.push_back(Pair("confirmations", wtx.GetDepthInMainChain()));
+    int confirms = wtx.GetDepthInMainChain();
+    entry.push_back(Pair("confirmations", confirms));
+    if (confirms)
+    {
+        entry.push_back(Pair("blockhash", wtx.hashBlock.GetHex()));
+        entry.push_back(Pair("blockindex", wtx.nIndex));
+    }
     entry.push_back(Pair("txid", wtx.GetHash().GetHex()));
     entry.push_back(Pair("time", (boost::int64_t)wtx.GetTxTime()));
     BOOST_FOREACH(const PAIRTYPE(string,string)& item, wtx.mapValue)