From 498542f60aa6f1a280bdde96ec1648a764d5d909 Mon Sep 17 00:00:00 2001
From: Alex English <alex@Compy.home.alexenglish.info>
Date: Mon, 14 May 2018 06:52:57 -0700
Subject: [PATCH 1/2] Recommitting fb9ad7b0daa32072a9ef555b8dabf71e501388f2
 from Sun May 13 23:34:34 2018 -0700 by MikeTout because I accidentally blew
 it away fixing a bad merge.

---
 src/main.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 2c4c176db..d3b0c1d7e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -907,14 +907,6 @@ unsigned int GetP2SHSigOpCount(const CTransaction& tx, const CCoinsViewCache& in
  */
 bool ContextualCheckCoinbaseTransaction(const CTransaction& tx, const int nHeight)
 {
-    int64_t valOut = tx.GetValueOut(), sub = komodo_ac_block_subsidy(nHeight);
-    if ((uint64_t)(tx.GetValueOut()) != komodo_ac_block_subsidy(nHeight))
-    {
-        // failed with invalid coinbase output
-        fprintf(stderr, "ERROR: invalid block #%i, reward=%li, subsidy should be %li", nHeight, valOut, sub);
-        return(false);
-    }
-
     // if time locks are on, ensure that this coin base is time locked exactly as it should be
     if ((uint64_t)(tx.GetValueOut()) >= ASSETCHAINS_TIMELOCKGTE)
     {
@@ -2827,7 +2819,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
         vPos.push_back(std::make_pair(tx.GetHash(), pos));
         pos.nTxOffset += ::GetSerializeSize(tx, SER_DISK, CLIENT_VERSION);
     }
-    
+
     view.PushAnchor(tree);
     if (!fJustCheck) {
         pindex->hashAnchorEnd = tree.root();
@@ -4040,7 +4032,6 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIn
             return state.DoS(100, error("%s: block height mismatch in coinbase", __func__), REJECT_INVALID, "bad-cb-height");
         }
     }
-    
     return true;
 }
 

From 72c5a7d56faa2b07a6eb71efa7bb4b947919dfc2 Mon Sep 17 00:00:00 2001
From: Alex English <alex@Compy.home.alexenglish.info>
Date: Mon, 14 May 2018 06:58:14 -0700
Subject: [PATCH 2/2] Added ability to invoke src/fiat/verus from any cwd.
 Added executable permission.

---
 src/fiat/verus | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/fiat/verus b/src/fiat/verus
index e0e37ab96..0bcc79fd2 100644
--- a/src/fiat/verus
+++ b/src/fiat/verus
@@ -1,2 +1,7 @@
 #!/bin/bash
-./komodo-cli -ac_name=VERUSTEST "$@"
+
+#set working directory to the location of this script
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR
+
+../komodo-cli -ac_name=VERUSTEST "$@"