From 1855a4edc745aa4ca8a6c220bf4945c707ade477 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 29 Nov 2016 10:18:53 -0300
Subject: [PATCH] test

---
 src/assetchains       |  1 +
 src/assetfunds        |  1 +
 src/fiat-cli          |  1 +
 src/komodo_bitcoind.h |  1 -
 src/miner.cpp         |  3 ++-
 src/rpcblockchain.cpp | 10 +++++++++-
 6 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/assetchains b/src/assetchains
index 8f5febcff..241c77c34 100755
--- a/src/assetchains
+++ b/src/assetchains
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x
 source pubkey.txt
 echo $pubkey
 
diff --git a/src/assetfunds b/src/assetfunds
index df5f715a6..6aede587c 100755
--- a/src/assetfunds
+++ b/src/assetfunds
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x
 ./komodo-cli paxdeposit $1 0.01 aud 
 ./komodo-cli paxdeposit $1 0.01 bgn 
 ./komodo-cli paxdeposit $1 0.01 cad 
diff --git a/src/fiat-cli b/src/fiat-cli
index 1a4004be7..f8aa190c4 100755
--- a/src/fiat-cli
+++ b/src/fiat-cli
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x
 echo aud; fiat/aud $1 $2 $3 $4
 echo bgn; fiat/bgn $1 $2 $3 $4
 echo cad; fiat/cad $1 $2 $3 $4
diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 5e3e228ea..ab2ef56e4 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -527,7 +527,6 @@ int8_t komodo_minerid(int32_t height)
                     return(i);
         }
     }
-    //printf("minderid not notary ht.%d\n",height);
     return(-1);
 }
 
diff --git a/src/miner.cpp b/src/miner.cpp
index 2567539f3..98207727c 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -99,7 +99,7 @@ void UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams,
 }
 
 #define ASSETCHAINS_MINHEIGHT 100
-#define ROUNDROBIN_DELAY 59
+#define ROUNDROBIN_DELAY 58
 extern int32_t ASSETCHAINS_SEED,IS_KOMODO_NOTARY,USE_EXTERNAL_PUBKEY,KOMODO_CHOSEN_ONE,ASSETCHAIN_INIT,KOMODO_INITDONE,KOMODO_ON_DEMAND,KOMODO_INITDONE;
 extern char ASSETCHAINS_SYMBOL[16];
 extern std::string NOTARY_PUBKEY;
@@ -717,6 +717,7 @@ void static BitcoinMiner(CWallet *pwallet)
                             for (i=0; i<32; i++)
                                 fprintf(stderr,"%02x",((uint8_t *)&hash)[i]);
                             fprintf(stderr," <- %s Block found %d\n",ASSETCHAINS_SYMBOL,Mining_height);
+                            sleep(60); // avoid mining forks
                             break;
                         }
                     } catch (EhSolverCancelledException&) {
diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp
index b87eaf942..70644aad7 100644
--- a/src/rpcblockchain.cpp
+++ b/src/rpcblockchain.cpp
@@ -412,12 +412,20 @@ Value minerids(const Array& params, bool fHelp)
             }
             for (i=0; i<64; i++)
             {
-                Object item; std::string hex; char *hexstr;
+                Object item; std::string hex,kmdaddress; char *hexstr,kmdaddr[64],*ptr; int32_t m;
                 hex.resize(66);
                 hexstr = (char *)hex.data();
                 for (j=0; j<33; j++)
                     sprintf(&hexstr[j*2],"%02x",pubkeys[i][j]);
                 item.push_back(Pair("notaryid", i));
+                
+                bitcoin_address(kmdaddr,60,pubkeys[i],33);
+                m = (int32_t)strlen(kmdaddr);
+                kmdaddress.resize(m);
+                ptr = (char *)kmdaddress.data();
+                memcpy(ptr,kmdaddr,m);
+                item.push_back(Pair("KMDaddress", kmdaddress));
+                
                 item.push_back(Pair("pubkey", hex));
                 item.push_back(Pair("blocks", tally[i]));
                 a.push_back(item);