|
|
@ -722,7 +722,7 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32 |
|
|
|
pblock->hashFinalSaplingRoot = sapling_tree.root(); |
|
|
|
|
|
|
|
// all PoS chains need this data in the block at all times
|
|
|
|
if ( ASSETCHAINS_LWMAPOS || SMART_CHAIN_SYMBOL[0] == 0 || ASSETCHAINS_STAKED == 0 || KOMODO_MININGTHREADS > 0 ) |
|
|
|
if ( ASSETCHAINS_LWMAPOS || SMART_CHAIN_SYMBOL[0] == 0 || ASSETCHAINS_STAKED == 0 || HUSH_MININGTHREADS > 0 ) |
|
|
|
{ |
|
|
|
UpdateTime(pblock, Params().GetConsensus(), pindexPrev); |
|
|
|
pblock->nBits = GetNextWorkRequired(pindexPrev, pblock, Params().GetConsensus()); |
|
|
@ -1184,7 +1184,7 @@ void static BitcoinMiner() |
|
|
|
|
|
|
|
#ifdef ENABLE_WALLET |
|
|
|
// notaries always default to staking
|
|
|
|
CBlockTemplate *ptr = CreateNewBlockWithKey(reservekey, pindexPrev->GetHeight()+1, gpucount, ASSETCHAINS_STAKED != 0 && KOMODO_MININGTHREADS == 0); |
|
|
|
CBlockTemplate *ptr = CreateNewBlockWithKey(reservekey, pindexPrev->GetHeight()+1, gpucount, ASSETCHAINS_STAKED != 0 && HUSH_MININGTHREADS == 0); |
|
|
|
#else |
|
|
|
CBlockTemplate *ptr = CreateNewBlockWithKey(); |
|
|
|
#endif |
|
|
@ -1332,7 +1332,7 @@ void static BitcoinMiner() |
|
|
|
// (x_1, x_2, ...) = A(I, V, n, k)
|
|
|
|
LogPrint("pow", "Running Equihash solver \"%s\" with nNonce = %s\n",solver, pblock->nNonce.ToString()); |
|
|
|
arith_uint256 hashTarget; |
|
|
|
if ( KOMODO_MININGTHREADS > 0 && ASSETCHAINS_STAKED > 0 && ASSETCHAINS_STAKED < 100 && Mining_height > 10 ) |
|
|
|
if ( HUSH_MININGTHREADS > 0 && ASSETCHAINS_STAKED > 0 && ASSETCHAINS_STAKED < 100 && Mining_height > 10 ) |
|
|
|
hashTarget = HASHTarget_POW; |
|
|
|
//else if ( ASSETCHAINS_ADAPTIVEPOW > 0 )
|
|
|
|
// hashTarget = HASHTarget_POW;
|
|
|
@ -1362,7 +1362,7 @@ void static BitcoinMiner() |
|
|
|
fprintf(stderr," POW\n");*/ |
|
|
|
if ( h > hashTarget ) |
|
|
|
{ |
|
|
|
//if ( ASSETCHAINS_STAKED != 0 && KOMODO_MININGTHREADS == 0 )
|
|
|
|
//if ( ASSETCHAINS_STAKED != 0 && HUSH_MININGTHREADS == 0 )
|
|
|
|
// MilliSleep(30);
|
|
|
|
return false; |
|
|
|
} |
|
|
|