highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-13 13:20:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

wallet: Move LegacyScriptPubKeyMan::IsMine to LegacyDataSPKM

Browse Source 
IsMine is necessary for migration. It should be inlined with migration
when the legacy wallet is removed.
This commit is contained in:
Ava Chow 2024-06-24 12:15:00 -04:00
parent 7461d0c006
commit b231f4d556
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/scriptpubkeyman.cpp
View File

@ -98,7 +98,7 @@ bool HaveKeys(const std::vector<valtype>& pubkeys, const LegacyDataSPKM& keystor
//! scripts or simply treat any script that has been //! scripts or simply treat any script that has been
//! stored in the keystore as spendable //! stored in the keystore as spendable
// NOLINTNEXTLINE(misc-no-recursion) // NOLINTNEXTLINE(misc-no-recursion)
IsMineResult IsMineInner(const LegacyScriptPubKeyMan& keystore, const CScript& scriptPubKey, IsMineSigVersion sigversion, bool recurse_scripthash=true) IsMineResult IsMineInner(const LegacyDataSPKM& keystore, const CScript& scriptPubKey, IsMineSigVersion sigversion, bool recurse_scripthash=true)
{ {
IsMineResult ret = IsMineResult::NO; IsMineResult ret = IsMineResult::NO;
@ -213,7 +213,7 @@ IsMineResult IsMineInner(const LegacyScriptPubKeyMan& keystore, const CScript& s
} // namespace } // namespace
isminetype LegacyScriptPubKeyMan::IsMine(const CScript& script) const isminetype LegacyDataSPKM::IsMine(const CScript& script) const
{ {
switch (IsMineInner(*this, script, IsMineSigVersion::TOP)) { switch (IsMineInner(*this, script, IsMineSigVersion::TOP)) {
case IsMineResult::INVALID: case IsMineResult::INVALID:

3
src/wallet/scriptpubkeyman.h
View File

@ -314,6 +314,8 @@ public:
std::unordered_set<CScript, SaltedSipHasher> GetScriptPubKeys() const override; std::unordered_set<CScript, SaltedSipHasher> GetScriptPubKeys() const override;
std::unique_ptr<SigningProvider> GetSolvingProvider(const CScript& script) const override; std::unique_ptr<SigningProvider> GetSolvingProvider(const CScript& script) const override;
uint256 GetID() const override { return uint256::ONE; } uint256 GetID() const override { return uint256::ONE; }
// TODO: Remove IsMine when deleting LegacyScriptPubKeyMan
isminetype IsMine(const CScript& script) const override;
// FillableSigningProvider overrides // FillableSigningProvider overrides
bool HaveKey(const CKeyID &address) const override; bool HaveKey(const CKeyID &address) const override;
@ -435,7 +437,6 @@ public:
LegacyScriptPubKeyMan(WalletStorage& storage, int64_t keypool_size) : LegacyDataSPKM(storage), m_keypool_size(keypool_size) {} LegacyScriptPubKeyMan(WalletStorage& storage, int64_t keypool_size) : LegacyDataSPKM(storage), m_keypool_size(keypool_size) {}
util::Result<CTxDestination> GetNewDestination(const OutputType type) override; util::Result<CTxDestination> GetNewDestination(const OutputType type) override;
isminetype IsMine(const CScript& script) const override;
bool Encrypt(const CKeyingMaterial& master_key, WalletBatch* batch) override; bool Encrypt(const CKeyingMaterial& master_key, WalletBatch* batch) override;