Skip to content

Commit 9c38c77

Browse files
committed
wallet: Move IsKeyActive to LegacyDataSPKM
1 parent 67e6fd0 commit 9c38c77

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/wallet/scriptpubkeyman.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ std::vector<WalletDestination> LegacyScriptPubKeyMan::MarkUnusedAddresses(const
402402
return result;
403403
}
404404

405-
bool LegacyScriptPubKeyMan::IsKeyActive(const CScript& script) const
405+
bool LegacyDataSPKM::IsKeyActive(const CScript& script) const
406406
{
407407
LOCK(cs_KeyStore);
408408

src/wallet/scriptpubkeyman.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ class LegacyDataSPKM : public ScriptPubKeyMan, public FillableSigningProvider
316316

317317
// ScriptPubKeyMan overrides
318318
bool CheckDecryptionKey(const CKeyingMaterial& master_key) override;
319+
[[nodiscard]] bool IsKeyActive(const CScript& script) const override;
319320
std::unordered_set<CScript, SaltedSipHasher> GetScriptPubKeys() const override;
320321
std::unique_ptr<SigningProvider> GetSolvingProvider(const CScript& script) const override;
321322
uint256 GetID() const override { return uint256::ONE; }
@@ -465,8 +466,6 @@ class LegacyScriptPubKeyMan : public LegacyDataSPKM
465466

466467
std::vector<WalletDestination> MarkUnusedAddresses(const CScript& script) override;
467468

468-
[[nodiscard]] bool IsKeyActive(const CScript& script) const override;
469-
470469
//! Upgrade stored CKeyMetadata objects to store key origin info as KeyOriginInfo
471470
void UpgradeKeyMetadata();
472471

0 commit comments

Comments
 (0)