phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-09 19:37:27 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bitcoin/bitcoin#30621: wallet: fix blank legacy detection
Some checks failed
CI / test each commit (push) Has been cancelled
Details
CI / macOS 13 native, x86_64, no depends, sqlite only, gui (push) Has been cancelled
Details
CI / Win64 native, VS 2022 (push) Has been cancelled
Details
CI / ASan + LSan + UBSan + integer, no depends, USDT (push) Has been cancelled
Details

Browse source 
6ed424f2db wallet: fix, detect blank legacy wallets in IsLegacy (furszy)

Pull request description:

  Blank legacy wallets do not have active SPKM. They can only be
  detected by checking the descriptors' flag or the db format.

  This enables the migration of blank legacy wallets in the GUI.

  To test this:
  1) Create a blank legacy wallet.
  2) Try to migrate it using the GUI's toolbar "Migrate Wallet" button.
      -> In master: The button will be disabled because `CWallet::IsLegacy()` returns false for blank legacy wallet.
      -> In this PR: the button will be enabled, allowing the migration of legacy wallets.

ACKs for top commit:
  achow101:
    ACK 6ed424f2db
  tdb3:
    ACK 6ed424f2db
  glozow:
    ACK 6ed424f2db

Tree-SHA512: c06c4c4c2e546ccb033287b9aa3aee4ca36b47aeb2fac6fbed5de774b65caef9c818fc8dfdaac6ce78839b2d5d642a5632a5b44c5e889ea169ced80ed50501a7
This commit is contained in:
glozow 2024-08-16 16:52:49 +01:00
commit ee367170cb
No known key found for this signature in database
GPG key ID: BA03F4DBE0C63FB4
1 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/wallet/wallet.cpp
View file

@ -1038,22 +1038,22 @@ bool CWallet::IsSpentKey(const CScript& scriptPubKey) const
if (IsAddressPreviouslySpent(dest)) { if (IsAddressPreviouslySpent(dest)) {
return true; return true;
} }
if (IsLegacy()) {
LegacyScriptPubKeyMan* spk_man = GetLegacyScriptPubKeyMan(); LegacyScriptPubKeyMan* spk_man = GetLegacyScriptPubKeyMan();
assert(spk_man != nullptr); if (!spk_man) return false;
for (const auto& keyid : GetAffectedKeys(scriptPubKey, *spk_man)) {
WitnessV0KeyHash wpkh_dest(keyid); for (const auto& keyid : GetAffectedKeys(scriptPubKey, *spk_man)) {
if (IsAddressPreviouslySpent(wpkh_dest)) { WitnessV0KeyHash wpkh_dest(keyid);
return true; if (IsAddressPreviouslySpent(wpkh_dest)) {
} return true;
ScriptHash sh_wpkh_dest(GetScriptForDestination(wpkh_dest)); }
if (IsAddressPreviouslySpent(sh_wpkh_dest)) { ScriptHash sh_wpkh_dest(GetScriptForDestination(wpkh_dest));
return true; if (IsAddressPreviouslySpent(sh_wpkh_dest)) {
} return true;
PKHash pkh_dest(keyid); }
if (IsAddressPreviouslySpent(pkh_dest)) { PKHash pkh_dest(keyid);
return true; if (IsAddressPreviouslySpent(pkh_dest)) {
} return true;
} }
} }
return false; return false;
@ -1626,7 +1626,9 @@ isminetype CWallet::IsMine(const CScript& script) const
} }
// Legacy wallet // Legacy wallet
if (IsLegacy()) return GetLegacyScriptPubKeyMan()->IsMine(script); if (LegacyScriptPubKeyMan* spkm = GetLegacyScriptPubKeyMan()) {
return spkm->IsMine(script);
}
return ISMINE_NO; return ISMINE_NO;
} }
@ -3559,7 +3561,8 @@ std::set<ScriptPubKeyMan*> CWallet::GetScriptPubKeyMans(const CScript& script) c
Assume(std::all_of(spk_mans.begin(), spk_mans.end(), [&script, &sigdata](ScriptPubKeyMan* spkm) { return spkm->CanProvide(script, sigdata); })); Assume(std::all_of(spk_mans.begin(), spk_mans.end(), [&script, &sigdata](ScriptPubKeyMan* spkm) { return spkm->CanProvide(script, sigdata); }));
// Legacy wallet // Legacy wallet
if (IsLegacy() && GetLegacyScriptPubKeyMan()->CanProvide(script, sigdata)) spk_mans.insert(GetLegacyScriptPubKeyMan()); LegacyScriptPubKeyMan* spkm = GetLegacyScriptPubKeyMan();
if (spkm && spkm->CanProvide(script, sigdata)) spk_mans.insert(spkm);
return spk_mans; return spk_mans;
} }
@ -3589,7 +3592,8 @@ std::unique_ptr<SigningProvider> CWallet::GetSolvingProvider(const CScript& scri
} }
// Legacy wallet // Legacy wallet
if (IsLegacy() && GetLegacyScriptPubKeyMan()->CanProvide(script, sigdata)) return GetLegacyScriptPubKeyMan()->GetSolvingProvider(script); LegacyScriptPubKeyMan* spkm = GetLegacyScriptPubKeyMan();
if (spkm && spkm->CanProvide(script, sigdata)) return spkm->GetSolvingProvider(script);
return nullptr; return nullptr;
} }
@ -3846,11 +3850,7 @@ void CWallet::DeactivateScriptPubKeyMan(uint256 id, OutputType type, bool intern
bool CWallet::IsLegacy() const bool CWallet::IsLegacy() const
{ {
if (m_internal_spk_managers.count(OutputType::LEGACY) == 0) { return !IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS);
return false;
}
auto spk_man = dynamic_cast<LegacyScriptPubKeyMan*>(m_internal_spk_managers.at(OutputType::LEGACY));
return spk_man != nullptr;
} }
DescriptorScriptPubKeyMan* CWallet::GetDescriptorScriptPubKeyMan(const WalletDescriptor& desc) const DescriptorScriptPubKeyMan* CWallet::GetDescriptorScriptPubKeyMan(const WalletDescriptor& desc) const