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

'R" to fund 'I' and 'T'

Browse Source
This commit is contained in:
jl777
2019-01-14 22:23:31 -11:00
parent 98a81709d7
commit 5e4375ef81
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cc/marmara.cpp
View File

@@ -379,7 +379,7 @@ int32_t MarmaraGetCreditloops(int64_t &totalamount,std::vector<uint256> &issuanc
UniValue MarmaraReceive(uint64_t txfee,CPubKey senderpk,int64_t amount,std::string currency,int32_t matures,uint256 batontxid) UniValue MarmaraReceive(uint64_t txfee,CPubKey senderpk,int64_t amount,std::string currency,int32_t matures,uint256 batontxid)
{ {
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; uint256 createtxid; int32_t needbaton = 0; UniValue result(UniValue::VOBJ); CPubKey mypk; struct CCcontract_info *cp,C; std::string rawtx; char *errorstr=0; uint256 createtxid; int64_t amount; int32_t needbaton = 0;
cp = CCinit(&C,EVAL_MARMARA); cp = CCinit(&C,EVAL_MARMARA);
if ( txfee == 0 ) if ( txfee == 0 )
txfee = 10000; txfee = 10000;
@@ -396,13 +396,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 ( createtxid == zeroid ) if ( batontxid != zeroid )
needbaton = 1; amount = txfee;
if ( AddNormalinputs(mtx,mypk,(1+needbaton)*txfee,1) > 0 ) else amount = 2*txfee;
if ( AddNormalinputs(mtx,mypk,amount + txfee,1) > 0 )
{ {
errorstr = (char *)"couldnt finalize CCtx"; errorstr = (char *)"couldnt finalize CCtx";
if ( needbaton != 0 ) mtx.vout.push_back(MakeCC1vout(EVAL_MARMARA,amount,senderpk));
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));
if ( rawtx.size() > 0 ) if ( rawtx.size() > 0 )
errorstr = 0; errorstr = 0;
@@ -455,9 +455,9 @@ UniValue MarmaraIssue(uint64_t txfee,uint8_t funcid,CPubKey receiverpk,int64_t a
if ( funcid == 'I' || AddNormalinputs(mtx,mypk,txfee,1) > 0 ) if ( funcid == 'I' || AddNormalinputs(mtx,mypk,txfee,1) > 0 )
{ {
errorstr = (char *)"couldnt finalize CCtx"; errorstr = (char *)"couldnt finalize CCtx";
mtx.vout.push_back(MakeCC1vout(EVAL_MARMARA,txfee/2,receiverpk)); mtx.vout.push_back(MakeCC1vout(EVAL_MARMARA,txfee,receiverpk));
if ( funcid == 'I' ) if ( funcid == 'I' )
mtx.vout.push_back(MakeCC1vout(EVAL_MARMARA,txfee/2,Marmarapk)); mtx.vout.push_back(MakeCC1vout(EVAL_MARMARA,txfee,Marmarapk));
rawtx = FinalizeCCTx(0,cp,mtx,mypk,txfee,MarmaraLoopOpret(funcid,createtxid,receiverpk,amount,matures,currency)); rawtx = FinalizeCCTx(0,cp,mtx,mypk,txfee,MarmaraLoopOpret(funcid,createtxid,receiverpk,amount,matures,currency));
if ( rawtx.size() > 0 ) if ( rawtx.size() > 0 )
errorstr = 0; errorstr = 0;