Implement GetReservedDestination in DescriptorScriptPubKeyMan

achow101 · achow101 · commit f866957979c2 · 2020-04-23T13:59:48.000-04:00
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -1608,7 +1608,11 @@ bool DescriptorScriptPubKeyMan::Encrypt(const CKeyingMaterial& master_key, Walle
 
 bool DescriptorScriptPubKeyMan::GetReservedDestination(const OutputType type, bool internal, CTxDestination& address, int64_t& index, CKeyPool& keypool)
 {
-    return false;
+    LOCK(cs_desc_man);
+    std::string error;
+    bool result = GetNewDestination(type, address, error);
+    index = m_wallet_descriptor.next_index - 1;
+    return result;
 }
 
 void DescriptorScriptPubKeyMan::ReturnDestination(int64_t index, bool internal, const CTxDestination& addr)

Original file line number	Diff line number	Diff line change
`@@ -1608,7 +1608,11 @@ bool DescriptorScriptPubKeyMan::Encrypt(const CKeyingMaterial& master_key, Walle`
`1608`	`1608`
`1609`	`1609`	`bool DescriptorScriptPubKeyMan::GetReservedDestination(const OutputType type, bool internal, CTxDestination& address, int64_t& index, CKeyPool& keypool)`
`1610`	`1610`	`{`
`1611`		`- return false;`
	`1611`	`+ LOCK(cs_desc_man);`
	`1612`	`+ std::string error;`
	`1613`	`+ bool result = GetNewDestination(type, address, error);`
	`1614`	`+ index = m_wallet_descriptor.next_index - 1;`
	`1615`	`+ return result;`
`1612`	`1616`	`}`
`1613`	`1617`
`1614`	`1618`	`void DescriptorScriptPubKeyMan::ReturnDestination(int64_t index, bool internal, const CTxDestination& addr)`