From: CryptoManiac Date: Sun, 13 Sep 2015 17:28:58 +0000 (+0300) Subject: Remove legacy checkings. X-Git-Tag: nvc-v0.5.4~48 X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=a387ed6d733041338d8cfa92ef63ff514da7ce07 Remove legacy checkings. --- diff --git a/src/main.cpp b/src/main.cpp index 6df49c7..defa537 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -732,7 +732,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, SIG_SWITCH_TIME < tx.nTime ? STRICT_FLAGS : SOFT_FLAGS)) + if (!tx.ConnectInputs(txdb, mapInputs, mapUnused, CDiskTxPos(1,1,1), pindexBest, false, false, true, STRICT_FLAGS)) { return error("CTxMemPool::accept() : ConnectInputs failed %s", hash.ToString().substr(0,10).c_str()); } diff --git a/src/script.h b/src/script.h index f490631..0b94f41 100644 --- a/src/script.h +++ b/src/script.h @@ -71,9 +71,6 @@ static const unsigned int MANDATORY_SCRIPT_VERIFY_FLAGS = SCRIPT_VERIFY_P2SH; // blocks and we must accept those blocks. static const unsigned int STRICT_FLAGS = MANDATORY_SCRIPT_VERIFY_FLAGS | STRICT_FORMAT_FLAGS; -// Soft verifications, no extended signature format checkings -static const unsigned int SOFT_FLAGS = STRICT_FLAGS & ~STRICT_FORMAT_FLAGS; - enum txnouttype { TX_NONSTANDARD, diff --git a/src/timestamps.h b/src/timestamps.h index 4fbd7e4..dea9396 100644 --- a/src/timestamps.h +++ b/src/timestamps.h @@ -7,6 +7,5 @@ static const unsigned int CHAINCHECKS_SWITCH_TIME = 1379635200; // Fri, 20 Sep 2 static const unsigned int STAKECURVE_SWITCH_TIME = 1382227200; // Sun, 20 Oct 2013 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