From b66f366d5cb4ca6a6c009ed928a3b93dad627b91 Mon Sep 17 00:00:00 2001
From: blackjok3r <blackjok3r@gmail.com>
Date: Tue, 16 Oct 2018 16:06:49 +0800
Subject: [PATCH] next try

---
 src/komodo_bitcoind.h | 2 --
 src/main.cpp          | 9 +++++++--
 src/miner.cpp         | 1 -
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index f1f5b8efd..b13a2c36e 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1577,10 +1577,8 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
     {
         if ( height == 1 )
         {
-            fprintf(stderr, "checking override pubkey thingo \n");
             script = (uint8_t *)pblock->vtx[0].vout[0].scriptPubKey.data();
             if ( script[0] != 33 || script[34] != OP_CHECKSIG || memcmp(script+1,ASSETCHAINS_OVERRIDE_PUBKEY33,33) != 0 ) {
-                fprintf(stderr, "failed the check\n");
                 return(-1);
             }
         }
diff --git a/src/main.cpp b/src/main.cpp
index 42f1d624d..c6d2ee9e3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1895,8 +1895,13 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams)
         else if ( ASSETCHAINS_ENDSUBSIDY == 0 || nHeight < ASSETCHAINS_ENDSUBSIDY )
         {
             if ( ASSETCHAINS_REWARD == 0 )
-                return(10000);
-            else if ( ( ASSETCHAINS_ENDSUBSIDY != 0 && nHeight >= ASSETCHAINS_ENDSUBSIDY )|| ASSETCHAINS_STREAM != 0)
+            {
+                if ( ASSETCHAINS_STREAM != 0 && nHeight > 128 )
+                    return(0);
+                else
+                    return(10000);
+            }
+            else if (  ASSETCHAINS_ENDSUBSIDY != 0 && nHeight >= ASSETCHAINS_ENDSUBSIDY )
                 return(0);
             else
             {
diff --git a/src/miner.cpp b/src/miner.cpp
index 36ed84f05..39caa35c3 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -609,7 +609,6 @@ CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey,int32_t nHeight,in
     if ( (nHeight == 1 || ASSETCHAINS_STREAM != 0 ) && ASSETCHAINS_OVERRIDE_PUBKEY33[0] != 0 )
     {
         scriptPubKey = CScript() << ParseHex(ASSETCHAINS_OVERRIDE_PUBKEY) << OP_CHECKSIG;
-        fprintf(stderr, "assechains stream should be mining to override pubkey\n");
     }
     else if ( USE_EXTERNAL_PUBKEY != 0 )
     {