From 550479b09f1a2bacc5a5fe2b9259baaa3c05029e Mon Sep 17 00:00:00 2001
From: mb300sd <mb300sd@github>
Date: Wed, 27 Feb 2013 22:12:14 -0500
Subject: [PATCH] add address and account information to listunspent

---
 src/rpcrawtransaction.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
index bbaf40c73..fb9811b92 100644
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpcrawtransaction.cpp
@@ -225,6 +225,13 @@ Value listunspent(const Array& params, bool fHelp)
         Object entry;
         entry.push_back(Pair("txid", out.tx->GetHash().GetHex()));
         entry.push_back(Pair("vout", out.i));
+        CTxDestination address;
+        if (ExtractDestination(out.tx->vout[out.i].scriptPubKey, address))
+        {
+            entry.push_back(Pair("address", CBitcoinAddress(address).ToString()));
+            if (pwalletMain->mapAddressBook.count(address))
+                entry.push_back(Pair("account", pwalletMain->mapAddressBook[address]));
+        }
         entry.push_back(Pair("scriptPubKey", HexStr(pk.begin(), pk.end())));
         if (pk.IsPayToScriptHash())
         {