fix: counting calculation of internal keys for Descriptor Wallets

knst · knst · commit b02fc0b2ce3c · 2024-03-07T01:22:37.000+07:00
KeypoolCountInternalKeys is not working as expected if there is
more than one ScriptPubKeyManager
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -2558,8 +2558,9 @@ static UniValue getwalletinfo(const JSONRPCRequest& request)
         obj.pushKV("timefirstkey", spk_man->GetTimeFirstKey());
         obj.pushKV("keypoololdest", spk_man->GetOldestKeyPoolTime());
     }
-    obj.pushKV("keypoolsize",   (int64_t)pwallet->KeypoolCountExternalKeys());
-    obj.pushKV("keypoolsize_hd_internal",   (int64_t)(pwallet->KeypoolCountInternalKeys()));
+    size_t kpExternalSize = pwallet->KeypoolCountExternalKeys();
+    obj.pushKV("keypoolsize",   (int64_t)kpExternalSize);
+    obj.pushKV("keypoolsize_hd_internal",   (int64_t)(pwallet->GetKeyPoolSize() - kpExternalSize));
     obj.pushKV("keys_left",     pwallet->nKeysLeftSinceAutoBackup);
     if (pwallet->IsCrypted())
         obj.pushKV("unlocked_until", pwallet->nRelockTime);
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -673,12 +673,6 @@ size_t LegacyScriptPubKeyMan::KeypoolCountExternalKeys() const
     return setExternalKeyPool.size();
 }
 
-size_t LegacyScriptPubKeyMan::KeypoolCountInternalKeys() const
-{
-    LOCK(cs_KeyStore); // setInternalKeyPool
-    return setInternalKeyPool.size();
-}
-
 unsigned int LegacyScriptPubKeyMan::GetKeyPoolSize() const
 {
     LOCK(cs_KeyStore);
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
@@ -192,7 +192,6 @@ class ScriptPubKeyMan
     virtual int64_t GetOldestKeyPoolTime() const { return GetTime(); }
 
     virtual size_t KeypoolCountExternalKeys() const { return 0; }
-    virtual size_t KeypoolCountInternalKeys() const { return 0; }
     virtual unsigned int GetKeyPoolSize() const { return 0; }
 
     virtual int64_t GetTimeFirstKey() const { return 0; }
@@ -344,7 +343,6 @@ class LegacyScriptPubKeyMan : public ScriptPubKeyMan, public FillableSigningProv
 
     int64_t GetOldestKeyPoolTime() const override;
     size_t KeypoolCountExternalKeys() const override;
-    size_t KeypoolCountInternalKeys() const override;
 
     unsigned int GetKeyPoolSize() const override;
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4006,18 +4006,6 @@ size_t CWallet::KeypoolCountExternalKeys() const
     return count;
 }
 
-size_t CWallet::KeypoolCountInternalKeys() const
-{
-    AssertLockHeld(cs_wallet);
-
-    unsigned int count = 0;
-    for (auto spk_man : GetActiveScriptPubKeyMans()) {
-        count += spk_man->KeypoolCountInternalKeys();
-    }
-
-    return count;
-}
-
 unsigned int CWallet::GetKeyPoolSize() const
 {
     AssertLockHeld(cs_wallet);
@@ -4864,7 +4852,7 @@ std::shared_ptr<CWallet> CWallet::Create(interfaces::Chain& chain, interfaces::C
 
     {
         walletInstance->WalletLogPrintf("setExternalKeyPool.size() = %u\n",   walletInstance->KeypoolCountExternalKeys());
-        walletInstance->WalletLogPrintf("setInternalKeyPool.size() = %u\n",   walletInstance->KeypoolCountInternalKeys());
+        walletInstance->WalletLogPrintf("GetKeyPoolSize() = %u\n",   walletInstance->GetKeyPoolSize());
         walletInstance->WalletLogPrintf("mapWallet.size() = %u\n",            walletInstance->mapWallet.size());
         walletInstance->WalletLogPrintf("m_address_book.size() = %u\n",  walletInstance->m_address_book.size());
         for (auto spk_man : walletInstance->GetAllScriptPubKeyMans()) {
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -1127,7 +1127,6 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
     CAmount m_default_max_tx_fee{DEFAULT_TRANSACTION_MAXFEE};
 
     size_t KeypoolCountExternalKeys() const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
-    size_t KeypoolCountInternalKeys() const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
     bool TopUpKeyPool(unsigned int kpSize = 0);
 
     int64_t GetOldestKeyPoolTime() const;

Original file line number	Diff line number	Diff line change
`@@ -673,12 +673,6 @@ size_t LegacyScriptPubKeyMan::KeypoolCountExternalKeys() const`
`673`	`673`	`return setExternalKeyPool.size();`
`674`	`674`	`}`
`675`	`675`
`676`		`-size_t LegacyScriptPubKeyMan::KeypoolCountInternalKeys() const`
`677`		`-{`
`678`		`- LOCK(cs_KeyStore); // setInternalKeyPool`
`679`		`- return setInternalKeyPool.size();`
`680`		`-}`
`681`		`-`
`682`	`676`	`unsigned int LegacyScriptPubKeyMan::GetKeyPoolSize() const`
`683`	`677`	`{`
`684`	`678`	`LOCK(cs_KeyStore);`