From eca62bb4f39fd697db8d35487e95035a503f1fcd Mon Sep 17 00:00:00 2001
From: blackjok3r <blackjok3r@gmail.com>
Date: Tue, 18 Jun 2019 21:49:56 +0800
Subject: [PATCH] fix crash/lockup on KMD with mining pools when an old utxo
 makes IsFinalTx fail in TestBlockValidity.

---
 src/miner.cpp      | 3 ++-
 src/rpc/mining.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 8ff4e2023..e4e907447 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -819,7 +819,8 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32
                     LEAVE_CRITICAL_SECTION(cs_main);
                     LEAVE_CRITICAL_SECTION(mempool.cs);
                 }
-                throw std::runtime_error("CreateNewBlock(): TestBlockValidity failed");
+                //throw std::runtime_error("CreateNewBlock(): TestBlockValidity failed"); // crashes the node, moved to GetBlockTemplate and issue return.
+                return(0);
             }
             //fprintf(stderr,"valid\n");
         }
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 53a744497..4814d34dd 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -745,7 +745,8 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
 #endif
         ENTER_CRITICAL_SECTION(cs_main);
         if (!pblocktemplate)
-            throw JSONRPCError(RPC_OUT_OF_MEMORY, "Out of memory or no available utxo for staking");
+            throw std::runtime_error("CreateNewBlock(): create block failed");
+            //throw JSONRPCError(RPC_OUT_OF_MEMORY, "Out of memory or no available utxo for staking");
 
         // Need to update only after we know CreateNewBlockWithKey succeeded
         pindexPrev = pindexPrevNew;