DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Metaphilibert requests

Browse Source
This commit is contained in:
jl777
2017-03-18 23:41:02 +02:00
parent ae04f6178d
commit 49b495854b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/miner.cpp
View File

@@ -663,7 +663,7 @@ void static BitcoinMiner(CWallet *pwallet)
if ( i == 33 ) if ( i == 33 )
externalflag = 1; externalflag = 1;
else externalflag = 0; 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++) for (i=1; i<66; i++)
if ( memcmp(pubkeys[i],pubkeys[0],33) == 0 ) if ( memcmp(pubkeys[i],pubkeys[0],33) == 0 )
@@ -678,7 +678,7 @@ void static BitcoinMiner(CWallet *pwallet)
} }
for (j=gpucount=0; j<65; j++) for (j=gpucount=0; j<65; j++)
{ {
if ( mids[j] >= 0 ) if ( mids[j] >= 0 || notaryid == 34 )
fprintf(stderr,"%d ",mids[j]); fprintf(stderr,"%d ",mids[j]);
else fprintf(stderr,"GPU "); else fprintf(stderr,"GPU ");
if ( mids[j] == -1 ) if ( mids[j] == -1 )
@@ -689,8 +689,10 @@ void static BitcoinMiner(CWallet *pwallet)
for (j=0; j<65; j++) for (j=0; j<65; j++)
if ( mids[j] == notaryid ) if ( mids[j] == notaryid )
break; break;
if ( j == 65 )
KOMODO_LASTMINED = 0;
} else fprintf(stderr,"no nonz pubkeys\n"); } 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); 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);