aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-06-27 12:43:19 -0400
committerGavin Andresen <gavinandresen@gmail.com>2012-07-06 11:37:01 -0400
commitdae3e10a5abe93833c57183b7c00f1db9200f46e (patch)
tree52799f24df21e1785c0e58e43438a8b130642ad5 /src/main.cpp
parent6e3a1a374293a8a5adeb2ad464f7205e819585ee (diff)
downloadbitcoin-dae3e10a5abe93833c57183b7c00f1db9200f46e.tar.xz
Treat non-version-1 transactions as non-standard
Adds CBlock::CURRENT_VERSION and CTransaction::CURRENT_VERSION constants, and makes non-CURRENT_VERSION transactions nonstandard. This will help make future upgrades smoother.
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 b4e827098e..499f4e336a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -268,6 +268,9 @@ bool CTransaction::ReadFromDisk(COutPoint prevout)
bool CTransaction::IsStandard() const
{
+ if (nVersion > CTransaction::CURRENT_VERSION)
+ return false;
+
BOOST_FOREACH(const CTxIn& txin, vin)
{
// Biggest 'standard' txin is a 3-signature 3-of-3 CHECKMULTISIG