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
2018-07-12 10:14:15 -11:00
parent eedbc1907e
commit 0debf37ff7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/komodo_bitcoind.h
View File

@@ -1191,12 +1191,12 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
txtime = komodo_txtime2(&value,txid,vout,address); txtime = komodo_txtime2(&value,txid,vout,address);
if ( validateflag == 0 ) if ( validateflag == 0 )
{ {
fprintf(stderr,"blocktime.%u -> ",blocktime); //fprintf(stderr,"blocktime.%u -> ",blocktime);
if ( blocktime < prevtime+3 ) if ( blocktime < prevtime+3 )
blocktime = prevtime+3; blocktime = prevtime+3;
if ( blocktime < GetAdjustedTime()-60 ) if ( blocktime < GetAdjustedTime()-60 )
blocktime = GetAdjustedTime()+30; blocktime = GetAdjustedTime()+30;
fprintf(stderr,"blocktime.%u txtime.%u\n",blocktime,txtime); //fprintf(stderr,"blocktime.%u txtime.%u\n",blocktime,txtime);
} }
if ( value == 0 || txtime == 0 || blocktime == 0 || prevtime == 0 ) if ( value == 0 || txtime == 0 || blocktime == 0 || prevtime == 0 )
{ {
@@ -1241,7 +1241,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
winner = 1; winner = 1;
if ( validateflag == 0 ) if ( validateflag == 0 )
{ {
fprintf(stderr,"winner blocktime.%u iter.%d segid.%d\n",blocktime,iter,segid); //fprintf(stderr,"winner blocktime.%u iter.%d segid.%d\n",blocktime,iter,segid);
blocktime += iter; blocktime += iter;
blocktime += segid * 2; blocktime += segid * 2;
} }

4
src/miner.cpp
View File

@@ -400,8 +400,8 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
if ( (siglen= komodo_staked(txStaked,pblock->nBits,&blocktime,&txtime,&utxotxid,&utxovout,&utxovalue,utxosig)) > 0 ) if ( (siglen= komodo_staked(txStaked,pblock->nBits,&blocktime,&txtime,&utxotxid,&utxovout,&utxovalue,utxosig)) > 0 )
{ {
CAmount txfees = 0; CAmount txfees = 0;
if ( (int32_t)chainActive.Tip()->nHeight+1 > 100 )//&& GetAdjustedTime() < blocktime-157 ) //if ( (int32_t)chainActive.Tip()->nHeight+1 > 100 && GetAdjustedTime() < blocktime-157 )
return(0); // return(0);
pblock->vtx.push_back(txStaked); pblock->vtx.push_back(txStaked);
pblocktemplate->vTxFees.push_back(txfees); pblocktemplate->vTxFees.push_back(txfees);
pblocktemplate->vTxSigOps.push_back(GetLegacySigOpCount(txStaked)); pblocktemplate->vTxSigOps.push_back(GetLegacySigOpCount(txStaked));