Merge pull request #267 from svost/headers

[novacoin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 5e8e030..3cf5d0d 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,7 +7,6 @@
 #include "checkpoints.h"
 #include "db.h"
 #include "txdb.h"
-#include "net.h"
 #include "init.h"
 #include "ui_interface.h"
 #include "checkqueue.h"
@@ -512,7 +511,8 @@ bool CTransaction::CheckTransaction() const
     if (vout.empty())
         return DoS(10, error("CTransaction::CheckTransaction() : vout empty"));
     // Time (prevent mempool memory exhaustion attack)
-    if (nTime > FutureDrift(GetAdjustedTime()))
+    // Comes into force since 20 December 2015.
+    if (nTime > 1450569600 && nTime > FutureDrift(GetAdjustedTime()))
         return DoS(10, error("CTransaction::CheckTransaction() : timestamp is too far into the future"));
     // Size limits
     if (::GetSerializeSize(*this, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE)