Implement SetType in DescriptorScriptPubKeyMan

achow101 · achow101 · commit 78f8a92910d3 · 2020-04-23T13:25:50.000-04:00
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -1608,4 +1608,8 @@ uint256 DescriptorScriptPubKeyMan::GetID() const
     return uint256();
 }
 
-void DescriptorScriptPubKeyMan::SetType(OutputType type, bool internal) {}
+void DescriptorScriptPubKeyMan::SetType(OutputType type, bool internal)
+{
+    this->m_address_type = type;
+    this->m_internal = internal;
+}
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
@@ -490,11 +490,18 @@ class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
     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);
+
+    OutputType m_address_type;
+    bool m_internal;
 public:
     DescriptorScriptPubKeyMan(WalletStorage& storage, WalletDescriptor& descriptor)
         :   ScriptPubKeyMan(storage),
             m_wallet_descriptor(descriptor)
         {}
+    DescriptorScriptPubKeyMan(WalletStorage& storage, OutputType address_type, bool internal)
+        :   ScriptPubKeyMan(storage),
+            m_address_type(address_type), m_internal(internal)
+        {}
 
     mutable RecursiveMutex cs_desc_man;
 

Original file line number	Diff line number	Diff line change
`@@ -1608,4 +1608,8 @@ uint256 DescriptorScriptPubKeyMan::GetID() const`
`1608`	`1608`	`return uint256();`
`1609`	`1609`	`}`
`1610`	`1610`
`1611`		`-void DescriptorScriptPubKeyMan::SetType(OutputType type, bool internal) {}`
	`1611`	`+void DescriptorScriptPubKeyMan::SetType(OutputType type, bool internal)`
	`1612`	`+{`
	`1613`	`+ this->m_address_type = type;`
	`1614`	`+ this->m_internal = internal;`
	`1615`	`+}`