From 6c96293f9355f70a81fb93aa74b7d6a0f407083b Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 30 Nov 2016 08:37:22 -0300 Subject: [PATCH] test --- src/pow.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pow.cpp b/src/pow.cpp index a5d75e7ba..644a3f59d 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -108,7 +108,7 @@ int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33) int32_t komodo_is_special(int32_t height,uint8_t pubkey33[33]); int32_t komodo_currentheight(); extern int32_t KOMODO_CHOSEN_ONE; -//extern int8_t Minerids[1024 * 1024 * 5]; // 5 million blocks +#define KOMODO_ELECTION_GAP 2000 bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned int nBits, const Consensus::Params& params) { @@ -128,12 +128,12 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in } if ( nonz == 0 ) return(true); // will come back via different path with pubkey set - if ( notaryid >= 0 ) + if ( notaryid >= 0 && ((height % KOMODO_ELECTION_GAP) == 0 || (height % KOMODO_ELECTION_GAP) > 64) ) { special2 = komodo_is_special(height,pubkey33); - if ( special2 == -2 ) - printf("height.%d special2.%d special.%d\n",height,special2,special); - if ( special2 == -2 || (height < 80000 && (special != 0 || special2 > 0)) || + //if ( special2 == -2 ) + // printf("height.%d special2.%d special.%d\n",height,special2,special); + if ( (height % KOMODO_ELECTION_GAP) == 0 || (height < 80000 && (special != 0 || special2 > 0)) || (height >= 80000 && special2 > 0) ) { bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);