Merge branch 'FSM' of https://github.com/jl777/komodo into mastertest

2019-01-23 16:57:05 +08:00
parent c2ce7ca9ce 3cc3cb20da
commit 292edfb284
61 changed files with 7223 additions and 1530 deletions
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -48,10 +48,8 @@

 using namespace std;

-extern int32_t ASSETCHAINS_ALGO, ASSETCHAINS_EQUIHASH, ASSETCHAINS_LWMAPOS;
-extern uint64_t ASSETCHAINS_STAKED;
-extern int32_t KOMODO_MININGTHREADS;
-extern bool VERUS_MINTBLOCKS;
+#include "komodo_defs.h"
+
 arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t height,int32_t goalperc);

 /**