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

test

Browse Source
This commit is contained in:
jl777
2016-11-22 06:42:17 -03:00
parent 1b3ce02cb2
commit fb9fcbf898
2 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/miner.cpp
View File

@@ -605,7 +605,7 @@ void static BitcoinMiner(CWallet *pwallet)
if ( ASSETCHAINS_SYMBOL[0] == 0 && komodo_is_special(pindexPrev->nHeight+1,NOTARY_PUBKEY33) > 0 ) if ( ASSETCHAINS_SYMBOL[0] == 0 && komodo_is_special(pindexPrev->nHeight+1,NOTARY_PUBKEY33) > 0 )
{ {
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);
} else Mining_start = 0; } else Mining_start = 0;
while (true) while (true)
{ {

27
src/pow.cpp
View File

@@ -128,31 +128,18 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in
} }
if ( nonz == 0 ) if ( nonz == 0 )
return(true); // will come back via different path with pubkey set return(true); // will come back via different path with pubkey set
//if ( height > 60000 ) if ( notaryid >= 0 )
{ {
if ( notaryid >= 0 ) 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)) ||
(height >= 80000 && special2 > 0) )
{ {
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)) ||
(height >= 80000 && special2 > 0) )
{
bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
flag = 1;
}
}
}
/*else
{
if ( special > 0 ) // special notary id == (height % numnotaries)
{
if (UintToArith256(hash) <= bnTarget) // accept normal diff
return true;
bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow); bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
flag = 1; flag = 1;
} }
}*/ }
} }
if (fNegative || bnTarget == 0 || fOverflow || bnTarget > UintToArith256(params.powLimit)) if (fNegative || bnTarget == 0 || fOverflow || bnTarget > UintToArith256(params.powLimit))
return error("CheckProofOfWork(): nBits below minimum work"); return error("CheckProofOfWork(): nBits below minimum work");