Support downgrading after recovered keypool witness keys

sipa · sipa · commit 7ee54fd7c7fa · 2018-01-09T15:35:31.000-08:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3636,6 +3636,7 @@ void CWallet::MarkReserveKeysAsUsed(int64_t keypool_id)
         if (walletdb.ReadPool(index, keypool)) { //TODO: This should be unnecessary
             m_pool_key_to_index.erase(keypool.vchPubKey.GetID());
         }
+        LearnAllRelatedScripts(keypool.vchPubKey);
         walletdb.ErasePool(index);
         LogPrintf("keypool index %d removed\n", index);
         it = setKeyPool->erase(it);

Original file line number	Diff line number	Diff line change
`@@ -3636,6 +3636,7 @@ void CWallet::MarkReserveKeysAsUsed(int64_t keypool_id)`
`3636`	`3636`	`if (walletdb.ReadPool(index, keypool)) { //TODO: This should be unnecessary`
`3637`	`3637`	`m_pool_key_to_index.erase(keypool.vchPubKey.GetID());`
`3638`	`3638`	`}`
	`3639`	`+ LearnAllRelatedScripts(keypool.vchPubKey);`
`3639`	`3640`	`walletdb.ErasePool(index);`
`3640`	`3641`	`LogPrintf("keypool index %d removed\n", index);`
`3641`	`3642`	`it = setKeyPool->erase(it);`