From 67da137bb69a7a5897ff61d74fee511a4afb4d06 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 22 Nov 2016 14:00:51 -0300 Subject: [PATCH 1/3] 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 dd4eda01a..bc5fa3e80 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -560,7 +560,7 @@ int32_t komodo_checkpoint(int32_t *notarized_heightp,int32_t nHeight,uint256 has return(-1); notarized_height = komodo_notarizeddata(pindex->nHeight,¬arized_hash,¬arized_desttxid); *notarized_heightp = notarized_height; - if ( notarized_height >= 0 && notarized_height <= pindex->nHeight && (notary= mapBlockIndex[notarized_hash]) != 0 ) + if ( nHeight >= 79700 && notarized_height >= 0 && notarized_height <= pindex->nHeight && (notary= mapBlockIndex[notarized_hash]) != 0 ) { //printf("nHeight.%d -> (%d %s)\n",pindex->Tip()->nHeight,notarized_height,notarized_hash.ToString().c_str()); if ( notary->nHeight == notarized_height ) // if notarized_hash not in chain, reorg From 81e6c3efe6d4a4b1e9e5688021595bb5f7918076 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 22 Nov 2016 14:26:51 -0300 Subject: [PATCH 2/3] test --- src/komodo_bitcoind.h | 7 ++++--- src/miner.cpp | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index bc5fa3e80..574eabc08 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -535,9 +535,10 @@ int32_t komodo_is_special(int32_t height,uint8_t pubkey33[33]) komodo_chosennotary(¬aryid,height,pubkey33); if ( height >= 34000 && notaryid >= 0 ) { - if ( height < 79693 ) - limit = 64; - else if ( height < 82000 ) + //if ( height < 79693 ) + // limit = 64; + //else + if ( height < 82000 ) limit = 8; else limit = 66; for (i=1; inHeight+1,NOTARY_PUBKEY33) > 0 ) { hashTarget = arith_uint256().SetCompact(KOMODO_MINDIFF_NBITS); - fprintf(stderr,"I am the chosen one for %s ht.%d\n",ASSETCHAINS_SYMBOL,pindexPrev->nHeight+1); + //fprintf(stderr,"I am the chosen one for %s ht.%d\n",ASSETCHAINS_SYMBOL,pindexPrev->nHeight+1); } else Mining_start = 0; while (true) { From 031b1129b7492f870a56ae9a87ec4bb3ab64667d Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 22 Nov 2016 14:57:29 -0300 Subject: [PATCH 3/3] Revert "test" This reverts commit 81e6c3efe6d4a4b1e9e5688021595bb5f7918076. --- src/komodo_bitcoind.h | 7 +++---- src/miner.cpp | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index 574eabc08..bc5fa3e80 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -535,10 +535,9 @@ int32_t komodo_is_special(int32_t height,uint8_t pubkey33[33]) komodo_chosennotary(¬aryid,height,pubkey33); if ( height >= 34000 && notaryid >= 0 ) { - //if ( height < 79693 ) - // limit = 64; - //else - if ( height < 82000 ) + if ( height < 79693 ) + limit = 64; + else if ( height < 82000 ) limit = 8; else limit = 66; for (i=1; inHeight+1,NOTARY_PUBKEY33) > 0 ) { hashTarget = arith_uint256().SetCompact(KOMODO_MINDIFF_NBITS); - //fprintf(stderr,"I am the chosen one for %s ht.%d\n",ASSETCHAINS_SYMBOL,pindexPrev->nHeight+1); + fprintf(stderr,"I am the chosen one for %s ht.%d\n",ASSETCHAINS_SYMBOL,pindexPrev->nHeight+1); } else Mining_start = 0; while (true) {