From 755c2b0044cf9f9df389ce2a005b7e66819c5a2e Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 19 Feb 2017 09:26:18 +0200 Subject: [PATCH 1/2] test --- src/komodo_bitcoind.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index 2a29b1dc9..de77d944a 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -700,7 +700,7 @@ int32_t komodo_is_special(int32_t height,uint8_t pubkey33[33]) komodo_chosennotary(&nid,height-i,_pubkey33); if ( nid == notaryid ) //komodo_minerid(height-i,_pubkey33) { - if ( (0) && notaryid > 0 ) + if ( (1) && notaryid > 0 ) fprintf(stderr,"ht.%d notaryid.%d already mined -i.%d nid.%d\n",height,notaryid,i,nid); if ( height > 225000 ) return(-1); From 86ad1cb1a010787cef5d90f3593915e3fa1d8cca Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 19 Feb 2017 10:29:32 +0200 Subject: [PATCH 2/2] Scheduled update 225000 --- src/komodo_bitcoind.h | 2 +- src/pow.cpp | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index de77d944a..2a29b1dc9 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -700,7 +700,7 @@ int32_t komodo_is_special(int32_t height,uint8_t pubkey33[33]) komodo_chosennotary(&nid,height-i,_pubkey33); if ( nid == notaryid ) //komodo_minerid(height-i,_pubkey33) { - if ( (1) && notaryid > 0 ) + if ( (0) && notaryid > 0 ) fprintf(stderr,"ht.%d notaryid.%d already mined -i.%d nid.%d\n",height,notaryid,i,nid); if ( height > 225000 ) return(-1); diff --git a/src/pow.cpp b/src/pow.cpp index 9ae787195..75d14c9cc 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -171,18 +171,8 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in for (i=0; i<66; i++) printf("%d ",mids[i]); printf(" minerids from ht.%d\n",height); - if ( notaryid == -1 ) - { - sleep(3); - komodo_chosennotary(¬aryid,height,pubkey33); - if ( notaryid >= 0 ) - { - flag = komodo_eligiblenotary(pubkeys,mids,&nonzpkeys,height); - printf("found notaryid.%d flag.%d\n",notaryid,flag); - return(true); - } - } - return error("CheckProofOfWork(): hash doesn't match nBits"); + if ( notaryid >= 0 ) + return error("CheckProofOfWork(): hash doesn't match nBits"); } } return true;