Move MainchainRPCCheck to its own schedule, fix resolution

Author: instagibbs

src/init.cpp

@@ -146,6 +146,7 @@ static std::unique_ptr<ECCVerifyHandle> globalVerifyHandle;
 
 static boost::thread_group threadGroup;
 static CScheduler scheduler;
+static CScheduler reverification_scheduler;
 
 void Interrupt()
 {
@@ -1866,16 +1867,21 @@ bool AppInitMain()
     SetRPCWarmupFinished();
 
     // ELEMENTS:
-    CScheduler::Function f2 = boost::bind(&MainchainRPCCheck, false);
-    unsigned int check_rpc_every = gArgs.GetArg("-recheckpeginblockinterval", 120);
-    if (check_rpc_every) {
-        scheduler.scheduleEvery(f2, check_rpc_every);
-    }
     uiInterface.InitMessage(_("Awaiting mainchain RPC warmup"));
     if (!MainchainRPCCheck(true)) { //Initial check, fail immediately
         return InitError(_("ERROR: elementsd is set to verify pegins but cannot get valid response from the mainchain daemon. Please check debug.log for more information."));
     }
 
+    // Start the lightweight block re-evaluation scheduler thread
+    CScheduler::Function reevaluationLoop = std::bind(&CScheduler::serviceQueue, &reverification_scheduler);
+    threadGroup.create_thread(std::bind(&TraceThread<CScheduler::Function>, "reevaluation_scheduler", reevaluationLoop));
+
+    CScheduler::Function f2 = boost::bind(&MainchainRPCCheck, false);
+    unsigned int check_rpc_every = gArgs.GetArg("-recheckpeginblockinterval", 120) * 1000;
+    if (check_rpc_every) {
+        reverification_scheduler.scheduleEvery(f2, check_rpc_every);
+    }
+
     uiInterface.InitMessage(_("Done loading"));
 
     g_wallet_init_interface.Start(scheduler);