From c6df523fa4c8df404f0c1705bf79fc92057cc6c2 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 26 Mar 2018 06:02:32 +0300
Subject: [PATCH] Test

---
 src/komodo_bitcoind.h | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 6ce8c5355..a94ec3d77 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -730,17 +730,22 @@ int8_t komodo_minerid(int32_t height,uint8_t *pubkey33)
     int32_t num,i,numnotaries; CBlockIndex *pindex; uint32_t timestamp=0; uint8_t _pubkey33[33],pubkeys[64][33];
     if ( pubkey33 == 0 && (pindex= chainActive[height]) != 0 )
     {
-        timestamp = pindex->GetBlockTime();
-        if ( pubkey33 == 0 )
+        if ( pindex->pubkey33[0] == 0 )
         {
-            pubkey33 = _pubkey33;
+            pindex->notaryid = -1;
+            timestamp = pindex->GetBlockTime();
+            if ( pubkey33 == 0 )
+                pubkey33 = _pubkey33;
             komodo_index2pubkey33(pubkey33,pindex,height);
-        }
-        if ( (num= komodo_notaries(pubkeys,height,timestamp)) > 0 )
-        {
-            for (i=0; i<num; i++)
-                if ( memcmp(pubkeys[i],pubkey33,33) == 0 )
-                    return(i);
+            if ( (num= komodo_notaries(pubkeys,height,timestamp)) > 0 )
+            {
+                for (i=0; i<num; i++)
+                    if ( memcmp(pubkeys[i],pubkey33,33) == 0 )
+                    {
+                        pindex->notaryid = i;
+                        return(i);
+                    }
+            }
         }
     }
     return(komodo_electednotary(&numnotaries,pubkey33,height,timestamp));
@@ -755,8 +760,6 @@ int32_t komodo_eligiblenotary(uint8_t pubkeys[66][33],int32_t *mids,int32_t *non
         if ( (pindex= komodo_chainactive(height-i)) != 0 )
         {
             komodo_index2pubkey33(pubkey33,pindex,height-i);
-            //for (j=0; j<33; j++)
-            //    pubkeys[i][j] = pubkey33[j];
             memcpy(pubkeys[i],pubkey33,33);
             if ( (mids[i]= komodo_minerid(height-i,pubkey33)) >= 0 )
             {