diff options
author | Gregory Maxwell <greg@xiph.org> | 2013-04-07 14:44:19 -0700 |
---|---|---|
committer | Gregory Maxwell <greg@xiph.org> | 2013-04-07 14:44:19 -0700 |
commit | 96371bc6e01e2bf9a6d78b92860160fb6ffd2180 (patch) | |
tree | 4f90d4569f8b68981e7d60abe5f280da09eadfd8 | |
parent | 31dead887d7658660e89d14c22d494baeca874e9 (diff) | |
parent | 550479b09f1a2bacc5a5fe2b9259baaa3c05029e (diff) | |
download | bitcoin-96371bc6e01e2bf9a6d78b92860160fb6ffd2180.tar.xz |
Merge pull request #2282 from mb300sd/addressinlistunspent
Address in listunspent
-rw-r--r-- | src/rpcrawtransaction.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index bbaf40c735..fb9811b921 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()) { |