Remove retries on getBlockTemplate to fix pool flooding with calls

This commit is contained in:
miketout
2018-10-21 14:54:19 -07:00
parent e871bb78ad
commit d82a969a58
3 changed files with 8 additions and 3 deletions

View File

@@ -43,8 +43,8 @@ void EnforceNodeDeprecation(int nHeight, bool forceLogging, bool fThread) {
msg = strprintf(_("This version will be deprecated at block height %d, and will automatically shut down."), msg = strprintf(_("This version will be deprecated at block height %d, and will automatically shut down."),
DEPRECATION_HEIGHT) + " " + DEPRECATION_HEIGHT) + " " +
_("You should upgrade to the latest version of Verus."); _("You should upgrade to the latest version of Verus.");
LogPrintf("*** %s\n", msg);
CAlert::Notify(msg, fThread);
uiInterface.ThreadSafeMessageBox(msg, "", CClientUIInterface::MSG_WARNING);
} }
LogPrintf("*** %s\n", msg);
CAlert::Notify(msg, fThread);
uiInterface.ThreadSafeMessageBox(msg, "", CClientUIInterface::MSG_WARNING);
} }

View File

@@ -614,6 +614,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
} }
if (Params().MiningRequiresPeers() && (IsNotInSync() || fvNodesEmpty)) if (Params().MiningRequiresPeers() && (IsNotInSync() || fvNodesEmpty))
{ {
/*
int loops = 0, blockDiff = 0, newDiff = 0; int loops = 0, blockDiff = 0, newDiff = 0;
const int delay = 15; const int delay = 15;
do { do {
@@ -643,6 +644,8 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
} while (fvNodesEmpty || IsNotInSync()); } while (fvNodesEmpty || IsNotInSync());
if (loops > delay) if (loops > delay)
throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Cannot get a block template while no peers are connected or chain not in sync!"); throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Cannot get a block template while no peers are connected or chain not in sync!");
*/
throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Cannot get a block template while no peers are connected or chain not in sync!");
} }
//if (IsInitialBlockDownload()) //if (IsInitialBlockDownload())

View File

@@ -731,6 +731,8 @@ UniValue CRPCTable::execute(const std::string &strMethod, const UniValue &params
throw JSONRPCError(RPC_IN_WARMUP, rpcWarmupStatus); throw JSONRPCError(RPC_IN_WARMUP, rpcWarmupStatus);
} }
// printf("RPC call: %s\n", strMethod.c_str());
// Find method // Find method
const CRPCCommand *pcmd = tableRPC[strMethod]; const CRPCCommand *pcmd = tableRPC[strMethod];
if (!pcmd) if (!pcmd)