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

'D'

Browse Source
This commit is contained in:
jl777
2019-01-16 23:44:01 -11:00
parent f2a11ac0af
commit 4f0a54f26f
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cc/marmara.cpp
View File

@@ -679,7 +679,7 @@ UniValue MarmaraCreditloop(uint256 txid)
if ( funcid == 'S' ) if ( funcid == 'S' )
{ {
refcreatetxid = creditloop[0]; refcreatetxid = creditloop[0];
result.push_back(Pair("settletxid",batontxid.GetHex())); result.push_back(Pair("settlement",batontxid.GetHex()));
result.push_back(Pair("createtxid",refcreatetxid.GetHex())); result.push_back(Pair("createtxid",refcreatetxid.GetHex()));
result.push_back(Pair("remainder",ValueFromAmount(refamount))); result.push_back(Pair("remainder",ValueFromAmount(refamount)));
result.push_back(Pair("settled",refmatures)); result.push_back(Pair("settled",refmatures));
@@ -695,6 +695,18 @@ UniValue MarmaraCreditloop(uint256 txid)
} }
refamount = -1; refamount = -1;
} }
else if ( funcid == 'D' )
{
refcreatetxid = creditloop[0];
result.push_back(Pair("settlement",batontxid.GetHex()));
result.push_back(Pair("createtxid",refcreatetxid.GetHex()));
result.push_back(Pair("remainder",ValueFromAmount(refamount)));
result.push_back(Pair("settled",refmatures));
Getscriptaddress(destaddr,tx.vout[0].scriptPubKey);
result.push_back(Pair("txidaddr",destaddr));
if ( tx.vout.size() > 1 )
result.push_back(Pair("collected",ValueFromAmount(tx.vout[1].nValue)));
}
else else
{ {
result.push_back(Pair("batontxid",batontxid.GetHex())); result.push_back(Pair("batontxid",batontxid.GetHex()));
@@ -759,6 +771,8 @@ UniValue MarmaraCreditloop(uint256 txid)
{ {
refamount = amount; refamount = amount;
refmatures = matures; refmatures = matures;
result.push_back(Pair("amount",ValueFromAmount(refamount)));
result.push_back(Pair("matures",refmatures));
} }
if ( createtxid != refcreatetxid || amount != refamount || matures != refmatures || currency != refcurrency ) if ( createtxid != refcreatetxid || amount != refamount || matures != refmatures || currency != refcurrency )
{ {