From f2a11ac0afb63db644d5479f19bc6bc7f3cce8d1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 16 Jan 2019 23:37:38 -1100
Subject: [PATCH] Settletxid

---
 src/cc/marmara.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/cc/marmara.cpp b/src/cc/marmara.cpp
index b59772f35..133a8c187 100644
--- a/src/cc/marmara.cpp
+++ b/src/cc/marmara.cpp
@@ -671,7 +671,6 @@ UniValue MarmaraCreditloop(uint256 txid)
             result.push_back(Pair("myaddress",coinaddr));
             GetCCaddress(cp,myCCaddr,Mypubkey());
             result.push_back(Pair("myCCaddress",myCCaddr));
-            result.push_back(Pair("batontxid",batontxid.GetHex()));
             if ( (funcid= MarmaraDecodeLoopOpret(tx.vout[numvouts-1].scriptPubKey,refcreatetxid,pk,refamount,refmatures,refcurrency)) != 0 )
             {
                 str[0] = funcid, str[1] = 0;
@@ -680,10 +679,11 @@ UniValue MarmaraCreditloop(uint256 txid)
                 if ( funcid == 'S' )
                 {
                     refcreatetxid = creditloop[0];
+                    result.push_back(Pair("settletxid",batontxid.GetHex()));
                     result.push_back(Pair("createtxid",refcreatetxid.GetHex()));
                     result.push_back(Pair("remainder",ValueFromAmount(refamount)));
-                    result.push_back(Pair("height",refmatures));
-                    result.push_back(Pair("settled",HexStr(pk)));
+                    result.push_back(Pair("settled",refmatures));
+                    result.push_back(Pair("pubkey",HexStr(pk)));
                     Getscriptaddress(coinaddr,CScript() << ParseHex(HexStr(pk)) << OP_CHECKSIG);
                     result.push_back(Pair("coinaddr",coinaddr));
                     result.push_back(Pair("collected",ValueFromAmount(tx.vout[0].nValue)));
@@ -697,6 +697,7 @@ UniValue MarmaraCreditloop(uint256 txid)
                 }
                 else
                 {
+                    result.push_back(Pair("batontxid",batontxid.GetHex()));
                     result.push_back(Pair("createtxid",refcreatetxid.GetHex()));
                     result.push_back(Pair("amount",ValueFromAmount(refamount)));
                     result.push_back(Pair("matures",refmatures));