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

Respect minDepth argument for Orchard notes in GetFilteredNotes 

Fixes #5566
This commit is contained in:
Kris Nuttycombe 2022-03-03 09:16:08 -07:00
parent cf4d0f3d2d
commit 6540694845
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wallet/wallet.cpp
View File

@ -6331,12 +6331,13 @@ void CWallet::GetFilteredNotes(
}
}
std::vector<OrchardNoteMetadata> orchardNotes;
if (noteFilter.has_value()) {
for (const OrchardRawAddress& addr: noteFilter.value().GetOrchardAddresses()) {
auto ivk = orchardWallet.GetIncomingViewingKeyForAddress(addr);
if (ivk.has_value()) {
orchardWallet.GetFilteredNotes(
orchardNotesRet,
orchardNotes,
ivk.value(),
ignoreSpent,
ignoreLocked,
@ -6346,17 +6347,20 @@ void CWallet::GetFilteredNotes(
} else {
// return all Orchard notes
orchardWallet.GetFilteredNotes(
orchardNotesRet,
orchardNotes,
std::nullopt,
ignoreSpent,
ignoreLocked,
requireSpendingKey);
}
for (auto &orchardNoteMeta : orchardNotesRet) {
auto wtx = GetWalletTx(orchardNoteMeta.GetOutPoint().hash);
for (auto& noteMeta : orchardNotes) {
auto wtx = GetWalletTx(noteMeta.GetOutPoint().hash);
if (wtx) {
orchardNoteMeta.SetConfirmations(wtx->GetDepthInMainChain());
if (wtx->GetDepthInMainChain() >= minDepth) {
noteMeta.SetConfirmations(wtx->GetDepthInMainChain());
orchardNotesRet.push_back(noteMeta);
}
} else {
throw std::runtime_error("Wallet inconsistency: We have an Orchard WalletTx without a corresponding CWalletTx");
}