From 58875d250624a57a26941b03de66c771dec0f222 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 21 Jul 2018 03:32:13 -1100 Subject: [PATCH] Return out --- src/cc/assets.cpp | 7 +++---- src/script/standard.cpp | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp index b69e47e28..f19728d62 100644 --- a/src/cc/assets.cpp +++ b/src/cc/assets.cpp @@ -288,9 +288,10 @@ CC *MakeAssetCond(CPubKey pk) CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk) { - CTxOut vout; + CTxOut vout; CScript scriptPubKey; CC *payoutCond = MakeAssetCond(pk); - CTxOut(nValue,CCPubKey(payoutCond)); + scriptPubKey = CCPubKey(payoutCond); + vout = CTxOut(nValue,scriptPubkey); cc_free(payoutCond); 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()); } - fprintf(stderr,"do cc_frees\n"); if ( mycond != 0 ) cc_free(mycond); if ( othercond != 0 ) cc_free(othercond); - fprintf(stderr,"did cc_frees\n"); if ( totalinputs >= totaloutputs+2*txfee ) { change = totalinputs - (totaloutputs+txfee); diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 97e34f911..0c463ab3d 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -262,7 +262,7 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet) else if (IsCryptoConditionsEnabled() != 0 && whichType == TX_CRYPTOCONDITION) { - fprintf(stderr,"found CC type\n"); + //fprintf(stderr,"found CC type\n"); addressRet = CScriptID(uint160(vSolutions[0])); return true; }