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
2019-03-21 21:25:51 -11:00
parent 4657f4db22
commit 5560b8574b
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cc/CCtx.cpp
View File

@@ -277,9 +277,7 @@ std::string FinalizeCCTx(uint64_t CCmask,struct CCcontract_info *cp,CMutableTran
} }
} }
} else fprintf(stderr,"FinalizeCCTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str()); } else fprintf(stderr,"FinalizeCCTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
fprintf(stderr,"done i.%d of %d\n",i,n);
} }
fprintf(stderr,"free A\n");
if ( mycond != 0 ) if ( mycond != 0 )
cc_free(mycond); cc_free(mycond);
if ( condCC2 != 0 ) if ( condCC2 != 0 )
@@ -292,7 +290,6 @@ std::string FinalizeCCTx(uint64_t CCmask,struct CCcontract_info *cp,CMutableTran
cc_free(othercond3); cc_free(othercond3);
if ( othercond4 != 0 ) if ( othercond4 != 0 )
cc_free(othercond4); cc_free(othercond4);
fprintf(stderr,"free B\n");
if ( othercond1of2 != 0 ) if ( othercond1of2 != 0 )
cc_free(othercond1of2); cc_free(othercond1of2);
if ( othercond1of2tokens != 0 ) if ( othercond1of2tokens != 0 )
@@ -303,8 +300,8 @@ std::string FinalizeCCTx(uint64_t CCmask,struct CCcontract_info *cp,CMutableTran
cc_free(mysingletokenscond); cc_free(mysingletokenscond);
if ( othertokenscond != 0 ) if ( othertokenscond != 0 )
cc_free(othertokenscond); cc_free(othertokenscond);
fprintf(stderr,"free C\n");
std::string strHex = EncodeHexTx(mtx); std::string strHex = EncodeHexTx(mtx);
fprintf(stderr,"hex.(%s)\n",strHex.c_str());
if ( strHex.size() > 0 ) if ( strHex.size() > 0 )
return(strHex); return(strHex);
else return("0"); else return("0");

4
src/cc/payments.cpp
View File

@@ -180,7 +180,7 @@ int64_t AddPaymentsInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CP
{ {
txid = it->first.txhash; txid = it->first.txhash;
vout = (int32_t)it->first.index; vout = (int32_t)it->first.index;
fprintf(stderr,"iter.%d %s/v%d %s\n",iter,txid.GetHex().c_str(),vout,coinaddr); //fprintf(stderr,"iter.%d %s/v%d %s\n",iter,txid.GetHex().c_str(),vout,coinaddr);
if ( vout == 0 && GetTransaction(txid,vintx,hashBlock,false) != 0 ) if ( vout == 0 && GetTransaction(txid,vintx,hashBlock,false) != 0 )
{ {
if ( latestheight != 0 ) if ( latestheight != 0 )
@@ -212,7 +212,7 @@ int64_t AddPaymentsInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CP
nValue = it->second.satoshis; nValue = it->second.satoshis;
totalinputs += nValue; totalinputs += nValue;
n++; n++;
fprintf(stderr,"iter.%d %s/v%d %s %.8f\n",iter,txid.GetHex().c_str(),vout,coinaddr,(double)nValue/COIN); //fprintf(stderr,"iter.%d %s/v%d %s %.8f\n",iter,txid.GetHex().c_str(),vout,coinaddr,(double)nValue/COIN);
if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) ) if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
break; break;
} //else fprintf(stderr,"nValue %.8f vs threshold %.8f\n",(double)nValue/COIN,(double)threshold/COIN); } //else fprintf(stderr,"nValue %.8f vs threshold %.8f\n",(double)nValue/COIN,(double)threshold/COIN);