aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2013-01-28 07:56:58 -0800
committerGavin Andresen <gavinandresen@gmail.com>2013-01-28 07:56:58 -0800
commitf73abdc82dd69c046f7800acd0845002cb20aec5 (patch)
tree955edb93dd9a80ece46619244ae370615a19bbea /src/main.cpp
parent0d3d6094faf0da252c581d58454ecc4be91aacb9 (diff)
parent6f8730752cf92ff8269812c01a6d9d35fff82e75 (diff)
downloadbitcoin-f73abdc82dd69c046f7800acd0845002cb20aec5.tar.xz
Merge pull request #2223 from gavinandresen/nonfinalnonstandard
Treat non-final transactions as non-standard
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 0c9e43a9be..fe35fbaf29 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -368,6 +368,9 @@ bool CTransaction::IsStandard() const
if (nVersion > CTransaction::CURRENT_VERSION)
return false;
+ if (!IsFinal())
+ return false;
+
BOOST_FOREACH(const CTxIn& txin, vin)
{
// Biggest 'standard' txin is a 3-signature 3-of-3 CHECKMULTISIG