From cad34b503d51f9076adef1e65435854f54fdba68 Mon Sep 17 00:00:00 2001
From: blackjok3r <blackjok3r@gmail.com>
Date: Sun, 18 Nov 2018 18:25:07 +0800
Subject: [PATCH] fix streamer with ac_pubey requiring ac_perc

---
 src/cryptoconditions/compile | 13 +++++-----
 src/komodo_utils.h           |  4 +--
 src/pow.cpp                  | 50 +++++++++++++++++-------------------
 3 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/src/cryptoconditions/compile b/src/cryptoconditions/compile
index a85b723c7..99e50524b 100755
--- a/src/cryptoconditions/compile
+++ b/src/cryptoconditions/compile
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -255,7 +255,8 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/src/komodo_utils.h b/src/komodo_utils.h
index a1705c20a..80581a1f8 100644
--- a/src/komodo_utils.h
+++ b/src/komodo_utils.h
@@ -1620,10 +1620,10 @@ void komodo_args(char *argv0)
                     ASSETCHAINS_COMMISSION = 53846154; // maps to 35%
                     printf("ASSETCHAINS_COMMISSION defaulted to 35%% when founders reward active\n");
                 }
-                else
+                else if ( ASSETCHAINS_STREAM == 0 )
                 {
                     ASSETCHAINS_OVERRIDE_PUBKEY.clear();
-                    printf("-ac_perc must be set with -ac_pubkey\n");
+                    printf("-ac_perc or -ac_stream must be set with -ac_pubkey\n");
                 }
             }
         }
diff --git a/src/pow.cpp b/src/pow.cpp
index 0e7e6678c..07776e273 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -24,35 +24,31 @@ extern int32_t ASSETCHAINS_STREAM;
 
 unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock, const Consensus::Params& params)
 {
-    if ( ASSETCHAINS_STREAM != 2 )
-    {
-      unsigned int nProofOfWorkLimit = UintToArith256(params.powLimit).GetCompact();
-      // Genesis block
-      if (pindexLast == NULL )
-          return nProofOfWorkLimit;
-
-      // Find the first block in the averaging interval
-      const CBlockIndex* pindexFirst = pindexLast;
-      arith_uint256 bnTot {0};
-      for (int i = 0; pindexFirst && i < params.nPowAveragingWindow; i++) {
-          arith_uint256 bnTmp;
-          bnTmp.SetCompact(pindexFirst->nBits);
-          bnTot += bnTmp;
-          pindexFirst = pindexFirst->pprev;
-      }
-
-      // Check we have enough blocks
-      if (pindexFirst == NULL)
-          return nProofOfWorkLimit;
-
-      arith_uint256 bnAvg {bnTot / params.nPowAveragingWindow};
-
-      return CalculateNextWorkRequired(bnAvg, pindexLast->GetMedianTimePast(), pindexFirst->GetMedianTimePast(), params);
-    }
-    else
-    {
+    if ( ASSETCHAINS_STREAM == 2 )
       return 537857807;
+
+    unsigned int nProofOfWorkLimit = UintToArith256(params.powLimit).GetCompact();
+    // Genesis block
+    if (pindexLast == NULL )
+        return nProofOfWorkLimit;
+
+    // Find the first block in the averaging interval
+    const CBlockIndex* pindexFirst = pindexLast;
+    arith_uint256 bnTot {0};
+    for (int i = 0; pindexFirst && i < params.nPowAveragingWindow; i++) {
+        arith_uint256 bnTmp;
+        bnTmp.SetCompact(pindexFirst->nBits);
+        bnTot += bnTmp;
+        pindexFirst = pindexFirst->pprev;
     }
+
+    // Check we have enough blocks
+    if (pindexFirst == NULL)
+        return nProofOfWorkLimit;
+
+    arith_uint256 bnAvg {bnTot / params.nPowAveragingWindow};
+
+    return CalculateNextWorkRequired(bnAvg, pindexLast->GetMedianTimePast(), pindexFirst->GetMedianTimePast(), params);
 }
 
 unsigned int CalculateNextWorkRequired(arith_uint256 bnAvg,