Mercurial > hg > bitcoin

changeset 1590:820c00b48391 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'txn_block_info' of https://github.com/luke-jr/bitcoin
author Gavin Andresen <gavinandresen@gmail.com>
date Mon, 19 Dec 2011 15:14:22 -0500
parents 2b4bb23f2ecc (current diff) 417a846d3aea (diff)
children f9117d13e533
files src/bitcoinrpc.cpp
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)