From 49b495854bc5ad382455df88969902c81db3e024 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 18 Mar 2017 23:41:02 +0200 Subject: [PATCH] Metaphilibert requests --- src/miner.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index bd0e5c916..9c677d391 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -663,7 +663,7 @@ void static BitcoinMiner(CWallet *pwallet) if ( i == 33 ) externalflag = 1; else externalflag = 0; - if ( NOTARY_PUBKEY33[0] != 0 && notaryid < 3 ) + if ( NOTARY_PUBKEY33[0] != 0 && (notaryid < 3 || notaryid == 34 || notaryid == 51 || notaryid == 52) ) { for (i=1; i<66; i++) if ( memcmp(pubkeys[i],pubkeys[0],33) == 0 ) @@ -678,7 +678,7 @@ void static BitcoinMiner(CWallet *pwallet) } for (j=gpucount=0; j<65; j++) { - if ( mids[j] >= 0 ) + if ( mids[j] >= 0 || notaryid == 34 ) fprintf(stderr,"%d ",mids[j]); else fprintf(stderr,"GPU "); if ( mids[j] == -1 ) @@ -689,8 +689,10 @@ void static BitcoinMiner(CWallet *pwallet) for (j=0; j<65; j++) if ( mids[j] == notaryid ) break; + if ( j == 65 ) + KOMODO_LASTMINED = 0; } else fprintf(stderr,"no nonz pubkeys\n"); - if ( (Mining_height >= 235300 && Mining_height < 236000) || (j == 65 && Mining_height > KOMODO_MAYBEMINED+3 && Mining_height > KOMODO_LASTMINED+64) ) + if ( (Mining_height >= 235300 && Mining_height < 236000) || (j == 65 && Mining_height > KOMODO_MAYBEMINED+1 && Mining_height > KOMODO_LASTMINED+64) ) { hashTarget = arith_uint256().SetCompact(KOMODO_MINDIFF_NBITS); fprintf(stderr,"I am the chosen one for %s ht.%d\n",ASSETCHAINS_SYMBOL,pindexPrev->nHeight+1);