Implement ReturnDestination in DescriptorScriptPubKeyMan

achow101 · achow101 · commit 586b57a9a6b4 · 2020-04-23T13:59:48.000-04:00
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -1617,6 +1617,13 @@ bool DescriptorScriptPubKeyMan::GetReservedDestination(const OutputType type, bo
 
 void DescriptorScriptPubKeyMan::ReturnDestination(int64_t index, bool internal, const CTxDestination& addr)
 {
+    LOCK(cs_desc_man);
+    // Only return when the index was the most recent
+    if (m_wallet_descriptor.next_index - 1 == index) {
+        m_wallet_descriptor.next_index--;
+    }
+    WalletBatch(m_storage.GetDatabase()).WriteDescriptor(GetID(), m_wallet_descriptor);
+    NotifyCanGetAddressesChanged();
 }
 
 std::map<CKeyID, CKey> DescriptorScriptPubKeyMan::GetKeys() const

Original file line number	Diff line number	Diff line change
`@@ -1617,6 +1617,13 @@ bool DescriptorScriptPubKeyMan::GetReservedDestination(const OutputType type, bo`
`1617`	`1617`
`1618`	`1618`	`void DescriptorScriptPubKeyMan::ReturnDestination(int64_t index, bool internal, const CTxDestination& addr)`
`1619`	`1619`	`{`
	`1620`	`+ LOCK(cs_desc_man);`
	`1621`	`+ // Only return when the index was the most recent`
	`1622`	`+ if (m_wallet_descriptor.next_index - 1 == index) {`
	`1623`	`+ m_wallet_descriptor.next_index--;`
	`1624`	`+ }`
	`1625`	`+ WalletBatch(m_storage.GetDatabase()).WriteDescriptor(GetID(), m_wallet_descriptor);`
	`1626`	`+ NotifyCanGetAddressesChanged();`
`1620`	`1627`	`}`
`1621`	`1628`
`1622`	`1629`	`std::map<CKeyID, CKey> DescriptorScriptPubKeyMan::GetKeys() const`