Merge branch 'master' of github.com:CryptoManiac/novacoin

diff --git a/src/main.cpp b/src/main.cpp
index 14e7ce3..64da4da 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -726,7 +726,7 @@ bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs,
 
         // Check against previous transactions
         // This is done last to help prevent CPU exhaustion denial-of-service attacks.
-        if (!tx.ConnectInputs(txdb, mapInputs, mapUnused, CDiskTxPos(1,1,1), pindexBest, false, false, true, VALIDATION_SWITCH_TIME < tx.nTime ? STRICT_FLAGS : SOFT_FLAGS))
+        if (!tx.ConnectInputs(txdb, mapInputs, mapUnused, CDiskTxPos(1,1,1), pindexBest, false, false, true, SIG_SWITCH_TIME < tx.nTime ? STRICT_FLAGS : SOFT_FLAGS))
         {
             return error("CTxMemPool::accept() : ConnectInputs failed %s", hash.ToString().substr(0,10).c_str());
         }

diff --git a/src/timestamps.h b/src/timestamps.h
index de8a6a6..027f220 100644 (file)
--- a/src/timestamps.h
+++ b/src/timestamps.h
@@ -9,5 +9,6 @@ static const unsigned int STAKECURVE_SWITCH_TIME = 1382227200; // Sun, 20 Oct 20
 static const unsigned int FEE_SWITCH_TIME = 1405814400; // Sun, 20 Jul 2014 00:00:00 GMT
 
 static const unsigned int VALIDATION_SWITCH_TIME = 1408492800; // Wed, 20 Aug 2014 00:00:00 GMT
+static const unsigned int SIG_SWITCH_TIME = 1411171200; // Sat, 20 Sep 2014 00:00:00 GMT
 
 #endif