aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Chow <achow101-github@achow101.com>2019-10-07 14:11:34 -0400
committerAndrew Chow <achow101-github@achow101.com>2019-11-01 22:56:37 -0400
commit533d8b364f4e589aa1acb28cdea5e6e6e80d34dc (patch)
treef3c0b2a60bb284c7d6cee4885dc2b7b0726ccc89
parentb4cb18bce3c9a6adab2fa32f3dad4ad966b33be0 (diff)
downloadbitcoin-533d8b364f4e589aa1acb28cdea5e6e6e80d34dc.tar.xz
Refactor: Declare LegacyScriptPubKeyMan methods as virtual
This commit does not change behavior.
-rw-r--r--src/wallet/scriptpubkeyman.h29
1 files changed, 22 insertions, 7 deletions
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
index 5b2f25f090..cef153d2bd 100644
--- a/src/wallet/scriptpubkeyman.h
+++ b/src/wallet/scriptpubkeyman.h
@@ -145,6 +145,21 @@ protected:
public:
ScriptPubKeyMan(WalletStorage& storage) : m_storage(storage) {}
+ virtual ~ScriptPubKeyMan() {};
+ virtual isminetype IsMine(const CScript& script) const { return ISMINE_NO; }
+
+ //! Upgrade stored CKeyMetadata objects to store key origin info as KeyOriginInfo
+ virtual void UpgradeKeyMetadata() {}
+
+ /* Returns true if HD is enabled */
+ virtual bool IsHDEnabled() const { return false; }
+
+ /* Returns true if the wallet can give out new addresses. This means it has keys in the keypool or can generate new keys */
+ virtual bool CanGetAddresses(bool internal = false) { return false; }
+
+ virtual int64_t GetOldestKeyPoolTime() { return GetTime(); }
+
+ virtual size_t KeypoolCountExternalKeys() { return 0; }
};
class LegacyScriptPubKeyMan : public ScriptPubKeyMan, public FillableSigningProvider
@@ -228,19 +243,18 @@ private:
public:
bool GetNewDestination(const OutputType type, const std::string label, CTxDestination& dest, std::string& error);
- isminetype IsMine(const CScript& script) const;
+ isminetype IsMine(const CScript& script) const override;
//! will encrypt previously unencrypted keys
bool EncryptKeys(CKeyingMaterial& vMasterKeyIn);
- void UpgradeKeyMetadata() EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
+ void UpgradeKeyMetadata() override EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
- bool IsHDEnabled() const;
+ bool IsHDEnabled() const override;
- int64_t GetOldestKeyPoolTime();
- size_t KeypoolCountExternalKeys() EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
+ int64_t GetOldestKeyPoolTime() override;
+ size_t KeypoolCountExternalKeys() override EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
- /* Returns true if the wallet can give out new addresses. This means it has keys in the keypool or can generate new keys */
- bool CanGetAddresses(bool internal = false);
+ bool CanGetAddresses(bool internal = false) override;
// Map from Key ID to key metadata.
std::map<CKeyID, CKeyMetadata> mapKeyMetadata GUARDED_BY(cs_wallet);
@@ -282,6 +296,7 @@ public:
//! Fetches a pubkey from mapWatchKeys if it exists there
bool GetWatchPubKey(const CKeyID &address, CPubKey &pubkey_out) const;
+ /* SigningProvider overrides */
bool HaveKey(const CKeyID &address) const override;
bool GetKey(const CKeyID &address, CKey& keyOut) const override;
bool GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const override;