|
|
|
@ -2341,13 +2341,14 @@ UniValue listunspent(const UniValue& params, bool fHelp)
@@ -2341,13 +2341,14 @@ UniValue listunspent(const UniValue& params, bool fHelp)
|
|
|
|
|
"\nResult\n" |
|
|
|
|
"[ (array of json object)\n" |
|
|
|
|
" {\n" |
|
|
|
|
" \"txid\" : \"txid\", (string) the transaction id \n" |
|
|
|
|
" \"txid\" : \"txid\", (string) the transaction id \n" |
|
|
|
|
" \"vout\" : n, (numeric) the vout value\n" |
|
|
|
|
" \"address\" : \"address\", (string) the bitcoin address\n" |
|
|
|
|
" \"account\" : \"account\", (string) DEPRECATED. The associated account, or \"\" for the default account\n" |
|
|
|
|
" \"scriptPubKey\" : \"key\", (string) the script key\n" |
|
|
|
|
" \"address\" : \"address\", (string) the bitcoin address\n" |
|
|
|
|
" \"account\" : \"account\", (string) DEPRECATED. The associated account, or \"\" for the default account\n" |
|
|
|
|
" \"scriptPubKey\" : \"key\", (string) the script key\n" |
|
|
|
|
" \"amount\" : x.xxx, (numeric) the transaction amount in " + CURRENCY_UNIT + "\n" |
|
|
|
|
" \"confirmations\" : n, (numeric) The number of confirmations\n" |
|
|
|
|
" \"redeemScript\" : n (string) The redeemScript if scriptPubKey is P2SH\n" |
|
|
|
|
" \"spendable\" : xxx, (bool) Whether we have the private keys to spend this output\n" |
|
|
|
|
" \"solvable\" : xxx (bool) Whether we know how to spend this output, ignoring the lack of keys\n" |
|
|
|
|
" }\n" |
|
|
|
@ -2393,38 +2394,34 @@ UniValue listunspent(const UniValue& params, bool fHelp)
@@ -2393,38 +2394,34 @@ UniValue listunspent(const UniValue& params, bool fHelp)
|
|
|
|
|
if (out.nDepth < nMinDepth || out.nDepth > nMaxDepth) |
|
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
if (setAddress.size()) { |
|
|
|
|
CTxDestination address; |
|
|
|
|
if (!ExtractDestination(out.tx->vout[out.i].scriptPubKey, address)) |
|
|
|
|
continue; |
|
|
|
|
CTxDestination address; |
|
|
|
|
const CScript& scriptPubKey = out.tx->vout[out.i].scriptPubKey; |
|
|
|
|
bool fValidAddress = ExtractDestination(scriptPubKey, address); |
|
|
|
|
|
|
|
|
|
if (!setAddress.count(address)) |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
if (setAddress.size() && (!fValidAddress || !setAddress.count(address))) |
|
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
CAmount nValue = out.tx->vout[out.i].nValue; |
|
|
|
|
const CScript& pk = out.tx->vout[out.i].scriptPubKey; |
|
|
|
|
UniValue entry(UniValue::VOBJ); |
|
|
|
|
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)) { |
|
|
|
|
|
|
|
|
|
if (fValidAddress) { |
|
|
|
|
entry.push_back(Pair("address", CBitcoinAddress(address).ToString())); |
|
|
|
|
|
|
|
|
|
if (pwalletMain->mapAddressBook.count(address)) |
|
|
|
|
entry.push_back(Pair("account", pwalletMain->mapAddressBook[address].name)); |
|
|
|
|
} |
|
|
|
|
entry.push_back(Pair("scriptPubKey", HexStr(pk.begin(), pk.end()))); |
|
|
|
|
if (pk.IsPayToScriptHash()) { |
|
|
|
|
CTxDestination address; |
|
|
|
|
if (ExtractDestination(pk, address)) { |
|
|
|
|
|
|
|
|
|
if (scriptPubKey.IsPayToScriptHash()) { |
|
|
|
|
const CScriptID& hash = boost::get<CScriptID>(address); |
|
|
|
|
CScript redeemScript; |
|
|
|
|
if (pwalletMain->GetCScript(hash, redeemScript)) |
|
|
|
|
entry.push_back(Pair("redeemScript", HexStr(redeemScript.begin(), redeemScript.end()))); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
entry.push_back(Pair("amount",ValueFromAmount(nValue))); |
|
|
|
|
entry.push_back(Pair("confirmations",out.nDepth)); |
|
|
|
|
|
|
|
|
|
entry.push_back(Pair("scriptPubKey", HexStr(scriptPubKey.begin(), scriptPubKey.end()))); |
|
|
|
|
entry.push_back(Pair("amount", ValueFromAmount(out.tx->vout[out.i].nValue))); |
|
|
|
|
entry.push_back(Pair("confirmations", out.nDepth)); |
|
|
|
|
entry.push_back(Pair("spendable", out.fSpendable)); |
|
|
|
|
entry.push_back(Pair("solvable", out.fSolvable)); |
|
|
|
|
results.push_back(entry); |
|
|
|
|