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

Return out

Browse Source
This commit is contained in:
jl777
2018-07-21 03:32:13 -11:00
parent 3c5300241e
commit 58875d2506
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cc/assets.cpp
View File

@@ -288,9 +288,10 @@ CC *MakeAssetCond(CPubKey pk)
CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk) CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk)
{ {
CTxOut vout; CTxOut vout; CScript scriptPubKey;
CC *payoutCond = MakeAssetCond(pk); CC *payoutCond = MakeAssetCond(pk);
CTxOut(nValue,CCPubKey(payoutCond)); scriptPubKey = CCPubKey(payoutCond);
vout = CTxOut(nValue,scriptPubkey);
cc_free(payoutCond); cc_free(payoutCond);
return(vout); return(vout);
} }
@@ -517,12 +518,10 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
} }
} 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,"do cc_frees\n");
if ( mycond != 0 ) if ( mycond != 0 )
cc_free(mycond); cc_free(mycond);
if ( othercond != 0 ) if ( othercond != 0 )
cc_free(othercond); cc_free(othercond);
fprintf(stderr,"did cc_frees\n");
if ( totalinputs >= totaloutputs+2*txfee ) if ( totalinputs >= totaloutputs+2*txfee )
{ {
change = totalinputs - (totaloutputs+txfee); change = totalinputs - (totaloutputs+txfee);

2
src/script/standard.cpp
View File

@@ -262,7 +262,7 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
else if (IsCryptoConditionsEnabled() != 0 && whichType == TX_CRYPTOCONDITION) else if (IsCryptoConditionsEnabled() != 0 && whichType == TX_CRYPTOCONDITION)
{ {
fprintf(stderr,"found CC type\n"); //fprintf(stderr,"found CC type\n");
addressRet = CScriptID(uint160(vSolutions[0])); addressRet = CScriptID(uint160(vSolutions[0]));
return true; return true;
} }