From c1e71947602d74ee626d5591ec4532bed300af95 Mon Sep 17 00:00:00 2001
From: Michael Toutonghi <michaeltoutonghi@gmail.com>
Date: Fri, 25 May 2018 21:52:53 -0700
Subject: [PATCH] fix coinbase spend after 10080 & seg fault

---
 src/coins.cpp | 2 +-
 src/main.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/coins.cpp b/src/coins.cpp
index 0a323d990..9ce8607fd 100644
--- a/src/coins.cpp
+++ b/src/coins.cpp
@@ -394,7 +394,7 @@ const CScript &CCoinsViewCache::GetSpendFor(const CCoins *coins, const CTxIn& in
             return LaunchMap().lmap[hc];
         }
     }
-    else return coins->vout[input.prevout.n].scriptPubKey;
+    return coins->vout[input.prevout.n].scriptPubKey;
 }
 
 const CScript &CCoinsViewCache::GetSpendFor(const CTxIn& input) const
diff --git a/src/main.cpp b/src/main.cpp
index 33204bad1..210105a73 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2069,7 +2069,7 @@ namespace Consensus {
                 if (fCoinbaseEnforcedProtectionEnabled &&
                     consensusParams.fCoinbaseMustBeProtected &&
                     !tx.vout.empty() &&
-                    (strcmp(ASSETCHAINS_SYMBOL, "VRSC") != 0 || nSpendHeight >= 10080)) {
+                    (strcmp(ASSETCHAINS_SYMBOL, "VRSC") != 0 || (nSpendHeight >= 10080 && coins->nHeight >= 10080)) {
                     return state.Invalid(
                                          error("CheckInputs(): tried to spend coinbase with transparent outputs"),
                                          REJECT_INVALID, "bad-txns-coinbase-spend-has-transparent-outputs");