diff options
| author | Andrew Chow <[email protected]> | 2019-07-08 15:34:37 -0400 |
|---|---|---|
| committer | Andrew Chow <[email protected]> | 2020-04-23 13:25:50 -0400 |
| commit | 834de0300cde57ca3f662fb7aa5b1bdaed68bc8f (patch) | |
| tree | 89d4eb03068961fd7191f70715ce7cd014217ce7 | |
| parent | Add a lock cs_desc_man for DescriptorScriptPubKeyMan (diff) | |
| download | discoin-834de0300cde57ca3f662fb7aa5b1bdaed68bc8f.tar.xz discoin-834de0300cde57ca3f662fb7aa5b1bdaed68bc8f.zip | |
Store WalletDescriptor in DescriptorScriptPubKeyMan
| -rw-r--r-- | src/wallet/scriptpubkeyman.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h index 2cf181792..3e9db905f 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<CScript, int32_t>; // 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; |