aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Chow <achow101-github@achow101.com>2019-07-08 15:34:37 -0400
committerAndrew Chow <achow101-github@achow101.com>2020-04-23 13:25:50 -0400
commit834de0300cde57ca3f662fb7aa5b1bdaed68bc8f (patch)
tree89d4eb03068961fd7191f70715ce7cd014217ce7 /src
parentd8132669e10c1db9ae0c2ea0d3f822d7d2f01345 (diff)
downloadbitcoin-834de0300cde57ca3f662fb7aa5b1bdaed68bc8f.tar.xz
Store WalletDescriptor in DescriptorScriptPubKeyMan
Diffstat (limited to 'src')
-rw-r--r--src/wallet/scriptpubkeyman.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
index 2cf1817927..3e9db905fd 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;