Handle shielded address case
This commit is contained in:
parent
6c41d1da05
commit
719c117f1c
|
@ -889,7 +889,7 @@ UniValue getblocksubsidy(const UniValue& params, bool fHelp)
|
||||||
" \"specification\" : \"url\", (string) A URL for the specification of this funding stream.\n"
|
" \"specification\" : \"url\", (string) A URL for the specification of this funding stream.\n"
|
||||||
" \"value\" : x.xxx (numeric) The funding stream amount in " + CURRENCY_UNIT + ".\n"
|
" \"value\" : x.xxx (numeric) The funding stream amount in " + CURRENCY_UNIT + ".\n"
|
||||||
" \"valueZat\" : x.xxx (numeric) The funding stream amount in " + MINOR_CURRENCY_UNIT + ".\n"
|
" \"valueZat\" : x.xxx (numeric) The funding stream amount in " + MINOR_CURRENCY_UNIT + ".\n"
|
||||||
" \"scriptPubKey\" : (string) scriptPubKey of the funding stream recipient.\n"
|
" \"pubKey\" : (json object) CScript or Sapling address of the funding stream recipient.\n"
|
||||||
" }, ...\n"
|
" }, ...\n"
|
||||||
" ]\n"
|
" ]\n"
|
||||||
"}\n"
|
"}\n"
|
||||||
|
@ -927,10 +927,20 @@ UniValue getblocksubsidy(const UniValue& params, bool fHelp)
|
||||||
|
|
||||||
auto fs = consensus.vFundingStreams[idx];
|
auto fs = consensus.vFundingStreams[idx];
|
||||||
auto address = fs.get().RecipientAddress(consensus, nHeight);
|
auto address = fs.get().RecipientAddress(consensus, nHeight);
|
||||||
CScript outpoint = boost::get<CScript>(address);
|
|
||||||
UniValue outobj(UniValue::VOBJ);
|
CScript* outpoint = boost::get<CScript>(&address);
|
||||||
ScriptPubKeyToJSON(outpoint, outobj, true);
|
libzcash::SaplingPaymentAddress* zaddr = boost::get<libzcash::SaplingPaymentAddress>(&address);
|
||||||
fsobj.pushKV("scriptPubKey", outobj);
|
UniValue pubkey(UniValue::VOBJ);
|
||||||
|
|
||||||
|
if (outpoint != nullptr) {
|
||||||
|
// For transparent funding stream addresses
|
||||||
|
ScriptPubKeyToJSON(*outpoint, pubkey, true);
|
||||||
|
} else if (zaddr != nullptr) {
|
||||||
|
// For shielded funding stream addresses
|
||||||
|
pubkey.pushKV("address", keyIO.EncodePaymentAddress(*zaddr));
|
||||||
|
}
|
||||||
|
|
||||||
|
fsobj.pushKV("pubkey", pubkey);
|
||||||
fundingstreams.push_back(fsobj);
|
fundingstreams.push_back(fsobj);
|
||||||
}
|
}
|
||||||
result.pushKV("fundingstreams", fundingstreams);
|
result.pushKV("fundingstreams", fundingstreams);
|
||||||
|
|
|
@ -330,8 +330,8 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
|
||||||
BOOST_CHECK_EQUAL(find_value(fsobj, "recipient").get_str(), recipients[i]);
|
BOOST_CHECK_EQUAL(find_value(fsobj, "recipient").get_str(), recipients[i]);
|
||||||
BOOST_CHECK_EQUAL(find_value(fsobj, "specification").get_str(), "https://zips.z.cash/zip-0214");
|
BOOST_CHECK_EQUAL(find_value(fsobj, "specification").get_str(), "https://zips.z.cash/zip-0214");
|
||||||
BOOST_CHECK_EQUAL(find_value(fsobj, "value").get_real(), amounts[i]);
|
BOOST_CHECK_EQUAL(find_value(fsobj, "value").get_real(), amounts[i]);
|
||||||
auto outobj = find_value(fsobj, "outpoint").get_obj();
|
auto pubkey = find_value(fsobj, "pubkey").get_obj();
|
||||||
auto address = find_value(outobj, "addresses").get_array()[0].get_str();
|
auto address = find_value(pubkey, "addresses").get_array()[0].get_str();
|
||||||
BOOST_CHECK_EQUAL(address, addresses[i]);
|
BOOST_CHECK_EQUAL(address, addresses[i]);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue