From 41e9c815497218c11fa91357d6db955e88047ea1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 16:50:11 -1100
Subject: [PATCH 1/3] Remove miner locks

---
 src/miner.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 5e7871dd4..20ff32d7c 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -425,7 +425,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
             if ( (siglen= komodo_staked(txStaked,pblock->nBits,&blocktime,&txtime,&utxotxid,&utxovout,&utxovalue,utxosig)) > 0 )
             {
                 CAmount txfees = 0;
-                if ( (int32_t)chainActive.Tip()->nHeight+1 > 100 && GetAdjustedTime() < blocktime-30 )
+                if ( (int32_t)chainActive.Tip()->nHeight+1 > 100 && GetAdjustedTime() < blocktime-57 )
                     return(0);
                 pblock->vtx.push_back(txStaked);
                 pblocktemplate->vTxFees.push_back(txfees);
@@ -975,7 +975,7 @@ void static BitcoinMiner()
                     fprintf(stderr," POW\n");*/
                     if ( h > hashTarget )
                         return false;
-                    if ( B.nTime > GetAdjustedTime() )
+                    if ( IS_KOMODO_NOTARY != 0 && B.nTime > GetAdjustedTime() )
                     {
                         //fprintf(stderr,"need to wait %d seconds to submit block\n",(int32_t)(B.nTime - GetAdjustedTime()));
                         while ( GetAdjustedTime() < B.nTime-2 )
@@ -999,8 +999,8 @@ void static BitcoinMiner()
                     }
                     else
                     {
-                        while ( GetAdjustedTime() < B.nTime )
-                            sleep(1);
+                        //while ( B.nTime > GetAdjustedTime() )
+                        //    sleep(1);
                         uint256 tmp = B.GetHash();
                         int32_t z; for (z=31; z>=0; z--)
                             fprintf(stderr,"%02x",((uint8_t *)&tmp)[z]);

From 0c35569bdcc102afab31183e81999465e7526a87 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 16:52:14 -1100
Subject: [PATCH 2/3] tweak

---
 src/miner.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 20ff32d7c..2e552d62f 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -999,8 +999,8 @@ void static BitcoinMiner()
                     }
                     else
                     {
-                        //while ( B.nTime > GetAdjustedTime() )
-                        //    sleep(1);
+                        while ( B.nTime-57 > GetAdjustedTime() )
+                            sleep(1);
                         uint256 tmp = B.GetHash();
                         int32_t z; for (z=31; z>=0; z--)
                             fprintf(stderr,"%02x",((uint8_t *)&tmp)[z]);

From 3aac96a8228e4f126cbf2c8b097902f631b9b58c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 16:53:01 -1100
Subject: [PATCH 3/3] <6000 compatibility

---
 src/miner.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/miner.cpp b/src/miner.cpp
index 2e552d62f..bbcbf6643 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -1001,6 +1001,11 @@ void static BitcoinMiner()
                     {
                         while ( B.nTime-57 > GetAdjustedTime() )
                             sleep(1);
+                        if ( Mining_height < 6000 )
+                        {
+                            while ( B.nTime > GetAdjustedTime() )
+                                sleep(1);
+                        }
                         uint256 tmp = B.GetHash();
                         int32_t z; for (z=31; z>=0; z--)
                             fprintf(stderr,"%02x",((uint8_t *)&tmp)[z]);