Key pool: Move TopUp call

This avoids extra keyman map lookup: bitcoin#16341 (comment), but may be "annoying" and lead to unnecessary topups in some situations: bitcoin#16341 (comment)
achow101 · Nov 4, 2019 · 17baba8 · 17baba8
1 parent f662281
commit 17baba8
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3075,8 +3075,6 @@ bool CWallet::GetNewChangeDestination(const OutputType type, CTxDestination& des
     LOCK(cs_wallet);
     error.clear();
 
-    m_spk_man->TopUp();
-
     ReserveDestination reservedest(this);
     if (!reservedest.GetReservedDestination(type, dest, true)) {
         error = "Error: Keypool ran out, please call keypoolrefill first";
@@ -3251,6 +3249,7 @@ bool ReserveDestination::GetReservedDestination(const OutputType type, CTxDestin
         return false;
     }
 
+    m_spk_man->TopUp();
 
     if (nIndex == -1)
     {