diff --git a/src/main.cpp b/src/main.cpp index f1443e42a..2defb8571 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3855,9 +3855,15 @@ void UnloadBlockIndex() bool LoadBlockIndex() { + extern int32_t KOMODO_LOADINGBLOCKS; // Load block index from databases + KOMODO_LOADINGBLOCKS = 1; if (!fReindex && !LoadBlockIndexDB()) + { + KOMODO_LOADINGBLOCKS = 0; return false; + } + KOMODO_LOADINGBLOCKS = 0; return true; } @@ -4344,7 +4350,7 @@ void static ProcessGetData(CNode* pfrom) CBlock block; if (!ReadBlockFromDisk(block, (*mi).second)) { - //assert(!"cannot load block from disk"); + assert(!"cannot load block from disk"); } else { diff --git a/src/miner.cpp b/src/miner.cpp index 0f89ca04e..307125da1 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -100,7 +100,7 @@ void UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams, #define ASSETCHAINS_MINHEIGHT 100 #define KOMODO_ELECTION_GAP 2000 -#define ROUNDROBIN_DELAY 58 +#define ROUNDROBIN_DELAY 60 extern int32_t ASSETCHAINS_SEED,IS_KOMODO_NOTARY,USE_EXTERNAL_PUBKEY,KOMODO_CHOSEN_ONE,ASSETCHAIN_INIT,KOMODO_INITDONE,KOMODO_ON_DEMAND,KOMODO_INITDONE; extern char ASSETCHAINS_SYMBOL[16]; extern std::string NOTARY_PUBKEY; diff --git a/src/pow.cpp b/src/pow.cpp index 59072290d..eb813087f 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -114,7 +114,7 @@ extern int32_t KOMODO_CHOSEN_ONE; #define KOMODO_ELECTION_GAP 2000 int32_t komodo_eligiblenotary(uint8_t pubkeys[66][33],int32_t *mids,int32_t *nonzpkeysp,int32_t height); - +int32_t KOMODO_LOADINGBLOCKS; extern std::string NOTARY_PUBKEY; @@ -167,7 +167,7 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in // Check proof of work matches claimed amount if ( UintToArith256(hash) > bnTarget ) { - if ( nonzpkeys > 0 && height > 182500 && KOMODO_REWIND == 0 && komodo_chainactive(height) != 0 ) + if ( KOMODO_LOADINGBLOCKS == 0 && height > 182507 && KOMODO_REWIND == 0 )//&& komodo_chainactive(height) != 0 && nonzpkeys > 0 { int32_t i; for (i=31; i>=0; i--)