From 834de0300cde57ca3f662fb7aa5b1bdaed68bc8f Mon Sep 17 00:00:00 2001 From: Andrew Chow Date: Mon, 8 Jul 2019 15:34:37 -0400 Subject: [PATCH] Store WalletDescriptor in DescriptorScriptPubKeyMan --- src/wallet/scriptpubkeyman.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h index 2cf18179272..3e9db905fd9 100644 --- a/src/wallet/scriptpubkeyman.h +++ b/src/wallet/scriptpubkeyman.h @@ -484,8 +484,17 @@ public: class DescriptorScriptPubKeyMan : public ScriptPubKeyMan { +private: + WalletDescriptor m_wallet_descriptor GUARDED_BY(cs_desc_man); + + using ScriptPubKeyMap = std::map; // Map of scripts to descriptor range index + + ScriptPubKeyMap m_map_script_pub_keys GUARDED_BY(cs_desc_man); public: - using ScriptPubKeyMan::ScriptPubKeyMan; + DescriptorScriptPubKeyMan(WalletStorage& storage, WalletDescriptor& descriptor) + : ScriptPubKeyMan(storage), + m_wallet_descriptor(descriptor) + {} mutable RecursiveMutex cs_desc_man;