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

Merge pull request #756 from jl777/jl777

Browse Source 
Jl777
This commit is contained in:
jl777
2018-07-11 10:15:31 -11:00
committed by GitHub
parent 8af1877ebd ae2d90651b
commit 6f6c4897fa
1 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/komodo_bitcoind.h
View File

@@ -1104,9 +1104,8 @@ int32_t komodo_validate_interest(const CTransaction &tx,int32_t txheight,uint32_
commission must be in coinbase.vout[1] and must be >= 10000 sats commission must be in coinbase.vout[1] and must be >= 10000 sats
PoS stake must be without txfee and in the last tx in the block at vout[0] PoS stake must be without txfee and in the last tx in the block at vout[0]
PoW mining on PoS chain must solve a harder diff that adjusts, but never less than KOMODO_POWMINMULT
*/ */
#define KOMODO_POWMINMULT 16 //#define KOMODO_POWMINMULT 16
uint64_t komodo_commission(const CBlock *pblock) uint64_t komodo_commission(const CBlock *pblock)
{ {
@@ -1267,19 +1266,37 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t height,int32_t goalperc) arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t height,int32_t goalperc)
{ {
CBlockIndex *pindex; arith_uint256 easydiff,bnTarget,hashval,sum,ave; bool fNegative,fOverflow; int32_t i,n,ht,percPoS,diff,val; CBlockIndex *pindex; arith_uint256 easydiff,bnTarget,hashval,sum,ave; bool fNegative,fOverflow; int32_t i,n,m,ht,percPoS,diff,val;
*percPoSp = percPoS = 0; *percPoSp = percPoS = 0;
if ( height <= 10 || (ASSETCHAINS_STAKED == 100 && height <= 100) ) if ( height <= 10 || (ASSETCHAINS_STAKED == 100 && height <= 100) )
return(target); return(target);
sum = arith_uint256(0); sum = arith_uint256(0);
ave = sum; ave = sum;
easydiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow); easydiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
for (i=n=0; i<100; i++) for (i=n=m=0; i<100; i++)
{ {
ht = height - 100 + i; ht = height - 100 + i;
if ( ht <= 1 ) if ( ht <= 1 )
continue; continue;
if ( (pindex= komodo_chainactive(ht)) != 0 ) if ( (pindex= komodo_chainactive(ht)) != 0 )
{
if ( komodo_segid(ht) >= 0 )
{
n++;
percPoS++;
if ( ASSETCHAINS_STAKED < 100 )
fprintf(stderr,"0");
}
else
{
if ( ASSETCHAINS_STAKED < 100 )
fprintf(stderr,"1");
sum += UintToArith256(pindex->GetBlockHash());
m++;
n++;
}
}
/*if ( (pindex= komodo_chainactive(ht)) != 0 )
{ {
bnTarget.SetCompact(pindex->nBits,&fNegative,&fOverflow); bnTarget.SetCompact(pindex->nBits,&fNegative,&fOverflow);
bnTarget = (bnTarget / arith_uint256(KOMODO_POWMINMULT)); bnTarget = (bnTarget / arith_uint256(KOMODO_POWMINMULT));
@@ -1298,22 +1315,22 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
if ( ASSETCHAINS_STAKED < 100 ) if ( ASSETCHAINS_STAKED < 100 )
fprintf(stderr,"0"); fprintf(stderr,"0");
} }
if ( ASSETCHAINS_STAKED < 100 && (i % 10) == 9 ) }*/
fprintf(stderr," %d, ",percPoS); if ( ASSETCHAINS_STAKED < 100 && (i % 10) == 9 )
} fprintf(stderr," %d, ",percPoS);
} }
if ( n < 100 ) if ( n < 100 )
percPoS = ((percPoS * n) + (goalperc * (100-n))) / 100; percPoS = ((percPoS * n) + (goalperc * (100-n))) / 100;
if ( ASSETCHAINS_STAKED < 100 ) if ( ASSETCHAINS_STAKED < 100 )
fprintf(stderr," -> %d%% percPoS vs goalperc.%d ht.%d\n",percPoS,goalperc,height); fprintf(stderr," -> %d%% percPoS vs goalperc.%d ht.%d\n",percPoS,goalperc,height);
*percPoSp = percPoS; *percPoSp = percPoS;
target = (target / arith_uint256(KOMODO_POWMINMULT)); //target = (target / arith_uint256(KOMODO_POWMINMULT));
if ( n > 0 ) if ( m > 0 )
{ {
ave = (sum / arith_uint256(n)); ave = (sum / arith_uint256(m));
if ( ave > target ) if ( ave > target )
ave = target; ave = target;
} else return(target); } else ave = easydiff; //else return(target);
if ( percPoS < goalperc ) // increase PoW diff -> lower bnTarget if ( percPoS < goalperc ) // increase PoW diff -> lower bnTarget
{ {
bnTarget = (ave * arith_uint256(percPoS * percPoS)) / arith_uint256(goalperc * goalperc * goalperc); bnTarget = (ave * arith_uint256(percPoS * percPoS)) / arith_uint256(goalperc * goalperc * goalperc);
@@ -1332,7 +1349,10 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
} }
else if ( percPoS > goalperc ) // decrease PoW diff -> raise bnTarget else if ( percPoS > goalperc ) // decrease PoW diff -> raise bnTarget
{ {
bnTarget = ((ave * arith_uint256(goalperc)) + (easydiff * arith_uint256(percPoS))) / arith_uint256(percPoS + goalperc); //bnTarget = ((ave * arith_uint256(goalperc)) + (easydiff * arith_uint256(percPoS))) / arith_uint256(percPoS + goalperc);
bnTarget = (ave * arith_uint256(percPoS * percPoS * percPoS)) / arith_uint256(goalperc * goalperc);
if ( bnTarget > easydiff || bnTarget < ave )
bnTarget = easydiff;
if ( 1 ) if ( 1 )
{ {
for (i=31; i>=24; i--) for (i=31; i>=24; i--)