Store WalletDescriptor in DescriptorScriptPubKeyMan

achow101 · achow101 · commit 834de0300cde · 2020-04-23T13:25:50.000-04:00
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
@@ -484,8 +484,17 @@ class LegacySigningProvider : public SigningProvider
 
 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;
 
