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

Address comments from review.

This commit is contained in:
Kris Nuttycombe 2022-02-09 20:56:00 -07:00
parent f320a6cc24
commit 50ad6675a5
1 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/wallet/wallet.cpp
View File

@ -6117,31 +6117,13 @@ bool PaymentAddressBelongsToWallet::operator()(const libzcash::SproutPaymentAddr
bool PaymentAddressBelongsToWallet::operator()(const libzcash::SaplingPaymentAddress &zaddr) const bool PaymentAddressBelongsToWallet::operator()(const libzcash::SaplingPaymentAddress &zaddr) const
{ {
libzcash::SaplingIncomingViewingKey ivk; libzcash::SaplingIncomingViewingKey ivk;
// If we have a SaplingExtendedSpendingKey in the wallet, then we will
// also have the corresponding SaplingExtendedFullViewingKey.
return return
m_wallet->GetSaplingIncomingViewingKey(zaddr, ivk) && m_wallet->GetSaplingIncomingViewingKey(zaddr, ivk) &&
m_wallet->HaveSaplingFullViewingKey(ivk); m_wallet->HaveSaplingFullViewingKey(ivk);
} }
bool PaymentAddressBelongsToWallet::operator()(const libzcash::UnifiedAddress &uaddr) const bool PaymentAddressBelongsToWallet::operator()(const libzcash::UnifiedAddress &uaddr) const
{ {
auto hdChain = m_wallet->GetMnemonicHDChain(); return m_wallet->FindUnifiedFullViewingKey(uaddr).has_value();
assert(hdChain.has_value());
auto ufvkid = m_wallet->FindUnifiedFullViewingKey(uaddr);
if (ufvkid.has_value()) {
// Look through the UFVKs that we have generated, and confirm that the
// seed fingerprint for the key we find for the ufvkid corresponds to
// the wallet's mnemonic seed.
for (const auto& [k, v] : m_wallet->mapUnifiedAccountKeys) {
if (v == ufvkid.value() && k.first == hdChain.value().GetSeedFingerprint()) {
return true;
}
}
}
return false;
} }
// GetSourceForPaymentAddress // GetSourceForPaymentAddress
@ -6149,8 +6131,6 @@ bool PaymentAddressBelongsToWallet::operator()(const libzcash::UnifiedAddress &u
PaymentAddressSource GetSourceForPaymentAddress::GetUnifiedSource(const libzcash::Receiver& receiver) const PaymentAddressSource GetSourceForPaymentAddress::GetUnifiedSource(const libzcash::Receiver& receiver) const
{ {
auto hdChain = m_wallet->GetMnemonicHDChain(); auto hdChain = m_wallet->GetMnemonicHDChain();
assert(hdChain.has_value());
auto ufvkMeta = m_wallet->GetUFVKMetadataForReceiver(receiver); auto ufvkMeta = m_wallet->GetUFVKMetadataForReceiver(receiver);
if (ufvkMeta.has_value()) { if (ufvkMeta.has_value()) {
auto ufvkid = ufvkMeta.value().first; auto ufvkid = ufvkMeta.value().first;
@ -6158,7 +6138,7 @@ PaymentAddressSource GetSourceForPaymentAddress::GetUnifiedSource(const libzcash
// seed fingerprint for the key we find for the ufvkid corresponds to // seed fingerprint for the key we find for the ufvkid corresponds to
// the wallet's mnemonic seed. // the wallet's mnemonic seed.
for (const auto& [k, v] : m_wallet->mapUnifiedAccountKeys) { for (const auto& [k, v] : m_wallet->mapUnifiedAccountKeys) {
if (v == ufvkid && k.first == hdChain.value().GetSeedFingerprint()) { if (v == ufvkid && hdChain.has_value() && k.first == hdChain.value().GetSeedFingerprint()) {
return PaymentAddressSource::MnemonicHDSeed; return PaymentAddressSource::MnemonicHDSeed;
} }
} }
@ -6189,10 +6169,8 @@ PaymentAddressSource GetSourceForPaymentAddress::operator()(const CScriptID &add
if (ufvkSource == PaymentAddressSource::AddressNotFound) { if (ufvkSource == PaymentAddressSource::AddressNotFound) {
if (m_wallet->HaveCScript(addr)) { if (m_wallet->HaveCScript(addr)) {
return PaymentAddressSource::Imported; return PaymentAddressSource::Imported;
} else { } else if (m_wallet->HaveWatchOnly(GetScriptForDestination(addr))) {
if (m_wallet->HaveWatchOnly(GetScriptForDestination(addr))) { return PaymentAddressSource::ImportedWatchOnly;
return PaymentAddressSource::ImportedWatchOnly;
}
} }
} }
@ -6238,15 +6216,13 @@ PaymentAddressSource GetSourceForPaymentAddress::operator()(const libzcash::Sapl
PaymentAddressSource GetSourceForPaymentAddress::operator()(const libzcash::UnifiedAddress &uaddr) const PaymentAddressSource GetSourceForPaymentAddress::operator()(const libzcash::UnifiedAddress &uaddr) const
{ {
auto hdChain = m_wallet->GetMnemonicHDChain(); auto hdChain = m_wallet->GetMnemonicHDChain();
assert(hdChain.has_value());
auto ufvkid = m_wallet->FindUnifiedFullViewingKey(uaddr); auto ufvkid = m_wallet->FindUnifiedFullViewingKey(uaddr);
if (ufvkid.has_value()) { if (ufvkid.has_value()) {
// Look through the UFVKs that we have generated, and confirm that the // Look through the UFVKs that we have generated, and confirm that the
// seed fingerprint for the key we find for the ufvkid corresponds to // seed fingerprint for the key we find for the ufvkid corresponds to
// the wallet's mnemonic seed. // the wallet's mnemonic seed.
for (const auto& [k, v] : m_wallet->mapUnifiedAccountKeys) { for (const auto& [k, v] : m_wallet->mapUnifiedAccountKeys) {
if (v == ufvkid.value() && k.first == hdChain.value().GetSeedFingerprint()) { if (v == ufvkid.value() && hdChain.has_value() && k.first == hdChain.value().GetSeedFingerprint()) {
return PaymentAddressSource::MnemonicHDSeed; return PaymentAddressSource::MnemonicHDSeed;
} }
} }