From 574b840c42d7ad5e53fe5c400581561912d1504f Mon Sep 17 00:00:00 2001 From: Ava Chow Date: Mon, 24 Jun 2024 12:33:59 -0400 Subject: [PATCH] Revert "wallet: Move LegacyScriptPubKeyMan::IsMine to LegacyDataSPKM" This reverts commit bbb1d51e1240da61db2ca1036f9ec91fd2f36f2d. --- src/wallet/scriptpubkeyman.cpp | 4 ++-- src/wallet/scriptpubkeyman.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp index 02154e04484edd..561140d21a6fe3 100644 --- a/src/wallet/scriptpubkeyman.cpp +++ b/src/wallet/scriptpubkeyman.cpp @@ -98,7 +98,7 @@ bool HaveKeys(const std::vector& pubkeys, const LegacyDataSPKM& keystor //! scripts or simply treat any script that has been //! stored in the keystore as spendable // NOLINTNEXTLINE(misc-no-recursion) -IsMineResult IsMineInner(const LegacyDataSPKM& keystore, const CScript& scriptPubKey, IsMineSigVersion sigversion, bool recurse_scripthash=true) +IsMineResult IsMineInner(const LegacyScriptPubKeyMan& keystore, const CScript& scriptPubKey, IsMineSigVersion sigversion, bool recurse_scripthash=true) { IsMineResult ret = IsMineResult::NO; @@ -213,7 +213,7 @@ IsMineResult IsMineInner(const LegacyDataSPKM& keystore, const CScript& scriptPu } // namespace -isminetype LegacyDataSPKM::IsMine(const CScript& script) const +isminetype LegacyScriptPubKeyMan::IsMine(const CScript& script) const { switch (IsMineInner(*this, script, IsMineSigVersion::TOP)) { case IsMineResult::INVALID: diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h index 9c1f4b0a1af16f..8e697a40128d02 100644 --- a/src/wallet/scriptpubkeyman.h +++ b/src/wallet/scriptpubkeyman.h @@ -314,8 +314,6 @@ class LegacyDataSPKM : public ScriptPubKeyMan, public FillableSigningProvider std::unordered_set GetScriptPubKeys() const override; std::unique_ptr GetSolvingProvider(const CScript& script) const override; uint256 GetID() const override { return uint256::ONE; } - // TODO: Remove IsMine when deleting LegacyScriptPubKeyMan - isminetype IsMine(const CScript& script) const override; // FillableSigningProvider overrides bool HaveKey(const CKeyID &address) const override; @@ -449,6 +447,7 @@ class LegacyScriptPubKeyMan : public LegacyDataSPKM LegacyScriptPubKeyMan(WalletStorage& storage, int64_t keypool_size) : LegacyDataSPKM(storage), m_keypool_size(keypool_size) {} util::Result GetNewDestination(const OutputType type) override; + isminetype IsMine(const CScript& script) const override; bool Encrypt(const CKeyingMaterial& master_key, WalletBatch* batch) override;