TSA+RST hybrid zawy19

This commit is contained in:
jl777
2019-08-07 10:21:55 -11:00
parent bb6e52fcb2
commit d8b8bbfda8

View File

@@ -361,7 +361,7 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
for (z=31; z>=0; z--) for (z=31; z>=0; z--)
fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[z]); fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[z]);
} }
fprintf(stderr," ht.%d bnTarget tipdiff.%d\n",height,tipdiff); fprintf(stderr," ht.%d TSA bnTarget tipdiff.%d\n",height,tipdiff);
/*bnTarget = (bnTarget + ct[0] + ct[1] + ct[2]) / arith_uint256(4); /*bnTarget = (bnTarget + ct[0] + ct[1] + ct[2]) / arith_uint256(4);
{ {
int32_t z; int32_t z;
@@ -369,9 +369,9 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[z]); fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[z]);
} }
fprintf(stderr," sma\n");*/ fprintf(stderr," sma\n");*/
nbits = bnTarget.GetCompact(); //nbits = bnTarget.GetCompact();
nbits = (nbits & 0xfffffffc) | 0; //nbits = (nbits & 0xfffffffc) | 0;
return(nbits); //return(nbits);
} }
} }
pindexFirst = pindexLast; pindexFirst = pindexLast;
@@ -407,7 +407,8 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
nbits = CalculateNextWorkRequired(bnAvg, pindexLast->GetMedianTimePast(), pindexFirst->GetMedianTimePast(), params); nbits = CalculateNextWorkRequired(bnAvg, pindexLast->GetMedianTimePast(), pindexFirst->GetMedianTimePast(), params);
if ( ASSETCHAINS_ADAPTIVEPOW > 0 ) if ( ASSETCHAINS_ADAPTIVEPOW > 0 )
{ {
bnTarget = arith_uint256().SetCompact(nbits); if ( ASSETCHAINS_ADAPTIVEPOW != 1 ) // not-TSA
bnTarget = arith_uint256().SetCompact(nbits);
if ( height > (int32_t)(sizeof(ct)/sizeof(*ct)) ) if ( height > (int32_t)(sizeof(ct)/sizeof(*ct)) )
{ {
easy.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow); easy.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);