zcash-hackworks
/
zcash-patched-for-explorer
mirror of https://github.com/zcash-hackworks/zcash-patched-for-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rpc: give back base58 encoded address format in utxos

This commit is contained in:
Braydon Fuller 2016-04-05 10:49:11 -04:00 committed by Simon
parent 2f8d20ba76
commit eed0b77388
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rpc/misc.cpp
View File

@ -635,8 +635,16 @@ UniValue getaddressutxos(const UniValue& params, bool fHelp)
for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) {
UniValue output(UniValue::VOBJ);
output.push_back(Pair("addressType", (int)it->first.type));
output.push_back(Pair("addressHash", it->first.hashBytes.GetHex()));
std::string address;
if (it->first.type == 2) {
address = CBitcoinAddress(CScriptID(it->first.hashBytes)).ToString();
} else if (it->first.type == 1) {
address = CBitcoinAddress(CKeyID(it->first.hashBytes)).ToString();
} else {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unknown address type");
}
output.push_back(Pair("address", address));
output.push_back(Pair("txid", it->first.txhash.GetHex()));
output.push_back(Pair("outputIndex", it->first.index));
output.push_back(Pair("script", HexStr(it->second.script.begin(), it->second.script.end())));