aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Chow <achow101-github@achow101.com>2019-07-16 13:50:32 -0400
committerAndrew Chow <achow101-github@achow101.com>2020-04-23 13:25:50 -0400
commit78f8a92910d34247fa5d04368338c598d9908267 (patch)
treed357f03efc4736b9ad2adc1f19f19875764b01f5
parent834de0300cde57ca3f662fb7aa5b1bdaed68bc8f (diff)
downloadbitcoin-78f8a92910d34247fa5d04368338c598d9908267.tar.xz
Implement SetType in DescriptorScriptPubKeyMan
-rw-r--r--src/wallet/scriptpubkeyman.cpp6
-rw-r--r--src/wallet/scriptpubkeyman.h7
2 files changed, 12 insertions, 1 deletions
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index ea61ab793e..c825438f99 100644
--- 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
index 3e9db905fd..81c89de985 100644
--- a/src/wallet/scriptpubkeyman.h
+++ b/src/wallet/scriptpubkeyman.h
@@ -490,11 +490,18 @@ private:
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;