diff options
| author | Andrew Chow <achow101-github@achow101.com> | 2019-07-08 11:21:31 -0400 |
|---|---|---|
| committer | Andrew Chow <achow101-github@achow101.com> | 2020-04-23 13:25:50 -0400 |
| commit | aeac157c9dc141546b45e06ba9c2e641ad86083f (patch) | |
| tree | 89b5cdcd9485c718f488f264677b2ba5c38154d0 /src | |
| parent | 96accc73f067c7c95946e9932645dd821ef67f63 (diff) | |
| download | bitcoin-aeac157c9dc141546b45e06ba9c2e641ad86083f.tar.xz | |
Return nullptr from GetLegacyScriptPubKeyMan if descriptor wallet
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 7a6deab1a8..a5ae1d6174 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -4353,6 +4353,9 @@ std::unique_ptr<SigningProvider> CWallet::GetSolvingProvider(const CScript& scri LegacyScriptPubKeyMan* CWallet::GetLegacyScriptPubKeyMan() const { + if (IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS)) { + return nullptr; + } // Legacy wallets only have one ScriptPubKeyMan which is a LegacyScriptPubKeyMan. // Everything in m_internal_spk_managers and m_external_spk_managers point to the same legacyScriptPubKeyMan. auto it = m_internal_spk_managers.find(OutputType::LEGACY); @@ -4368,7 +4371,7 @@ LegacyScriptPubKeyMan* CWallet::GetOrCreateLegacyScriptPubKeyMan() void CWallet::SetupLegacyScriptPubKeyMan() { - if (!m_internal_spk_managers.empty() || !m_external_spk_managers.empty() || !m_spk_managers.empty()) { + if (!m_internal_spk_managers.empty() || !m_external_spk_managers.empty() || !m_spk_managers.empty() || IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS)) { return; } |