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-11-08 04:46:51 -11:00
parent 2bbf50e165
commit 0ba20c202a
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cc/CCutils.cpp
View File

@@ -391,7 +391,7 @@ int64_t CCduration(int32_t &numblocks,uint256 txid)
} }
else if ( hashBlock == zeroid ) else if ( hashBlock == zeroid )
{ {
fprintf(stderr,"CCduration no hashBlock for txid %s\n",uint256_str(str,txid)); //fprintf(stderr,"CCduration no hashBlock for txid %s\n",uint256_str(str,txid));
return(0); return(0);
} }
else if ( (pindex= mapBlockIndex[hashBlock]) == 0 || (txtime= pindex->nTime) == 0 || (txheight= pindex->nHeight) <= 0 ) else if ( (pindex= mapBlockIndex[hashBlock]) == 0 || (txtime= pindex->nTime) == 0 || (txheight= pindex->nHeight) <= 0 )
@@ -401,7 +401,8 @@ int64_t CCduration(int32_t &numblocks,uint256 txid)
} }
else if ( (pindex= chainActive.LastTip()) == 0 || pindex->nTime < txtime || pindex->nHeight <= txheight ) else if ( (pindex= chainActive.LastTip()) == 0 || pindex->nTime < txtime || pindex->nHeight <= txheight )
{ {
fprintf(stderr,"CCduration backwards timestamps %u %u for txid %s hts.(%d %d)\n",(uint32_t)pindex->nTime,txtime,uint256_str(str,txid),txheight,(int32_t)pindex->nHeight); if ( pindex->nTime < txtime )
fprintf(stderr,"CCduration backwards timestamps %u %u for txid %s hts.(%d %d)\n",(uint32_t)pindex->nTime,txtime,uint256_str(str,txid),txheight,(int32_t)pindex->nHeight);
return(0); return(0);
} }
numblocks = (pindex->nHeight - txheight); numblocks = (pindex->nHeight - txheight);

9
src/cc/dice.cpp
View File

@@ -268,7 +268,7 @@ int32_t dice_betspent(char *debugstr,uint256 bettxid)
CSpentIndexKey key2(bettxid,1); CSpentIndexKey key2(bettxid,1);
if ( GetSpentIndex(key,value) != 0 || GetSpentIndex(key2,value2) != 0 ) if ( GetSpentIndex(key,value) != 0 || GetSpentIndex(key2,value2) != 0 )
{ {
fprintf(stderr,"%s txid.%s already spent\n",debugstr,bettxid.GetHex().c_str()); //fprintf(stderr,"%s txid.%s already spent\n",debugstr,bettxid.GetHex().c_str());
return(1); return(1);
} }
/*if ( mode > 0 ) /*if ( mode > 0 )
@@ -304,11 +304,11 @@ void *dicefinish(void *_ptr)
sleep(10); sleep(10);
while ( 1 ) while ( 1 )
{ {
fprintf(stderr,"dicefinish process lastheight.%d <- newht.%d\n",lastheight,newht);
if ( newht != 0 && lastheight != newht ) if ( newht != 0 && lastheight != newht )
{ {
lastheight = newht; lastheight = newht;
newblock = 1; newblock = 1;
fprintf(stderr,"dicefinish process lastheight.%d <- newht.%d\n",lastheight,newht);
} else newblock = 0; } else newblock = 0;
for (iter=-1; iter<=1; iter+=2) for (iter=-1; iter<=1; iter+=2)
{ {
@@ -360,7 +360,10 @@ void *dicefinish(void *_ptr)
{ {
CCduration(numblocks,ptr->txid); CCduration(numblocks,ptr->txid);
if ( numblocks > 0 ) if ( numblocks > 0 )
{
fprintf(stderr,"alread confirmed %s\n",ptr->txid.GetHex().c_str());
continue; continue;
}
} }
if ( ptr->bettxid_ready != 0 && ptr->iswin == iter && ptr->rawtx.size() == 0 && dice_betspent((char *)"dicefinish",ptr->bettxid) == 0 ) if ( ptr->bettxid_ready != 0 && ptr->iswin == iter && ptr->rawtx.size() == 0 && dice_betspent((char *)"dicefinish",ptr->bettxid) == 0 )
{ {
@@ -426,7 +429,7 @@ void DiceQueue(int32_t iswin,uint64_t sbits,uint256 fundingtxid,uint256 bettxid,
ptr->winamount = betTx.vout[1].nValue * ((betTx.vout[2].nValue - txfee)+1); ptr->winamount = betTx.vout[1].nValue * ((betTx.vout[2].nValue - txfee)+1);
DL_APPEND(DICEFINISH_LIST,ptr); DL_APPEND(DICEFINISH_LIST,ptr);
//fprintf(stderr,"queued iswin.%d %s\n",iswin,bettxid.GetHex().c_str()); //fprintf(stderr,"queued iswin.%d %s\n",iswin,bettxid.GetHex().c_str());
} else fprintf(stderr,"DiceQueue status bettxid.%s already in list\n",bettxid.GetHex().c_str()); } //else fprintf(stderr,"DiceQueue status bettxid.%s already in list\n",bettxid.GetHex().c_str());
pthread_mutex_unlock(&DICE_MUTEX); pthread_mutex_unlock(&DICE_MUTEX);
} }