From 7ebf1d817686b6dfe32465235b5ba3739bd250a2 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 12 Jan 2019 08:41:23 -1100
Subject: [PATCH] +print

---
 src/cc/marmara.cpp       | 31 ++++++++++++++++++-------------
 src/wallet/rpcwallet.cpp |  2 +-
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/cc/marmara.cpp b/src/cc/marmara.cpp
index bb06b3e39..353f3edba 100644
--- a/src/cc/marmara.cpp
+++ b/src/cc/marmara.cpp
@@ -237,26 +237,31 @@ int64_t AddMarmaraCoinbases(struct CCcontract_info *cp,CMutableTransaction &mtx,
     GetCCaddress(cp,coinaddr,poolpk);
     SetCCunspents(unspentOutputs,coinaddr);
     unlocks = MarmaraUnlockht(firstheight);
+    fprintf(stderr,"check coinaddr.(%s)\n",coinaddr);
     for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
     {
         txid = it->first.txhash;
         vout = (int32_t)it->first.index;
-        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 && vintx.IsCoinBase() != 0 )
+        fprintf(stderr,"txid.%s/v%d\n",txid.GetHex().c_str(),vout);
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
         {
-            if ( DecodeMaramaraCoinbaseOpRet(vintx.vout[1].scriptPubKey,pk,ht,unlockht) == 'C' && unlockht == unlocks && pk == poolpk )
+            if ( vintx.IsCoinBase() != 0 )
             {
-                if ( (nValue= IsMarmaravout(cp,vintx,vout)) > 0 && myIsutxo_spentinmempool(txid,vout) == 0 )
+                if ( DecodeMaramaraCoinbaseOpRet(vintx.vout[1].scriptPubKey,pk,ht,unlockht) == 'C' && unlockht == unlocks && pk == poolpk )
                 {
-                    if ( maxinputs != 0 )
-                        mtx.vin.push_back(CTxIn(txid,vout,CScript()));
-                    nValue = it->second.satoshis;
-                    totalinputs += nValue;
-                    n++;
-                    if ( maxinputs > 0 && n >= maxinputs )
-                        break;
-                }
-            }
-        }
+                    if ( (nValue= IsMarmaravout(cp,vintx,vout)) > 0 && myIsutxo_spentinmempool(txid,vout) == 0 )
+                    {
+                        if ( maxinputs != 0 )
+                            mtx.vin.push_back(CTxIn(txid,vout,CScript()));
+                        nValue = it->second.satoshis;
+                        totalinputs += nValue;
+                        n++;
+                        if ( maxinputs > 0 && n >= maxinputs )
+                            break;
+                    } else fprintf(stderr,"nValue.%8f\n",(double)nValue/COIN);
+                } else fprintf(stderr,"decode error\n");
+            } else fprintf(stderr,"not coinbase\n");
+        } else fprintf(stderr,"error getting tx\n");
     }
     return(totalinputs);
 }
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 4a7024eb4..6a2a351dc 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -5544,7 +5544,7 @@ UniValue marmara_poolpayout(const UniValue& params, bool fHelp)
     perc = atof(params[0].get_str().c_str()) / 100.;
     firstheight = atol(params[1].get_str().c_str());
     jsonstr = (char *)params[2].get_str().c_str();
-    fprintf(stderr,"perc %.2f ht.%d (%s)\n",perc,firstheight,jsonstr);
+    fprintf(stderr,"perc %.8f ht.%d (%s)\n",perc,firstheight,jsonstr);
     return(MarmaraPoolPayout(0,firstheight,perc,jsonstr)); // [[pk0, shares0], [pk1, shares1], ...]
 }