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

fix

Browse Source
This commit is contained in:
blackjok3r
2019-03-22 17:15:19 +08:00
parent b897d56363
commit 550f698a56
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/cc/payments.cpp
View File

@@ -155,18 +155,18 @@ bool PaymentsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &
// change is/must be in vout[0] // change is/must be in vout[0]
// only 'F' or 1of2 txidaddr can be spent // only 'F' or 1of2 txidaddr can be spent
// all vouts must match exactly // all vouts must match exactly
BOOST_FOREACH(const CTxIn& vin, tx) BOOST_FOREACH(const CTxIn& vin, tx.vin)
{ {
uint256 blockhash; CTransaction txin; uint256 blockhash; CTransaction txin;
if ( myGetTransaction(vin.prevout.hash,txin,blockhash) ) if ( myGetTransaction(vin.prevout.hash,txin,blockhash) )
{ {
fprintf(stderr, "vin txid.%s\n", txin.GetHex().c_str()); fprintf(stderr, "vin txid.%s\n", txin.GetHash().GetHex().c_str());
} }
} }
BOOST_FOREACH(const CTxOut& vout, tx) BOOST_FOREACH(const CTxOut& vout, tx.vout)
{ {
fprintf(stderr, "vout txid.%s\n", vout.hash.GetHex().c_str()); fprintf(stderr, "vout txid.%s\n", vout.GetHash().GetHex().c_str());
} }
return(true); return(true);
@@ -392,10 +392,7 @@ UniValue PaymentsRelease(struct CCcontract_info *cp,char *jsonstr)
mtx.vout[i+1].nValue *= amount; mtx.vout[i+1].nValue *= amount;
mtx.vout[i+1].nValue /= totalallocations; mtx.vout[i+1].nValue /= totalallocations;
} }
<<<<<<< Updated upstream
=======
//fprintf(stderr,"addinputs %.8f\n",(double)amount/COIN); //fprintf(stderr,"addinputs %.8f\n",(double)amount/COIN);
>>>>>>> Stashed changes
if ( (inputsum= AddPaymentsInputs(cp,mtx,txidpk,amount+PAYMENTS_TXFEE,60,createtxid,latestheight)) >= amount ) if ( (inputsum= AddPaymentsInputs(cp,mtx,txidpk,amount+PAYMENTS_TXFEE,60,createtxid,latestheight)) >= amount )
{ {
std::string rawtx; std::string rawtx;