diff --git a/src/miner.cpp b/src/miner.cpp index 9a4b17842..356374207 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -756,44 +756,6 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32 } pblock->nSolution.clear(); pblocktemplate->vTxSigOps[0] = GetLegacySigOpCount(pblock->vtx[0]); - /* - if ( SMART_CHAIN_SYMBOL[0] == 0 && IS_HUSH_NOTARY != 0 && My_notaryid >= 0 ) - { - uint32_t r; CScript opret; void **ptr=0; - - CMutableTransaction txNotary = CreateNewContextualCMutableTransaction(Params().GetConsensus(), chainActive.Height() + 1); - if ( pblock->nTime < pindexPrev->nTime+60 ) - pblock->nTime = pindexPrev->nTime + 60; - if ( gpucount < 33 ) - { - uint8_t tmpbuffer[40]; uint32_t r; int32_t n=0; uint256 randvals; - memcpy(&tmpbuffer[n],&My_notaryid,sizeof(My_notaryid)), n += sizeof(My_notaryid); - memcpy(&tmpbuffer[n],&Mining_height,sizeof(Mining_height)), n += sizeof(Mining_height); - memcpy(&tmpbuffer[n],&pblock->hashPrevBlock,sizeof(pblock->hashPrevBlock)), n += sizeof(pblock->hashPrevBlock); - vcalc_sha256(0,(uint8_t *)&randvals,tmpbuffer,n); - memcpy(&r,&randvals,sizeof(r)); - pblock->nTime += (r % (33 - gpucount)*(33 - gpucount)); - } - if ( hush_notaryvin(txNotary,NOTARY_PUBKEY33,ptr) > 0 ) - { - CAmount txfees = 5000; - pblock->vtx.push_back(txNotary); - pblocktemplate->vTxFees.push_back(txfees); - pblocktemplate->vTxSigOps.push_back(GetLegacySigOpCount(txNotary)); - nFees += txfees; - pblocktemplate->vTxFees[0] = -nFees; - //*(uint64_t *)(&pblock->vtx[0].vout[0].nValue) += txfees; - //fprintf(stderr,"added notaryvin\n"); - } else { - fprintf(stderr,"error adding notaryvin, need to create 0.0001 utxos\n"); - if ( SMART_CHAIN_SYMBOL[0] == 0 || (SMART_CHAIN_SYMBOL[0] != 0 && !isStake) ) - { - LEAVE_CRITICAL_SECTION(cs_main); - LEAVE_CRITICAL_SECTION(mempool.cs); - } - return(0); - } - } else */ if ( ASSETCHAINS_CC == 0 && pindexPrev != 0 && ASSETCHAINS_STAKED == 0 && (SMART_CHAIN_SYMBOL[0] != 0 || IS_HUSH_NOTARY == 0 || My_notaryid < 0) ) {