Key pool: Move CanGetAddresses call

This is a minor change in behavior: call now only happens if a new key needs to be reserved, since if a key is already reserved it might fail unnecessarily. This change also serves as a sanity check bitcoin#16341 (comment)
ryanofsky · Oct 7, 2019 · bd7c03d · bd7c03d
1 parent f0d7bf1
commit bd7c03d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -271,6 +271,10 @@ bool LegacyScriptPubKeyMan::Encrypt(const CKeyingMaterial& master_key, WalletBat
 
 bool LegacyScriptPubKeyMan::GetReservedDestination(const OutputType type, bool internal, int64_t& index, CKeyPool& keypool)
 {
+    if (!CanGetAddresses(internal)) {
+        return false;
+    }
+
     {
         LOCK(cs_KeyStore);
         if (!ReserveKeyFromKeyPool(index, keypool, internal)) {

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3261,9 +3261,6 @@ bool ReserveDestination::GetReservedDestination(const OutputType type, CTxDestin
         return false;
     }
 
-    if (!pwallet->CanGetAddresses(internal)) {
-        return false;
-    }
 
     if (nIndex == -1)
     {