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

Need baton in 'R'

Browse Source
This commit is contained in:
jl777
2019-01-13 02:52:29 -11:00
parent 85271fb3a5
commit 38093ec82a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cc/marmara.cpp
View File

@@ -311,7 +311,7 @@ int64_t AddMarmaraCoinbases(struct CCcontract_info *cp,CMutableTransaction &mtx,
UniValue MarmaraReceive(uint64_t txfee,CPubKey senderpk,int64_t amount,std::string currency,int32_t matures,uint256 createtxid) UniValue MarmaraReceive(uint64_t txfee,CPubKey senderpk,int64_t amount,std::string currency,int32_t matures,uint256 createtxid)
{ {
CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), komodo_nextheight()); CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), komodo_nextheight());
UniValue result(UniValue::VOBJ); CPubKey mypk; struct CCcontract_info *cp,C; std::string rawtx; char *errorstr=0; UniValue result(UniValue::VOBJ); CPubKey mypk; struct CCcontract_info *cp,C; std::string rawtx; char *errorstr=0; int32_t needbaton = 0;
cp = CCinit(&C,EVAL_MARMARA); cp = CCinit(&C,EVAL_MARMARA);
if ( txfee == 0 ) if ( txfee == 0 )
txfee = 10000; txfee = 10000;
@@ -324,10 +324,13 @@ UniValue MarmaraReceive(uint64_t txfee,CPubKey senderpk,int64_t amount,std::stri
errorstr = (char *)"it must mature in the future"; errorstr = (char *)"it must mature in the future";
if ( errorstr == 0 ) if ( errorstr == 0 )
{ {
if ( AddNormalinputs(mtx,mypk,2*txfee,1) > 0 ) if ( createtxid == zeroid )
needbaton = 1;
if ( AddNormalinputs(mtx,mypk,(1+needbaton)*txfee,1) > 0 )
{ {
errorstr = (char *)"couldnt finalize CCtx"; errorstr = (char *)"couldnt finalize CCtx";
mtx.vout.push_back(MakeCC1vout(EVAL_MARMARA,txfee,senderpk)); if ( needbaton != 0 )
mtx.vout.push_back(MakeCC1vout(EVAL_MARMARA,txfee,senderpk));
rawtx = FinalizeCCTx(0,cp,mtx,mypk,txfee,MarmaraLoopOpret('R',createtxid,senderpk,amount,matures,currency)); rawtx = FinalizeCCTx(0,cp,mtx,mypk,txfee,MarmaraLoopOpret('R',createtxid,senderpk,amount,matures,currency));
} else errorstr = (char *)"dont have enough normal inputs for 2*txfee"; } else errorstr = (char *)"dont have enough normal inputs for 2*txfee";
} }