[Wallet] Bugfix: FRT: don't terminate when keypool is empty

Github-Pull: #9295 Rebased-From: c24a4f5
bitcoin · d6098956c34719cd833a645b21d3d8f1be0a9d17 · jonasschnelli committed with MarcoFalke Dec 6, 2016 · Dec 6, 2016 · d609895
1 parent 8dee97f
commit d6098956c34719cd833a645b21d3d8f1be0a9d17
Unified Split

Showing with 5 additions and 1 deletion.

+5 −1 src/wallet/wallet.cpp
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2104,7 +2104,11 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                         CPubKey vchPubKey;
                         bool ret;
                         ret = reservekey.GetReservedKey(vchPubKey);
-                        assert(ret); // should never fail, as we just unlocked
+                        if (!ret)
+                        {
+                            strFailReason = _("Keypool ran out, please call keypoolrefill first");
+                            return false;
+                        }
 
                         scriptChange = GetScriptForDestination(vchPubKey.GetID());
                     }