Key pool: Fix omitted pre-split count in GetKeyPoolSize

achow101 · achow101 · commit 886f1731bec4 · 2019-12-02T11:57:46.000-05:00
This is a bugfix: bitcoin/bitcoin#16341 (comment)
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -455,7 +455,7 @@ size_t LegacyScriptPubKeyMan::KeypoolCountExternalKeys()
 unsigned int LegacyScriptPubKeyMan::GetKeyPoolSize() const
 {
     AssertLockHeld(cs_wallet);
-    return setInternalKeyPool.size() + setExternalKeyPool.size();
+    return setInternalKeyPool.size() + setExternalKeyPool.size() + set_pre_split_keypool.size();
 }
 
 int64_t LegacyScriptPubKeyMan::GetTimeFirstKey() const

Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,7 @@ size_t LegacyScriptPubKeyMan::KeypoolCountExternalKeys()`
`455`	`455`	`unsigned int LegacyScriptPubKeyMan::GetKeyPoolSize() const`
`456`	`456`	`{`
`457`	`457`	`AssertLockHeld(cs_wallet);`
`458`		`- return setInternalKeyPool.size() + setExternalKeyPool.size();`
	`458`	`+ return setInternalKeyPool.size() + setExternalKeyPool.size() + set_pre_split_keypool.size();`
`459`	`459`	`}`
`460`	`460`
`461`	`461`	`int64_t LegacyScriptPubKeyMan::GetTimeFirstKey() const`