From 3ec201770581e1a1daa8d69b8e7bd8f58dd84197 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 10 Jul 2019 21:17:19 -1100
Subject: [PATCH] No expiry

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

diff --git a/src/main.cpp b/src/main.cpp
index e7444bad3..57f21a80b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2224,7 +2224,6 @@ bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlo
     {
         int64_t rewardsum = 0; int32_t retval,vout = 0;
         retval = NSPV_gettransaction(1,vout,hash,0,txOut,0,0,rewardsum);
-        fprintf(stderr,"myGetTransaction retval.%d\n",retval);
         return(retval == 0);
     }
     // need a GetTransaction without lock so the validation code for assets can run without deadlock
@@ -8471,7 +8470,8 @@ CMutableTransaction CreateNewContextualCMutableTransaction(const Consensus::Para
     bool isOverwintered = NetworkUpgradeActive(nHeight, consensusParams, Consensus::UPGRADE_OVERWINTER) || (KOMODO_NSPV != 0);
     if (isOverwintered) {
         mtx.fOverwintered = true;
-        mtx.nExpiryHeight = nHeight + expiryDelta;
+        if ( KOMODO_NSPV == 0 )
+            mtx.nExpiryHeight = nHeight + expiryDelta;
 
         if ( NetworkUpgradeActive(nHeight, consensusParams, Consensus::UPGRADE_SAPLING) || (KOMODO_NSPV != 0) )
         {