zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add Orchard support to z_listunspent. 

Also, ensure that Sapling internal addresses are not displayed
in z_listunspent outputs.

Fixes #5683
This commit is contained in:
Kris Nuttycombe 2022-03-30 10:06:29 -06:00
parent 560db173bd
commit 824824d6d2
1 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/wallet/rpcwallet.cpp
View File

@ -2577,23 +2577,49 @@ UniValue z_listunspent(const UniValue& params, bool fHelp)
obj.pushKV("confirmations", entry.confirmations);
bool hasSaplingSpendingKey = pwalletMain->HaveSaplingSpendingKeyForAddress(entry.address);
obj.pushKV("spendable", hasSaplingSpendingKey);
obj.pushKV("address", keyIO.EncodePaymentAddress([&]() {
auto ua = pwalletMain->FindUnifiedAddressByReceiver(entry.address);
if (ua.has_value()) {
return libzcash::PaymentAddress{ua.value()};
} else {
return libzcash::PaymentAddress{entry.address};
}
}()));
auto addr = pwalletMain->GetPaymentAddressForRecipient(entry.op.hash, entry.address);
if (addr.second != RecipientType::WalletInternalAddress) {
obj.pushKV("address", keyIO.EncodePaymentAddress(addr.first));
}
obj.pushKV("amount", ValueFromAmount(CAmount(entry.note.value()))); // note.value() is equivalent to plaintext.value()
obj.pushKV("memo", HexStr(entry.memo));
if (hasSaplingSpendingKey) {
obj.pushKV("change", pwalletMain->IsNoteSaplingChange(saplingNullifiers, entry.address, entry.op));
obj.pushKV(
"change",
pwalletMain->IsInternalRecipient(entry.address) ||
pwalletMain->IsNoteSaplingChange(saplingNullifiers, entry.address, entry.op));
}
results.push_back(obj);
}
// TODO ORCHARD #5683
for (auto & entry : orchardEntries) {
UniValue obj(UniValue::VOBJ);
obj.pushKV("txid", entry.GetOutPoint().hash.ToString());
obj.pushKV("pool", ADDR_TYPE_ORCHARD);
obj.pushKV("outindex", (int)entry.GetOutPoint().n);
obj.pushKV("confirmations", entry.GetConfirmations());
// TODO: add a better mechanism for checking whether we have the
// spending key for an Orchard receiver.
auto ufvkMeta = pwalletMain->GetUFVKMetadataForReceiver(entry.GetAddress());
bool haveSpendingKey =
ufvkMeta.has_value() &&
pwalletMain->GetUnifiedAccountId(ufvkMeta.value().GetUFVKId()).has_value();
bool isInternal = pwalletMain->IsInternalRecipient(entry.GetAddress());
std::optional<std::string> addrStr;
obj.pushKV("spendable", haveSpendingKey);
if (!isInternal) {
auto ua = pwalletMain->FindUnifiedAddressByReceiver(entry.GetAddress());
assert(ua.has_value());
obj.pushKV("address", keyIO.EncodePaymentAddress(ua.value()));
}
obj.pushKV("amount", ValueFromAmount(entry.GetNoteValue()));
obj.pushKV("memo", HexStr(entry.GetMemo()));
if (haveSpendingKey) {
obj.pushKV("change", isInternal);
}
results.push_back(obj);
}
return results;
}