Merge of Komodo and Verus Technologies Post Sapling, Pre-VerusPoP with Support for Time locked coinbases

2018-11-14 16:40:10 -08:00
parent 7a993143ef 0dcc818ae0
commit 6e2a502b0e
81 changed files with 4300 additions and 2785 deletions
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -76,7 +76,6 @@ using namespace std;
 extern void ThreadSendAlert();
 extern int32_t KOMODO_LOADINGBLOCKS;
 extern bool VERUS_MINTBLOCKS;
-extern std::string VERUS_CHEATCATCHER;

 ZCJoinSplit* pzcashParams = NULL;

@@ -1869,8 +1868,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)

    StartNode(threadGroup, scheduler);

-    VERUS_CHEATCATCHER = GetArg("-cheatcatcher", "");
-
 #ifdef ENABLE_MINING
    // Generate coins in the background
 #ifdef ENABLE_WALLET